From b21869e5ae60f4a0b48d0c741189d07ba7f15b2f Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Wed, 9 Aug 2023 18:36:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dustSupervision/dustManagement/index.vue | 2 +- .../planFinishSituation/index.vue | 1 + .../subItemManagement/index.vue | 34 +++++++++++-------- .../approve/company/components/unit-table.vue | 7 ++-- src/views/goverment/approve/company/index.vue | 4 ++- .../divisionsAndISubItems/index.vue | 34 +++++++++++-------- .../panoramicPlan/index.vue | 16 ++++----- .../dustSupervision/dustManagement/index.vue | 2 +- .../planFinishSituation/index.vue | 1 + .../subItemManagement/index.vue | 34 +++++++++++-------- 10 files changed, 75 insertions(+), 60 deletions(-) diff --git a/src/views/enterprise/dustSupervision/dustManagement/index.vue b/src/views/enterprise/dustSupervision/dustManagement/index.vue index f28ef66..ca6545e 100644 --- a/src/views/enterprise/dustSupervision/dustManagement/index.vue +++ b/src/views/enterprise/dustSupervision/dustManagement/index.vue @@ -159,7 +159,7 @@ const formConfig = reactive({ name: [ { required: true, - message: "请输入视频名称", + message: "请输入设备名称", trigger: "blur" } ], diff --git a/src/views/enterprise/progressManagement/planFinishSituation/index.vue b/src/views/enterprise/progressManagement/planFinishSituation/index.vue index 50b1514..79e71ce 100644 --- a/src/views/enterprise/progressManagement/planFinishSituation/index.vue +++ b/src/views/enterprise/progressManagement/planFinishSituation/index.vue @@ -165,6 +165,7 @@ const handleAddItem = () => { openVisible.value = true; }; const saveItem = async (form: any) => { + form.engineeringSn = searchSn.value; if (form.id) { // console.log(form.dictCode); const res = await applyTimeAdd(form); diff --git a/src/views/enterprise/progressManagement/subItemManagement/index.vue b/src/views/enterprise/progressManagement/subItemManagement/index.vue index 49c9101..aff1cf8 100644 --- a/src/views/enterprise/progressManagement/subItemManagement/index.vue +++ b/src/views/enterprise/progressManagement/subItemManagement/index.vue @@ -51,21 +51,25 @@ diff --git a/src/views/goverment/approve/company/components/unit-table.vue b/src/views/goverment/approve/company/components/unit-table.vue index 1a39189..acac5c2 100644 --- a/src/views/goverment/approve/company/components/unit-table.vue +++ b/src/views/goverment/approve/company/components/unit-table.vue @@ -102,10 +102,9 @@ const uplUrl = import.meta.env.VITE_ULD_API_URL; const onPreview = row => { // console.log(row); - - const url = Base64.encode( - baseUrl + "/xmgl/file/preview?fileUrl=" + row.licenseImage + "&fullfilename=" + row.licenseImageOriginalName - ); + let arr = row.licenseImageOriginalName.split("."); + console.log(arr[1]); + const url = Base64.encode(baseUrl + "/xmgl/file/preview?fileUrl=" + row.licenseImage + "&fullfilename=123." + arr[1]); // 标记打包 // const url1 = "http://182.90.224.147:8012/onlinePreview?url="; // const uplUrl = "http://192.168.34.122:8012/onlinePreview?url="; diff --git a/src/views/goverment/approve/company/index.vue b/src/views/goverment/approve/company/index.vue index bceecd9..0025776 100644 --- a/src/views/goverment/approve/company/index.vue +++ b/src/views/goverment/approve/company/index.vue @@ -279,7 +279,9 @@ const getTableList = (params: any) => { }; const onPreview = () => { - const url = Base64.encode(baseUrl + "/xmgl/file/preview?fileUrl=" + fileUrl.value + "&fullfilename=" + fileName.value); + let arr = fileName.value.split("."); + console.log(arr[1]); + const url = Base64.encode(baseUrl + "/xmgl/file/preview?fileUrl=" + fileUrl.value + "&fullfilename=123." + arr[1]); // 标记打包 // const url1 = "http://182.90.224.147:8012/onlinePreview?url="; // const url1 = "http://192.168.34.155:8012/onlinePreview?url="; diff --git a/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue b/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue index 7baad07..eeb8edc 100644 --- a/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue +++ b/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue @@ -66,21 +66,25 @@ diff --git a/src/views/goverment/progressManagement/panoramicPlan/index.vue b/src/views/goverment/progressManagement/panoramicPlan/index.vue index 2ba7963..c452545 100644 --- a/src/views/goverment/progressManagement/panoramicPlan/index.vue +++ b/src/views/goverment/progressManagement/panoramicPlan/index.vue @@ -132,8 +132,8 @@ const columns: ColumnProps[] = [ } }, { prop: "phaseName", label: "智能条线", width: 150 }, - // { prop: "chargerNumber", label: "节点责任人", width: 150 }, // { prop: "chargerPhone", label: "负责人联系方式", width: 180 }, + { prop: "chargerNumber", label: "节点责任编号", width: 150 }, { prop: "chargerName", label: "节点责任人", width: 150 }, { prop: "isDeleted", @@ -247,17 +247,17 @@ const formConfig = { disabled: true }, { - label: "节点负责人", + label: "节点责任人编号", + prop: "chargerNumber", + type: "input", + disabled: true + }, + { + label: "节点责任人", prop: "chargerName", type: "input", disabled: true } - // { - // label: "负责人联系方式", - // prop: "chargerNumber", - // type: "input", - // disabled: true - // } ], rules: { nodeNumber: [ diff --git a/src/views/project/dustSupervision/dustManagement/index.vue b/src/views/project/dustSupervision/dustManagement/index.vue index 5d65418..81f7f0e 100644 --- a/src/views/project/dustSupervision/dustManagement/index.vue +++ b/src/views/project/dustSupervision/dustManagement/index.vue @@ -184,7 +184,7 @@ const formConfig = reactive({ name: [ { required: true, - message: "请输入视频名称", + message: "请输入设备名称", trigger: "blur" } ], diff --git a/src/views/project/progressManagement/planFinishSituation/index.vue b/src/views/project/progressManagement/planFinishSituation/index.vue index 0b83eff..c03ce7b 100644 --- a/src/views/project/progressManagement/planFinishSituation/index.vue +++ b/src/views/project/progressManagement/planFinishSituation/index.vue @@ -158,6 +158,7 @@ const handleAddItem = () => { openVisible.value = true; }; const saveItem = async (form: any) => { + form.engineeringSn = searchSn.value; if (form.id) { // console.log(form.dictCode); const res = await applyTimeAdd(form); diff --git a/src/views/project/progressManagement/subItemManagement/index.vue b/src/views/project/progressManagement/subItemManagement/index.vue index dfc23e7..77c0386 100644 --- a/src/views/project/progressManagement/subItemManagement/index.vue +++ b/src/views/project/progressManagement/subItemManagement/index.vue @@ -51,21 +51,25 @@