diff --git a/src/assets/overview/map.json b/src/assets/overview/map.json index 0933b1a..4b4fc4a 100644 --- a/src/assets/overview/map.json +++ b/src/assets/overview/map.json @@ -2,6 +2,7 @@ { "id": 2, "label": "管线本体", + "disabled": "disabled", "children": [ {"id": 20, "label": "阀室", "url": "2", "type":4, "style": "static/images/overview/阀室.png", "name": "{VALVEHOUSENAME}", "color": "#405d99", @@ -32,6 +33,7 @@ { "id": 3, "label": "周边环境", + "disabled": "disabled", "children": [ {"id": 30, "label": "维抢修队伍", "url": "23", "type":0, "style": "static/images/overview/维抢修队伍.png", "popup": "
抢修队名称:{TEAMNAME}应急电话:{PHONE}
人员数量:{ORGANIZATION}是否外协单位:{EXTERNALTEAM}
行政隶属:{ADMINISTRATIVESUBORDINATE}地址:{ADDRESS}
所属单位代码:{ORGCODE}所属单位名称:{ORGNAME}
抢险资源位置标识:{RESOURCELOCATIONEVENTID}管道编码:{PIPECODE}
管道名称:{PIPENAME}填报人姓名:{REPNAME}
填报人联系方式:{REPTELEPHONE}备注:{REMARKS}
" diff --git a/src/assets/overview/map.json b/src/assets/overview/map.json index 0933b1a..4b4fc4a 100644 --- a/src/assets/overview/map.json +++ b/src/assets/overview/map.json @@ -2,6 +2,7 @@ { "id": 2, "label": "管线本体", + "disabled": "disabled", "children": [ {"id": 20, "label": "阀室", "url": "2", "type":4, "style": "static/images/overview/阀室.png", "name": "{VALVEHOUSENAME}", "color": "#405d99", @@ -32,6 +33,7 @@ { "id": 3, "label": "周边环境", + "disabled": "disabled", "children": [ {"id": 30, "label": "维抢修队伍", "url": "23", "type":0, "style": "static/images/overview/维抢修队伍.png", "popup": "
抢修队名称:{TEAMNAME}应急电话:{PHONE}
人员数量:{ORGANIZATION}是否外协单位:{EXTERNALTEAM}
行政隶属:{ADMINISTRATIVESUBORDINATE}地址:{ADDRESS}
所属单位代码:{ORGCODE}所属单位名称:{ORGNAME}
抢险资源位置标识:{RESOURCELOCATIONEVENTID}管道编码:{PIPECODE}
管道名称:{PIPENAME}填报人姓名:{REPNAME}
填报人联系方式:{REPTELEPHONE}备注:{REMARKS}
" diff --git a/src/components/Mars3D/Mars3dMap.vue b/src/components/Mars3D/Mars3dMap.vue index 2ba0b3c..241c144 100644 --- a/src/components/Mars3D/Mars3dMap.vue +++ b/src/components/Mars3D/Mars3dMap.vue @@ -313,6 +313,7 @@ }, changeBaseLayer(basemap) { + console.log(basemap, 'basemap') window.map.basemap = basemap } } diff --git a/src/assets/overview/map.json b/src/assets/overview/map.json index 0933b1a..4b4fc4a 100644 --- a/src/assets/overview/map.json +++ b/src/assets/overview/map.json @@ -2,6 +2,7 @@ { "id": 2, "label": "管线本体", + "disabled": "disabled", "children": [ {"id": 20, "label": "阀室", "url": "2", "type":4, "style": "static/images/overview/阀室.png", "name": "{VALVEHOUSENAME}", "color": "#405d99", @@ -32,6 +33,7 @@ { "id": 3, "label": "周边环境", + "disabled": "disabled", "children": [ {"id": 30, "label": "维抢修队伍", "url": "23", "type":0, "style": "static/images/overview/维抢修队伍.png", "popup": "
抢修队名称:{TEAMNAME}应急电话:{PHONE}
人员数量:{ORGANIZATION}是否外协单位:{EXTERNALTEAM}
行政隶属:{ADMINISTRATIVESUBORDINATE}地址:{ADDRESS}
所属单位代码:{ORGCODE}所属单位名称:{ORGNAME}
抢险资源位置标识:{RESOURCELOCATIONEVENTID}管道编码:{PIPECODE}
管道名称:{PIPENAME}填报人姓名:{REPNAME}
填报人联系方式:{REPTELEPHONE}备注:{REMARKS}
" diff --git a/src/components/Mars3D/Mars3dMap.vue b/src/components/Mars3D/Mars3dMap.vue index 2ba0b3c..241c144 100644 --- a/src/components/Mars3D/Mars3dMap.vue +++ b/src/components/Mars3D/Mars3dMap.vue @@ -313,6 +313,7 @@ }, changeBaseLayer(basemap) { + console.log(basemap, 'basemap') window.map.basemap = basemap } } diff --git a/src/views/overview/overview3ddz.vue b/src/views/overview/overview3ddz.vue index b1f3c39..f855073 100644 --- a/src/views/overview/overview3ddz.vue +++ b/src/views/overview/overview3ddz.vue @@ -60,7 +60,7 @@ checkedLayers:[20,21,25,26], basemap: 1113, mapLoading: true, - showTree: true, + showTree: false, defaultProps: { children: 'children', label: 'label' @@ -341,6 +341,7 @@ handleCheckChange(data, checked, indeterminate) { if(data.hasOwnProperty('url')) { const layer = window.map.getLayerByAttr(data.id.toString(), 'id') + console.log(layers[data.id], 'layer') if(!layers[data.id]) { return } diff --git a/src/assets/overview/map.json b/src/assets/overview/map.json index 0933b1a..4b4fc4a 100644 --- a/src/assets/overview/map.json +++ b/src/assets/overview/map.json @@ -2,6 +2,7 @@ { "id": 2, "label": "管线本体", + "disabled": "disabled", "children": [ {"id": 20, "label": "阀室", "url": "2", "type":4, "style": "static/images/overview/阀室.png", "name": "{VALVEHOUSENAME}", "color": "#405d99", @@ -32,6 +33,7 @@ { "id": 3, "label": "周边环境", + "disabled": "disabled", "children": [ {"id": 30, "label": "维抢修队伍", "url": "23", "type":0, "style": "static/images/overview/维抢修队伍.png", "popup": "
抢修队名称:{TEAMNAME}应急电话:{PHONE}
人员数量:{ORGANIZATION}是否外协单位:{EXTERNALTEAM}
行政隶属:{ADMINISTRATIVESUBORDINATE}地址:{ADDRESS}
所属单位代码:{ORGCODE}所属单位名称:{ORGNAME}
抢险资源位置标识:{RESOURCELOCATIONEVENTID}管道编码:{PIPECODE}
管道名称:{PIPENAME}填报人姓名:{REPNAME}
填报人联系方式:{REPTELEPHONE}备注:{REMARKS}
" diff --git a/src/components/Mars3D/Mars3dMap.vue b/src/components/Mars3D/Mars3dMap.vue index 2ba0b3c..241c144 100644 --- a/src/components/Mars3D/Mars3dMap.vue +++ b/src/components/Mars3D/Mars3dMap.vue @@ -313,6 +313,7 @@ }, changeBaseLayer(basemap) { + console.log(basemap, 'basemap') window.map.basemap = basemap } } diff --git a/src/views/overview/overview3ddz.vue b/src/views/overview/overview3ddz.vue index b1f3c39..f855073 100644 --- a/src/views/overview/overview3ddz.vue +++ b/src/views/overview/overview3ddz.vue @@ -60,7 +60,7 @@ checkedLayers:[20,21,25,26], basemap: 1113, mapLoading: true, - showTree: true, + showTree: false, defaultProps: { children: 'children', label: 'label' @@ -341,6 +341,7 @@ handleCheckChange(data, checked, indeterminate) { if(data.hasOwnProperty('url')) { const layer = window.map.getLayerByAttr(data.id.toString(), 'id') + console.log(layers[data.id], 'layer') if(!layers[data.id]) { return } diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue index 358aecd..620e514 100644 --- a/src/views/wellManage/detailWell.vue +++ b/src/views/wellManage/detailWell.vue @@ -1,22 +1,23 @@