From 22a6670a697394cec530a4e0a96004d914eb6b74 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Mon, 22 Jul 2024 18:52:46 +0800 Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E8=AF=84=E5=88=86=E7=9A=84bug=20=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9A=84=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i18n/langs/cn/companyAdmin/extendInfo.js | 74 +++++++++---------- src/assets/js/http.js | 12 +-- src/components/header.vue | 7 +- src/store/index.js | 14 ++-- .../learningMaterial/learningMaterial.vue | 40 ++++++---- .../safetyEducation/securityRiskAnalysis.vue | 6 +- 6 files changed, 84 insertions(+), 69 deletions(-) diff --git a/src/assets/i18n/langs/cn/companyAdmin/extendInfo.js b/src/assets/i18n/langs/cn/companyAdmin/extendInfo.js index 62294d30..fd539f63 100644 --- a/src/assets/i18n/langs/cn/companyAdmin/extendInfo.js +++ b/src/assets/i18n/langs/cn/companyAdmin/extendInfo.js @@ -1,57 +1,57 @@ const newLocal = '总投资额(万元)'; export default { - projectExtension:'项目扩展信息表', - contractSigning:'合同签订', - contractProjectTime:'合同工期', - actualConstructionTime:'实际工期', - toryBurchOnSale:'中标单位', - architect:'设计单位', - ownersUnit:'业主单位', - projectProfile:'工程概况', - constructionUnit:'建设单位', - supervisingUnit:'监理单位', - optionDate:'选择日期', - to:'至', - startDate:'开始日期', - endingDate:'结束日期', - pleaseEnter:'请输入', - editProjectInfo:'编辑项目扩展信息', + projectExtension: '项目扩展信息表', + contractSigning: '合同签订', + contractProjectTime: '合同工期', + actualConstructionTime: '实际工期', + toryBurchOnSale: '中标单位', + architect: '设计单位', + ownersUnit: '业主单位', + projectProfile: '工程概况', + constructionUnit: '建设单位', + supervisingUnit: '监理单位', + optionDate: '选择日期', + to: '至', + startDate: '开始日期', + endingDate: '结束日期', + pleaseEnter: '请输入', + editProjectInfo: '编辑项目扩展信息', editProjectFormRules: { - contractPrice: [ - { required: true, message: "请输入合同额", trigger: "change" }, - ], - investmentPrice: [ - { required: true, message: "请输入投资额", trigger: "change" }, - ], + contractPrice: [ + { required: true, message: "请输入合同额", trigger: "change" }, + ], + investmentPrice: [ + { required: true, message: "请输入投资额", trigger: "change" }, + ], contractSignTime: [ - { required: true, message: "请选择合同签订日期", trigger: "change" }, + { required: true, message: "请选择合同签订日期", trigger: "change" }, ], contractPeriodEndTime: [ - { required: true, message: "请选择合同工期", trigger: "change" }, + { required: true, message: "请选择合同工期", trigger: "change" }, ], realPeriodStartTime: [ - { required: true, message: "请选择实际工期", trigger: "change" }, + { required: true, message: "请选择实际工期", trigger: "change" }, ], bidWinner: [ - { required: true, message: "请输入中标单位", trigger: "blur" }, + { required: true, message: "请输入中标单位", trigger: "blur" }, ], constructionUnit: [ - { required: true, message: "请输入建设单位", trigger: "blur" }, + { required: true, message: "请输入建设单位", trigger: "blur" }, ], designUnit: [ - { required: true, message: "请输入设计单位", trigger: "blur" }, + { required: true, message: "请输入设计单位", trigger: "blur" }, ], ownerUnit: [ - { required: true, message: "请输入业主单位", trigger: "blur" }, + { required: true, message: "请输入业主单位", trigger: "blur" }, ], supervisorUnit: [ - { required: true, message: "请输入监理单位", trigger: "blur" }, + { required: true, message: "请输入监理单位", trigger: "blur" }, ], - educationId: [ - { required: true, message: "请选择安全教育培训", trigger: "change" }, - ], - }, - modifySuccessfully:"修改成功", - contractPrice:'施工合同额(万元)', - investmentPrice:'总投资额(万元)' + // educationId: [ + // { required: true, message: "请选择安全教育培训", trigger: "change" }, + // ], + }, + modifySuccessfully: "修改成功", + contractPrice: '施工合同额(万元)', + investmentPrice: '总投资额(万元)' } \ No newline at end of file diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 4b7ef25b..11bebe0a 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -174,7 +174,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:28890/' //郭圣雄本地 - // 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/' //彭洁远程 @@ -187,11 +187,11 @@ 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://8.136.222.164:8808/' //中科安信正式地址 - // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 - // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址 - // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 + // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 + // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 + // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 + // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址 + // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; } else if (process.env.NODE_ENV == "production") { diff --git a/src/components/header.vue b/src/components/header.vue index f225c53b..b9c0df0c 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -259,7 +259,12 @@ export default { if (newVal.path == "/project/labor/personManage") { this.showQrCode = true; // this.bindQRCode(); - this.getEduIdFn(); + if(this.company == 'agjt'){ + this.getEduIdFn(); + } else { + this.bindQRCode(); + } + } else { this.showQrCode = false; } diff --git a/src/store/index.js b/src/store/index.js index 7d02d50a..a9ea9360 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -56,15 +56,15 @@ export default new Vuex.Store({ // FILEURL:'http://182.90.224.237:51234/image/', // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 // 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/', //郭圣雄本地 + 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.129:89/#/workspace/forms", //罗峰工作流地址(本地) - CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.175:5173/#/contractorApply" : `${window.location.protocol}//${host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地) + WORKFLOWURL: "http://192.168.34.175:88/#/workspace/forms", //罗峰工作流地址(本地) + CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.175:5173/#/contractorApply" : `${window.location.protocol}//${window.location.host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地) // 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 + "/", //正式环境 // UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 @@ -72,7 +72,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/examSystem2/learningMaterial/learningMaterial.vue b/src/views/projectFront/examSystem2/learningMaterial/learningMaterial.vue index e2a26040..6fb953cb 100644 --- a/src/views/projectFront/examSystem2/learningMaterial/learningMaterial.vue +++ b/src/views/projectFront/examSystem2/learningMaterial/learningMaterial.vue @@ -26,7 +26,7 @@ -
单个文件不超过100M，最多可上传1个附件
+ - + :on-exceed="(file, fileList) => materialExceedFn(file, fileList)" :before-upload="handleBeforeUpload">
@@ -419,15 +422,15 @@ export default { this.$message.warning('已经上传了1个封面啦！'); }, handleBeforeUpload(file) { - let maxSize = 100 * 1024 * 1024; // 100MB，设置最大文件大小 - if (file.size > maxSize) { - this.$message.warning('文件太大啦~') - // ElMessage({ - // message: `文件大小超过了${maxSize / (1024 * 1024)}MB的限制`, - // type: 'warning' - // }); - return false; - } + // let maxSize = 100 * 1024 * 1024; // 100MB，设置最大文件大小 + // if (file.size > maxSize) { + // this.$message.warning('文件太大啦~') + // // ElMessage({ + // // message: `文件大小超过了${maxSize / (1024 * 1024)}MB的限制`, + // // type: 'warning' + // // }); + // return false; + // } if(file.type == "video/mp4"){ const videoTypeList = ["mp4"]; @@ -518,6 +521,13 @@ export default { }