Browse Source

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

haojianlong 4 years ago
parent
commit
b300631745

+ 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,

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

@@ -300,7 +300,7 @@
         </a-collapse-panel>
       </a-collapse>
     </div>
-    <editDialog ref="dialog" :attrCards="attrCards" :sysNum="imageNum" :key="new Date().getTime()" />
+    <editDialog ref="dialog" :attrCards="attrCards" :getmajorId="getmajorId"  :sysNum="imageNum" :key="new Date().getTime()" />
     <!--    <editDialog ref="dialog" :typeEdit="2" :getmajorId="'1001'" :sysNum="5" />-->
   </div>
 </template>
@@ -377,7 +377,7 @@ export default {
       },
       swatchess: ["#69C5FC", "#656EDF", "#58AF6F", "#2D8FAA"],
       swatches: [
-        "#00000000",
+        "#F7F9Fa",
         "#1FBC9C",
         "#1CA085",
         "#2ECC70",
@@ -387,7 +387,8 @@ export default {
         "#A463BF",
         "#8E43AD",
         "#3D556E",
-        "#222F3D"
+        "#222F3D",
+        "#00000000",
       ],
       lengedName: "", // 图例名称
       imageNum: 1, //设备数量
@@ -510,13 +511,39 @@ export default {
       console.log('------------')
       console.log(FENGMAP)
       const Item = newval.itemList[0];
-      this.getmajorId = Item.data.Properties.InfoSystemId;
       this.imageNum = 1; //切换item初始化
       if (Item.data && Item.data.SubType) {
         this.SubType = Item.data.SubType;
       } else {
         this.SubType = "";
       }
+      this.getmajorId = Item.data.Properties.InfoSystemId;
+      //判断点 面 带回专业类
+      // let InfoTypeIdArr = [];
+      // if( Item.data.Properties.InfoTypeId.length){
+      //   let InfoTypeId = Item.data.Properties.InfoTypeId;
+      //   console.log('poiList',11111111111111,FENGMAP.poiList);
+      //   console.log('spaceType',2222222222222222,FENGMAP.spaceType);
+      //   if(FENGMAP.poiList.length){
+      //     FENGMAP.poiList.join(',').split(',').map((item,index)=>{
+      //       let n = InfoTypeId.includes(item)
+      //       if(n){
+      //         InfoTypeIdArr.push(item);
+      //       }
+      //     })
+      //   }else if(FENGMAP.spaceType.length){
+      //     FENGMAP.spaceType.join(',').split(',').map((item,index)=>{
+      //       let n = InfoTypeId.includes(item)
+      //       if(n){
+      //         InfoTypeIdArr.push(item);
+      //       }
+      //     })
+      //   }else{
+      //     this.getmajorId = '';
+      //   }
+      // }
+      // InfoTypeIdArr.length? this.getmajorId = InfoTypeIdArr[0]:this.getmajorId ='';
+      //结束
 
       if (newval.itemList.length == 1) {
         if (newval.itemType == "baseText") {

+ 16 - 8
src/components/edit/edit-dialog.vue

@@ -12,7 +12,7 @@
       <div class="left">
         <div class="header">
           <div class="select">
-            <a-select style="width: 236px;margin: 0 10px" >
+            <a-select style="width: 236px;margin: 0 10px"  :default-value="majorId">
               <a-select-opt-group>
                 <span slot="label">设备设施</span>
                 <a-select-option v-for="item in majorList" :value="item.id" @click="handleChange(item)">
@@ -87,7 +87,13 @@
         components: {searchTree},
       props:{
         sysNum:Number ,//设备总数
-        attrCards:Array
+        attrCards:Array,
+        getmajorId:String
+      },
+      computed:{
+        majorId(){
+          return this.getmajorId || ''
+        }
       },
         data() {
             return {
@@ -193,9 +199,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 =>{
@@ -455,6 +461,11 @@
         },
         created() {
           this.floorId = getUrlMsg().FloorID;
+          //如果有专业就带过来
+          console.log(this.getmajorId);
+          if(this.getmajorId){
+            this.getQuerySmsxtBy(this.getmajorId,'Image')
+          }
           if(this.attrCards.length){
             this.attrCards.map(item=>{
               this.selectedRowKeys.push(item.location||item.assetnum)
@@ -465,10 +476,7 @@
             this.selectedRowKeys = [];
           }
           this.getQuerySmsxt();
-          // //如果有专业就带过来
-          // if(this.majorId){
-          //   this.getQuerySmsxtBy(this.majorId)
-          // }
+
           this.getPlazaFloor();
 
         }

+ 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,
@@ -454,8 +455,9 @@ export class EditScence extends SGraphScene {
                 color: '',  //字体颜色
                 FrameColor: this._legend.FrameColor,
                 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);

+ 3 - 0
src/lib/items/SImageLegendItem.ts

@@ -78,6 +78,9 @@ export class SImageLegendItem extends SIconTextItem {
         if (data.Properties && data.Properties.IsActive) {
             this.isActive = data.Properties.IsActive;
         }
+        if (data.AttachObjectIds && data.AttachObjectIds.length) {
+            this.isActive = true;
+        }
         if (data.Properties && data.Properties.FrameColor) {
             this.activeColor = new SColor(data.Properties.FrameColor);
         }

+ 4 - 4
src/views/drafts.vue

@@ -89,6 +89,7 @@ import { uuid } from "@/components/mapClass/until";
 import { SImageItem } from "@saga-web/graph/lib";
 import store from "../store";
 import { Loading } from "element-ui";
+import {getUrlMsg}  from '@/components/urlMsg.js'
 let fengmap = null;
 export default {
   components: { Tree },
@@ -360,16 +361,15 @@ export default {
         projectId: this.projectId,
         flag: true,
         graphId: this.graphId,
-        pub: false
+        pub: false,
+        categoryId:getUrlMsg().categoryId
       }).then(res => {
         console.log(res);
         this.legendLoading = false;
         if (res.data.Result == "success") {
           const data = res.data.Data;
           data.map(item => {
-            if (item.RealNum == 0) {
-              this.legendData.push(item);
-            }
+            this.legendData.push(item);
           });
         } else {
           this.legendData = [];