Ver código fonte

'还原度修改'

zhangyu 4 anos atrás
pai
commit
375e856f37

BIN
src/assets/images/delete.png


+ 9 - 2
src/components/edit/attr_select.vue

@@ -248,7 +248,7 @@
     >
       <a-spin :spinning="spinning">
       <div class="row">
-        <span>{{type =='Zone'?`工程信息化中的位置类型`:'工程信息化中的设备类型'}}</span>
+        <span class="edit-option-text">{{type =='Zone'?`工程信息化中的位置类型`:'工程信息化中的设备类型'}}</span>
         <a-button type="link" class="edit-option-btn" @click="handleEdit">选择编辑</a-button>
       </div>
 
@@ -597,7 +597,7 @@ export default {
       }
     }
     .row-tit {
-      color: #1f2429;
+      color: #8D9399;
       font-size: 14px;
     }
   }
@@ -618,6 +618,13 @@ export default {
     font-size: 25px;
   }
 
+  .edit-option-text {
+    color: #8D9399;
+    height: 32px;
+    line-height: 32px;
+    margin-top: -5px;
+  }
+
   .edit-option-btn {
     float: right;
     margin-top: -5px;

+ 5 - 2
src/components/edit/left_toolbar.vue

@@ -585,11 +585,12 @@ export default {
   }
   .drawer-model {
     position: absolute;
-    left: 70px;
+    left: 81px;
     top: 0;
     overflow: hidden;
     width: 100%;
     height: 100%;
+    z-index: 0;
     .drawer-model-body {
       width: 100%;
       .btn-list {
@@ -602,6 +603,8 @@ export default {
           border-left: 4px solid #0091ff;
           margin-top: 20px;
           text-indent: 8px;
+          height: 20px;
+          line-height: 20px;
           color: #1F2329;
           margin-bottom: 12px;
         }
@@ -643,7 +646,7 @@ export default {
             }
             .text {
               width: 100%;
-              padding: 0 5px;
+              padding: 0 4px;
               font-size: 12px;
               text-align: center;
               overflow: hidden;

+ 4 - 3
src/components/edit/top_toolbar.vue

@@ -12,7 +12,7 @@
           <span>保存</span>
         </li>
         <li @click="undo">
-            <img class="lock" :src="require(`./../../assets/images/undo.png`)" alt />
+          <img class="lock" :src="require(`./../../assets/images/undo.png`)" alt />
           <span>撤销</span>
         </li>
         <li @click="redo">
@@ -61,7 +61,7 @@
           <span>{{isLock?"解锁":"锁定"}}</span>
         </li>
         <li @click="deleteItem">
-          <a-icon type="delete" />
+          <img class="lock" :src="require(`./../../assets/images/delete.png`)" alt />
           <span>删除</span>
         </li>
       </ul>
@@ -144,7 +144,8 @@ export default {
   computed: {
     // 缩放比例显示文本
     scalePercent() {
-      return (this.scale * 100).toFixed(0) + '%'
+      const scalePercent = (this.scale * 100).toFixed(0) > 9999? 9999 : (this.scale * 100).toFixed(0);
+      return scalePercent + '%'
     }
   },
   methods: {

+ 2 - 0
src/views/editer.vue

@@ -70,6 +70,8 @@ export default {
   .top_toolbar {
     width: 100%;
     height: 60px;
+    position: relative;
+    z-index: 1;
     background: rgba(255, 255, 255, 1);
     box-shadow: 2px 2px 12px 0 rgba(0, 0, 0, 0.1);
   }