Procházet zdrojové kódy

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-editer into develop

YaolongHan před 5 roky
rodič
revize
1251367f2e

+ 3 - 3
package.json

@@ -9,10 +9,10 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.22",
-    "@saga-web/big": "1.0.66",
+    "@saga-web/big": "1.0.67",
     "@saga-web/draw": "2.1.100",
-    "@saga-web/feng-map": "1.0.17",
-    "@saga-web/graph": "2.1.101",
+    "@saga-web/feng-map": "1.0.19",
+    "@saga-web/graph": "2.1.102",
     "ant-design-vue": "^1.6.0",
     "core-js": "^3.6.4",
     "element-ui": "^2.13.2",

binární
src/assets/images/delete.png


+ 3 - 1
src/components/baseEditer.vue

@@ -45,6 +45,7 @@ export default {
       appName: "万达可视化系统",
       key: "23f30a832a862c58637a4aadbf50a566",
       mapServerURL: "http://map.wanda.cn/editor",
+      mapthemeUrl: `http://map.wanda.cn/editor/webtheme`,
       canvasWidth: 700,
       canvasHeight: 800,
       fParser: null,
@@ -100,7 +101,8 @@ export default {
         this.mapServerURL + "/fmap/" + this.urlMsg.fmapID,
         this.key,
         this.appName,
-        null
+        null,
+        this.mapthemeUrl
       );
       const floorid = this.urlMsg.FloorID;
       fengmap.loadMap(this.urlMsg.fmapID, resp => {

+ 11 - 4
src/components/edit/attr_select.vue

@@ -212,7 +212,7 @@
         <div v-if="!SubType">
           <!-- 普通分区 -->
           <div class="row">
-            <div class="row-tit">名称显示</div>
+            <div class="row-tit">显示名称</div>
             <a-button
               type="link"
               class="edit-option-btn"
@@ -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;
     }
   }
@@ -610,7 +610,7 @@ export default {
   }
 
   .grid-content {
-    // margin-top: 10px;
+     margin-top: 12px;
     position: relative;
   }
 
@@ -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: {

+ 1 - 1
src/lib/items/SFHFQZoneLegendItem.ts

@@ -1,5 +1,5 @@
 
-import { SGraphItem } from "@saga-web/graph/lib";
+import { SGraphItem, SLineStyle } from "@saga-web/graph/lib";
 import { Legend } from '../types/Legend';
 import { SPainter, SColor, SFont, SPoint, SLineCapStyle } from "@saga-web/draw";
 import { STextItem } from '@saga-web/graph/lib';

+ 1 - 1
src/lib/items/SSCPZZoneLegendItem.ts

@@ -1,5 +1,5 @@
 
-import { SGraphItem } from "@saga-web/graph/lib";
+import { SGraphItem, SLineStyle } from "@saga-web/graph/lib";
 import { Legend } from '../types/Legend';
 import { SPainter, SColor, SFont, SPoint, SLineCapStyle } from "@saga-web/draw";
 import { STextItem } from '@saga-web/graph/lib';

+ 3 - 1
src/views/drafts.vue

@@ -114,6 +114,7 @@ export default {
       urlMsg: null,
       floorList: {},
       mapServerURL: "http://map.wanda.cn/editor",
+      mapthemeUrl: `http://map.wanda.cn/editor/webtheme`,
       key: "23f30a832a862c58637a4aadbf50a566",
       appName: "万达可视化系统",
       defaultProps: {
@@ -158,7 +159,8 @@ export default {
         this.mapServerURL + "/fmap/" + this.fmapID,
         this.key,
         this.appName,
-        null
+        null,
+        this.mapthemeUrl
       );
       fengmap.loadMap(this.fmapID, resp => {
         this.floorList = resp;

+ 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);
   }