diff --git a/pages/projectEnd/qualityManage/hiddenTroubleComponents/addHiddenTroubleList.vue b/pages/projectEnd/qualityManage/hiddenTroubleComponents/addHiddenTroubleList.vue index 9ce4dde0..f1593319 100644 --- a/pages/projectEnd/qualityManage/hiddenTroubleComponents/addHiddenTroubleList.vue +++ b/pages/projectEnd/qualityManage/hiddenTroubleComponents/addHiddenTroubleList.vue @@ -207,19 +207,22 @@ success(res) { const tempFilePaths = res.tempFilePaths; console.log(222, tempFilePaths[0]) + // #ifdef APP-PLUS that.canversList(tempFilePaths[0]); - // uni.uploadFile({ - // url: that.url_config + 'upload/image', //仅为示例,非真实的接口地址 - // filePath: tempFilePaths[0], - // name: 'files', - // success: (uploadFileRes) => { - // let data = { - // name: JSON.parse(uploadFileRes.data).data[0].filename, - // url: JSON.parse(uploadFileRes.data).data[0].imageUrl - // }; - // that.imgFileList.push(data) - // } - // }); + return + // #endif + uni.uploadFile({ + url: that.url_config + 'upload/image', //仅为示例,非真实的接口地址 + filePath: tempFilePaths[0], + name: 'files', + success: (uploadFileRes) => { + let data = { + name: JSON.parse(uploadFileRes.data).data[0].filename, + url: JSON.parse(uploadFileRes.data).data[0].imageUrl + }; + that.imgFileList.push(data) + } + }); } }) } else if (type == 2) { diff --git a/pages/projectEnd/qualityManage/list.vue b/pages/projectEnd/qualityManage/list.vue index d3fe9c96..d1044054 100644 --- a/pages/projectEnd/qualityManage/list.vue +++ b/pages/projectEnd/qualityManage/list.vue @@ -927,39 +927,52 @@ this.listData = []; this.checkPointName = '' this.regionId = [] + this.condition.reviewId = ''; + this.condition.changeId = ''; + this.condition.verifyManId = ''; + this.condition.regionId = ''; + if (this.checkedTab == 2 || this.checkedTab == 5) { + this.condition.changeId = this.userInfo.userId + } else if (this.checkedTab == 3) { + this.condition.reviewId = this.userInfo.userId + } else if (this.checkedTab == 4) { + this.condition.verifyManId = this.userInfo.userId + } else if (this.checkedTab == 6) { + this.condition.regionId = this.regionId + } this.getListData() }, //获取列表数据 getListData() { - if (this.checkedTab == 2 || this.checkedTab == 5) { - this.condition.changeId = this.userInfo.userId - // this.condition.reviewId = '' - // this.condition.verifyManId = '' - // this.condition.regionId = [] - } else if (this.checkedTab == 3) { - this.condition.reviewId = this.userInfo.userId - // this.condition.changeId = ''; - // this.condition.verifyManId = '' - // this.condition.regionId = [] - } else if (this.checkedTab == 4) { - this.condition.verifyManId = this.userInfo.userId - // this.condition.changeId = ''; - // this.condition.reviewId = '' - // this.condition.regionId = [] - } else if (this.checkedTab == 6) { - // this.condition.status = '' - // this.condition.verifyManId = '' - // this.condition.changeId = ''; - // this.condition.reviewId = '' - this.condition.regionId = this.regionId - } else { - // this.condition.status = '' - // this.condition.reviewId = ''; - // this.condition.changeId = ''; - // this.condition.verifyManId = '' - // this.condition.regionId = '' + // if (this.checkedTab == 2 || this.checkedTab == 5) { + // this.condition.changeId = this.userInfo.userId + // // this.condition.reviewId = '' + // // this.condition.verifyManId = '' + // // this.condition.regionId = [] + // } else if (this.checkedTab == 3) { + // this.condition.reviewId = this.userInfo.userId + // // this.condition.changeId = ''; + // // this.condition.verifyManId = '' + // // this.condition.regionId = [] + // } else if (this.checkedTab == 4) { + // this.condition.verifyManId = this.userInfo.userId + // // this.condition.changeId = ''; + // // this.condition.reviewId = '' + // // this.condition.regionId = [] + // } else if (this.checkedTab == 6) { + // // this.condition.status = '' + // // this.condition.verifyManId = '' + // // this.condition.changeId = ''; + // // this.condition.reviewId = '' + // this.condition.regionId = this.regionId + // } else { + // // this.condition.status = '' + // // this.condition.reviewId = ''; + // // this.condition.changeId = ''; + // // this.condition.verifyManId = '' + // // this.condition.regionId = '' - } + // } console.log('查询列表条件数据', this.checkedTab) let that = this; // uni.showLoading({title: '加载中'}) @@ -1009,6 +1022,7 @@ background: #EFF3F7; min-height: 100vh; } + .fixedheader { position: fixed; top: 0; @@ -1295,7 +1309,8 @@ margin-top: 20rpx; display: flex; align-items: center; - > image { + + >image { width: 40rpx; height: 40rpx; margin-right: 10rpx; @@ -1313,10 +1328,12 @@ color: #808080; margin-top: 20rpx; } + .item_header { font-size: 24rpx; color: #808080; } + .item_info { font-size: 26rpx; line-height: 24px; @@ -1361,7 +1378,7 @@ flex-direction: column; align-items: center; justify-content: center; - + >view { width: 300rpx; height: 300rpx; @@ -1369,7 +1386,7 @@ background-repeat: no-repeat; background-size: 100% 100%; } - + >text { font-size: 22rpx; color: #808080; diff --git a/pages/projectEnd/safeSame/hiddenTroubleComponents/addHiddenTroubleList.vue b/pages/projectEnd/safeSame/hiddenTroubleComponents/addHiddenTroubleList.vue index dca1f921..9c3976cc 100644 --- a/pages/projectEnd/safeSame/hiddenTroubleComponents/addHiddenTroubleList.vue +++ b/pages/projectEnd/safeSame/hiddenTroubleComponents/addHiddenTroubleList.vue @@ -207,19 +207,21 @@ success(res) { const tempFilePaths = res.tempFilePaths; console.log(222, tempFilePaths[0]) + // #ifdef APP-PLUS that.canversList(tempFilePaths[0]); - // uni.uploadFile({ - // url: that.url_config + 'upload/image', //仅为示例,非真实的接口地址 - // filePath: tempFilePaths[0], - // name: 'files', - // success: (uploadFileRes) => { - // let data = { - // name: JSON.parse(uploadFileRes.data).data[0].filename, - // url: JSON.parse(uploadFileRes.data).data[0].imageUrl - // }; - // that.imgFileList.push(data) - // } - // }); + return + uni.uploadFile({ + url: that.url_config + 'upload/image', //仅为示例,非真实的接口地址 + filePath: tempFilePaths[0], + name: 'files', + success: (uploadFileRes) => { + let data = { + name: JSON.parse(uploadFileRes.data).data[0].filename, + url: JSON.parse(uploadFileRes.data).data[0].imageUrl + }; + that.imgFileList.push(data) + } + }); } }) } else if (type == 2) { diff --git a/pages/projectEnd/safeSame/list.vue b/pages/projectEnd/safeSame/list.vue index f2c32e71..aa75acb6 100644 --- a/pages/projectEnd/safeSame/list.vue +++ b/pages/projectEnd/safeSame/list.vue @@ -927,39 +927,52 @@ this.listData = []; this.checkPointName = '' this.regionId = [] + this.condition.reviewId = ''; + this.condition.changeId = ''; + this.condition.verifyManId = '' + this.condition.regionId = '' + if (this.checkedTab == 2 || this.checkedTab == 5) { + this.condition.changeId = this.userInfo.userId + } else if (this.checkedTab == 3) { + this.condition.reviewId = this.userInfo.userId + } else if (this.checkedTab == 4) { + this.condition.verifyManId = this.userInfo.userId + } else if (this.checkedTab == 6) { + this.condition.regionId = this.regionId + } this.getListData() }, //获取列表数据 getListData() { - if (this.checkedTab == 2 || this.checkedTab == 5) { - this.condition.changeId = this.userInfo.userId - // this.condition.reviewId = '' - // this.condition.verifyManId = '' - // this.condition.regionId = [] - } else if (this.checkedTab == 3) { - this.condition.reviewId = this.userInfo.userId - // this.condition.changeId = ''; - // this.condition.verifyManId = '' - // this.condition.regionId = [] - } else if (this.checkedTab == 4) { - this.condition.verifyManId = this.userInfo.userId - // this.condition.changeId = ''; - // this.condition.reviewId = '' - // this.condition.regionId = [] - } else if (this.checkedTab == 6) { - // this.condition.status = '' - // this.condition.verifyManId = '' - // this.condition.changeId = ''; - // this.condition.reviewId = '' - this.condition.regionId = this.regionId - } else { - // this.condition.status = '' - // this.condition.reviewId = ''; - // this.condition.changeId = ''; - // this.condition.verifyManId = '' - // this.condition.regionId = '' + // if (this.checkedTab == 2 || this.checkedTab == 5) { + // this.condition.changeId = this.userInfo.userId + // // this.condition.reviewId = '' + // // this.condition.verifyManId = '' + // // this.condition.regionId = [] + // } else if (this.checkedTab == 3) { + // this.condition.reviewId = this.userInfo.userId + // // this.condition.changeId = ''; + // // this.condition.verifyManId = '' + // // this.condition.regionId = [] + // } else if (this.checkedTab == 4) { + // this.condition.verifyManId = this.userInfo.userId + // // this.condition.changeId = ''; + // // this.condition.reviewId = '' + // // this.condition.regionId = [] + // } else if (this.checkedTab == 6) { + // // this.condition.status = '' + // // this.condition.verifyManId = '' + // // this.condition.changeId = ''; + // // this.condition.reviewId = '' + // this.condition.regionId = this.regionId + // } else { + // // this.condition.status = '' + // // this.condition.reviewId = ''; + // // this.condition.changeId = ''; + // // this.condition.verifyManId = '' + // // this.condition.regionId = '' - } + // } console.log('查询列表条件数据', this.checkedTab) let that = this; // uni.showLoading({title: '加载中'}) @@ -1009,6 +1022,7 @@ background: #EFF3F7; min-height: 100vh; } + .fixedheader { position: fixed; top: 0; @@ -1295,7 +1309,8 @@ margin-top: 20rpx; display: flex; align-items: center; - > image { + + >image { width: 40rpx; height: 40rpx; margin-right: 10rpx; @@ -1313,10 +1328,12 @@ color: #808080; margin-top: 20rpx; } + .item_header { font-size: 24rpx; color: #808080; } + .item_info { font-size: 26rpx; line-height: 24px; @@ -1361,7 +1378,7 @@ flex-direction: column; align-items: center; justify-content: center; - + >view { width: 300rpx; height: 300rpx; @@ -1369,7 +1386,7 @@ background-repeat: no-repeat; background-size: 100% 100%; } - + >text { font-size: 22rpx; color: #808080; diff --git a/pages/projectEnd/safeSame/reply.vue b/pages/projectEnd/safeSame/reply.vue index 2f6bf825..d5670e52 100644 --- a/pages/projectEnd/safeSame/reply.vue +++ b/pages/projectEnd/safeSame/reply.vue @@ -380,34 +380,37 @@ count: 5 - that.fileList.length, success(res) { const tempFilePaths = res.tempFilePaths; + // #ifdef APP-PLUS that.canversList(tempFilePaths[0]); - // uni.uploadFile({ - // url: that.url_config + 'upload/image', //仅为示例,非真实的接口地址 - // filePath: tempFilePaths[0], - // name: 'files', - // success: (uploadFileRes) => { - // let data = { - // name: JSON.parse(uploadFileRes.data).data[0].filename, - // url: JSON.parse(uploadFileRes.data).data[0].imageUrl - // }; - // that.fileList.push(data) - // uni.getImageInfo({ - // src: tempFilePaths[0], - // success: (resInfo) => { - // console.log('传过去啦 resInfo', resInfo) - // that.imgList = { - // imgUrl: tempFilePaths[0], - // imgWidth: resInfo.width, - // imgHeight: resInfo.height, - // // team:'班组人员', - // // name: '张三' - // } - // that.openImg = true - // } - // }) - // that.openImg = false - // } - // }); + return + // #endif + uni.uploadFile({ + url: that.url_config + 'upload/image', //仅为示例,非真实的接口地址 + filePath: tempFilePaths[0], + name: 'files', + success: (uploadFileRes) => { + let data = { + name: JSON.parse(uploadFileRes.data).data[0].filename, + url: JSON.parse(uploadFileRes.data).data[0].imageUrl + }; + that.fileList.push(data) + // uni.getImageInfo({ + // src: tempFilePaths[0], + // success: (resInfo) => { + // console.log('传过去啦 resInfo', resInfo) + // that.imgList = { + // imgUrl: tempFilePaths[0], + // imgWidth: resInfo.width, + // imgHeight: resInfo.height, + // // team:'班组人员', + // // name: '张三' + // } + // that.openImg = true + // } + // }) + // that.openImg = false + } + }); } }) },