Forráskód Böngészése

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

YaolongHan 4 éve
szülő
commit
6b15904239

+ 5 - 5
package.json

@@ -8,11 +8,11 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@saga-web/base": "2.1.22",
-    "@saga-web/big": "1.0.86",
-    "@saga-web/draw": "2.1.102",
-    "@saga-web/feng-map": "1.0.25",
-    "@saga-web/graph": "2.1.112",
+    "@saga-web/base": "2.1.24",
+    "@saga-web/big": "1.0.90",
+    "@saga-web/draw": "2.1.104",
+    "@saga-web/feng-map": "1.0.26",
+    "@saga-web/graph": "2.1.115",
     "ant-design-vue": "^1.6.0",
     "core-js": "^3.6.4",
     "element-ui": "^2.13.2",

+ 6 - 4
src/components/baseEditer.vue

@@ -8,7 +8,7 @@
 </template>
 <script>
 import { SFengParser } from "@saga-web/feng-map";
-import { SFloorParser,SItemStatus } from "@saga-web/big";
+import { SFloorParser } from "@saga-web/big";
 import { FloorView } from "./../lib/FloorView";
 import { EditScence } from "./mapClass/EditScence";
 import bus from "@/bus";
@@ -20,8 +20,7 @@ import {
 } from "@/api/editer.js";
 import { STopologyParser } from "./../lib/parsers/STopologyParser";
 import { uuid } from "@/components/mapClass/until";
-import { SImageItem } from "@saga-web/graph/lib";
-import { SPainter, SColor, SFont, SPoint } from "@saga-web/draw";
+import { SImageItem, SImageShowType } from "@saga-web/graph/lib";
 import { SImageLegendItem } from "@/lib/items/SImageLegendItem";
 import store from "../store";
 import { Loading } from "element-ui";
@@ -147,12 +146,15 @@ export default {
             null,
             `${this.mapServerURL}/webtheme/${this.urlMsg.fmapID}/${window.FENGMAP.frImg}`
           );
+          imgItem.showType = SImageShowType.AutoFit;
+          imgItem.connect('imgLoadOver',this,()=> {
+            this.readGraph();
+          })
           this.scene.addItem(imgItem);
           this.view.scene = this.scene;
           // this.view.fitSceneToView();
           // this.loading = false;
           // this.isQuerying = false;
-          this.readGraph();
         }
       } else {
         if (this.floorList[floor]) {

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

@@ -757,6 +757,9 @@ export default {
       font-size: 14px;
     }
   }
+  .row:first-child{
+    margin-top: 0;
+  }
   .grid {
     margin: 10px 15px;
     .grid-title {
@@ -778,12 +781,12 @@ export default {
     color: #8d9399;
     height: 32px;
     line-height: 32px;
-    margin-top: -5px;
+    /*margin-top: -5px;*/
   }
 
   .edit-option-btn {
     float: right;
-    margin-top: -5px;
+    /*margin-top: -5px;*/
   }
 
   .attr-card {

+ 3 - 1
src/components/edit/edit-dialog.vue

@@ -56,7 +56,9 @@
                 <div class="tree" >
                     <a-spin :spinning="spinning">
                     <a-input-search placeholder="请输入关键字" v-if="majorId||sysId" style="width: 235px;margin: 10px 10px;"  v-model="selectVal"  @search="onSearchTree" />
-                    <Tree @change="getTreeId" :data="treeData"/>
+                   <div style="height: 385px;overflow-y: scroll;">
+                       <Tree @change="getTreeId" :data="treeData"/>
+                   </div>
                     </a-spin>
                 </div>
                 <div class="checkbox">

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

@@ -206,7 +206,6 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
     toData(): any {
         this.data.Pos = { X: this.x, Y: this.y };
         this.data.Name = this.name;
-        console.log(this.zOrder);
         this.data.Properties.Zorder = this.zOrder;
         this.data.Properties.FillColor = this.fillColor.value;
         this.data.Properties.StrokeColor = this.strokeColor.value;