Przeglądaj źródła

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

zhangyu 4 lat temu
rodzic
commit
9f106cc5a9

+ 2 - 2
package.json

@@ -9,9 +9,9 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.22",
-    "@saga-web/big": "1.0.55",
+    "@saga-web/big": "1.0.56",
     "@saga-web/draw": "2.1.100",
-    "@saga-web/feng-map": "1.0.13",
+    "@saga-web/feng-map": "1.0.15",
     "@saga-web/graph": "2.1.94",
     "@saga-web/topology": "1.0.84",
     "ant-design-vue": "^1.6.0",

+ 2 - 2
src/components/baseEditer.vue

@@ -126,6 +126,7 @@ export default {
             this.fParser.parseData(res);
             this.scene.fidToItem = {}
             this.fParser.spaceList.forEach(t => {
+              t.zOrder = t.zOrder + t.data.Height;
               t.selectable = true;
               this.scene.fidToItem[t.data.SourceId] = t;
               this.scene.addItem(t);
@@ -402,7 +403,7 @@ export default {
        */
       // TODO: changeScale缩放底图
       bus.$on('changeScale', zoom => {
-        let { scale } = this.view;
+        const { scale } = this.view;
         this.changeScaleByClick = true
         this.view.scaleByPoint(zoom, this.canvasWidth / 2, this.canvasHeight / 2)
         this.changeScaleByClick = false
@@ -417,7 +418,6 @@ export default {
         projectId: this.urlMsg.projectId,
         BuildingID: this.urlMsg.BuildingID, // 建筑ID
         FloorID: this.urlMsg.FloorID, // 楼层id
-        Pub: false //是否获取草稿 //获取草稿
       };
       return readGroup(data);
     },

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

@@ -471,7 +471,6 @@ export default {
   },
   watch: {
     focusItemList: function(newval) {
-      console.log(111111111,newval);
       const Item = newval.itemList[0];
       if (Item.data && Item.data.SubType) {
         this.SubType = Item.data.SubType;
@@ -509,7 +508,7 @@ export default {
         }
       }
      if(newval.itemType == 'Zone'){
-       let location = Item.location;
+       const location = Item.location;
        this.spinning = true;
        queryGlsmsLocation({plazaId: '1000423'},{location:'1890'}).then(res=>{
          this.spinning = false;

+ 1 - 1
src/components/edit/right_toolbar.vue

@@ -177,7 +177,7 @@ export default {
   watch: {
     focusItemList: function(newVal) {
       this.attrType = newVal.itemType;
-      console.log(' this.attrType',this.attrType)
+      console.log(' this.attrType',newVal)
       if (newVal.itemList.length !== 1) {
         this.msgList.forEach(item => {
           if (item.name == "X") {

+ 1 - 0
src/views/drafts.vue

@@ -272,6 +272,7 @@ export default {
         FloorID: this.floorId,
         GraphId: this.graphId,
         ProjectID: this.projectId,
+        Pub:false,
         PubUser: ""
       };
       publishGraph(data).then(res => {