diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 0a0362325..48692641d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -255,6 +255,13 @@ export default { ellipsis: true, width: 170 }, + { + title: this.$t('taskname'), + align: 'left', + dataIndex: 'rwmc', + ellipsis: true, + width: 170 + }, { title: this.$t('noticebatch'), align: 'left', diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 5c2556420..0d58ef2e1 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -105,15 +105,24 @@ {{$t('upgradefailureorinterruption')}} - - + +
+ +
+
+ +
@@ -190,6 +199,7 @@ export default { exportData: '/ota/otaBaSjSjyxpg/exportData', importZipUrl: '/ota/otaBaSjSjyxpg/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, + flag:false, loading: false, disable:false, columns: [ @@ -379,18 +389,14 @@ this.$forceUpdate() if(res.result.zxsj==null){ res.result.zxsj=undefined } - this.form=res.result==null ? { - sjmd:'', - // fhgd:1, - // zdjsxg:2, - // sfyxaq:2, - // yhqr:1, - // aqkkx:1, - // zxsj:2, - // aqjz:'2', - // sjbcs:'3,4' - } : res.result + this.form=res.result==null ? { sjmd:'' } : res.result } + console.log(this.form.aqjz) + if(this.form.aqjz == '2'){ + this.flag = true + }else{ + this.flag = false + } }) }, save(){ @@ -417,6 +423,13 @@ this.$forceUpdate() this.save() this.$emit('safetyPrecautionsdown') }, + changeQuery(val) { + if(val.indexOf('将车辆置于安全状态') != -1 || val.indexOf('Put the vehicle in a safe position') != -1){ + this.flag = true + }else{ + this.flag = false + } + }, } } @@ -446,13 +459,21 @@ this.$forceUpdate() margin-left: 40px; } .box-input1 { - display: inline-block; + //display: inline-block; width: calc(100% - 80px); position: absolute; height: 38px; margin-left: 40px; top: 4px; } +.box-input2 { + //display: inline-block; + width: calc(100% - 80px); + position: absolute; + height: 38px; + margin-left: 40px; + top: 50px; +} ::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title { white-space: pre-wrap!important; }