diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
index 6018ef0da..9fcf1bc8a 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
@@ -201,7 +201,8 @@ export default {
       //url传参严格按照当前命名
       url: {
         list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page',
-        deleteBatch: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/deleteBatch'
+        deleteBatch: '/ota/otaBaSjList/delete'
+      
       },
       visible: false,
       loading: false,
@@ -388,7 +389,7 @@ export default {
       this.$confirm({
         content: _this.$t('ConfirmDelete'),
         onOk() {
-          deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
+          deleteAction(_this.url.deleteBatch, { id: val.id }).then((res) => {
             if (res.success) {
               _this.$message.success(_this.$t('OperationSuccessful'))
               _this.getList()
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
index 7ba9967a4..68c4443a4 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
@@ -32,7 +32,7 @@
           <a-input :placeholder="$t('ifNot')" :title="record.sjqbgcs ? record.sjqbgcs : $t('ifNot')" v-model="record.sjqbgcs" :max-length="500"></a-input>
       </span>
       <span slot="afterupgrade" slot-scope="text,record">
-          <a-input :placeholder="$t('ifNot')" :title="record.sjhbgcs ? record.sjhbgcs : $t('ifNot')" v-model="record.sjhbgcs":max-length="500"></a-input>
+          <a-input :placeholder="$t('ifNot')" :title="record.sjhbgcs ? record.sjhbgcs : $t('ifNot')" v-model="record.sjhbgcs" :max-length="500"></a-input>
       </span>
       <span slot="functionalchangedescription" slot-scope="text,record">
         <a-input :placeholder="$t('pleaseEnter')" v-model="record.gnbgms" :title='record.gnbgms' :max-length="500"></a-input>
@@ -87,7 +87,9 @@ export default {
     return {
       dataSource: [
         {
-
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及',
+          sjsjkzq:'ADC ADAS主控制器'
         }
       ],
       fileList:'',
@@ -219,7 +221,11 @@ export default {
           otaId=''
         }
         getAction('/ota/otaBaSjSjfzbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
-          this.dataSource =res.result.list == null ?  [{}] : res.result.list
+          this.dataSource =res.result.list == null ?  [ {
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及',
+          sjsjkzq:'ADC ADAS主控制器'
+        }] : res.result.list
           this.fileList = res.result.fj
         })
     },
@@ -276,7 +282,11 @@ export default {
       this.$emit('beupgradedonlinedown')
     },
     addlineAtBot(){
-      let obj={}
+      let obj= {
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及',
+          sjsjkzq:'ADC ADAS主控制器'
+        }
         this.dataSource.push(obj)
       },
       deleteData(record){
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
index 7359cc864..c18dd9d0d 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
@@ -90,6 +90,8 @@ export default {
     return {
       dataSource: [
         {
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及'
         }
       ],
       loading: false,
@@ -285,7 +287,10 @@ export default {
           otaId=''
         }
         getAction('/ota/otaBaSjSjxtbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
-          this.dataSource =res.result.list == null ?  [{}] : res.result.list
+          this.dataSource =res.result.list == null ?  [ {
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及'
+        }] : res.result.list
         })
     },
     save(){
@@ -317,7 +322,10 @@ export default {
       this.$emit('upgradedonlinedown')
     },
     addlineAtBot(){
-      let obj={}
+      let obj= {
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及'
+        }
         this.dataSource.push(obj)
       },
       deleteData(record){
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment copy.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment copy.vue
new file mode 100644
index 000000000..fb6045b3d
--- /dev/null
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment copy.vue	
@@ -0,0 +1,541 @@
+<template>
+  <!-- 第三页 -->
+  <div class="box">
+    <div class="table-operator">
+      <div class="operator-text">
+        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'"  @getList="getData"/>
+      </div>
+      <div @click='handleModule' class="operator-text">
+        <a-icon type="download"/>
+        {{$t('templateDownload')}}
+      </div>
+    </div>
+    <a-layout style='margin-bottom: 48px;'>
+      <a-layout style='height: 60px'>
+        <a-layout-sider style='border: black solid 1px;'>
+          <span class='sider-span1'>{{$t('upgradePurpose')}}</span>
+        </a-layout-sider>
+          <a-layout-content style='border: black solid 1px;border-left: none;border-bottom: none;'>
+            <j-multi-select-tag class="box-input"
+                               v-model="form.sjmd"
+                               @change="update"
+                               :disabled="disable"
+                               :placeholder="$t('PleaseSelect')"
+                               :type="'select'"
+                               :dictCode="'uipgrade_purpose'"
+                               :triggerChange="false"/>
+          </a-layout-content>
+      </a-layout>
+      <a-layout>
+        <a-layout-sider style='border: black solid 1px;border-top: none;border-bottom: none'>
+          <span class='sider-span'>{{$t('impactassessmentofupgradeactivities')}}</span>
+        </a-layout-sider>
+        <a-layout-content style='max-width: 522px'>
+          <span class='content-text' :title="$t('correspondingvehicletype')">{{$t('correspondingvehicletype')}}</span>
+          <span class='content-text' :title="$t('technicalperformancechanges')">{{$t('technicalperformancechanges')}}</span>
+          <span class='content-text' :title="$t('technicalstandardsandsafetytechnicalconditions')">{{$t('technicalstandardsandsafetytechnicalconditions')}}</span>
+          <span class='content-text' :title="$t('autoautonomousdrivingfunction')">{{$t('autoautonomousdrivingfunction')}}</span>
+        </a-layout-content>
+        <a-layout-content style='width: 5.5%'>
+          <span class='content-text'>
+            <a-radio-group style='margin-left: 40px;' v-model="form.sfbgcs">
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+          </span>
+          <span class='content-text'>
+            <a-radio-group style='margin-left: 40px;' v-model="form.sjxnbh">
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+          </span>
+          <span class='content-text'>
+            <a-radio-group style='margin-left: 40px;' v-model="form.fhgd">
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+          </span>
+          <span class='content-text'>
+            <a-radio-group style='margin-left: 40px;' v-model="form.zdjsxg">
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+          </span>
+        </a-layout-content>
+        <a-layout-content style='border: black solid 1px;border-left: none;border-bottom: none;max-width: 428px'>
+          <a-button type="primary" style='margin-top: 15%;margin-left: 10%;'
+                    @click="clickButtonToUpload('bgfj')">
+            {{ (form.bgfj === 'null' || form.bgfj === '' ||
+            form.bgfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
+            }}
+          </a-button>
+          <span class="spanone">{{$t('notetwo')}}</span>
+          <span class="spanone">{{$t('format')}}</span>
+        </a-layout-content>
+      </a-layout>
+      <div class='box-layout'>
+        <div class='layout-box'>
+          <span class='box-text' :title="$t('vehiclepriortothereleaseoftheupgrade')">{{$t('vehiclepriortothereleaseoftheupgrade')}}</span>
+          <span class='box-text' :title="$t('conditionsareupgradesperformed')">{{$t('conditionsareupgradesperformed')}}</span>
+          <span class='box-text' :title="$t('upgradefailureorinterruption')">{{$t('upgradefailureorinterruption')}}</span>
+          <span class='box-text' :title="$t('upgradeactivitiesaffectvehiclesafety')">{{$t('upgradeactivitiesaffectvehiclesafety')}}</span>
+          <span class='box-text' :title="$t('upgradeactivityprovidesuserconfirmationoptions')">{{$t('upgradeactivityprovidesuserconfirmationoptions')}}</span>
+          <span class='box-text' :title="$t('upgradepackagetest')">{{$t('upgradepackagetest')}}</span>
+          <span class='box-text' style='border-bottom: black solid 1px' :title="$t('reliabilityofonlineupgradeactivities')">{{$t('reliabilityofonlineupgradeactivities')}}</span>
+        </div>
+        <div class='layout-box-second'>
+          <span class='box-text'>
+            <a-radio-group style='margin-left: 40px;' v-model="form.jrxxg">
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+          </span>
+          <span class='box-text'>
+            <j-dict-select-tag class="box-input"
+                               style='margin-top: 2px'
+                               :disabled="disable"
+                               v-model="form.zxsj"
+                               :placeholder="$t('PleaseSelect')"
+                               :type="'select'"
+                               dictCode="conditions_upgrades"
+                               :triggerChange="false"/>
+          </span>
+          <span class='box-text'>
+            <j-multi-select-tag class="box-input"
+                               v-model="form.aqjz"
+                               style='margin-top: 2px'
+                               :disabled="disable"
+                               dictCode="upgrade_failed"
+                               :placeholder="$t('PleaseSelect')"
+                               :type="'select'"
+                               :triggerChange="false"/>
+          </span>
+          <span class='box-text'>
+            <a-radio-group style='margin-left: 40px;' v-model="form.sfyxaq">
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+          </span>
+          <span class='box-text'>
+            <a-radio-group style='margin-left: 40px;' v-model="form.yhqr">
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+          </span>
+          <span class='box-text'>
+            <j-multi-select-tag class="box-input"
+                               style='margin-top: 2px'
+                               :disabled="disable"
+                               v-model="form.sjbcs"
+                               :placeholder="$t('PleaseSelect')"
+                               dictCode="package_test"
+                               :type="'select'"
+                               :triggerChange="false"/>
+          </span>
+          <span class='box-text' style='border-bottom: black solid 1px'>
+            <a-radio-group style='margin-left: 40px;' v-model="form.aqkkx">
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+          </span>
+        </div>
+        <div class='layout-box-three'>
+          <a-button type="primary" style='margin-top: 15%;margin-left: 10%;'
+                    @click="clickButtonToUpload('clfj')">
+            {{ (form.clfj === 'null' || form.clfj === '' ||
+            form.clfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
+            }}
+          </a-button>
+          <span class="spanone">{{$t('notethree')}}</span>
+          <span class="spanone">{{$t('format')}}</span>
+        </div>
+      </div>
+    </a-layout>
+    <div class="bootom-button">
+      <a-button style="margin-right:50px" @click="save">{{$t('preservation')}}</a-button>
+      <a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
+      <a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
+    </div>
+    <uploadFile ref="uploadFile" :acceptcode="'doc,docx,pdf'" @uploadSuccess="uploadSuccess"></uploadFile>
+  </div>
+</template>
+
+<script>
+import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
+import ImportFile from '@/components/ImportFileData/index'
+import uploadFile from '@/components/uploadFile/file'
+
+export default {
+  name: 'beupgradedonline',
+  components:{
+    uploadFile,
+    ImportFile
+  },
+  data() {
+    return {
+      dataSource: [
+        {
+          key:1,
+          functionname:'ceshi',
+        }
+      ],
+      url: {
+        exportData: '/ota/otaBaSjSjyxpg/exportData',
+        importZipUrl: '/ota/otaBaSjSjyxpg/importData?otaId=' + localStorage.getItem('otaId'),//导入
+      },
+      loading: false,
+      disable:false,
+      columns: [
+        {
+          title: this.$t('systemname'),
+          align: 'left',
+          dataIndex: 'systemname',
+          ellipsis: true,
+          width: 170
+        },
+        {
+          title: this.$t('adjustmentofchangedBulletinparameters'),
+          align: 'left',
+          dataIndex: 'adjustmentofchangedBulletinparameters',
+          ellipsis: true,
+          width: 170,
+          children: [
+            {
+              title: this.$t('preupgrade'),
+              align: 'left',
+              dataIndex: 'preupgrade',
+              scopedSlots: { customRender: 'preupgrade' },
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('afterupgrade'),
+              align: 'left',
+              dataIndex: 'afterupgrade',
+              scopedSlots: { customRender: 'afterupgrade' },
+              ellipsis: true,
+              width: 170
+            },
+          ]
+        },
+        {
+          title: this.$t('controllerparameter'),
+          align: 'left',
+          dataIndex: 'controllerparameter',
+          ellipsis: true,
+          width: 170,
+          children: [
+            {
+              title: this.$t('nameoftheupgradedelectroniccontroller'),
+              align: 'left',
+              dataIndex: 'nameoftheupgradedelectroniccontroller',
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('adaptivehardwareversion'),
+              align: 'left',
+              dataIndex: 'adaptivehardwareversion',
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('beforethesoftwareversionupgraded'),
+              align: 'left',
+              dataIndex: 'beforethesoftwareversionupgraded',
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('afterthesoftwareversionupgraded'),
+              align: 'left',
+              dataIndex: 'afterthesoftwareversionupgraded',
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('beforetheOSversionupgraded'),
+              align: 'left',
+              dataIndex: 'beforetheOSversionupgraded',
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('aftertheoperatingsystemversionupgraded'),
+              align: 'left',
+              dataIndex: 'aftertheoperatingsystemversionupgraded',
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('softwablackevelopmententerprise'),
+              align: 'left',
+              dataIndex: 'softwablackevelopmententerprise',
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('initialpackageforintegrityinflammatorydata'),
+              align: 'left',
+              dataIndex: 'initialpackageforintegrityinflammatorydata',
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('upgradepackageintegrityverificationdata'),
+              align: 'left',
+              dataIndex: 'upgradepackageintegrityverificationdata',
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('upgradepackagesize'),
+              align: 'left',
+              dataIndex: 'upgradepackagesize',
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('differentialupgradeornot'),
+              align: 'left',
+              dataIndex: 'differentialupgradeornot',
+              ellipsis: true,
+              width: 170
+            },
+          ]
+        },
+        {
+          title: this.$t('operation'),
+          align: 'left',
+          fixed: 'right',
+          width: 200,
+          scopedSlots: { customRender: 'operation' }
+        }
+      ],
+      form:{
+        sjmd:'',
+        fhgd:1,
+        zdjsxg:2,
+        sfyxaq:2,
+        yhqr:1,
+        aqkkx:1,
+        zxsj:2,
+        aqjz:'2',
+        sjbcs:'3,4'
+      }
+    }
+  },
+  mounted() {
+    // this.getList()
+    this.getData()
+  },
+  methods: {
+    update(){
+this.$forceUpdate()
+    },
+    // 模板下载
+    handleModule() {
+      downloadFile('ota/otaBaSjSjyxpg/exportTemplate', '升级影响评估' + '.zip', {})
+    },
+    clickButtonToUpload(item) {
+      this.$refs.uploadFile.perentHandleFunc()
+      this.$refs.uploadFile.visible = true
+      this.uploadName = item
+      getAction('sys/common/getFileInfos', { id: this.form[item] }).then((res) => {
+        if (res.success) {
+          this.$refs.uploadFile.perentHandleFunc(res.result)
+        } else {
+          this.$refs.uploadFile.perentHandleFunc()
+        }
+      })
+    },
+    uploadSuccess(data) {
+      let attIdList = []
+      if(data && data.length>0){
+        data.map(item => {
+          attIdList.push(item.id || data.name)
+        })
+        /** 赋值给当前对应的表单文件 */
+        this.form[this.uploadName] = attIdList.join(',')
+        this.form = { ...this.form }
+        // console.log('form',this.formInline)
+      }else{
+        this.form[this.uploadName] = ''
+        this.form = { ...this.form }
+        // console.log('form',this.formInline)
+
+      }
+    },
+    getData(){
+      let otaIdT=localStorage.getItem('otaIdT')
+        if(otaIdT==null){
+          otaIdT=''
+        }
+        let otaId=localStorage.getItem('otaId')
+        if(otaId==null){
+          otaId=''
+        }
+        getAction('/ota/otaBaSjSjyxpg/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
+           if(res.code==200){
+            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
+           }
+        })
+    },
+    save(){
+      let otaId = localStorage.getItem('otaId')
+      if(otaId == null || otaId == undefined){
+        otaId=''
+      }
+       this.form.otaId=otaId
+       postAction('/ota/otaBaSjSjyxpg/add',this.form).then(res=>{
+        if(res.code==200){
+          this.$message.success(this.$t('SavedSuccessfully'))
+           this.getData()
+        }
+       })
+    },
+    last(){
+      this.save()
+      this.$emit('safetyPrecautionsup')
+    },
+    next(){
+      this.save()
+      this.$emit('safetyPrecautionsdown')
+    },
+  }
+}
+</script>
+
+<style lang='less' scoped>
+@import '~@assets/less/common.less';
+
+.box {
+  padding: 0 24px 24px 24px;
+  box-sizing: border-box;
+}
+
+.bootom-button{
+  text-align: center!important;
+}
+
+.text-operation{
+  margin-right: 8px;
+}
+
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 10px;
+  margin-left: 40px;
+}
+
+::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title {
+  white-space: pre-wrap!important;
+}
+#components-layout-demo-basic {
+  text-align: center;
+}
+::v-deep  .ant-layout-footer {
+  line-height: 1.5;
+}
+::v-deep  .ant-layout-sider {
+  line-height: 50px;
+  background: white;
+}
+::v-deep  .ant-layout-content {
+  min-height: 60px;
+  line-height: 20px;
+}
+//::v-deep  > .ant-layout {
+//  margin-bottom: 48px;
+//}
+::v-deep  > .ant-layout:last-child {
+  margin: 0;
+}
+.content-text{
+  display: inline-block;
+  width: 100%;
+  height: 50px;
+  border: black solid 1px;
+  border-left: none;
+  border-bottom: none;
+  vertical-align: top;
+  overflow: hidden; /*超出部分隐藏*/
+  // text-overflow: ellipsis; /*超出部分省略号表示*/
+  white-space: wrap;
+  display: flex;
+  // justify-content: center;
+  align-items: center;
+  line-height: 1.3;
+}
+//::v-deep .sider .ant-layout-sider .ant-layout-sider-dark{
+//  min-width: 723px !important;
+//  mmax-width: 723px !important;
+//  width: 723px !important;
+//  flex: 0 0 200px;
+//}
+.box-layout{
+  display: flex;
+  //justify-content: space-between;
+}
+.layout-box{
+  width: 721px;
+  height:350px;
+}
+.layout-box-second{
+  max-width: 425.859px;
+  width:32.5%;
+  height:350px;
+}
+.layout-box-three{
+  border: black solid 1px;
+  max-width: 427.859px;
+  min-width: 227.859px;
+  width: 427.859px;
+  height:350px;
+}
+.box-text{
+  display: inline-block;
+  width: 100%;
+  height: 50px;
+  line-height: 1.3;
+  border: black solid 1px;
+  vertical-align: top;
+  border-right: none;
+  border-bottom: none;
+  overflow: hidden; /*超出部分隐藏*/
+  // text-overflow: ellipsis; /*超出部分省略号表示*/
+  white-space: wrap;
+  display: flex;
+  // justify-content: center;
+  align-items: center;
+}
+.sider-span{
+  display: inline-block;
+  width: 100%;
+  height: 50px;
+  margin-top: 74px;
+}
+.sider-span1{
+  display: inline-block;
+  width: 100%;
+  height: 50px;
+  margin-top: 8px;
+}
+.spanone{
+  white-space: pre-wrap;
+  padding: 0 45px;
+  display: flex;
+}
+</style>
\ 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 fb6045b3d..5e791007d 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
@@ -10,59 +10,30 @@
         {{$t('templateDownload')}}
       </div>
     </div>
-    <a-layout style='margin-bottom: 48px;'>
-      <a-layout style='height: 60px'>
-        <a-layout-sider style='border: black solid 1px;'>
-          <span class='sider-span1'>{{$t('upgradePurpose')}}</span>
-        </a-layout-sider>
-          <a-layout-content style='border: black solid 1px;border-left: none;border-bottom: none;'>
-            <j-multi-select-tag class="box-input"
-                               v-model="form.sjmd"
-                               @change="update"
-                               :disabled="disable"
-                               :placeholder="$t('PleaseSelect')"
-                               :type="'select'"
-                               :dictCode="'uipgrade_purpose'"
-                               :triggerChange="false"/>
-          </a-layout-content>
-      </a-layout>
-      <a-layout>
-        <a-layout-sider style='border: black solid 1px;border-top: none;border-bottom: none'>
-          <span class='sider-span'>{{$t('impactassessmentofupgradeactivities')}}</span>
-        </a-layout-sider>
-        <a-layout-content style='max-width: 522px'>
-          <span class='content-text' :title="$t('correspondingvehicletype')">{{$t('correspondingvehicletype')}}</span>
-          <span class='content-text' :title="$t('technicalperformancechanges')">{{$t('technicalperformancechanges')}}</span>
-          <span class='content-text' :title="$t('technicalstandardsandsafetytechnicalconditions')">{{$t('technicalstandardsandsafetytechnicalconditions')}}</span>
-          <span class='content-text' :title="$t('autoautonomousdrivingfunction')">{{$t('autoautonomousdrivingfunction')}}</span>
-        </a-layout-content>
-        <a-layout-content style='width: 5.5%'>
-          <span class='content-text'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.sfbgcs">
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
-          </span>
-          <span class='content-text'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.sjxnbh">
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
-          </span>
-          <span class='content-text'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.fhgd">
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
-          </span>
-          <span class='content-text'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.zdjsxg">
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
-          </span>
-        </a-layout-content>
-        <a-layout-content style='border: black solid 1px;border-left: none;border-bottom: none;max-width: 428px'>
+    <table border="1" cellspacing="0" width='100%'>
+      <tr>
+        <td>{{$t('upgradePurpose')}}</td>
+        <td colspan="3" width="400px">
+          <j-multi-select-tag class="box-input"
+                              v-model="form.sjmd"
+                              @change="update"
+                              :disabled="disable"
+                              :placeholder="$t('PleaseSelect')"
+                              :type="'select'"
+                              :dictCode="'uipgrade_purpose'"
+                              :triggerChange="false"/>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="4" width="150px" align="left">{{$t('impactassessmentofupgradeactivities')}}</td>
+        <td width="150px" height="50px">{{$t('correspondingvehicletype')}}</td>
+        <td width="150px" height="50px">
+          <a-radio-group style='margin-left: 40px;' v-model="form.sfbgcs">
+            <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+            <a-radio :value="2"> {{ $t('not') }} </a-radio>
+          </a-radio-group>
+        </td>
+        <td rowspan="4" width="150px" align="left">
           <a-button type="primary" style='margin-top: 15%;margin-left: 10%;'
                     @click="clickButtonToUpload('bgfj')">
             {{ (form.bgfj === 'null' || form.bgfj === '' ||
@@ -71,86 +42,121 @@
           </a-button>
           <span class="spanone">{{$t('notetwo')}}</span>
           <span class="spanone">{{$t('format')}}</span>
-        </a-layout-content>
-      </a-layout>
-      <div class='box-layout'>
-        <div class='layout-box'>
-          <span class='box-text' :title="$t('vehiclepriortothereleaseoftheupgrade')">{{$t('vehiclepriortothereleaseoftheupgrade')}}</span>
-          <span class='box-text' :title="$t('conditionsareupgradesperformed')">{{$t('conditionsareupgradesperformed')}}</span>
-          <span class='box-text' :title="$t('upgradefailureorinterruption')">{{$t('upgradefailureorinterruption')}}</span>
-          <span class='box-text' :title="$t('upgradeactivitiesaffectvehiclesafety')">{{$t('upgradeactivitiesaffectvehiclesafety')}}</span>
-          <span class='box-text' :title="$t('upgradeactivityprovidesuserconfirmationoptions')">{{$t('upgradeactivityprovidesuserconfirmationoptions')}}</span>
-          <span class='box-text' :title="$t('upgradepackagetest')">{{$t('upgradepackagetest')}}</span>
-          <span class='box-text' style='border-bottom: black solid 1px' :title="$t('reliabilityofonlineupgradeactivities')">{{$t('reliabilityofonlineupgradeactivities')}}</span>
-        </div>
-        <div class='layout-box-second'>
-          <span class='box-text'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.jrxxg">
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
-          </span>
-          <span class='box-text'>
-            <j-dict-select-tag class="box-input"
-                               style='margin-top: 2px'
-                               :disabled="disable"
-                               v-model="form.zxsj"
-                               :placeholder="$t('PleaseSelect')"
-                               :type="'select'"
-                               dictCode="conditions_upgrades"
-                               :triggerChange="false"/>
-          </span>
-          <span class='box-text'>
-            <j-multi-select-tag class="box-input"
-                               v-model="form.aqjz"
-                               style='margin-top: 2px'
-                               :disabled="disable"
-                               dictCode="upgrade_failed"
-                               :placeholder="$t('PleaseSelect')"
-                               :type="'select'"
-                               :triggerChange="false"/>
-          </span>
-          <span class='box-text'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.sfyxaq">
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
-          </span>
-          <span class='box-text'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.yhqr">
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
-          </span>
-          <span class='box-text'>
-            <j-multi-select-tag class="box-input"
-                               style='margin-top: 2px'
-                               :disabled="disable"
-                               v-model="form.sjbcs"
-                               :placeholder="$t('PleaseSelect')"
-                               dictCode="package_test"
-                               :type="'select'"
-                               :triggerChange="false"/>
-          </span>
-          <span class='box-text' style='border-bottom: black solid 1px'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.aqkkx">
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
-          </span>
-        </div>
-        <div class='layout-box-three'>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" height="50px">{{$t('technicalperformancechanges')}}</td>
+        <td height="50px">
+          <a-radio-group style='margin-left: 40px;' v-model="form.sjxnbh">
+            <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+            <a-radio :value="2"> {{ $t('not') }} </a-radio>
+          </a-radio-group>
+        </td>
+      </tr>
+      <tr>
+        <td height="50px">{{$t('technicalstandardsandsafetytechnicalconditions')}}</td>
+        <td height="50px">
+          <a-radio-group style='margin-left: 40px;' v-model="form.fhgd">
+            <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+            <a-radio :value="2"> {{ $t('not') }} </a-radio>
+          </a-radio-group>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" height="50px">{{$t('autoautonomousdrivingfunction')}}</td>
+        <td height="50px">
+          <a-radio-group style='margin-left: 40px;' v-model="form.zdjsxg">
+            <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+            <a-radio :value="2"> {{ $t('not') }} </a-radio>
+          </a-radio-group>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2" align="left" height="50px">{{$t('vehiclepriortothereleaseoftheupgrade')}}</td>
+        <td height="50px">
+          <a-radio-group style='margin-left: 40px;' v-model="form.jrxxg">
+            <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+            <a-radio :value="2"> {{ $t('not') }} </a-radio>
+          </a-radio-group>
+        </td>
+        <td rowspan="7" width="150px" align="left">
           <a-button type="primary" style='margin-top: 15%;margin-left: 10%;'
                     @click="clickButtonToUpload('clfj')">
             {{ (form.clfj === 'null' || form.clfj === '' ||
             form.clfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
             }}
           </a-button>
-          <span class="spanone">{{$t('notethree')}}</span>
+          <span class="spanone">{{$t('notetwo')}}</span>
           <span class="spanone">{{$t('format')}}</span>
-        </div>
-      </div>
-    </a-layout>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2" align="left" height="50px">{{$t('conditionsareupgradesperformed')}}</td>
+        <td height="50px">
+          <j-dict-select-tag class="box-input"
+                             style='margin-top: 2px'
+                             :disabled="disable"
+                             v-model="form.zxsj"
+                             :placeholder="$t('PleaseSelect')"
+                             :type="'select'"
+                             dictCode="conditions_upgrades"
+                             :triggerChange="false"/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2" align="left" height="50px">{{$t('upgradefailureorinterruption')}}</td>
+        <td height="50px">
+          <j-multi-select-tag class="box-input"
+                              v-model="form.aqjz"
+                              style='margin-top: 2px'
+                              :disabled="disable"
+                              dictCode="upgrade_failed"
+                              :placeholder="$t('PleaseSelect')"
+                              :type="'select'"
+                              :triggerChange="false"/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2" align="left" height="50px">{{$t('upgradeactivitiesaffectvehiclesafety')}}</td>
+        <td height="50px">
+          <a-radio-group style='margin-left: 40px;' v-model="form.sfyxaq">
+            <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+            <a-radio :value="2"> {{ $t('not') }} </a-radio>
+          </a-radio-group>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2" align="left" height="50px">{{$t('upgradeactivityprovidesuserconfirmationoptions')}}</td>
+        <td height="50px">
+          <a-radio-group style='margin-left: 40px;' v-model="form.yhqr">
+            <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+            <a-radio :value="2"> {{ $t('not') }} </a-radio>
+          </a-radio-group>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2" align="left" height="50px">{{$t('upgradepackagetest')}}</td>
+        <td height="50px">
+          <j-multi-select-tag class="box-input"
+                                style='margin-top: 2px'
+                                :disabled="disable"
+                                v-model="form.sjbcs"
+                                :placeholder="$t('PleaseSelect')"
+                                dictCode="package_test"
+                                :type="'select'"
+                                :triggerChange="false"/>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2" align="left" height="50px">{{$t('reliabilityofonlineupgradeactivities')}}</td>
+        <td height="50px">
+          <a-radio-group style='margin-left: 40px;' v-model="form.aqkkx">
+            <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+            <a-radio :value="2"> {{ $t('not') }} </a-radio>
+          </a-radio-group>
+        </td>
+      </tr>
+    </table>
     <div class="bootom-button">
       <a-button style="margin-right:50px" @click="save">{{$t('preservation')}}</a-button>
       <a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
@@ -426,6 +432,7 @@ this.$forceUpdate()
 
 .bootom-button{
   text-align: center!important;
+  margin-top: 40px;
 }
 
 .text-operation{
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
index d4f042877..10413d2a0 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
@@ -203,7 +203,10 @@ export default {
     return {
       confirmLoading: false,
       disabled: false,
-      formInline:{},
+      formInline:{
+        sjky:'车辆解闭锁功能可用，但不可驾驶',
+        sjbkygn:'除解闭锁均不可用'
+      },
       url: {
         exportData: '/ota/otaBaSjGgnrfs/exportData',
         importZipUrl: '/ota/otaBaSjGgnrfs/importData?otaId=' + localStorage.getItem('otaId'),//导入
@@ -255,7 +258,10 @@ export default {
         getAction('/ota/otaBaSjGgnrfs/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
           if(res.code == 200){
           
-            this.formInline= res.result ==null ? {} :res.result 
+            this.formInline= res.result ==null ? {
+        sjky:'车辆解闭锁功能可用，但不可驾驶',
+        sjbkygn:'除解闭锁均不可用'
+      } :res.result 
             this.formInline.id=res.result.id
             this.$forceUpdate()
           }