YaolongHan 4 lat temu
rodzic
commit
cd3cf1e6a9

+ 1 - 0
src/components/baseEditer.vue

@@ -428,6 +428,7 @@ export default {
                     SubType: "",
                     Properties: {
                       IconUrl: '/serve/topology-wanda/Picture/query/' + val.age.Url,
+                      InfoSystemId: val.age.InfoSystemId?val.age.InfoSystemId:'',   //信息工程话分类ID分类
                       StrokeColor: val.age.Color,
                       FillColor: val.age.FillColor,
                       LineDash: val.age.LineDash,

+ 2 - 2
src/components/edit/edit-dialog.vue

@@ -193,9 +193,9 @@
                 },1000);
             },
             handleCancel(e) {
-                this.visible = false;
+              this.visible = false;
               let arr = [];
-              let lists = [];
+              const lists = [];
               console.log(this.selectList);
               arr = JSON.parse(JSON.stringify( this.selectList))
               arr.map(item =>{

+ 7 - 3
src/components/edit/left_toolbar.vue

@@ -90,7 +90,7 @@
               <div class="btn-list">
                 <Tabs
                   type="card"
-                  v-show="showDrawerItem.type == 'Zone'"
+                  v-if="showDrawerItem.type == 'Zone'"
                   :data="tabData"
                   v-model="tabActive"
                 />
@@ -435,8 +435,11 @@ export default {
         this.showDrawer(this.showDrawerItem);
       }
     },
-    tabActive(val) {
-      this.changeDrawType(val);
+    tabActive: {
+      handler: function(val) {
+        this.changeDrawType(val);
+      },
+      immediate: true
     }
   },
   mounted() {
@@ -464,6 +467,7 @@ export default {
     });
     this.categoryId = obj.categoryId;
     this.categoryIdS.push(obj.categoryId);
+    this.categoryId;
   }
 };
 </script>

+ 8 - 6
src/components/mapClass/EditScence.ts

@@ -55,7 +55,7 @@ export class EditScence extends SGraphScene {
         }
     };
     /** 绘制区域时 是否为点选   */
-    isSelecting: boolean = false;
+    isSelecting: boolean = true;
 
     /** 是否开启吸附  */
     isAbsorbing: boolean = false;
@@ -279,7 +279,8 @@ export class EditScence extends SGraphScene {
                 font: 0,
                 color: '',
                 TextPos: { X: 0, Y: 0 },
-                InfoTypeId:this._legend.InfoTypeId.length? this._legend.InfoTypeId :[]
+                InfoTypeId:this._legend.InfoTypeId.length? this._legend.InfoTypeId :[],
+                InfoSystemId:this._legend.InfoSystemId ? this._legend.InfoSystemId :''
             },
         }
         let Polylines = null;
@@ -335,7 +336,8 @@ export class EditScence extends SGraphScene {
                     color: '',
                     FID: item.data.SourceId,
                     TextPos: { X: item.data.Location.Points[0].X, Y: -item.data.Location.Points[0].Y },
-                    InfoTypeId:this._legend.InfoTypeId.length? this._legend.InfoTypeId :[]
+                    InfoTypeId:this._legend.InfoTypeId.length? this._legend.InfoTypeId :[],
+                    InfoSystemId:this._legend.InfoSystemId ? this._legend.InfoSystemId :''
                 },
             }
             let Polylines = null;
@@ -431,7 +433,6 @@ export class EditScence extends SGraphScene {
      */
     addIconItem(event: SMouseEvent): void {
         //获取信息工程化相关参数
-        const InfoSystemId = this._legend.InfoSystemId ? this._legend.InfoSystemId : '';
         const LegendData: Legend = {
             ID: uuid(),
             Name: this._legend.Name,
@@ -453,8 +454,9 @@ export class EditScence extends SGraphScene {
                 font: 12,    //font
                 color: '',  //字体颜色
                 GraphCategoryId: this._legend.GraphCategoryId,
-                InfoSystemId: InfoSystemId,   //信息工程话分类ID分类
-                InfoTypeId:this._legend.InfoTypeId.length? this._legend.InfoTypeId :[]// 铺位可视化Typeid(用于编辑工程信息化时默认问题)
+                InfoSystemId:this._legend.InfoSystemId ? this._legend.InfoSystemId :'' ,
+                InfoTypeId:this._legend.InfoTypeId.length? this._legend.InfoTypeId :[],// 铺位可视化Typeid(用于编辑工程信息化时默认问题)
+
             },
         }
         const item = new SImageLegendItem(null, LegendData);