From ce19343b79a4af4254a9bf16bbb56716e92607de Mon Sep 17 00:00:00 2001 From: jiayu Date: Tue, 10 Jun 2025 11:44:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/api/mapLocation.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/assets/js/api/mapLocation.js b/src/assets/js/api/mapLocation.js index 43557046..0bd38a64 100644 --- a/src/assets/js/api/mapLocation.js +++ b/src/assets/js/api/mapLocation.js @@ -13,6 +13,11 @@ export const updateSystemConfig = params => { return post(`xmgl/systemConfig/edit`, params) } +// 新增系统配置 +export const addSystemConfig = params => { + return post(`xmgl/systemConfig/add`, params) +} + // 底图图层分页列表 export const baseMapPage = params => { return post(`xmgl/baseMap/page`, params) From 315039c1467bb035ea8deecece8df359955c5251 Mon Sep 17 00:00:00 2001 From: jiayu Date: Mon, 16 Jun 2025 16:08:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E9=97=B8=E6=9C=BA=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 +- src/store/index.js | 8 ++-- .../quality/businessModule/checkPoint.vue | 46 +++++++++++++++++++ 3 files changed, 52 insertions(+), 6 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index e029aae9..5bd05341 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -180,8 +180,8 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地 // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 - // axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地 - axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 + axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 diff --git a/src/store/index.js b/src/store/index.js index 91bda8df..3de891fa 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -76,16 +76,16 @@ export default new Vuex.Store({ // FILEURL: 'http://8.136.222.164:8808/image/', // 中科安信 // UPLOADURL: 'http://101.43.164.214:11111/upload/image/', // 百色 // FILEURL: 'http://101.43.164.214:11111/image/', // 百色 - // WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", // 百色 + WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", // 百色 // UPLOADURL:'http://182.90.224.237:51234/upload/image/', // FILEURL:'http://182.90.224.237:51234/image/', - UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地 - FILEURL: "http://192.168.34.155:19111/image/", //洁本地 + // UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地 + // FILEURL: "http://192.168.34.155:19111/image/", //洁本地 // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 // UPLOADURL: 'http://192.168.34.221:19112/upload/image/', // 郭圣雄本地 // FILEURL: 'http://192.168.34.221:19112/image/', //郭圣雄本地 - WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地) + // WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地) // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) // WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地) CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.129:5174/#/contractorApply" : `${window.location.protocol}//${window.location.host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地) diff --git a/src/views/projectFront/quality/businessModule/checkPoint.vue b/src/views/projectFront/quality/businessModule/checkPoint.vue index b7f94db4..7f94892b 100644 --- a/src/views/projectFront/quality/businessModule/checkPoint.vue +++ b/src/views/projectFront/quality/businessModule/checkPoint.vue @@ -222,6 +222,23 @@ + + + + + + { + this.allUfaceDev = list.result; + }); + }, // 获取AI设备 getAIDeviceFn() { aiAnalyseHardWareRecordList({ @@ -361,6 +391,8 @@ export default { dutyId: [], personId: [], aiDeviceId: "", + ufaceDevIds: [], + ufaceDevList: [], intendanceIds: [], intendanceNames: "", remark: "", @@ -444,6 +476,13 @@ export default { } else { this.form.aiDeviceId = [] } + if (value.ufaceDevList && value.ufaceDevList.length > 0) { + this.form.ufaceDevIds = value.ufaceDevList.map((item) => { + return item.id; + }); + } else { + this.form.ufaceDevIds = [] + } this.form.remark = value.remark; this.form.id = value.id; this.title = "编辑区域"; @@ -460,6 +499,8 @@ export default { regionName: "", dutyId: "", aiDeviceId: "", + ufaceDevIds: [], + ufaceDevList: [], intendanceIds: [], intendanceNames: "", remark: "", @@ -536,6 +577,11 @@ export default { return { id: item }; }); } + if (this.form.ufaceDevIds && this.form.ufaceDevIds.length > 0) { + data.ufaceDevList = this.form.ufaceDevIds.map((item) => { + return { id: item }; + }); + } if (this.form.dutyId && this.form.dutyId.length > 0) { data.enterpriseInfos = this.form.dutyId.map((item) => { return { id: item };