From 3984dc616317a8777fd0e7d9374711a8de9db11e Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Wed, 17 Apr 2024 09:08:38 +0800 Subject: [PATCH 1/2] =?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 --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0f4da62e..bcad95d6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ yarn-error.log* pnpm-debug.log* lerna-debug.log* +uni_modules node_modules dist html From 7ffb259ce24198acd7b5b9633d359b3eccb5bede Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Thu, 18 Apr 2024 19:53:04 +0800 Subject: [PATCH 2/2] =?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 --- pages/projectEnd/carManage/addCar.vue | 40 +++++++++++++++++- .../addConstructionStation.vue | 2 +- .../addOrdinaryAcceptance.vue | 2 +- pages/projectEnd/dangerBigProject/addPlan.vue | 5 ++- pages/projectEnd/dangerBigProject/details.vue | 15 ++++++- .../dangerBigProject/engineeringData.vue | 41 ++++++++++--------- pages/projectEnd/safeManage/addExamine.vue | 18 ++++++-- pages/projectEnd/safeManage/dangerLibrary.vue | 4 +- 8 files changed, 95 insertions(+), 32 deletions(-) diff --git a/pages/projectEnd/carManage/addCar.vue b/pages/projectEnd/carManage/addCar.vue index 23ed89d2..ff2c7360 100644 --- a/pages/projectEnd/carManage/addCar.vue +++ b/pages/projectEnd/carManage/addCar.vue @@ -67,10 +67,19 @@ 司机姓名 - + + + 请选择 + + {{colorList[driverNameIndex]}} + + + + @@ -112,6 +121,8 @@ colorList: ['蓝色', '绿色', '黄色', '白色', '黑色'], carTypeList: [], carTypeIndex: null, + driverNameList: [], + driverNameIndex: null, form: { carColor: "", carNumber: "", @@ -198,6 +209,28 @@ radioChange(e) { this.form.isBlack = e.target.value }, + //获取司机姓名 + getDriverNameList() { + var that = this + this.sendRequest({ + url: 'xmgl/carType/list', + data: { + projectSn: this.projectDetail.projectSn + }, + method: "POST", + success(res) { + that.carTypeList = res.result + if (!that.isAdd) { + for (var i = 0; i < res.result.length; i++) { + if (that.form.carType == res.result[i].id) { + that.carTypeIndex = i; + break; + } + } + } + } + }) + }, //获取车种 getCarTypeList() { var that = this @@ -251,6 +284,9 @@ bindPickerChange2: function(e) { this.carTypeIndex = e.target.value }, + bindPickerChange3: function(e) { + this.carTypeIndex = e.target.value + }, bindDateChange: function(e) { this.form.eduTime = e.target.value }, diff --git a/pages/projectEnd/dangerBigProject/addConstructionStation.vue b/pages/projectEnd/dangerBigProject/addConstructionStation.vue index 79760f04..2c04625a 100644 --- a/pages/projectEnd/dangerBigProject/addConstructionStation.vue +++ b/pages/projectEnd/dangerBigProject/addConstructionStation.vue @@ -19,7 +19,7 @@ 现场照片 - + diff --git a/pages/projectEnd/dangerBigProject/addOrdinaryAcceptance.vue b/pages/projectEnd/dangerBigProject/addOrdinaryAcceptance.vue index ef54e41c..02bcce54 100644 --- a/pages/projectEnd/dangerBigProject/addOrdinaryAcceptance.vue +++ b/pages/projectEnd/dangerBigProject/addOrdinaryAcceptance.vue @@ -37,7 +37,7 @@ 现场照片 - + diff --git a/pages/projectEnd/dangerBigProject/addPlan.vue b/pages/projectEnd/dangerBigProject/addPlan.vue index f61cb9be..216a9864 100644 --- a/pages/projectEnd/dangerBigProject/addPlan.vue +++ b/pages/projectEnd/dangerBigProject/addPlan.vue @@ -9,7 +9,7 @@ *责任区域 - + 进度描述 @@ -19,7 +19,7 @@ 现场照片 - + @@ -276,6 +276,7 @@ } } .from-input{ + width: 57%; text-align: right; } } diff --git a/pages/projectEnd/dangerBigProject/details.vue b/pages/projectEnd/dangerBigProject/details.vue index 34d1e78a..9a27f88b 100644 --- a/pages/projectEnd/dangerBigProject/details.vue +++ b/pages/projectEnd/dangerBigProject/details.vue @@ -155,6 +155,19 @@ // this.listData = res.result.records // } this.detailData = res.result + let str = ''; + if(res.result.chooseTypeDescribeList){ + this.detailData.describeName + res.result.chooseTypeDescribeList.map((item,index) => { + if(index == res.result.chooseTypeDescribeList.length - 1){ + str = str + item.describeName + } else { + str = str + item.describeName + ',' + } + }) + console.log(str,123456789) + this.detailData.describeName = str; + } console.log(this.detailData) } }) @@ -198,7 +211,7 @@ uni.removeStorageSync('detailData'); } uni.navigateTo({ - url:'../safeManage/addExamine?type=1&engineeringId='+this.detailId + url:'../safeManage/addExamine?type=1&engineeringId='+this.detailId + '&moduleType=safeCheck' }) } else if(this.activeIndex == 6){ uni.navigateTo({ diff --git a/pages/projectEnd/dangerBigProject/engineeringData.vue b/pages/projectEnd/dangerBigProject/engineeringData.vue index e833af39..7a640770 100644 --- a/pages/projectEnd/dangerBigProject/engineeringData.vue +++ b/pages/projectEnd/dangerBigProject/engineeringData.vue @@ -97,27 +97,28 @@ uni.previewImage({ urls: [url] }) - } - //#ifdef H5 - uni.showToast({ - title: '暂不支持预览！', - icon: "none", - duration: 2000 + } else{ + uni.downloadFile({ + url: url, + success: function (res) { + var filePath = res.tempFilePath; + uni.openDocument({ + filePath: filePath, + success: function (res) { + console.log('打开文档成功'); + } + }); + } }); - return; - //#endif - uni.downloadFile({ - url: url, - success: function (res) { - var filePath = res.tempFilePath; - uni.openDocument({ - filePath: filePath, - success: function (res) { - console.log('打开文档成功'); - } - }); - } - }); + } + // //#ifdef H5 + // uni.showToast({ + // title: '暂不支持预览！', + // icon: "none", + // duration: 2000 + // }); + // return; + // //#endif } } } diff --git a/pages/projectEnd/safeManage/addExamine.vue b/pages/projectEnd/safeManage/addExamine.vue index 0f7d9c36..5667abd5 100644 --- a/pages/projectEnd/safeManage/addExamine.vue +++ b/pages/projectEnd/safeManage/addExamine.vue @@ -348,6 +348,7 @@ taskId: "", itemId: "", base64Image: '', + moduleType: '' } }, computed: { @@ -465,6 +466,9 @@ this.taskId = val.taskId this.itemId = val.itemId } + if(val.moduleType){ + this.moduleType = val.moduleType; + } console.log(val, '----页面类型') }, methods: { @@ -689,7 +693,7 @@ // uni.removeStorageSync('dangerData'); // } uni.navigateTo({ - url: './dangerLibrary?type=1&taskId=' + this.taskId + '&itemId=' + this.itemId + '&engineeringId=' + this.engineeringId + url: './dangerLibrary?type=1&taskId=' + this.taskId + '&itemId=' + this.itemId + '&engineeringId=' + this.engineeringId + '&moduleType=safeCheck' }) } }, @@ -947,9 +951,15 @@ uni.showToast({ title: '保存成功' }) - uni.navigateTo({ - url: "./safeIndex" - }) + if(this.moduleType == 'safeCheck'){ + uni.navigateBack({ + delta: 3 + }) + } else { + uni.navigateTo({ + url: "./safeIndex" + }) + } } console.log(res.result) } diff --git a/pages/projectEnd/safeManage/dangerLibrary.vue b/pages/projectEnd/safeManage/dangerLibrary.vue index 4817feb1..27d465d2 100644 --- a/pages/projectEnd/safeManage/dangerLibrary.vue +++ b/pages/projectEnd/safeManage/dangerLibrary.vue @@ -130,6 +130,7 @@ taskId:"", itemId:"", engineeringId: "", + moduleType: "", statusBarHeight: 0, navList: [], leftIndex: 0, @@ -174,6 +175,7 @@ this.taskId = val.taskId this.itemId = val.itemId this.engineeringId = val.engineeringId + this.moduleType = val.moduleType }, onShow(val){ @@ -248,7 +250,7 @@ val.title = this.navList[this.leftIndex].hiddenDangerName uni.setStorageSync('dangerData', val); uni.navigateTo({ - url: './addExamine?type='+this.type+'&taskId=' + this.taskId + '&itemId=' + this.itemId + '&engineeringId=' + this.engineeringId + url: './addExamine?type='+this.type+'&taskId=' + this.taskId + '&itemId=' + this.itemId + '&engineeringId=' + this.engineeringId + '&moduleType=' + this.moduleType }) }, previewRule(e){