|
@@ -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") {
|