From 4adc406712349f42fcb6ba6e45f56a9e93bf7559 Mon Sep 17 00:00:00 2001 From: jxj_yjl <1490736767@qq.com> Date: Sat, 4 Nov 2023 15:11:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E8=BF=98=E5=8E=9F=E5=88=9D=E5=A7=8B=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/config.js | 4 +- src/store/index.js | 16 ++-- .../safeManage/v2/checkStandingBook.vue | 75 ++++++------------- 3 files changed, 34 insertions(+), 61 deletions(-) diff --git a/public/js/config.js b/public/js/config.js index fa99ab6d..50d99cfd 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -1,5 +1,5 @@ //-------项目配置标识------- -var COMPANY = '' //通用 +// var COMPANY = '' //通用 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业 // var COMPANY='hezhan'; //合展-宿迁 // var COMPANY='nanchang'; //南昌地铁、衢州 @@ -16,7 +16,7 @@ var COMPANY = '' //通用 // COMPANY = 'sccr'//四川成润 // COMPANY = 'pssh'//坪山沙湖项目 // COMPANY = 'jlw'//金林湾 -// COMPANY = 'shzj'//上海张江 +COMPANY = 'shzj'//上海张江 // COMPANY = 'shjg'//上海优益（上海建工） // COMPANY = 'syhy'//沈阳和盈 diff --git a/src/store/index.js b/src/store/index.js index d0c2e73c..0ba1e36d 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -51,12 +51,12 @@ export default new Vuex.Store({ 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/", //正式环境 + UPLOADURL: + window.location.protocol + + "//" + + window.location.host + + "/upload/image", //正式环境 + FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl @@ -104,8 +104,8 @@ export default new Vuex.Store({ // FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式） // UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾 // FILEURL: 'http://121.196.214.246/api/image/',//金林湾 - UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地 - FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地 + // UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地 + // FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地 // UPLOADURL: 'http://101.43.164.214:45011/upload/image',//上海优益 // FILEURL: 'http://101.43.164.214:45011/image/',//上海优益 diff --git a/src/views/projectFront/safeManage/v2/checkStandingBook.vue b/src/views/projectFront/safeManage/v2/checkStandingBook.vue index 2eb6393a..9f5cceb5 100644 --- a/src/views/projectFront/safeManage/v2/checkStandingBook.vue +++ b/src/views/projectFront/safeManage/v2/checkStandingBook.vue @@ -614,7 +614,7 @@ {{ @@ -649,7 +649,7 @@ $t('message.safeMangeCheck.dialog.content') " v-if=" - detailData.reviewId == $store.state.userInfo.userId && + detailData.changeUser == $store.state.userInfo.userId && detailData.status == 2 " prop="inspectTypeId" @@ -696,7 +696,7 @@ @@ -721,15 +721,7 @@
- + {{ detailData.reviewId == $store.state.userInfo.userId && detailData.status == 3 @@ -746,14 +738,9 @@ @click="closeDialog2" >{{ $t('message.safeMangeCheck.dialog.back') }} - {{ $t('message.safeMangeCheck.dialog.cancel') }} + {{ + $t('message.safeMangeCheck.dialog.cancel') + }}
@@ -851,17 +838,14 @@ :value="item.id"> --> - - + > @@ -1112,7 +1096,7 @@ export default { value: 'id', label: 'hiddenDangerName', // children: 'children', - checkStrictly: false, + checkStrictly: true, lazy: true, lazyLoad(node, resolve) { console.log(node, that) @@ -1123,7 +1107,7 @@ export default { getinspectHiddenDangerItemRecordListApi({ libraryId: node.data.id }).then((res) => { - console.log("res", res) + console.log(res) if (res.code == 200) { let arr = [] res.result.forEach((item) => { @@ -1137,13 +1121,14 @@ export default { checkContent: item.checkContent, val: item.rectifyRequire, hiddenDangerLevel: item.hiddenDangerLevel, - leaf: true + leaf: node.level >= 2 }) }) - console.log("arr", arr) resolve(arr) } }) + } else if (node.level == 2) { + resolve([]) } } }, @@ -1167,7 +1152,7 @@ export default { this.$t('message.safeMangeCheck.awaitExamine'), this.$t('message.safeMangeCheck.upToStandard'), this.$t('message.safeMangeCheck.not') + - this.$t('message.safeMangeCheck.upToStandard') + this.$t('message.safeMangeCheck.upToStandard') ], dialogVisible: false, detailData: {}, @@ -1253,7 +1238,7 @@ export default { } }, created() { - console.log('当前用户id', this.$store.state.userInfo.userId) + // console.log(this.statusArr) this.COMPANY = COMPANY this.projectSn = this.$store.state.projectSn this.userInfo = this.$store.state.userInfo @@ -1346,7 +1331,7 @@ export default { } }) } else if ( - this.detailData.changeUser == this.$store.state.userInfo.userId && + this.detailData.reviewId == this.$store.state.userInfo.userId && this.detailData.status == 3 ) { data = { @@ -1432,7 +1417,6 @@ export default { this.dialogVisible = false }, close() { - this.$refs['formData'].resetFields() this.formData = { inspectTypeId: '', status: 2, @@ -1497,17 +1481,18 @@ export default { }) this.inspectOptions3 = arr3 // this.$forceUpdate() - console.log('级联选择器数据', this.inspectOptions3) + console.log(this.inspectOptions3) } } ) }, handleChange(val) { + console.log(val) + console.log(this.$refs['cascaderAddr'].getCheckedNodes()[0]) if (this.$refs['cascaderAddr'].getCheckedNodes()[0].data.checkContent) { this.formData.checkContent = this.$refs['cascaderAddr'].getCheckedNodes()[0].data.checkContent } - if (this.$refs['cascaderAddr'].getCheckedNodes()[0].data.val) { this.formData.rectifyRequire = this.$refs['cascaderAddr'].getCheckedNodes()[0].data.val @@ -1522,7 +1507,6 @@ export default { this.formData.hiddenDangerLevel = this.$refs['cascaderAddr'].getCheckedNodes()[0].data.hiddenDangerLevel } - // getinspectHiddenDangerItemRecordListApi({libraryId: val[0]}).then(res=>{ // console.log(res) // if(res.code == 200){ @@ -1544,34 +1528,30 @@ export default { // }) }, checkOptions(val) { + console.log(val) this.inspectOptions2.forEach((item) => { if (item.id == val) { this.formData.checkItem2 = item.hiddenDangerName // console.log(item.hiddenDangerName); - // item.children.forEach((item) => { - // item.children = null - // }) + item.children.forEach((item) => { + item.children = [] + }) this.inspectOptions3 = item.children - console.log('级联', this.inspectOptions3) } - }) }, - getinspectHiddenDangerLibraryList() { getinspectHiddenDangerLibraryListApi({ sn: this.userInfo.headquartersSn }).then((res) => { console.log(res.result) this.inspectOptions2 = res.result - // console.log('获取级联',res) }) }, getInspectTypeList() { getInspectTypeListApi({ sn: this.userInfo.headquartersSn }).then( (res) => { this.inspectOptions = res.result - // console.log('级联',res) } ) }, @@ -1650,7 +1630,6 @@ export default { }, //显示检查详细弹框 showDetailFn(row) { - console.log('显示检查详细弹框', row); console.log(row) this.getRectifyRecordList(row.id) this.replyData = { @@ -1669,7 +1648,7 @@ export default { this.searchForm.inspectEndTime = '' } }, - detailsPoint(item) { }, + detailsPoint(item) {}, loadList(val) { if (val && val == 1) { this.searchForm.pageNo = 1 @@ -1826,10 +1805,4 @@ export default { width: 300px; box-sizing: border-box; } -/deep/.el-cascader-menu__wrap .el-scrollbar__wrap { - display: none !important; -} -// /deep/ .el-cascader-menu:last-child { -// display: none !important; -// }