From 6d57d715da85a667b839b3da4ac312d10704d295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com> Date: Fri, 7 Jun 2024 21:12:01 +0800 Subject: [PATCH 1/4] 1 --- src/assets/js/http.js | 4 ++-- src/store/index.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 77a985cf..e90427b4 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -173,7 +173,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 + axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 // 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/' //彭洁远程 @@ -186,7 +186,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) - axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 + // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 // axios.defaults.baseURL = 'http://8.136.222.164:8808/'//中科安信正式地址 } else if (process.env.NODE_ENV == "debug") { diff --git a/src/store/index.js b/src/store/index.js index be3ccd8a..5e79a154 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -54,8 +54,8 @@ export default new Vuex.Store({ // 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/',//郭圣雄本地 - 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", //坤工作流地址(本地) + WORKFLOWURL: "http://192.168.34.126: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 efef1eebc80ffdee70f45e20481bcaeea2bbc7da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com> Date: Fri, 7 Jun 2024 21:15:41 +0800 Subject: [PATCH 2/4] 1 --- src/views/projectFront/laborManage/personAuditAg.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/projectFront/laborManage/personAuditAg.vue b/src/views/projectFront/laborManage/personAuditAg.vue index 1cdb8e97..8dfe8869 100644 --- a/src/views/projectFront/laborManage/personAuditAg.vue +++ b/src/views/projectFront/laborManage/personAuditAg.vue @@ -195,8 +195,8 @@ From cfd40a702e585a2ba2dee9023ff0aee58d6eef53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com> Date: Fri, 7 Jun 2024 23:30:59 +0800 Subject: [PATCH 3/4] 1 --- src/assets/js/http.js | 4 ++-- src/store/index.js | 8 ++++---- src/views/projectFront/specialWork/blindPlugWork.vue | 2 +- src/views/projectFront/specialWork/confinedSpaceWork.vue | 2 +- src/views/projectFront/specialWork/disconnectionWork.vue | 2 +- src/views/projectFront/specialWork/fireWork.vue | 9 ++++++++- src/views/projectFront/specialWork/riggingOutWork.vue | 2 +- src/views/projectFront/specialWork/startBuildingWork.vue | 2 +- .../projectFront/specialWork/temporaryPowerWork.vue | 2 +- src/views/projectFront/specialWork/towerOverWork.vue | 2 +- 10 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index e90427b4..432cf053 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -173,7 +173,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 + // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 // 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/' //彭洁远程 @@ -186,7 +186,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) - // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 + axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 // axios.defaults.baseURL = 'http://8.136.222.164:8808/'//中科安信正式地址 } else if (process.env.NODE_ENV == "debug") { diff --git a/src/store/index.js b/src/store/index.js index 5e79a154..70add8ed 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -52,14 +52,14 @@ export default new Vuex.Store({ // 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.221:9111/upload/image/',// 郭圣雄本地 - FILEURL:'http://192.168.34.221:9111/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", //罗峰工作流地址(本地) // 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',//测试 - // FILEURL:'http://42.180.188.17:11211/image/',//测试 + UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 + FILEURL:'http://42.180.188.17:11211/image/',//测试 // BASEURL: baseUrl // ? baseUrl // : window.location.protocol + "//" + window.location.host + "/", //正式环境 diff --git a/src/views/projectFront/specialWork/blindPlugWork.vue b/src/views/projectFront/specialWork/blindPlugWork.vue index cf5de2ce..a6458070 100644 --- a/src/views/projectFront/specialWork/blindPlugWork.vue +++ b/src/views/projectFront/specialWork/blindPlugWork.vue @@ -276,7 +276,7 @@ :preview-src-list="[item.url]">
- {{ item.name }}
diff --git a/src/views/projectFront/specialWork/confinedSpaceWork.vue b/src/views/projectFront/specialWork/confinedSpaceWork.vue index 165c18a6..70971b97 100644 --- a/src/views/projectFront/specialWork/confinedSpaceWork.vue +++ b/src/views/projectFront/specialWork/confinedSpaceWork.vue @@ -390,7 +390,7 @@ :preview-src-list="[item.url]">
- {{ item.name }}
diff --git a/src/views/projectFront/specialWork/disconnectionWork.vue b/src/views/projectFront/specialWork/disconnectionWork.vue index 11730ca8..a83b14ca 100644 --- a/src/views/projectFront/specialWork/disconnectionWork.vue +++ b/src/views/projectFront/specialWork/disconnectionWork.vue @@ -228,7 +228,7 @@ :preview-src-list="[item.url]">
- {{ item.name }}
diff --git a/src/views/projectFront/specialWork/fireWork.vue b/src/views/projectFront/specialWork/fireWork.vue index f89a9e83..e541d759 100644 --- a/src/views/projectFront/specialWork/fireWork.vue +++ b/src/views/projectFront/specialWork/fireWork.vue @@ -236,7 +236,7 @@ :preview-src-list="[item.url]">
- {{ item.name }}
@@ -426,6 +426,13 @@ export default { }, }, methods: { + // downloadFile(url, fileName) { + // const link = document.createElement('a'); + // link.href = url; + // link.download = fileName; + // link.target = "_blank"; // 可选，如果希望在新窗口中下载文件，请取消注释此行 + // link.click(); + // }, goBack() { this.dialogFormVisible = true; // this.initData() diff --git a/src/views/projectFront/specialWork/riggingOutWork.vue b/src/views/projectFront/specialWork/riggingOutWork.vue index 72cfc42b..0aea0734 100644 --- a/src/views/projectFront/specialWork/riggingOutWork.vue +++ b/src/views/projectFront/specialWork/riggingOutWork.vue @@ -227,7 +227,7 @@ :src="item.url" :preview-src-list="[item.url]">
- {{ item.name }}
diff --git a/src/views/projectFront/specialWork/startBuildingWork.vue b/src/views/projectFront/specialWork/startBuildingWork.vue index 77f6e364..f9e275a0 100644 --- a/src/views/projectFront/specialWork/startBuildingWork.vue +++ b/src/views/projectFront/specialWork/startBuildingWork.vue @@ -225,7 +225,7 @@ :preview-src-list="[item.url]">
- {{ item.name }}
diff --git a/src/views/projectFront/specialWork/temporaryPowerWork.vue b/src/views/projectFront/specialWork/temporaryPowerWork.vue index 40ca8411..8b4a0cfb 100644 --- a/src/views/projectFront/specialWork/temporaryPowerWork.vue +++ b/src/views/projectFront/specialWork/temporaryPowerWork.vue @@ -240,7 +240,7 @@ :preview-src-list="[item.url]">
- {{ item.name }}
diff --git a/src/views/projectFront/specialWork/towerOverWork.vue b/src/views/projectFront/specialWork/towerOverWork.vue index 42478eea..068d09a2 100644 --- a/src/views/projectFront/specialWork/towerOverWork.vue +++ b/src/views/projectFront/specialWork/towerOverWork.vue @@ -216,7 +216,7 @@ :preview-src-list="[item.url]">
- {{ item.name }}
From 9397237048a6d3d4c65b5c5eeb4c90223e40f623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com> Date: Fri, 7 Jun 2024 23:36:59 +0800 Subject: [PATCH 4/4] 1 --- src/store/index.js | 4 ++-- src/views/projectFront/specialWork/blindPlugWork.vue | 2 +- src/views/projectFront/specialWork/confinedSpaceWork.vue | 2 +- src/views/projectFront/specialWork/disconnectionWork.vue | 2 +- src/views/projectFront/specialWork/fireWork.vue | 2 +- src/views/projectFront/specialWork/riggingOutWork.vue | 2 +- src/views/projectFront/specialWork/startBuildingWork.vue | 2 +- src/views/projectFront/specialWork/temporaryPowerWork.vue | 2 +- src/views/projectFront/specialWork/towerOverWork.vue | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index 70add8ed..86e14870 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -55,7 +55,7 @@ export default new Vuex.Store({ // 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.126: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',//测试 @@ -69,7 +69,7 @@ export default new Vuex.Store({ // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址 - // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 + WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl diff --git a/src/views/projectFront/specialWork/blindPlugWork.vue b/src/views/projectFront/specialWork/blindPlugWork.vue index a6458070..87c58c44 100644 --- a/src/views/projectFront/specialWork/blindPlugWork.vue +++ b/src/views/projectFront/specialWork/blindPlugWork.vue @@ -276,7 +276,7 @@ :preview-src-list="[item.url]">
- {{ item.name }}
diff --git a/src/views/projectFront/specialWork/confinedSpaceWork.vue b/src/views/projectFront/specialWork/confinedSpaceWork.vue index 70971b97..5e093c5c 100644 --- a/src/views/projectFront/specialWork/confinedSpaceWork.vue +++ b/src/views/projectFront/specialWork/confinedSpaceWork.vue @@ -390,7 +390,7 @@ :preview-src-list="[item.url]">
- {{ item.name }}
diff --git a/src/views/projectFront/specialWork/disconnectionWork.vue b/src/views/projectFront/specialWork/disconnectionWork.vue index a83b14ca..6846bf24 100644 --- a/src/views/projectFront/specialWork/disconnectionWork.vue +++ b/src/views/projectFront/specialWork/disconnectionWork.vue @@ -228,7 +228,7 @@ :preview-src-list="[item.url]">
- {{ item.name }}
diff --git a/src/views/projectFront/specialWork/fireWork.vue b/src/views/projectFront/specialWork/fireWork.vue index e541d759..3d4e5b01 100644 --- a/src/views/projectFront/specialWork/fireWork.vue +++ b/src/views/projectFront/specialWork/fireWork.vue @@ -236,7 +236,7 @@ :preview-src-list="[item.url]">
- {{ item.name }}
diff --git a/src/views/projectFront/specialWork/riggingOutWork.vue b/src/views/projectFront/specialWork/riggingOutWork.vue index 0aea0734..167301da 100644 --- a/src/views/projectFront/specialWork/riggingOutWork.vue +++ b/src/views/projectFront/specialWork/riggingOutWork.vue @@ -227,7 +227,7 @@ :src="item.url" :preview-src-list="[item.url]">
- {{ item.name }}
diff --git a/src/views/projectFront/specialWork/startBuildingWork.vue b/src/views/projectFront/specialWork/startBuildingWork.vue index f9e275a0..45200ee8 100644 --- a/src/views/projectFront/specialWork/startBuildingWork.vue +++ b/src/views/projectFront/specialWork/startBuildingWork.vue @@ -225,7 +225,7 @@ :preview-src-list="[item.url]">
- {{ item.name }}
diff --git a/src/views/projectFront/specialWork/temporaryPowerWork.vue b/src/views/projectFront/specialWork/temporaryPowerWork.vue index 8b4a0cfb..31ee144a 100644 --- a/src/views/projectFront/specialWork/temporaryPowerWork.vue +++ b/src/views/projectFront/specialWork/temporaryPowerWork.vue @@ -240,7 +240,7 @@ :preview-src-list="[item.url]">
- {{ item.name }}
diff --git a/src/views/projectFront/specialWork/towerOverWork.vue b/src/views/projectFront/specialWork/towerOverWork.vue index 068d09a2..e1ed84a3 100644 --- a/src/views/projectFront/specialWork/towerOverWork.vue +++ b/src/views/projectFront/specialWork/towerOverWork.vue @@ -216,7 +216,7 @@ :preview-src-list="[item.url]">
- {{ item.name }}