From 587c4be2f5247ebdb9fca647080b60fe5cd3ef75 Mon Sep 17 00:00:00 2001 From: caoqi Date: Mon, 24 Feb 2025 14:51:34 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E6=9C=8D=E5=8A=A1=E5=90=8D=E7=A7=B0=E7=9A=84=E6=AD=A3?= =?UTF-8?q?=E5=88=99=E8=A1=A8=E8=BE=BE=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layerManage/resource/LayerDetails.vue | 284 ++++-------------- 1 file changed, 61 insertions(+), 223 deletions(-) diff --git a/src/views/aiSupervision/layerManage/resource/LayerDetails.vue b/src/views/aiSupervision/layerManage/resource/LayerDetails.vue index 506b0f5..1ce08f2 100644 --- a/src/views/aiSupervision/layerManage/resource/LayerDetails.vue +++ b/src/views/aiSupervision/layerManage/resource/LayerDetails.vue @@ -17,208 +17,93 @@
- 添加图层 + 添加图层 - - - + + + - - + + - - + + - - + + - - + + - - + + - + + + +
- + {{ editDataInfoForm.relationStyleName ? editDataInfoForm.relationStyleName : "点击选择样式" }} - 取消选择样式 + 取消选择样式
- +
- 添加 - 删除 + 添加 + 删除
- - + + @@ -226,22 +111,13 @@
- + 搜索
- + @@ -251,18 +127,9 @@ - + @@ -271,34 +138,20 @@
取 消 - 确 定 + 确 定
- + 搜索
- + @@ -307,28 +160,13 @@ - +
@@ -519,7 +357,7 @@ export default { }); }, async saveOrUpdateLayer() { - const reg = /^(?=.{1,100}$)[\u4e00-\u9fa5\w:]+$/; + const reg = /^(?=.{1,100}$)[\u4e00-\u9fa5\w:./-;]+$/; if (!reg.test(this.editDataInfoForm.serviceName)) { this.$message({ type: "info", From 1351830b1a8dfeabb74a285ddaa23e874d0084e2 Mon Sep 17 00:00:00 2001 From: caoqi Date: Mon, 24 Feb 2025 14:56:55 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9placeHolder?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layerManage/resource/LayerDetails.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/aiSupervision/layerManage/resource/LayerDetails.vue b/src/views/aiSupervision/layerManage/resource/LayerDetails.vue index 1ce08f2..d7805ca 100644 --- a/src/views/aiSupervision/layerManage/resource/LayerDetails.vue +++ b/src/views/aiSupervision/layerManage/resource/LayerDetails.vue @@ -28,13 +28,13 @@ :value="item.value" /> - - + v-if="editDataInfoForm.serviceType === '081100'"> + - + From 2eb5346690375725ea319933d043fff45daab8ce Mon Sep 17 00:00:00 2001 From: caoqi Date: Mon, 24 Feb 2025 15:06:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E5=8E=BB=E6=8E=89=E5=AF=B9LayerNam?= =?UTF-8?q?e=E7=9A=84=E6=AD=A3=E5=88=99=E8=A1=A8=E8=BE=BE=E7=9A=84?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layerManage/resource/LayerDetails.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/aiSupervision/layerManage/resource/LayerDetails.vue b/src/views/aiSupervision/layerManage/resource/LayerDetails.vue index d7805ca..dabcb16 100644 --- a/src/views/aiSupervision/layerManage/resource/LayerDetails.vue +++ b/src/views/aiSupervision/layerManage/resource/LayerDetails.vue @@ -357,15 +357,15 @@ export default { }); }, async saveOrUpdateLayer() { - const reg = /^(?=.{1,100}$)[\u4e00-\u9fa5\w:./-;]+$/; - if (!reg.test(this.editDataInfoForm.serviceName)) { - this.$message({ - type: "info", - message: - "格式有误，目录名称仅支持中文、数字、字母、下划线、冒号，最大长度不超过100", - }); - return; - } + // const reg = /^(?=.{1,100}$)[\u4e00-\u9fa5\w:./-;]+$/; + // if (!reg.test(this.editDataInfoForm.serviceName)) { + // this.$message({ + // type: "info", + // message: + // "格式有误，目录名称仅支持中文、数字、字母、下划线、冒号，最大长度不超过100", + // }); + // return; + // } const params = { ...this.editDataInfoForm, extendData: JSON.stringify(this.extendTable), From a06aaa84e533606579b5c37d4c6ce4284b96be07 Mon Sep 17 00:00:00 2001 From: caoqi Date: Mon, 24 Feb 2025 15:44:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9js=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/aiSupervision/layerConfigApi.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/aiSupervision/layerConfigApi.js b/src/api/aiSupervision/layerConfigApi.js index d9bdffa..95dd1d3 100644 --- a/src/api/aiSupervision/layerConfigApi.js +++ b/src/api/aiSupervision/layerConfigApi.js @@ -212,8 +212,8 @@ export function queryServiceInfoApi(url, layer) { } } else if (nameArr.length === 2) { let layerName = nameArr[1]; - nameArr = layerName.split(":"); - const newUrl = `${nameArr[1]}/rest/data/datasources/${nameArr[0]}/datasets/${nameArr[1]}/fields.json?k=${token}`; + layerNameArr = layerName.split(":"); + const newUrl = `${nameArr[0]}/rest/data/datasources/${layerNameArr[0]}/datasets/${layerNameArr[1]}/fields.json?k=${token}`; const result = await axios.get(newUrl); if (result.status === 200 && result.data) { const fields = result.data.fieldNames.map((item) => { From 3f39e703d3e923cd2d53af05d120fd4b35c83c8d Mon Sep 17 00:00:00 2001 From: caoqi Date: Mon, 24 Feb 2025 15:55:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E5=A4=84=E7=90=86=E6=8B=BC?= =?UTF-8?q?=E6=8E=A5=E6=9F=A5=E8=AF=A2url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/reservoir/safeOperation/js/mapUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/reservoir/safeOperation/js/mapUtils.js b/src/views/reservoir/safeOperation/js/mapUtils.js index 59036ef..732c8de 100644 --- a/src/views/reservoir/safeOperation/js/mapUtils.js +++ b/src/views/reservoir/safeOperation/js/mapUtils.js @@ -46,7 +46,7 @@ const identifyLayerActions = { queryUrl = url.split("maps/")[0].replace("map-", "data-"); } else if (layerName.split(";").length == 2 && layerName.includes(":")) { let dataServiceLayerInfo = layerName.split(";"); - queryUrl = dataServiceLayerInfo[0]; + queryUrl = dataServiceLayerInfo[0]+"/"; layerName = dataServiceLayerInfo[1]; } let requestUrl = `${queryUrl}data/featureResults.rjson?returnContent=true`;