From 26ee7b9d1b79f17da95d6c3f00ccc07d23e9b2ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com> Date: Fri, 24 May 2024 20:36:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectFront/specialWork/blindPlugWork.vue | 2 +- src/views/projectFront/specialWork/fireWork.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/projectFront/specialWork/blindPlugWork.vue b/src/views/projectFront/specialWork/blindPlugWork.vue index c88bdb4b..2ec26c68 100644 --- a/src/views/projectFront/specialWork/blindPlugWork.vue +++ b/src/views/projectFront/specialWork/blindPlugWork.vue @@ -246,7 +246,7 @@ {{ workDetail.safetyWorkTicketCode }} --> - diff --git a/src/views/projectFront/specialWork/fireWork.vue b/src/views/projectFront/specialWork/fireWork.vue index b7549f6c..ca43a79f 100644 --- a/src/views/projectFront/specialWork/fireWork.vue +++ b/src/views/projectFront/specialWork/fireWork.vue @@ -368,7 +368,7 @@ {{ workDetail.certificateNo }} --> - From b1f785cfd99b8e2ec1385bc039d1b87ec29dff8e 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 14:21:17 +0800 Subject: [PATCH 2/4] 1 --- src/store/index.js | 3 ++- .../divisionSubManage.vue | 7 ++++++ .../projectProgressDetail.vue | 24 +++++++++++-------- .../projectFront/quality/qualityAnalysis.vue | 4 +++- .../safeSame/inspectionLedger.vue | 4 +++- .../safetyEducation/safetyAnalysis.vue | 3 ++- 6 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index 4804dff3..39e06abb 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -52,7 +52,8 @@ export default new Vuex.Store({ // FILEURL:'http://182.90.224.237:51234/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.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://jxj.zhgdyun.com:15551/upload/image',//测试 diff --git a/src/views/projectFront/progressManagementAg/divisionSubManage.vue b/src/views/projectFront/progressManagementAg/divisionSubManage.vue index e422ba86..56809ea6 100644 --- a/src/views/projectFront/progressManagementAg/divisionSubManage.vue +++ b/src/views/projectFront/progressManagementAg/divisionSubManage.vue @@ -195,6 +195,13 @@ + + --> -
+
进度记录
-
+
+ 开始任务 + 上报进度 + b - a)[0]; + const maxCount = data.map(item => item).sort((a,b) => b - a)[0]; + // console.log('~~~~~~~~~~~~~',this.examineInfo2,data); let option = { legend: { icon: 'roundRect', diff --git a/src/views/projectFront/safeSame/inspectionLedger.vue b/src/views/projectFront/safeSame/inspectionLedger.vue index 95ff0840..9d2a9fbb 100644 --- a/src/views/projectFront/safeSame/inspectionLedger.vue +++ b/src/views/projectFront/safeSame/inspectionLedger.vue @@ -2634,6 +2634,7 @@ export default { }, //导出 exportData() { + if (this.COMPANY == "zjwj") { window.location.href = this.$http.defaults.baseURL + @@ -2654,9 +2655,10 @@ export default { "&pageSize=" + this.pageSize; } else { + // xmgl/download/exporExcelQualityInspectionRecord window.location.href = this.$http.defaults.baseURL + - "xmgl/download/exporExcelQualityInspectionRecord?projectSn=" + + "xmgl/download/exportExcelXzSecurityQualityInspectionRecord?projectSn=" + this.$store.state.projectSn + "&recordType=" + this.formInline.recordType + diff --git a/src/views/projectFront/safetyEducation/safetyAnalysis.vue b/src/views/projectFront/safetyEducation/safetyAnalysis.vue index a5a7c5ef..2daa2a57 100644 --- a/src/views/projectFront/safetyEducation/safetyAnalysis.vue +++ b/src/views/projectFront/safetyEducation/safetyAnalysis.vue @@ -507,7 +507,8 @@ export default { this.examineInfo2.rectificationNum, this.examineInfo2.reviewNum, this.examineInfo2.verificationNum]; - const maxCount = data.sort((a,b) => b - a)[0]; + const maxCount = data.map(item => item).sort((a,b) => b - a)[0]; + // console.log('~~~~~~~~~~~~~',this.examineInfo2,data); let option = { legend: { icon: 'roundRect', From 6f2849d3b708eb9cf4982efbc376314c62afdbea 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 14:29:11 +0800 Subject: [PATCH 3/4] 1 --- src/store/index.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index 146bf8aa..cce3faef 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -50,21 +50,13 @@ export default new Vuex.Store({ // FILEURL:' http://101.43.164.214:11111/image/',// 百色 // UPLOADURL:'http://182.90.224.237:51234/upload/image/', // FILEURL:'http://182.90.224.237:51234/image/', -<<<<<<< .mine UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地 FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 -======= - // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 - // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 ->>>>>>> .theirs // WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//坤工作流地址(本地) -<<<<<<< .mine WORKFLOWURL: 'http://192.168.34.126:88/#/workspace/forms',//罗峰工作流地址(本地) -======= // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) ->>>>>>> .theirs // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试 From 6d481a4239922723ddf6331e575ddb980ca87b20 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 19:50:17 +0800 Subject: [PATCH 4/4] 1 --- src/assets/js/http.js | 4 +-- src/store/index.js | 26 +++++++++---------- .../projectProgressDetail.vue | 8 +++--- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 4486d203..08e97487 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -85,7 +85,7 @@ if (process.env.NODE_ENV == 'development') { // 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.155:19111/' //彭洁本地 + 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/' //沈阳和盈 @@ -97,7 +97,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://jxj.zhgdyun.com:19814/'//测试地址 } else if (process.env.NODE_ENV == 'debug') { diff --git a/src/store/index.js b/src/store/index.js index cce3faef..df83963c 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -62,19 +62,19 @@ export default new Vuex.Store({ // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试 // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试 - BASEURL: baseUrl - ? baseUrl - : window.location.protocol + "//" + window.location.host + "/", //正式环境 - UPLOADURL: - window.location.protocol + - "//" + - window.location.host + - "/upload/image", //正式环境 - FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 - // 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',//鞍钢测试平台工作流地址 + // BASEURL: baseUrl + // ? baseUrl + // : window.location.protocol + "//" + window.location.host + "/", //正式环境 + // UPLOADURL: + // window.location.protocol + + // "//" + + // window.location.host + + // "/upload/image", //正式环境 + // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + // // 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',//鞍钢测试平台工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl diff --git a/src/views/projectFront/progressManagementAg/projectProgressDetail.vue b/src/views/projectFront/progressManagementAg/projectProgressDetail.vue index fd7a5666..f0ddd66d 100644 --- a/src/views/projectFront/progressManagementAg/projectProgressDetail.vue +++ b/src/views/projectFront/progressManagementAg/projectProgressDetail.vue @@ -143,12 +143,12 @@
进度记录
- -