diff --git a/src/store/index.js b/src/store/index.js index ddf9e6f0..e2940f3f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -44,9 +44,9 @@ export default new Vuex.Store({ PAGESIZRS: [10, 20, 30, 50], // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/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/', //测试 // tag: 本地测试接口 + // 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/', //测试 // tag: 本地测试接口 /* 2022-05-16 */ // tag: 部署河南项目时,需要打开这两行代码 // UPLOADURL: 'http://139.9.66.234:6324/upload/image', @@ -56,8 +56,10 @@ export default new Vuex.Store({ // UPLOADURL: 'http://182.90.224.237:7000/upload/image', // FILEURL: 'http://182.90.224.237:7000/image/', // 邱平毅的 - // UPLOADURL: 'http://192.168.34.116:6023/upload/image', - // FILEURL: 'http://192.168.34.116:6023/image/', + UPLOADURL:'http://192.168.34.116:6023/upload/image', + FILEURL: 'http://192.168.34.116:6023/image/', + BASEURL: 'http://192.168.34.116:6023/', // + // UPLOADURL: 'http://124.71.67.160:8088/upload/image', // FILEURL: 'http://124.71.67.160:8088/image/', diff --git a/src/views/projectFront/laborManage/penalize.vue b/src/views/projectFront/laborManage/penalize.vue index d72fa30d..afc51569 100644 --- a/src/views/projectFront/laborManage/penalize.vue +++ b/src/views/projectFront/laborManage/penalize.vue @@ -633,15 +633,15 @@ export default { //上传之前 handleBeforeUpload(file) { - if ( - file.type != "image/jpeg" || - file.type != "image/jpg" || - file.type != "image/png" || - file.type != "image/webp" - ) { - this.$message.error(this.$t("message.laborMange.uploadedError")); - return false; - } + // if ( + // file.type != "image/jpeg" || + // file.type != "image/jpg" || + // file.type != "image/png" || + // file.type != "image/webp" + // ) { + // this.$message.error(this.$t("message.laborMange.uploadedError")); + // return false; + // } }, //删除附件 handleRemove(file, fileList) { @@ -662,7 +662,8 @@ export default { //详情 if (file.url) { this.dialogImageUrl = this.fileUrl + file.url; - } else { + } else + { this.dialogImageUrl = this.fileUrl + file.response.data[0].imageUrl; } }, diff --git a/src/views/projectFront/projectSummary/extendInfo.vue b/src/views/projectFront/projectSummary/extendInfo.vue index e3e8ffce..f2851f98 100644 --- a/src/views/projectFront/projectSummary/extendInfo.vue +++ b/src/views/projectFront/projectSummary/extendInfo.vue @@ -445,6 +445,7 @@ export default { box-sizing: border-box; height: 60px; background: #eeeeee; + line-height: 35px; } .type_content {