From 9f9ae3e0253f2d657b6b337d62d269394d04ee09 Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期五, 17 十一月 2023 14:29:08 +0800
Subject: [PATCH] 版本更新
---
src/views/layer/layerManage.vue | 299 +++++++++++++++++++++++++++++------------------------------
1 files changed, 149 insertions(+), 150 deletions(-)
diff --git a/src/views/layer/layerManage.vue b/src/views/layer/layerManage.vue
index 478ba9d..dfbe13c 100644
--- a/src/views/layer/layerManage.vue
+++ b/src/views/layer/layerManage.vue
@@ -12,20 +12,9 @@
</div>
</div>
<div class="layerContent">
- <el-tree
- node-key="id"
- :props="props"
- :highlight-current="false"
- :current-node-key="selectedNodeId"
- :data="treeData"
- :default-expanded-keys="defaultExpanded"
- :expand-on-click-node="false"
- show-checkbox
- @check="handleCheckChange"
- ref="estreeRef"
- v-if="treeData.length"
- :default-checked-keys="DefaultId"
- >
+ <el-tree node-key="id" :props="props" :highlight-current="false" :current-node-key="selectedNodeId" :data="treeData"
+ :default-expanded-keys="defaultExpanded" :expand-on-click-node="false" show-checkbox @check="handleCheckChange"
+ ref="estreeRef" v-if="treeData.length" :default-checked-keys="DefaultId">
<template #default="{ node, data }">
<span class="custom-tree-node">
<span class="label">{{ node.label }}</span>
@@ -44,31 +33,21 @@
</span>
<template #dropdown>
<el-dropdown-menu>
- <el-dropdown-item
- v-if="data.type != 6 && data.isLayer == 1"
- @click.native="clickdropdown(1, data)"
- >璇︾粏</el-dropdown-item>
+ <el-dropdown-item v-if="data.type != 6 && data.isLayer == 1"
+ @click.native="clickdropdown(1, data)">璇︾粏</el-dropdown-item>
<el-dropdown-item v-if="data.type == 6 && data.isLayer == 1">鍒犻櫎</el-dropdown-item>
- <el-dropdown-item
- v-if="data.type == 3 && data.isLayer == 1"
- @click.native="clickdropdown(2, data)"
- >灞炴��</el-dropdown-item>
- <el-dropdown-item
- v-if="data.isLayer == 0"
- @click.native="clickdropdown(3, data)"
- >閫忔槑搴�</el-dropdown-item>
- <el-dropdown-item
- v-if="data.shpType == 'temporaryLayer'"
- @click.native="clickdTemporary(1, data)"
- >缂栬緫</el-dropdown-item>
- <el-dropdown-item
- v-if="data.shpType == 'temporaryLayer'"
- @click.native="clickdTemporary(2, data)"
- >鍒犻櫎</el-dropdown-item>
- <el-dropdown-item
- v-if="data.shpType == 'temporaryLayer'"
- @click.native="clickdTemporary(3, data)"
- >瀹氫綅</el-dropdown-item>
+ <el-dropdown-item v-if="data.type == 3 && data.isLayer == 1"
+ @click.native="clickdropdown(2, data)">灞炴��</el-dropdown-item>
+ <el-dropdown-item v-if="data.isLayer == 0"
+ @click.native="clickdropdown(3, data)">閫忔槑搴�</el-dropdown-item>
+ <el-dropdown-item v-if="data.shpType == 'temporaryLayer'"
+ @click.native="clickdTemporary(1, data)">缂栬緫</el-dropdown-item>
+ <el-dropdown-item v-if="data.shpType == 'temporaryLayer'"
+ @click.native="clickdTemporary(2, data)">鍒犻櫎</el-dropdown-item>
+ <el-dropdown-item v-if="data.shpType == 'temporaryLayer'"
+ @click.native="clickdTemporary(3, data)">瀹氫綅</el-dropdown-item>
+ <el-dropdown-item v-if="data.shpType == 'temporaryLayer'"
+ @click.native="clickdTemporary(4, data)">涓嬭浇鎴恠hp</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
@@ -78,18 +57,9 @@
</el-tree>
</div>
</div>
- <layer-set
- v-if="layerSetIsshow"
- @SETstate="SETstate"
- :layerTree="treeData"
- @addlayer="addlayer"
- @delLayer="delLayer"
- ></layer-set>
- <attribute-list
- v-if="layerAttributeIsshow"
- :layerData="layerObjData"
- @spatialClose="setSpatialClose"
- ></attribute-list>
+ <layer-set v-if="layerSetIsshow" @SETstate="SETstate" :layerTree="treeData" @addlayer="addlayer" @delLayer="delLayer"
+ @onSubmit="editLayer"></layer-set>
+ <attribute-list v-if="layerAttributeIsshow" :layerData="layerObjData" @spatialClose="setSpatialClose"></attribute-list>
<layer-detail :layerData="layerObjData" v-if="layerDetailIsshow" @detailClose="detailClose"></layer-detail>
</template>
@@ -190,107 +160,95 @@
// for (var i in keys) {
// checkedKeys.push(keys[i]);
// }
-
+ var keys = estreeRef.value.getCheckedKeys();
var val = treeData.value[0].children;
for (var i = 0; i < val.length; i++) {
if (val[i].id == data.id) {
val.splice(i, 1);
}
}
- var keys = estreeRef.value.getCheckedKeys();
- if (val.length <= 0 && keys.indexOf(data.id) > -1) {
-
- keys.splice(keys.indexOf(data.id), 1);
- estreeRef.value.setCheckedKeys(keys, true);
- }
- // nextTick(() => {
- // var str = JSON.parse(std)
- // console.log(str)
- // var layerIds = [];
- // if (str.indexOf(data.id) > -1) {
- // str.splice(str.indexOf(data.id), 1);
- // }
- // if (str.indexOf(str.value) > -1) {
- // str.splice(str.indexOf(str.value), 1);
- // }
- // for (var i in str) {
- // var val = estreeRef.value.getNode(str[i]).data;
- // if (val.isLayer == 1) {
- // layerIds.push(str[i]);
- // }
- // }
- // estreeRef.value.setCheckedKeys(layerIds, true);
- // });
+ var std = [];
+ for (var i in keys) {
+ var layer_res = estreeRef.value.getNode(keys[i]).data;
+ if (layer_res.shpType && layer_res.shpType == 'temporaryLayer') {
+ std.push(keys[i]);
+ } else if (layer_res.isLayer == 1) {
+ std.push(keys[i]);
+ }
+ }
+ estreeRef.value.setCheckedKeys([], true);
+ console.log(data.id);
+ nextTick(() => {
+ console.log(std);
+ estreeRef.value.setCheckedKeys(std, true);
+ });
} else if (res == 3) {
let son = estreeRef.value.getCheckedKeys();
if (son.indexOf(data.id) < 0) {
return ElMessage(data.cnName + "鍥惧眰娌℃湁鍕鹃��,鏃犳硶杩涜瀹氫綅");
}
temporaryTool.locationTemporaryLayer(data);
+ } else if (res == 4) {
+debugger
}
};
//閫夋嫨鍥惧眰
const handleCheckChange = (data, checked) => {
layerAttributeIsshow.value = false;
layerDetailIsshow.value = false;
- let isCheck = checked.checkedKeys.indexOf(data.id) > -1;
- nextTick(() => {
- let son = estreeRef.value.getCheckedNodes();
- store.commit("SET_CHECKLAYER", son);
- });
- if (isCheck) {
- if (data.isLayer == 0) {
- let son = estreeRef.value.getCheckedNodes().reverse();
- for (var i in son) {
- var layerArr = son[i];
- layerArr.checked = true;
- if (layerArr.shpType && layerArr.shpType == "temporaryLayer") {
- //涓存椂鍥惧眰娣诲姞
- temporaryTool.addTemporaryTool(layerArr);
+ // let isCheck = checked.checkedKeys.indexOf(data.id) > -1;
+
+ let son = estreeRef.value.getCheckedNodes();
+ store.commit("SET_CHECKLAYER", son);
+ temporaryTool.removeTemporaryLayerAll();
+ server.delLayerAll();
+ var alphaGroup = [];
+ var idGroup = [];
+ for (var i in server.layerList) {
+ const layerData = server.layerList[i];
+ if (layerData.layerData && layerData.id != server.wmsLayerId) {
+ alphaGroup.push(layerData.layerData.alpha);
+ idGroup.push(layerData.layerData.id);
+ }
+ }
+ server.delLayerAll();
+
+ var setGeoWms = [];
+ var geoUrl = null;
+ var layerTreeDate = estreeRef.value.getCheckedNodes().reverse();
+ for (var i in layerTreeDate) {
+ var layerArr = layerTreeDate[i];
+ if (layerArr.shpType && layerArr.shpType == "temporaryLayer") {
+ temporaryTool.addTemporaryTool(layerArr);
+ } else {
+ if (layerArr.isLayer == 1) {
+ if (layerArr.category == 2 && layerArr.type == 3) {
+ if (layerArr.tab != "moon:geo_mappable_unit") {
+ var id = layerArr.id;
+ if (idGroup.indexOf(id) > -1) {
+ var alpha = alphaGroup[idGroup.indexOf(id)];
+ if (alpha == 1) {
+ setGeoWms.push(layerArr.tab);
+ geoUrl = layerArr.url;
+ } else {
+ server.setAddGeoWmsLayer(layerArr, alpha);
+ }
+ } else {
+ setGeoWms.push(layerArr.tab);
+ geoUrl = layerArr.url;
+ }
+ }
} else {
server.addTreeData(layerArr);
}
}
- } else {
- if (data.shpType && data.shpType == "temporaryLayer") {
- //涓存椂鍥惧眰娣诲姞
- temporaryTool.addTemporaryTool(data);
- } else {
- let son = estreeRef.value.getCheckedNodes().reverse();
- for (var i in son) {
- var layerArr = son[i];
- layerArr.checked = true;
- if (layerArr.shpType && layerArr.shpType == "temporaryLayer") {
- //涓存椂鍥惧眰娣诲姞
- } else {
- server.addTreeData(layerArr);
- }
- }
- }
- }
- } else {
- if (data.isLayer == 0) {
- var layers = getCheckedLayerChildren(data);
-
- // var layers = data.children;
- for (var i in layers) {
- if (layers[i].shpType && layers[i].shpType == "temporaryLayer") {
- //涓存椂鍥惧眰娣诲姞
- temporaryTool.removeTemporaryLayer(layers[i]);
- } else {
- server.delLayer(layers[i].id);
- }
- }
- } else {
- if (data.shpType && data.shpType == "temporaryLayer") {
- //涓存椂鍥惧眰娣诲姞
- temporaryTool.removeTemporaryLayer(data);
- } else {
- server.delLayer(data.id);
- }
}
}
+ if (setGeoWms.length > 0) {
+ server.addGeoServerMmsLayers(setGeoWms, geoUrl);
+ }
+
menuTool.setImageLayerChange();
};
const setVisiable = (treeNode, checked) => {
@@ -363,13 +321,13 @@
forFn(item);
} else {
if (ids.indexOf(item.id) > -1) {
- temp.push(item.id);
+ temp.push(item);
}
}
});
} else {
if (ids.indexOf(data.id) > -1) {
- temp.push(data.id);
+ temp.push(data);
}
}
};
@@ -414,7 +372,16 @@
node = estreeRef.value.getNode(e);
}
});
+
+ var checKey = estreeRef.value.getCheckedKeys();
+ let checkid = [];
+ for (var i in checKey) {
+ if (estreeRef.value.getNode(checKey[i]).data.isLayer == 1) {
+ checkid.push(checKey[i])
+ }
+ }
// 灏嗗彉鍔ㄤ箣鍓嶇殑node澶囦唤
+ estreeRef.value.setCheckedKeys([], true);
let copyNode = { ...node };
copyNode.previousSibling = { ...node.previousSibling };
copyNode.nextSibling = { ...node.nextSibling };
@@ -440,6 +407,7 @@
estreeRef.value.insertAfter(copyNode.data, copyNode.nextSibling.data);
}
}
+ estreeRef.value.setCheckedKeys(checkid, true);
};
//鍒犻櫎鍥惧眰鏍�
const delLayer = (res) => {
@@ -448,24 +416,42 @@
// });
// treeData = handleTree(menuOption, "id", "pid", "children");
};
+const editLayer = () => {
+ var layer = store.state.chekNowLayers;
+ var std = [];
+ for (var i in layer) {
+ if (layer[i].isLayer == 1) {
+ std.push(layer[i].id)
+ }
+ }
+ estreeRef.value.setCheckedKeys([], true);
+ nextTick(() => {
+ estreeRef.value.setCheckedKeys(std, true);
+ })
+
+}
const setRestLayerData = () => {
let son = estreeRef.value.getCheckedNodes().reverse();
+
+ var setGeoWms = [];
+ var geoUrl = null;
for (var i in son) {
var layerArr = son[i];
+ console.log(layerArr.isLayer);
layerArr.checked = true;
if (layerArr.category == 2 && layerArr.type == 3) {
if (layerArr.tab != "moon:geo_mappable_unit") {
- // setGeoWms.push(layerArr.tab);
- // url = layerArr.url;
- server.addTreeData(layerArr);
+ setGeoWms.push(layerArr.tab);
+ geoUrl = layerArr.url;
+ // server.addTreeData(layerArr);
}
} else {
server.addTreeData(layerArr);
}
}
- // if (setGeoWms.length > 0) {
- // server.addGeoServerMmsLayers(setGeoWms, url);
- // }
+ if (setGeoWms.length > 0) {
+ server.addGeoServerMmsLayers(setGeoWms, geoUrl);
+ }
store.commit("SET_CHECKLAYER", son);
};
const getLayer = async () => {
@@ -490,13 +476,20 @@
var children = [];
if (comperLayer.code == 200 && comperLayer.result) {
for (var i in comperLayer.result) {
- var slayer = JSON.parse(comperLayer.result[i].wkt);
- slayer.sid = comperLayer.result[i].id;
- children.push(slayer);
+ var layer = comperLayer.result[i]
+ if (layer.wkt && layer.wkt.indexOf("shpType") > -1 && layer.wkt.indexOf("shpType") > -1) {
+
+ var slayer = JSON.parse(comperLayer.result[i].wkt);
+
+ slayer.sid = comperLayer.result[i].id;
+ children.push(slayer);
+
+ }
}
}
+
treeData.value.unshift({
- cnName: "涓存椂鍥惧眰",
+ cnName: "鑷畾涔夊浘灞�",
level: 1,
pid: 0,
isLayer: 0,
@@ -557,24 +550,29 @@
}
const addTemporaryLayer = async (res) => {
var obj = {
- id: res.id,
name: res.cnName,
wkt: JSON.stringify(res),
};
+ var checkedKeys = estreeRef.value.getCheckedKeys();
const data = await mark_insert(obj);
if (data.code != 200 || !data.result) return;
store.state.temporaryLayer = null;
res.sid = data.result;
treeData.value[0].children.push(res);
- var id = res.id;
+
nextTick(() => {
- var checkedKeys = estreeRef.value.getCheckedKeys();
- if (checkedKeys.indexOf(temporary.value) > -1) {
- checkedKeys.splice(checkedKeys.indexOf(temporary.value), 1);
+ var std = [res.id];
+ for (var i in checkedKeys) {
+ var layer_res = estreeRef.value.getNode(checkedKeys[i]).data;
+ if (layer_res.shpType && layer_res.shpType == 'temporaryLayer') {
+ std.push(checkedKeys[i]);
+ } else if (layer_res.isLayer == 1) {
+ std.push(checkedKeys[i]);
+ }
}
- checkedKeys.push(id);
- estreeRef.value.setCheckedKeys(checkedKeys, true);
+ estreeRef.value.setCheckedKeys([], true);
+ estreeRef.value.setCheckedKeys(std, true);
temporaryTool.addTemporaryTool(res);
});
};
@@ -622,6 +620,7 @@
() => store.state.restLayer,
(nVal, oVal) => {
if (nVal) {
+
setRestLayerData();
}
},
@@ -631,6 +630,7 @@
() => store.state.temporaryLayer,
(nVal, oVal) => {
if (nVal) {
+
addTemporaryLayer(nVal);
}
},
@@ -640,6 +640,7 @@
() => store.state.editTemporarName,
(nVal, oVal) => {
if (nVal) {
+
editTemporaryLayerName(nVal);
}
},
@@ -649,6 +650,7 @@
() => store.state.editTemporaryback,
(nVal, oVal) => {
if (nVal) {
+
editTemporaryBackById(nVal);
}
},
@@ -780,7 +782,7 @@
padding: 8px;
}
-/deep/ .el-tree-node:focus > .el-tree-node__content {
+/deep/ .el-tree-node:focus>.el-tree-node__content {
background: transparent;
}
@@ -798,10 +800,7 @@
}
}
-/deep/
- .el-tree--highlight-current
- .el-tree-node.is-current
- > .el-tree-node__content {
+/deep/ .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
background: rgba(104, 156, 255, 0.5) !important;
}
--
Gitblit v1.9.3