From 0020d383bf60240ccae5a6b11ef13f21514220a5 Mon Sep 17 00:00:00 2001 From: lcw <1878680531@qq.com> Date: Tue, 21 Apr 2026 17:00:46 +0800 Subject: [PATCH 1/2] lcw --- src/router/index.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 001d96f..e13b9a8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -434,7 +434,15 @@ export const publicRoutes = [ icon: "article-create" } }, - + { + path: "/InformationReporting", + name: "InformationReporting", + component: () => import("@/views/backOfficeSystem/InformationReporting/index.vue"), + meta: { + title: "蜂群信息", + icon: "article-create" + } + }, // { // path: "/MakeAcomment", // name: "MakeAcomment", @@ -484,14 +492,6 @@ export const publicRoutes = [ title: "线索发布", icon: "article" } - }, { - path: "/InformationReporting", - name: "InformationReporting", - component: () => import("@/views/backOfficeSystem/InformationReporting/index.vue"), - meta: { - title: "蜂群信息", - icon: "article-create" - } }, // { // path: "/InformationFlows", From aa1af80bdf19568429f92e7c8d72883a4c3f5e98 Mon Sep 17 00:00:00 2001 From: "2584795794@qq.com" <2584795794@qq.com> Date: Tue, 21 Apr 2026 17:00:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../myControl/components/addBkdx.vue | 15 +++++++++-- .../ysMyControl/components/addBkdx.vue | 15 +++++++++-- .../components/detailForm.vue | 26 ++++++++++++++++++- 3 files changed, 51 insertions(+), 5 deletions(-) diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue index 47374a9..0148b78 100644 --- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue +++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue @@ -629,7 +629,7 @@ const submit = () => { bklx = "02"; } let params = { ...listQuery.value, bklx: bklx }; - params.bkfj = params.bkfj ? params.bkfj.join(",") : ""; + params.bkfj = params.bkfj ? JSON.stringify(params.bkfj) : ""; params.bkdxList = params.bkdxList ? params.bkdxList : []; params.bkdxList.forEach((item) => { if (Array.isArray(item.fjZp)) { @@ -769,7 +769,18 @@ const changeXzqh = (val) => { // 根据id获取详情 const getDataById = (id) => { qcckGet({}, "/mosty-gsxt/tbGsxtBk/selectVoById/" + id).then((res) => { - res.bkfj = res.ossList || []; + // 兼容处理:优先使用 ossList,为空则解析 bkfj JSON 字符串 + if (res.ossList && res.ossList.length > 0) { + res.bkfj = res.ossList; + } else if (res.bkfj) { + try { + res.bkfj = JSON.parse(res.bkfj); + } catch (e) { + res.bkfj = []; + } + } else { + res.bkfj = []; + } listQuery.value = res || {}; dataOrge.value = res; if (res.bkqyList) { diff --git a/src/views/backOfficeSystem/IntelligentControl/ysMyControl/components/addBkdx.vue b/src/views/backOfficeSystem/IntelligentControl/ysMyControl/components/addBkdx.vue index 73a8dde..a034e68 100644 --- a/src/views/backOfficeSystem/IntelligentControl/ysMyControl/components/addBkdx.vue +++ b/src/views/backOfficeSystem/IntelligentControl/ysMyControl/components/addBkdx.vue @@ -384,7 +384,7 @@ const submit = () => { bklx = '02' } let params = { ...listQuery.value, bklx: bklx }; - params.bkfj = params.bkfj ? params.bkfj.join(',') : ''; + params.bkfj = params.bkfj ? JSON.stringify(params.bkfj) : ""; params.bkdxList = params.bkdxList ? params.bkdxList : []; params.bkdxList.forEach(item => { if (Array.isArray(item.fjZp)) { @@ -523,7 +523,18 @@ const changeXzqh = (val) => { // 根据id获取详情 const getDataById = (id) => { qcckGet({}, '/mosty-gsxt/tbGsxtBk/selectVoById/' + id).then(res => { - res.bkfj = res.ossList || []; + // 兼容处理:优先使用 ossList,为空则解析 bkfj JSON 字符串 + if (res.ossList && res.ossList.length > 0) { + res.bkfj = res.ossList; + } else if (res.bkfj) { + try { + res.bkfj = JSON.parse(res.bkfj); + } catch (e) { + res.bkfj = []; + } + } else { + res.bkfj = []; + } listQuery.value = res || {} dataOrge.value = res if (res.bkqyList) { diff --git a/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/detailForm.vue b/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/detailForm.vue index d7f7dc1..9e89cb0 100644 --- a/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/detailForm.vue +++ b/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/detailForm.vue @@ -16,6 +16,12 @@ 请选择关联线索 +
@@ -49,6 +55,7 @@