admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bjxz-cjw' into bjxz-dev

Browse Source
This commit is contained in:
Vce 2024-06-18 16:04:02 +08:00
commit 87ab2edd6f
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/projectFront/laborManage/components/comboForm/dialogPage/adminDialog.vue
View File

@ -1784,18 +1784,6 @@ export default {
this.$store.state.FILEURL + imgInfo.imageUrl; this.$store.state.FILEURL + imgInfo.imageUrl;
this.cropperDialog = true; this.cropperDialog = true;
} }
// let imgStatus = result.file.size / 1024 < 500
// if (!imgStatus) {
// this.cropperOption.img =
// this.$store.state.FILEURL + imgInfo.imageUrl
// this.cropperDialog = true
// } else {
// if (this.isSzProject == 1) {
// this.checkImgLibrary(imgInfo.imageUrl)
// } else {
// this.checkFace(imgInfo.imageUrl)
// }
// }
break; break;
} }
} }

17
src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue
View File

@ -1261,13 +1261,16 @@ export default {
loading.close(); loading.close();
}) })
}else{ }else{
if(res.code == 200 && res.result.checkType == "1"){ this.cropperOption.img =
this.cropperOption.img = this.$store.state.FILEURL + imgInfo.imageUrl;
this.$store.state.FILEURL + imgInfo.imageUrl; this.cropperDialog = true;
this.cropperDialog = true; // if(res.code == 200 && res.result.checkType == "1"){
}else{ // this.cropperOption.img =
this.$message.error(res.result.message) // this.$store.state.FILEURL + imgInfo.imageUrl;
} // this.cropperDialog = true;
// }else{
// this.$message.error(res.result.message)
// }
} }
// let imgStatus = result.file.size / 1024 < 500 // let imgStatus = result.file.size / 1024 < 500
// if (!imgStatus) { // if (!imgStatus) {