From bff1083bbd6aca9bcc9a39bd7fa1f211faf633b7 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Sun, 2 Jun 2024 23:54:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/index.js | 4 ++-- .../projectFront/laborManage/personRegisterDetails.vue | 9 +++++++++ src/views/projectFront/specialWork/blindPlugWork.vue | 9 ++++----- src/views/projectFront/specialWork/confinedSpaceWork.vue | 9 ++++----- src/views/projectFront/specialWork/disconnectionWork.vue | 9 ++++----- src/views/projectFront/specialWork/fireWork.vue | 9 ++++----- src/views/projectFront/specialWork/riggingOutWork.vue | 9 ++++----- src/views/projectFront/specialWork/startBuildingWork.vue | 9 ++++----- .../projectFront/specialWork/temporaryPowerWork.vue | 9 ++++----- src/views/projectFront/specialWork/towerOverWork.vue | 9 ++++----- 10 files changed, 43 insertions(+), 42 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index 30bdf909..31bc09a6 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -54,7 +54,7 @@ export default new Vuex.Store({ // 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/',//郭圣雄本地 - WORKFLOWURL: "http://192.168.57.67:88/#/workspace/forms", //坤工作流地址(本地) + // WORKFLOWURL: "http://192.168.57.67: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/',//郭圣雄远程 @@ -70,7 +70,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/laborManage/personRegisterDetails.vue b/src/views/projectFront/laborManage/personRegisterDetails.vue index 1d0fef91..1721b3b4 100644 --- a/src/views/projectFront/laborManage/personRegisterDetails.vue +++ b/src/views/projectFront/laborManage/personRegisterDetails.vue @@ -3342,6 +3342,15 @@ export default { this.cropperEditTitle = "现场采集照裁剪"; } else if (type == 8) { this.cropperEditTitle = "身份证头像裁剪"; + } else if ([4, 5, 6, 7].includes(type)) { + let url = + this.$http.defaults.baseURL + + "xmgl/upload/getRenameFile?fileUrl=" + + this.fileUrl + + itemUrl + + "&fileName=" + + itemName; + window.location.href = url; } if (this.basicInfoStatus) { this.dialogVisible = true; diff --git a/src/views/projectFront/specialWork/blindPlugWork.vue b/src/views/projectFront/specialWork/blindPlugWork.vue index 5386d53e..defedcfe 100644 --- a/src/views/projectFront/specialWork/blindPlugWork.vue +++ b/src/views/projectFront/specialWork/blindPlugWork.vue @@ -260,7 +260,6 @@ style="width: 100px; height: 100px; margin-right: 10px" :src="item.url" :preview-src-list="[item.url]" - @click="openImg(item.url)" > @@ -273,7 +272,6 @@ style="width: 100px; height: 100px; margin-right: 10px" :src="item.url" :preview-src-list="[item.url]" - @click="openImg(item.url)" > @@ -496,9 +494,6 @@ export default { }, }, methods: { - openImg(src) { - window.open(src); - }, editRow(index, rows) { if (rows[index].finalAcceptanceStatus === 2) { this.$message.warning('该项危大工程已闭合，请勿操作') @@ -1256,4 +1251,8 @@ export default { display: flex; flex-wrap: wrap; } +// 图片预览的关闭按钮 +::v-deep .el-image-viewer__btn.el-image-viewer__close{ + color: white; +} \ No newline at end of file diff --git a/src/views/projectFront/specialWork/confinedSpaceWork.vue b/src/views/projectFront/specialWork/confinedSpaceWork.vue index 279aebf2..1c801dc8 100644 --- a/src/views/projectFront/specialWork/confinedSpaceWork.vue +++ b/src/views/projectFront/specialWork/confinedSpaceWork.vue @@ -380,7 +380,6 @@ style="width: 100px; height: 100px; margin-right: 10px" :src="item.url" :preview-src-list="[item.url]" - @click="openImg(item.url)" > @@ -393,7 +392,6 @@ style="width: 100px; height: 100px; margin-right: 10px" :src="item.url" :preview-src-list="[item.url]" - @click="openImg(item.url)" > @@ -674,9 +672,6 @@ export default { }, }, methods: { - openImg(src) { - window.open(src); - }, editRow(index, rows) { if (rows[index].finalAcceptanceStatus === 2) { this.$message.warning('该项危大工程已闭合，请勿操作') @@ -1429,4 +1424,8 @@ export default { display: flex; flex-wrap: wrap; } +// 图片预览的关闭按钮 +::v-deep .el-image-viewer__btn.el-image-viewer__close{ + color: white; +} \ No newline at end of file diff --git a/src/views/projectFront/specialWork/disconnectionWork.vue b/src/views/projectFront/specialWork/disconnectionWork.vue index 8d6c863a..f4669478 100644 --- a/src/views/projectFront/specialWork/disconnectionWork.vue +++ b/src/views/projectFront/specialWork/disconnectionWork.vue @@ -215,7 +215,6 @@ style="width: 100px; height: 100px; margin-right: 10px" :src="item.url" :preview-src-list="[item.url]" - @click="openImg(item.url)" > @@ -228,7 +227,6 @@ style="width: 100px; height: 100px; margin-right: 10px" :src="item.url" :preview-src-list="[item.url]" - @click="openImg(item.url)" > @@ -429,9 +427,6 @@ export default { }, }, methods: { - openImg(src) { - window.open(src); - }, editRow(index, rows) { if (rows[index].finalAcceptanceStatus === 2) { this.$message.warning('该项危大工程已闭合，请勿操作') @@ -1143,4 +1138,8 @@ export default { display: flex; flex-wrap: wrap; } +// 图片预览的关闭按钮 +::v-deep .el-image-viewer__btn.el-image-viewer__close{ + color: white; +} \ No newline at end of file diff --git a/src/views/projectFront/specialWork/fireWork.vue b/src/views/projectFront/specialWork/fireWork.vue index 286c97f8..02639b8c 100644 --- a/src/views/projectFront/specialWork/fireWork.vue +++ b/src/views/projectFront/specialWork/fireWork.vue @@ -405,7 +405,6 @@ style="width: 100px; height: 100px; margin-right: 10px" :src="item.url" :preview-src-list="[item.url]" - @click="openImg(item.url)" > @@ -423,7 +422,6 @@ style="width: 100px; height: 100px; margin-right: 10px" :src="item.url" :preview-src-list="[item.url]" - @click="openImg(item.url)" > @@ -633,9 +631,6 @@ export default { }, }, methods: { - openImg(src) { - window.open(src); - }, goBack() { this.dialogFormVisible = true; // this.initData() @@ -1061,4 +1056,8 @@ export default { display: flex; flex-wrap: wrap; } +// 图片预览的关闭按钮 +::v-deep .el-image-viewer__btn.el-image-viewer__close{ + color: white; +} diff --git a/src/views/projectFront/specialWork/riggingOutWork.vue b/src/views/projectFront/specialWork/riggingOutWork.vue index 6162d837..a6420104 100644 --- a/src/views/projectFront/specialWork/riggingOutWork.vue +++ b/src/views/projectFront/specialWork/riggingOutWork.vue @@ -214,7 +214,6 @@ style="width: 100px; height: 100px; margin-right: 10px" :src="item.url" :preview-src-list="[item.url]" - @click="openImg(item.url)" > @@ -227,7 +226,6 @@ style="width: 100px; height: 100px; margin-right: 10px" :src="item.url" :preview-src-list="[item.url]" - @click="openImg(item.url)" > @@ -428,9 +426,6 @@ export default { }, }, methods: { - openImg(src) { - window.open(src); - }, editRow(index, rows) { if (rows[index].finalAcceptanceStatus === 2) { this.$message.warning('该项危大工程已闭合，请勿操作') @@ -1142,4 +1137,8 @@ export default { display: flex; flex-wrap: wrap; } +// 图片预览的关闭按钮 +::v-deep .el-image-viewer__btn.el-image-viewer__close{ + color: white; +} \ No newline at end of file diff --git a/src/views/projectFront/specialWork/startBuildingWork.vue b/src/views/projectFront/specialWork/startBuildingWork.vue index 340e8c77..65f23616 100644 --- a/src/views/projectFront/specialWork/startBuildingWork.vue +++ b/src/views/projectFront/specialWork/startBuildingWork.vue @@ -212,7 +212,6 @@ style="width: 100px; height: 100px; margin-right: 10px" :src="item.url" :preview-src-list="[item.url]" - @click="openImg(item.url)" > @@ -225,7 +224,6 @@ style="width: 100px; height: 100px; margin-right: 10px" :src="item.url" :preview-src-list="[item.url]" - @click="openImg(item.url)" > @@ -426,9 +424,6 @@ export default { }, }, methods: { - openImg(src) { - window.open(src); - }, editRow(index, rows) { if (rows[index].finalAcceptanceStatus === 2) { this.$message.warning('该项危大工程已闭合，请勿操作') @@ -1140,4 +1135,8 @@ export default { display: flex; flex-wrap: wrap; } +// 图片预览的关闭按钮 +::v-deep .el-image-viewer__btn.el-image-viewer__close{ + color: white; +} \ No newline at end of file diff --git a/src/views/projectFront/specialWork/temporaryPowerWork.vue b/src/views/projectFront/specialWork/temporaryPowerWork.vue index 81b42081..def4d543 100644 --- a/src/views/projectFront/specialWork/temporaryPowerWork.vue +++ b/src/views/projectFront/specialWork/temporaryPowerWork.vue @@ -227,7 +227,6 @@ style="width: 100px; height: 100px; margin-right: 10px" :src="item.url" :preview-src-list="[item.url]" - @click="openImg(item.url)" > @@ -240,7 +239,6 @@ style="width: 100px; height: 100px; margin-right: 10px" :src="item.url" :preview-src-list="[item.url]" - @click="openImg(item.url)" > @@ -412,9 +410,6 @@ export default { }, }, methods: { - openImg(src) { - window.open(src); - }, editRow(index, rows) { if (rows[index].finalAcceptanceStatus === 2) { this.$message.warning('该项危大工程已闭合，请勿操作') @@ -1165,4 +1160,8 @@ export default { display: flex; flex-wrap: wrap; } +// 图片预览的关闭按钮 +::v-deep .el-image-viewer__btn.el-image-viewer__close{ + color: white; +} \ No newline at end of file diff --git a/src/views/projectFront/specialWork/towerOverWork.vue b/src/views/projectFront/specialWork/towerOverWork.vue index f47b0355..050e8c2c 100644 --- a/src/views/projectFront/specialWork/towerOverWork.vue +++ b/src/views/projectFront/specialWork/towerOverWork.vue @@ -203,7 +203,6 @@ style="width: 100px; height: 100px; margin-right: 10px" :src="item.url" :preview-src-list="[item.url]" - @click="openImg(item.url)" > @@ -216,7 +215,6 @@ style="width: 100px; height: 100px; margin-right: 10px" :src="item.url" :preview-src-list="[item.url]" - @click="openImg(item.url)" > @@ -359,9 +357,6 @@ export default { }, }, methods: { - openImg(src) { - window.open(src); - }, editRow(index, rows) { if (rows[index].finalAcceptanceStatus === 2) { this.$message.warning('该项危大工程已闭合，请勿操作') @@ -1074,4 +1069,8 @@ export default { display: flex; flex-wrap: wrap; } +// 图片预览的关闭按钮 +::v-deep .el-image-viewer__btn.el-image-viewer__close{ + color: white; +} \ No newline at end of file