From 774a2712b6919e421e88cab52a5c292b343afb74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com> Date: Sat, 25 May 2024 23:29:13 +0800 Subject: [PATCH 1/3] 1 --- src/store/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/store/index.js b/src/store/index.js index 959b3c00..b323e9d9 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -54,7 +54,8 @@ export default new Vuex.Store({ // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地 FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 - WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) + WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //坤工作流地址(本地) + // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 From d3dde190bc065c682b2b28460cce7b38f75c4dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com> Date: Sat, 25 May 2024 23:30:32 +0800 Subject: [PATCH 2/3] 1 --- src/store/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/index.js b/src/store/index.js index b323e9d9..6b73c4f7 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -54,7 +54,7 @@ export default new Vuex.Store({ // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地 FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 - WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //坤工作流地址(本地) + WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 From 1da259aeb1290dc894e615acfe43e5fb602a86c9 Mon Sep 17 00:00:00 2001 From: Vce Date: Sun, 26 May 2024 00:00:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=8B=E6=8B=89=E6=90=9C=E7=B4=A2=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectFront/emergencyDisposal/emergencyPush.vue | 2 +- .../projectFront/laborManage/safeWorkManage/safeWorkRules.vue | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/projectFront/emergencyDisposal/emergencyPush.vue b/src/views/projectFront/emergencyDisposal/emergencyPush.vue index 87c39a51..049e0c23 100644 --- a/src/views/projectFront/emergencyDisposal/emergencyPush.vue +++ b/src/views/projectFront/emergencyDisposal/emergencyPush.vue @@ -97,7 +97,7 @@ {{ emergencyTypeDetail.enterpriseName }} - diff --git a/src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue b/src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue index 0f1c5f11..01386638 100644 --- a/src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue +++ b/src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue @@ -187,6 +187,7 @@ v-model="row.enterpriseId" placeholder="请选择" v-if="row.isEdit" + filterable @change="(e) => enterpriseChange(e, $index)" >