diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 8540ebe86..65d6c5a03 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1690,4 +1690,11 @@ module.exports = {
taskTypeMismatch:'Task Type Mismatch',
taskNodeMismatch:'Task Node Mismatch',
ifNot:'If not, fill in "none" or "not involved"',
+ addfunction:'Add function',
+ controllername:'Controller name',
+ hardwaremanufacturer:'Hardware manufacturer',
+ softwareversion:'Software version',
+ returntofill:'Return to fill',
+
+
}
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index cec34877c..28f8158b6 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1790,4 +1790,9 @@ module.exports = {
taskTypeMismatch:'任务类型不匹配',
taskNodeMismatch:'任务节点不匹配',
ifNot:'如无,则填写“无”或“不涉及”',
+ addfunction:'添加功能',
+ controllername:'控制器名称',
+ hardwaremanufacturer:'硬件生产企业',
+ softwareversion:'软件版本',
+ returntofill:'返回填写',
}
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
index 26d9d7611..64b7d7140 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
@@ -1,359 +1,293 @@
+
+
+
+ {{$t('dataimport')}}
+
+
+
+ {{$t('templateDownload')}}
+
+
-
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- {{$t('monitoringProcess')}}
- {{$t('view')}}
-
-
-
- {{text}}
-
-
-
-
- {{text}}
-
- --
+ {{$t('addcontroller')}}
+ {{$t('addfunction')}}
+ {{$t('delete')}}
-
-
+
+
{{$t('uploadattachment')}}
+
+
-
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue
index aa0ebbeca..976e388e6 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue
@@ -30,7 +30,9 @@
-
+
@@ -119,6 +121,9 @@
this.getList()
},
methods: {
+ back(){
+ this.$emit('historicalrecordup')
+ },
monitoringProcessClick(row){
let newUrl = this.$router.resolve({
path: '/processDetails',
@@ -377,4 +382,8 @@
.titlebox-text-text{
margin-left: 60px;
}
+ .bootom-button{
+ position: relative;
+ left: 30%;
+ }
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue
index 96c1c5846..edac44790 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue
@@ -99,7 +99,7 @@ export default {
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
index e76e6451d..63dd7b3aa 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
@@ -1,366 +1,466 @@
-
-
-
- {{$t('monitoringProcess')}}
- {{$t('view')}}
-
-
- {{text}}
-
-
-
- {{text}}
-
- --
-
-
-
-
+
+
+
+ {{$t('dataimport')}}
+
+
+
+ {{$t('templateDownload')}}
+
+
+
+
+ {{$t('upgradePurpose')}}
+
+
+
+
+
+
+
+ {{$t('impactassessmentofupgradeactivities')}}
+
+
+ {{$t('correspondingvehicletype')}}
+ {{$t('technicalperformancechanges')}}
+ {{$t('technicalstandardsandsafetytechnicalconditions')}}
+ {{$t('autoautonomousdrivingfunction')}}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{$t('uploadattachment')}}
+
+
+
+
+ {{$t('vehiclepriortothereleaseoftheupgrade')}}
+ {{$t('conditionsareupgradesperformed')}}
+ {{$t('upgradefailureorinterruption')}}
+ {{$t('upgradeactivitiesaffectvehiclesafety')}}
+ {{$t('upgradeactivityprovidesuserconfirmationoptions')}}
+ {{$t('upgradepackagetest')}}
+ {{$t('reliabilityofonlineupgradeactivities')}}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+
+
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+
{{$t('uploadattachment')}}
+
+
+
+
+
-
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
index 6803a69dd..b400c4bc6 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
@@ -113,10 +113,10 @@ export default {
},
methods: {
next(){
- this.$emit('upgradeRequirementsdown')
+ this.$emit('recordparametersdown')
},
last(){
- this.$emit('upgradeRequirementsup')
+ this.$emit('recordparametersup')
},
dateChange(item) {
this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue
index 18d88cf9d..aa920ed34 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue
@@ -7,21 +7,26 @@
{{$t('fillintherecord')}}
+
+
+ {{$t('historicalrecord')}}
+
-
+
-
+
-
+
-
+
-
+
@@ -31,7 +36,7 @@
-
+
@@ -206,6 +211,12 @@ export default {
this.pageSizehistory = pageSize
this.bussLogList()
},
+ historicalrecordClick(){
+ this.tabActive = this.$t('historicalrecord')
+ },
+ historicalrecordup(){
+ this.tabActive = this.$t('upgradetargetmodel')
+ },
basicInformationForm(){
this.tabActive = this.$t('thetargetvehicleofthisupgrade')
},
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
index d0cf8e1dc..ddf7a4bbc 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
@@ -54,6 +54,9 @@
{{$t('delete')}}
+
+
{{$t('uploadattachment')}}
+
-
+
@@ -119,6 +121,9 @@
this.getList()
},
methods: {
+ back(){
+ this.$emit('historicalrecordup')
+ },
monitoringProcessClick(row){
let newUrl = this.$router.resolve({
path: '/processDetails',
@@ -377,4 +382,8 @@
.titlebox-text-text{
margin-left: 60px;
}
+ .bootom-button{
+ position: relative;
+ left: 30%;
+ }
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
index 787fb4542..41b6586b4 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
@@ -12,28 +12,247 @@
+
+
+ {{$t('componentname')}}
+
+ {{$t('networksecurityrequirements')}}
+
+
+ {{$t('millimeterwaveradar')}}
+
+
+ {{$t('ultrasonicradar')}}
+
+
+
+ {{$t('camera')}}
+
+
+ {{$t('asternimage')}}
+
+
+ {{$t('Monocularbinocularmultiocular')}}
+
+
+
+
+ {{$t('driverattentionmonitoringsystem')}}
+
+
+ {{$t('driversurveillancecamera')}}
+
+
+ {{$t('drivermonitoringinfraredsensor')}}
+
+
+
+
+ {{$t('positioningandnavigationsystem')}}
+
+
+ {{$t('vehiclesatellitepositioningequipment')}}
+
+
+ {{$t('inertialnavigationsystem')}}
+
+
+ {{$t('wheelspeedmeter')}}
+
+
+ {{$t('highprecisionmap')}}
+
+
+ {{$t('electronicfence')}}
+
+
+
+ {{$t('vehiclecommunicationsystem')}}
+
+
+
+ {{$t('signalingdevices')}}
+
+
+ {{$t('driverassistancefunctioncontrols')}}
+
+
+ {{$t('drivingassistancefunctionindicatorsignaldevice')}}
+
+
+ {{$t('steerinwheelreleaseindicatorsignaldevice')}}
+
+
+ {{$t('driverattentionindicatorsignaldevice')}}
+
+
+
+ {{$t('automaticDrivingDataRecordingSystem')}}
+
+
+ {{$t('eventdatarecordingsystem')}}
+
+
+
+
{{$t('fillincontent')}}
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{ $t('yes') }}
+ {{ $t('not') }}
+
+
+
+
+ {{$t('ParameterName')}}
+
+ {{item.ParameterName}}
+
+
+
+
{{$t('fillincontent')}}
+
+
+
+
+
-
-
-
+
+
+
{{ $t('yes') }}
{{ $t('not') }}
-
-
-
+
+
+
+
+
+
+ {{$t('uploadattachment')}}
+
+
+
+ {{$t('addcontroller')}}
+ {{$t('delete')}}
@@ -57,6 +276,7 @@ export default {
},
data() {
return {
+ radioList:9,
dataSource: [
{
key: '1',
@@ -476,121 +696,87 @@ export default {
url: {
},
queryParam: {},
+ dataSourceList: [
+ {
+ key:1,
+ systemclass: 'ceshi',
+ vaule: 2,
+ }
+ ],
columns: [
{
title: this.$t('componentname'),
align: 'left',
dataIndex: 'componentname',
- width: 170,
- // customRender: (value, row, index) => {
- // const obj = {
- // children: '',
- // attrs: {},
- // };
- // if(index === 0){ // 第一行数据开始,跨行合并的长度为数据data的长度
- // obj.attrs.rowSpan = 2;
- // obj.children = this.$t('networksecurityrequirements')
- // }else if(index === 2){ // 第一行数据开始,跨行合并的长度为数据data的长度
- // obj.attrs.rowSpan = 6;
- // obj.children = this.$t('upgradefunctionrequirements')
- // }else if(index === 8){
- // obj.attrs.rowSpan = 2;
- // obj.children = this.$t('usernotificationrequirement')
- // }else{
- // obj.attrs.rowSpan = 0
- // }
- // return obj;
- // }
+ ellipsis: true,
+ width: 170
},
{
title: this.$t('configuration'),
align: 'left',
dataIndex: 'configuration',
- scopedSlots: { customRender: 'configuration' },
- width: 170,
- // customRender: (value, row, index) => {
- // const obj = {
- // children: '',
- // attrs: {},
- // };
- // if(index === 0){ // 第一行数据开始,跨行合并的长度为数据data的长度
- // obj.attrs.rowSpan = 2;
- // obj.children = this.$t('networksecurityrequirements')
- // }else if(index === 2){ // 第一行数据开始,跨行合并的长度为数据data的长度
- // obj.attrs.rowSpan = 6;
- // obj.children = this.$t('upgradefunctionrequirements')
- // }else if(index === 8){
- // obj.attrs.rowSpan = 2;
- // obj.children = this.$t('usernotificationrequirement')
- // }else{
- // obj.attrs.rowSpan = 0
- // obj.children = this.$t('usernotificationrequirement')
- // }
- // return obj;
- // }
- // customCell: (record, rowIndex) => {
- // // return this.mergeCellsSlot(record, rowIndex);
- // const obj = {
- // children: '',
- // attrs: {},
- // style: {display: record.row === 0 ? 'none' : undefined},
- // };
- // if(rowIndex === 0){ // 第一行数据开始,跨行合并的长度为数据data的长度
- // obj.attrs.rowSpan = 2;
- // }else if(rowIndex === 2){
- // obj.attrs.rowSpan = 6;
- // }else if(rowIndex === 8){
- // obj.attrs.rowSpan = 2;
- // }else{
- // obj.attrs.rowSpan = 0
- // }
- // return obj;
- // // return {
- // // style: {display: record.row === 0 ? 'none' : undefined},
- // // attrs: {
- // // rowSpan: record.row,
- // // }
- // // }
- // }
- },
- {
- title: this.$t('ParameterName'),
- align: 'left',
- dataIndex: 'ParameterName',
- scopedSlots: { customRender: 'ParameterName' },
+ scopedSlots: { customRender: 'systemclass' },
ellipsis: true,
width: 170
},
{
- title: this.$t('fillincontent'),
+ title: this.$t('controllerparameter'),
align: 'left',
- dataIndex: 'fillincontent',
- scopedSlots: { customRender: 'fillincontent' },
+ dataIndex: 'controllerparameter',
ellipsis: true,
- width: 370,
-
- // customRender: (value, row, index) => {
- // const child = this.$createElement('button', {
- // domProps: {
- // innerHTML: value
- // },
- // on: {
- // click: () =>{this.click(row)}
- // }
- // });
- // const obj = {
- // children: child,
- // attrs: {},
- // };
- // if(index === 0){ // 第一行数据开始,跨行合并的长度为数据data的长度
- // obj.attrs.rowSpan = 10;
- // }else{
- // obj.attrs.rowSpan = 0
- // }
- // return obj
- //
- // }
+ width: 170,
+ children: [
+ {
+ title: this.$t('controllername'),
+ align: 'left',
+ dataIndex: 'controllername',
+ ellipsis: true,
+ width: 170
+ },
+ {
+ title: this.$t('hardwarespecificationmodel'),
+ align: 'left',
+ dataIndex: 'hardwarespecificationmodel',
+ ellipsis: true,
+ width: 170
+ },
+ {
+ title: this.$t('hardwaremanufacturer'),
+ align: 'left',
+ dataIndex: 'hardwaremanufacturer',
+ ellipsis: true,
+ width: 170
+ },
+ {
+ title: this.$t('softwareversion'),
+ align: 'left',
+ dataIndex: 'softwareversion',
+ ellipsis: true,
+ width: 170
+ },
+ {
+ title: this.$t('softwaredevelopmententerprise'),
+ align: 'left',
+ dataIndex: 'softwaredevelopmententerprise',
+ ellipsis: true,
+ width: 170
+ },
+ {
+ title: this.$t('layoutposition'),
+ align: 'left',
+ dataIndex: 'layoutposition',
+ ellipsis: true,
+ width: 170
+ },
+ ]
},
+ {
+ title: this.$t('operation'),
+ align: 'left',
+ fixed: 'right',
+ width: 200,
+ scopedSlots: { customRender: 'operation' }
+ }
],
selectedRowKeys: [],
fileList:{},
@@ -730,4 +916,148 @@ button{
height: 38px;
margin-top: 2px;
}
+.content-text{
+ display: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 100%;
+ line-height: 50px;
+ height: 50px;
+}
+.radio-text{
+ display: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 100%;
+ height: 200px;
+ line-height: 200px;
+}
+.radio-text-two{
+ display: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 100%;
+ height: 100px;
+ line-height: 100px;
+}
+.radio-text-three{
+ display: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 100%;
+ height: 50px;
+ line-height: 50px;
+}
+.radio-text-four{
+ display: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 100%;
+ height: 250px;
+ line-height: 250px;
+}
+.radio-text-five{
+ display: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 100%;
+ height: 150px;
+ line-height: 150px;
+}
+.text-box{
+ display: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 100%;
+ height: 400px;
+ line-height: 400px;
+}
+.text-box-two{
+ display: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 100%;
+ height: 450px;
+ line-height: 450px;
+}
+.text-text{
+ display: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 50%;
+ height: 400px;
+ line-height: 400px;
+}
+.text-text-two{
+ display: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 50%;
+ height: 200px;
+ line-height: 200px;
+}
+.text-text-three{
+ display: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 50%;
+ height: 100px;
+ line-height: 100px;
+}
+.text-text-five{
+ display: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 50%;
+ height: 50px;
+ line-height: 50px;
+}
+.text-box-three{
+ isplay: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 100%;
+ height: 250px;
+ line-height: 250px;
+}
+.text-box-four{
+ isplay: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 100%;
+ height: 600px;
+ line-height: 600px;
+}
+.four-text-text{
+ isplay: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 50%;
+ height: 600px;
+ line-height: 600px;
+}
+.four-text{
+ isplay: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 50%;
+ height: 150px;
+ line-height: 150px;
+}
+.text-box-five{
+ isplay: inline-block;
+ float: left;
+ border: #e8e8e8 solid 1px;
+ width: 100%;
+ height: 100px;
+ line-height: 100px;
+}
+span{
+ overflow: hidden; /*超出部分隐藏*/
+ text-overflow: ellipsis; /*超出部分省略号表示*/
+ white-space: nowrap;
+}
+.item-input{
+ margin-top: 9px;
+}
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
index e8ae9052e..791eae4e8 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
@@ -42,6 +42,9 @@
{{$t('delete')}}
+
+
{{$t('uploadattachment')}}
+
+
+
+ {{$t('historicalrecord')}}
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -206,6 +211,9 @@ export default {
this.pageSizehistory = pageSize
this.bussLogList()
},
+ historicalrecordClick(){
+ this.tabActive = this.$t('historicalrecord')
+ },
basicInformationForm(){
this.tabActive = this.$t('onlineupgraderequirements')
},
@@ -242,6 +250,9 @@ export default {
otherup(){
this.tabActive = this.$t('recordparameters')
},
+ historicalrecordup(){
+ this.tabActive = this.$t('basicinformationofvehicletype')
+ },
// taskConfirmationHandlingClick() {
// this.$router.push({
// path: '/toDoTaskConfirmation'