From 01cfdd11310b7a68419eeec6deea6472c7c82b2c Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Mon, 24 Feb 2025 14:39:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=85=E5=A1=AB=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=92=8Cvue=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E3=80=81=E7=99=BB=E5=BD=95=E9=AA=8C=E8=AF=81=E7=A0=81=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/bonus.js | 16 +++++++------- src/utils/request.js | 2 +- .../coursewareStore/index.vue | 4 ++-- src/views/login.vue | 16 +++++++------- .../personnelInformation/index.vue | 1 + src/views/pro/apply/consEnterApply.vue | 4 ++-- src/views/pro/apply/supervisorEnterApply.vue | 4 ++-- .../pro/projectManagement/proList/addPro.vue | 22 ++++++++++++++----- vue.config.js | 6 ++--- 9 files changed, 44 insertions(+), 31 deletions(-) diff --git a/src/utils/bonus.js b/src/utils/bonus.js index 79af40e..834b9ec 100644 --- a/src/utils/bonus.js +++ b/src/utils/bonus.js @@ -1,23 +1,23 @@ import { getToDoNum } from '@/api/system/notice' export function lookFile() { - return 'http://192.168.0.14:21626/file/statics' //14服务器 + // return 'http://192.168.0.14:21626/file/statics' //14服务器 // return 'http://112.29.103.165:14413/file/statics' //1.6演示服务器 - // return 'http://218.21.27.6:1999/file/statics' //生产服务器 + return 'http://218.21.27.6:1999/file/statics' //生产服务器 } export function lookFaceFile() { - return 'http://192.168.0.14:21626/file/statics/' //14服务器 + // return 'http://192.168.0.14:21626/file/statics/' //14服务器 //return 'http://112.29.103.165:14413/file/statics/' //1.6演示服务器 - // return 'http://218.21.27.6:1999/file/statics/' //生产服务器 + return 'http://218.21.27.6:1999/file/statics/' //生产服务器 } export function filePreview() { - return 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器 + // return 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器 // return 'http://112.29.103.165:8012/onlinePreview?url=' //1.6演示服务器 - // return 'http://218.21.27.6:18013/onlinePreview?url=' + return 'http://218.21.27.6:18013/onlinePreview?url=' } export function lookMioIoFile() { - // return 'http://218.21.27.6:19090/nxdt-courseware' //生产服务器 - return 'http://192.168.0.14:9090/nxdt-courseware-1' //14服务器 + return 'http://218.21.27.6:19090/nxdt-courseware' //生产服务器 + // return 'http://192.168.0.14:9090/nxdt-courseware-1' //14服务器 } // lookFile: 'http://218.21.27.6:1999/nxnyback/statics', diff --git a/src/utils/request.js b/src/utils/request.js index 18c9c9d..7a3c0e8 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -18,7 +18,7 @@ const service = axios.create({ // axios中请求配置有baseURL选项，表示请求URL公共部分 baseURL: process.env.VUE_APP_BASE_API, // 超时 - timeout: 10000 * 5, + timeout: 10000 * 20, }) // request拦截器 diff --git a/src/views/educationalTraining/resourceAdministration/coursewareStore/index.vue b/src/views/educationalTraining/resourceAdministration/coursewareStore/index.vue index 3f76556..0aa0d5c 100644 --- a/src/views/educationalTraining/resourceAdministration/coursewareStore/index.vue +++ b/src/views/educationalTraining/resourceAdministration/coursewareStore/index.vue @@ -350,9 +350,9 @@ export default { fileList.forEach(item => { totalSize += item.size }) - const isLtFile = totalSize / 1024 / 1024 < 500 + const isLtFile = totalSize / 1024 / 1024 < 600 if (!isLtFile) { - this.$message.error('文件大小不能超过500M') + this.$message.error('文件大小不能超过600M') fileList = [] this.fileList = [] } else if (fileList.length > 5) { diff --git a/src/views/login.vue b/src/views/login.vue index 830faf5..4baeed9 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -112,14 +112,14 @@ export default { trigger: 'blur', }, ], - // code: [{ required: true, trigger: "change", message: "请输入验证码" }, - // { validator: (rule, value, callback) => { - // if (/\s/.test(value)) { - // callback(new Error("验证码中不允许包含空格")); - // } else { - // callback(); - // } - // }, trigger: "blur" }] + code: [{ required: true, trigger: "change", message: "请输入验证码" }, + { validator: (rule, value, callback) => { + if (/\s/.test(value)) { + callback(new Error("验证码中不允许包含空格")); + } else { + callback(); + } + }, trigger: "blur" }] }, loading: false, // 验证码开关 diff --git a/src/views/pro/admissionRequest/personnelInformation/index.vue b/src/views/pro/admissionRequest/personnelInformation/index.vue index df47c12..fa98eb6 100644 --- a/src/views/pro/admissionRequest/personnelInformation/index.vue +++ b/src/views/pro/admissionRequest/personnelInformation/index.vue @@ -400,6 +400,7 @@ export default { this.$message.error('请选择需要出场的人员') return } + this.uuid = this.ids.join(',') this.taskId = this.taskId.join(',') } else { diff --git a/src/views/pro/apply/consEnterApply.vue b/src/views/pro/apply/consEnterApply.vue index 11f7338..731a800 100644 --- a/src/views/pro/apply/consEnterApply.vue +++ b/src/views/pro/apply/consEnterApply.vue @@ -2243,9 +2243,9 @@ export default { /** 获取文件数据 */ fileChange(file, fileList) { // 检查文件大小 - if (file.size > 1024 * 1024 * 500) { + if (file.size > 1024 * 1024 * 600) { // 10MB 限制 - this.$message.warning('文件大小不能超过500MB') + this.$message.warning('文件大小不能超过600MB') fileList = fileList.filter(item => item.uid !== file.uid) } // 更新 fileList 状态 diff --git a/src/views/pro/apply/supervisorEnterApply.vue b/src/views/pro/apply/supervisorEnterApply.vue index 1adcb43..54d792e 100644 --- a/src/views/pro/apply/supervisorEnterApply.vue +++ b/src/views/pro/apply/supervisorEnterApply.vue @@ -1478,9 +1478,9 @@ export default { /** 获取文件数据 */ fileChange(file, fileList) { // 检查文件大小 - if (file.size > 1024 * 1024 * 500) { + if (file.size > 1024 * 1024 * 600) { // 10MB 限制 - this.$message.warning('文件大小不能超过500MB') + this.$message.warning('文件大小不能超过600MB') fileList = fileList.filter(item => item.uid !== file.uid) } // 更新 fileList 状态 diff --git a/src/views/pro/projectManagement/proList/addPro.vue b/src/views/pro/projectManagement/proList/addPro.vue index d0b8e1d..cc4231f 100644 --- a/src/views/pro/projectManagement/proList/addPro.vue +++ b/src/views/pro/projectManagement/proList/addPro.vue @@ -481,9 +481,11 @@ export default { { label: '经度', prop: 'lon', type: 'input', labelWidth: '120px', disabled: true }, { label: '纬度', prop: 'lat', type: 'input', labelWidth: '120px', disabled: true } ], + isOne:{ + one:false + }, formData: { proId: undefined, - jlId:undefined, //工程名称 proName: undefined, @@ -599,10 +601,15 @@ export default { }, 'formData.supervisorUnitId'(newVal) { this.formData.jlId=newVal; - this.formData.supervisorUnitUserId=''; - this.formData.supervisorUnitUser=''; + console.log(this.isOne.one,"-->one" + ) + if(!this.isOne.one){ + this.formData.supervisorUnitUserId=''; + this.formData.supervisorUnitUser=''; + }else{ + this.isOne.one=false; + } this.supervisorUnitOptions=[]; - this.getSupervisionUnit(newVal) @@ -1148,7 +1155,12 @@ export default { this.loading = true // TODO 获取数据 selectProInfoDetails(proId).then(response => { - this.formData = response.projectInfo[0] + this.isOne.one=true; + console.log(5) + console.log( response.projectInfo[0].supervisorUnitUserId) + console.log( response.projectInfo[0].supervisorUnitUser) + console.error(response.projectInfo[0]) + this.formData= response.projectInfo[0] this.loading = false }) }, diff --git a/vue.config.js b/vue.config.js index 6d5e584..c9756fa 100644 --- a/vue.config.js +++ b/vue.config.js @@ -38,10 +38,10 @@ module.exports = { // target: `http://localhost:18080`, // target: 'http://192.168.0.176:18080', // target: 'http://192.168.0.58:19090', // 杰 - // target: 'http://192.168.0.14:1999/nxdt-api', // 测试环境 + //target: 'http://192.168.0.38:18080', // 测试环境 // target: 'http://218.21.27.6:1999/prod-api', // 生产环境 - // target: 'http://192.168.0.38:18080', // 郝志权 - target: 'http://192.168.2.125:18080', // 梁超 + target: 'http://192.168.0.14:38080', // 郝志权 + // target: 'http://192.168.2.122:18080', // 梁超 changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '',