YaolongHan před 4 roky
rodič
revize
53077758bf

+ 5 - 3
src/components/baseEditer.vue

@@ -396,7 +396,8 @@ export default {
                         color: '',  //字体颜色
                         GraphCategoryId: val.age.GraphCategoryId,
                         InfoSystemId: val.age.InfoSystemId?val.age.InfoSystemId:'',   //信息工程话分类ID分类
-                        FID: t.data.SourceId
+                        FID: t.data.SourceId,
+                        InfoTypeId:val.age.InfoTypeId.length? val.age.InfoTypeId :[]
                     },
                   };
                   const item = new SImageLegendItem(null, data)
@@ -433,7 +434,8 @@ export default {
                       font: 12,
                       color: "",
                       TextPos: { X: 0, Y: 0},
-                      FID: t.data.SourceId
+                      FID: t.data.SourceId,
+                      InfoTypeId:val.age.InfoTypeId.length? val.age.InfoTypeId :[]
                     },
                     Num: 1
                   };
@@ -451,7 +453,7 @@ export default {
           // undo/redo事件
           this.scene.AddListCommand(parserData.zoneLegendList);
           bus.$emit("elementDataChange", this.scene);
-        } 
+        }
       });
       // 设备图例样式对象
       bus.$on("setLenged", obj => {

+ 9 - 10
src/components/edit/left_toolbar.vue

@@ -89,15 +89,6 @@
           <a-spin :spinning="spinning">
             <div class="drawer-model-body" v-if="!isExtract">
               <div class="btn-list">
-<!--                <a-radio-group-->
-<!--                  v-show="showDrawerItem.type == 'Zone'"-->
-<!--                  default-value="draw"-->
-<!--                  button-style="solid"-->
-<!--                  @change="changeDrawType"-->
-<!--                >-->
-<!--                  <a-radio-button value="draw">绘制</a-radio-button>-->
-<!--                  <a-radio-button value="select">点选</a-radio-button>-->
-<!--                </a-radio-group>-->
                 <Tabs type="card"  v-show="showDrawerItem.type == 'Zone'" :data="tabData" v-model="tabActive"/>
               </div>
               <div class="list" v-for="(item,index) in itemList" :key="index">
@@ -270,7 +261,7 @@ export default {
         {name: '绘制', id:'draw'},
         {name: '点选', id:'select' }
       ],
-      tabActive:'draw'
+      tabActive:'select'
     };
   },
   computed: {
@@ -349,6 +340,14 @@ export default {
       });
     },
     getexampleItem(item,indexs,index) {
+      if(this.showDrawerItem.type == 'Zone'){
+  //       if(item.SubType == "SCPZ" || item.SubType == "SCPZ" ){
+  //  {name: '绘制', id:'draw'},
+  //       {name: '点选', id:'select' }
+  //       }else{
+
+  //       }
+      }
       this.activeIndex = index;
       this.activeIndexs = indexs;
       this.$emit("toolActionClick", item);

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

@@ -278,7 +278,8 @@ export class EditScence extends SGraphScene {
                 LineWidth: this._legend.LineWidth,
                 font: 0,
                 color: '',
-                TextPos: { X: 0, Y: 0 }
+                TextPos: { X: 0, Y: 0 },
+                InfoTypeId:this._legend.InfoTypeId.length? this._legend.InfoTypeId :[]
             },
         }
         let Polylines = null;
@@ -333,7 +334,8 @@ export class EditScence extends SGraphScene {
                     font: 12,
                     color: '',
                     FID: item.data.SourceId,
-                    TextPos: { X: item.data.Location.Points[0].X, Y: -item.data.Location.Points[0].Y }
+                    TextPos: { X: item.data.Location.Points[0].X, Y: -item.data.Location.Points[0].Y },
+                    InfoTypeId:this._legend.InfoTypeId.length? this._legend.InfoTypeId :[]
                 },
             }
             let Polylines = null;
@@ -451,7 +453,8 @@ export class EditScence extends SGraphScene {
                 font: 12,    //font
                 color: '',  //字体颜色
                 GraphCategoryId: this._legend.GraphCategoryId,
-                InfoSystemId: InfoSystemId   //信息工程话分类ID分类
+                InfoSystemId: InfoSystemId,   //信息工程话分类ID分类
+                InfoTypeId:this._legend.InfoTypeId.length? this._legend.InfoTypeId :[]// 铺位可视化Typeid(用于编辑工程信息化时默认问题)
             },
         }
         const item = new SImageLegendItem(null, LegendData);