From e23e4ab06e34db3a4479871652cd9670c7cf875e Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 22 Mar 2023 18:01:20 +0800
Subject: [PATCH] =?UTF-8?q?ota=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   7 +
 jero-web/src/common/lang/zh-cn.js             |   5 +
 .../auxiliaryupgradehavechanged.vue           | 596 ++++++-------
 .../components/historicalrecord.vue           |  11 +-
 .../informationaboutotherupgradetasks.vue     |   2 +-
 .../components/upgradehavechanged.vue         | 618 +++++++-------
 .../components/upgradeimpactassessment.vue    | 796 ++++++++++--------
 .../components/usernotification.vue           |   4 +-
 .../upgradeactivityrecord/index.vue           |  23 +-
 .../components/beupgradedonline.vue           |   3 +
 .../components/historicalrecord.vue           |  11 +-
 .../components/recordparameters.vue           | 544 +++++++++---
 .../components/upgradedonline.vue             |   3 +
 .../vehicleinformation/index.vue              |  27 +-
 14 files changed, 1514 insertions(+), 1136 deletions(-)

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 @@
 <template>
   <div class="box">
+    <div class="table-operator">
+      <div class="operator-text">
+        <a-icon type="import" :rotate="270"/>
+        {{$t('dataimport')}}
+      </div>
+      <div class="operator-text">
+        <a-icon type="download"/>
+        {{$t('templateDownload')}}
+      </div>
+    </div>
     <a-table
       ref="table"
       size="middle"
-      :components="drag(columns,'columns')"
       :loading="loading"
       :pagination="false"
       :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
       rowKey="id"
+      bordered
       :data-source="dataSource"
       :columns="columns"
+      style="margin-bottom: 20px"
     >
-      <!--         -->
+      <!--      配置情况-->
+      <span slot="configuration" slot-scope="text,record">
+            <a-radio-group>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+      </span>
+      <!--      可升级-->
+      <span slot="whetheritcanbeupgraded" slot-scope="text,record">
+            <a-radio-group>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+      </span>
+      <!--       自动化级别-->
+      <span slot="drivingautomationlevel" slot-scope="text,record">
+                    <j-dict-select-tag class="box-input"
+                                       :disabled="disable"
+                                       :placeholder="$t('PleaseSelect')"
+                                       :type="'select'"
+                                       :triggerChange="false"/>
+      </span>
+      <!--       升级前-->
+      <span slot="preupgrade" slot-scope="text,record">
+          <a-input :placeholder="$t('ifNot')"></a-input>
+      </span>
+      <!--       升级后-->
+      <span slot="afterupgrade" slot-scope="text,record">
+          <a-input :placeholder="$t('ifNot')"></a-input>
+      </span>
+      <!--      操作列-->
       <span slot="operation" slot-scope="text,record">
-          <a class="text-operation" v-if="record.flowType != '10'"
-            @click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
-          <a class="text-operation"
-             @click="viewClick(record)">{{$t('view')}}</a>
-      </span>
-      <span slot="RelatedItems" slot-scope="text,record">
-          <a @click="RelatedItemsClick(record)" :title="text">
-            {{text}}
-          </a>
-      </span>
-      <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
-          {{text}}
-        </a>
-        <span v-else>--</span>
+          <a class="text-operation">{{$t('addcontroller')}}</a>
+          <a class="text-operation">{{$t('addfunction')}}</a>
+          <a class="text-operation">{{$t('delete')}}</a>
       </span>
     </a-table>
-    <div class="page" v-if="dataSource && dataSource.length > 0">
-      <a-pagination
-        :show-total="total => $t('total')+` ${total} `+$t('strip')"
-        show-quick-jumper
-        show-size-changer
-        :page-size.sync="pageSize"
-        :total="total"
-        :current="pageNo"
-        @change="pageOnChange"
-        @showSizeChange="SizeChange"
-      />
+    <div>
+      <a-button @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
     </div>
+    <div class="bootom-button">
+      <a-button style="margin-right:50px">{{$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" @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
 </template>
 
 <script>
-  import { getAction, postAction, deleteAction } from '@/api/manage'
-  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+import { getAction, postAction, deleteAction } from '@/api/manage'
+import uploadFile from '@/components/uploadFile/file'
 
-  export default {
-    name: 'doneList',
-    mixins:[ResizeHeader, ResizeColumnProvide],
-    data() {
-      return {
-        dataSource: [],
-        loading: false,
-        url: {
-          list: '/todoCenter/projectProcess/doneProcess'
+export default {
+  name: 'beupgradedonline',
+  components:{
+    uploadFile
+  },
+  data() {
+    return {
+      dataSource: [
+        {
+          key:1,
+          functionname:'ceshi',
+        }
+      ],
+      loading: false,
+      disable:false,
+      columns: [
+        {
+          title: this.$t('functionname'),
+          align: 'left',
+          dataIndex: 'functionname',
+          ellipsis: true,
+          width: 170
         },
-        queryParam: {},
-        columns: [
-          {
-            title: this.$t('RelatedItems'),
-            align: 'left',
-            dataIndex: 'projectName',
-            ellipsis: true,
-            scopedSlots: { customRender: 'RelatedItems' },
-            width: 170
-          },
-          {
-            title: this.$t('standardInformation'),
-            align: 'left',
-            dataIndex: 'standardInfo',
-            ellipsis: true,
-            scopedSlots: { customRender: 'standardInformation' },
-            width: 170
-          },
-          {
-            title: this.$t('taskType'),
-            align: 'left',
-            dataIndex: 'flowTypeShow',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('Sponsor'),
-            align: 'left',
-            dataIndex: 'createBy',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('CurrentProcessor'),
-            align: 'left',
-            dataIndex: 'assigneeName',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('TaskCutOffTime'),
-            align: 'left',
-            dataIndex: 'endTime',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('taskStatus'),
-            align: 'left',
-            dataIndex: 'statusShow',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('operation'),
-            align: 'left',
-            fixed: 'right',
-            width: 120,
-            scopedSlots: { customRender: 'operation' }
-          }
-        ],
-        selectedRowKeys: [],
-        pageSize: 10,
-        pageNo: 1,
-        total: 0
-      }
-    },
-    mounted() {
-      this.getList()
-    },
-    methods: {
-      monitoringProcessClick(row){
-        let newUrl = this.$router.resolve({
-          path: '/processDetails',
-          query: {
-            prcNum: row.prcNum,
-            prcType:row.flowType,
-            prcId:row.actiProcInstId,
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      RelatedItemsClick(item) {
-        let newUrl = this.$router.resolve({
-          path: '/ProjectDetails',
-          query: {
-            id: item.projectLibraryId,
-            projectName: item.projectName,
-            projectNameId: item.projectNameId,
-            targetMarket: item.targetMarket,
-            studioEngineer:item.studioEngineer,
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      standardInformationClick(item){
-        let newUrl = this.$router.resolve({
-          path: '/docManage/library/detail',
-          query: {
-            id: item.bussDocumentLibraryId,
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      viewClick(row) {
-        let query = {}
-        row.router = this.$route.path
-        if (row.flowType == '1') {
-          query = {
-            taskDefinitionKey:row.taskDefinitionKey,
-            taskIds:row.taskId,
-            prcType:row.flowType,
-            prcNum:row.prcNum,
-            isTrue:false,
-          }
-          let newUrl = this.$router.resolve({
-            path: '/handshakeProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
-        }else if(row.flowType == '10'){
-          let newUrl = this.$router.resolve({
-            path: '/ProjectDetails',
-            query: {
-              id: row.projectLibraryId,
-              projectName: row.projectName,
-              projectNameId: row.projectNameId,
-              targetMarket: row.targetMarket,
-              studioEngineer:row.studioEngineer,
-              type:'102',
-            }
-          })
-          window.open(newUrl.href, '_blank')
-        }else if(row.flowType == '2'){
-          row.taskId = row.taskId + ''
-          if (row.taskId.length > 30) {
-            row.taskId = ''
-          }
-          query = {
-            router: row.router,
-            taskIds:row.taskId,
-            actiProcInstId: row.actiProcInstId,
-            projectTaskInventoryId: row.projectLawsInventoryId,
-            projectLibraryId:row.projectLibraryId,
-            id: row.projectLibraryId,
-            studioEngineer: row.studioEngineer,
-            serialNumber: row.serialNumber,
-            TaskKey: row.taskDefinitionKey,
-            isDisplay: false,
-            flowType: 2,
-            Sponsor: 'designInitiatorName',
-            personLiable: 'designDutyName',
-            typeOfDeliverables: 'designDeliverableTypeName',
-            deliverableTemplate: 'designDeliverableTemplate',
-            DueDate: 'designDueDate',
-            remarks: 'designRemark',
-            projectName: row.projectName,
-            targetMarket: row.targetMarket,
-            projectNameId: row.projectNameId,
-            primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
-          }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
-        }else if(row.flowType == '3'){
-          row.taskId = row.taskId + ''
-          if (row.taskId.length > 30) {
-            row.taskId = ''
-          }
-          query = {
-            router: row.router,
-            taskIds:row.taskId,
-            actiProcInstId: row.actiProcInstId,
-            projectTaskInventoryId: row.projectLawsInventoryId,
-            studioEngineer: row.studioEngineer,
-            projectLibraryId:row.projectLibraryId,
-            serialNumber: row.serialNumber,
-            TaskKey: row.taskDefinitionKey,
-            flowType: 3,
-            isDisplay: false,
-            id: row.projectLibraryId,
-            Sponsor: 'prehomoInitiatorName',
-            personLiable: 'prehomoDutyName',
-            typeOfDeliverables: 'prehomoDeliverableTypeName',
-            deliverableTemplate: 'prehomoDeliverableTemplate',
-            DueDate: 'prehomoDueDate',
-            remarks: 'prehomoRemark',
-            projectName: row.projectName,
-            targetMarket: row.targetMarket,
-            projectNameId: row.projectNameId,
-            primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
-          }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
-        }else if(row.flowType == '4'){
-          row.taskId = row.taskId + ''
-          if (row.taskId.length > 30) {
-            row.taskId = ''
-          }
-          query = {
-            router: row.router,
-            taskIds: row.taskId,
-            actiProcInstId: row.actiProcInstId,
-            id: row.projectLibraryId,
-            projectLibraryId: row.projectLibraryId,
-            studioEngineer: row.studioEngineer,
-            serialNumber: row.serialNumber,
-            projectTaskInventoryId: row.projectLawsInventoryId,
-            TaskKey: row.taskDefinitionKey,
-            flowType: 4,
-            isDisplay: false,
-            Sponsor: 'verifyInitiatorName',
-            personLiable: 'verifyDutyName',
-            typeOfDeliverables: 'verifyDeliverableTypeName',
-            deliverableTemplate: 'verifyDeliverableTemplate',
-            DueDate: 'verifyDueDate',
-            remarks: 'verifyRemark',
-            projectName: row.projectName,
-            targetMarket: row.targetMarket,
-            projectNameId: row.projectNameId,
-            primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
-          }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
+        {
+          title: this.$t('configuration'),
+          align: 'left',
+          dataIndex: 'configuration',
+          ellipsis: true,
+          width: 170
+        },
+        {
+          title: this.$t('whetheritcanbeupgraded'),
+          align: 'left',
+          dataIndex: 'whetheritcanbeupgraded',
+          ellipsis: true,
+          width: 170
+        },
+        {
+          title: this.$t('drivingautomationlevel'),
+          align: 'left',
+          dataIndex: 'drivingautomationlevel',
+          ellipsis: true,
+          width: 170
+        },
+        {
+          title: this.$t('technicalparameters'),
+          align: 'left',
+          dataIndex: 'technicalparameters',
+          ellipsis: true,
+          width: 170
+        },
+        {
+          title: this.$t('functiondescription'),
+          align: 'left',
+          dataIndex: 'functiondescription',
+          ellipsis: true,
+          width: 170
+        },
+        {
+          title: this.$t('applicationconditions'),
+          align: 'left',
+          dataIndex: 'applicationconditions',
+          ellipsis: true,
+          width: 170
+        },
+        {
+          title: this.$t('controllerparameter'),
+          align: 'left',
+          dataIndex: 'controllerparameter',
+          ellipsis: true,
+          width: 170,
+          children: [
+            {
+              title: this.$t('electronic'),
+              align: 'left',
+              dataIndex: 'electronic',
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('electroniccontrollerproductionenterprises'),
+              align: 'left',
+              dataIndex: 'electroniccontrollerproductionenterprises',
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('electroniccontrollertype'),
+              align: 'left',
+              dataIndex: 'electroniccontrollertype',
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('hardwareversioninformation'),
+              align: 'left',
+              dataIndex: 'hardwareversioninformation',
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('softwaredevelopmententerprise'),
+              align: 'left',
+              dataIndex: 'softwaredevelopmententerprise',
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('operatingsystemversion'),
+              align: 'left',
+              dataIndex: 'operatingsystemversion',
+              ellipsis: true,
+              width: 170
+            },
+            {
+              title: this.$t('inflammatorydata'),
+              align: 'left',
+              dataIndex: 'inflammatorydata',
+              ellipsis: true,
+              width: 170
+            },
+          ]
+        },
+        {
+          title: this.$t('operation'),
+          align: 'left',
+          fixed: 'right',
+          width: 200,
+          scopedSlots: { customRender: 'operation' }
         }
-      },
-      searchQuery(value) {
-        this.queryParam = value
-        this.pageNo = 1
-        this.getList()
-      },
-      searchReset() {
-        this.queryParam = {}
-        this.pageNo = 1
-        this.getList()
-      },
-      pageOnChange(page) {
-        this.pageNo = page
-        this.getList()
-      },
-      SizeChange(page, pageSize) {
-        this.pageNo = 1
-        this.pageSize = pageSize
-        this.getList()
-      },
-      getList() {
-        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
-        Object.keys(queryParam).forEach(val => {
-          if (queryParam[val] instanceof Array) {
-            queryParam[val] = queryParam[val].join(',')
-          }
-        })
-        let query = {
-          pageNo: this.pageNo,
-          pageSize: this.pageSize,
-          ...queryParam
-        }
-        this.loading = true
-        getAction(this.url.list, query).then((res) => {
-          if (res.success) {
-            if (res.result.current > 1 && res.result.records.length == 0) {
-              this.pageNo = 1
-              this.getList()
-              return
-            }
-            this.dataSource = res.result.records || []
-            this.total = res.result.total
-            this.loading = false
-          } else {
-            this.loading = false
-          }
-        })
-      }
+      ],
     }
+  },
+  mounted() {
+    // this.getList()
+  },
+  methods: {
+    getList() {
+      let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+      Object.keys(queryParam).forEach(val => {
+        if (queryParam[val] instanceof Array) {
+          queryParam[val] = queryParam[val].join(',')
+        }
+      })
+      let query = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        ...queryParam
+      }
+      this.loading = true
+      getAction(this.url.list, query).then((res) => {
+        if (res.success) {
+          if (res.result.current > 1 && res.result.records.length == 0) {
+            this.pageNo = 1
+            this.getList()
+            return
+          }
+          this.dataSource = res.result.records || []
+          this.total = res.result.total
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+    },
+    last(){
+      this.$emit('beupgradedonlineup')
+    },
+    next(){
+      this.$emit('beupgradedonlinedown')
+    },
+    uploadSuccess(data) {
+      let attIdList = []
+      if (data && data.length > 0) {
+        data.map(item => {
+          attIdList.push({
+            id:item.id,
+            fileName:item.fileName
+          })
+        })
+      }
+      /** 赋值给当前对应的表单文件 */
+      this.fileList.uploadName = attIdList
+      this.fileList.certifyingmaterials = this.$t('viewFile')
+    },
   }
+}
 </script>
 
-<style scoped>
-  @import '~@assets/less/common.less';
-  .page {
-    text-align: right;
-    margin-top: 20px;
-  }
-  .text-operation{
-     margin-right: 8px;
-  }
+<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: 100%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title {
+  white-space: pre-wrap!important;
+}
 </style>
\ 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 @@
         </div>
       </a-col>
     </a-row>
-
+    <div class="bootom-button">
+      <a-button type="primary" style='margin-top: 50px' @click='back'>{{$t('returntofill')}}</a-button>
+    </div>
   </div>
 </template>
 
@@ -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%;
+  }
 </style>
\ 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 {
 <style lang="less" scoped>
 @import'~@assets/less/common.less';
 .box {
-  height: 650px;
+  height: 500px;
   padding: 0 24px 24px 24px;
   box-sizing: border-box;
 }
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
index 26d9d7611..7e1fb1f80 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
@@ -1,359 +1,315 @@
 <template>
   <div class="box">
+    <div class="table-operator">
+      <div class="operator-text">
+        <a-icon type="import" :rotate="270"/>
+        {{$t('dataimport')}}
+      </div>
+      <div class="operator-text">
+        <a-icon type="download"/>
+        {{$t('templateDownload')}}
+      </div>
+    </div>
     <a-table
       ref="table"
       size="middle"
-      :components="drag(columns,'columns')"
       :loading="loading"
       :pagination="false"
       :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
       rowKey="id"
+      bordered
       :data-source="dataSource"
       :columns="columns"
+      style="margin-bottom: 20px"
     >
-      <!--         -->
+      <!--      配置情况-->
+      <span slot="configuration" slot-scope="text,record">
+            <a-radio-group>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+      </span>
+      <!--      可升级-->
+      <span slot="whetheritcanbeupgraded" slot-scope="text,record">
+            <a-radio-group>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+      </span>
+      <!--       自动化级别-->
+      <span slot="drivingautomationlevel" slot-scope="text,record">
+                    <j-dict-select-tag class="box-input"
+                                       :disabled="disable"
+                                       :placeholder="$t('PleaseSelect')"
+                                       :type="'select'"
+                                       :triggerChange="false"/>
+      </span>
+      <!--       升级前-->
+      <span slot="preupgrade" slot-scope="text,record">
+          <a-input :placeholder="$t('ifNot')"></a-input>
+      </span>
+      <!--       升级后-->
+      <span slot="afterupgrade" slot-scope="text,record">
+          <a-input :placeholder="$t('ifNot')"></a-input>
+      </span>
+      <!--      操作列-->
       <span slot="operation" slot-scope="text,record">
-          <a class="text-operation" v-if="record.flowType != '10'"
-            @click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
-          <a class="text-operation"
-             @click="viewClick(record)">{{$t('view')}}</a>
-      </span>
-      <span slot="RelatedItems" slot-scope="text,record">
-          <a @click="RelatedItemsClick(record)" :title="text">
-            {{text}}
-          </a>
-      </span>
-      <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
-          {{text}}
-        </a>
-        <span v-else>--</span>
+          <a class="text-operation">{{$t('addcontroller')}}</a>
+          <a class="text-operation">{{$t('delete')}}</a>
       </span>
     </a-table>
-    <div class="page" v-if="dataSource && dataSource.length > 0">
-      <a-pagination
-        :show-total="total => $t('total')+` ${total} `+$t('strip')"
-        show-quick-jumper
-        show-size-changer
-        :page-size.sync="pageSize"
-        :total="total"
-        :current="pageNo"
-        @change="pageOnChange"
-        @showSizeChange="SizeChange"
-      />
+    <div>
+      <a-button @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
     </div>
+    <div class="bootom-button">
+      <a-button style="margin-right:50px">{{$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" @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
 </template>
 
 <script>
-  import { getAction, postAction, deleteAction } from '@/api/manage'
-  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+import { getAction, postAction, deleteAction } from '@/api/manage'
+import uploadFile from '@/components/uploadFile/file'
 
-  export default {
-    name: 'doneList',
-    mixins:[ResizeHeader, ResizeColumnProvide],
-    data() {
-      return {
-        dataSource: [],
-        loading: false,
-        url: {
-          list: '/todoCenter/projectProcess/doneProcess'
+export default {
+  name: 'beupgradedonline',
+  components:{
+    uploadFile
+  },
+  data() {
+    return {
+      dataSource: [
+        {
+          key:1,
+          functionname:'ceshi',
+        }
+      ],
+      loading: false,
+      disable:false,
+      columns: [
+        {
+          title: this.$t('systemname'),
+          align: 'left',
+          dataIndex: 'systemname',
+          ellipsis: true,
+          width: 170
         },
-        queryParam: {},
-        columns: [
-          {
-            title: this.$t('RelatedItems'),
-            align: 'left',
-            dataIndex: 'projectName',
-            ellipsis: true,
-            scopedSlots: { customRender: 'RelatedItems' },
-            width: 170
-          },
-          {
-            title: this.$t('standardInformation'),
-            align: 'left',
-            dataIndex: 'standardInfo',
-            ellipsis: true,
-            scopedSlots: { customRender: 'standardInformation' },
-            width: 170
-          },
-          {
-            title: this.$t('taskType'),
-            align: 'left',
-            dataIndex: 'flowTypeShow',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('Sponsor'),
-            align: 'left',
-            dataIndex: 'createBy',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('CurrentProcessor'),
-            align: 'left',
-            dataIndex: 'assigneeName',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('TaskCutOffTime'),
-            align: 'left',
-            dataIndex: 'endTime',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('taskStatus'),
-            align: 'left',
-            dataIndex: 'statusShow',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('operation'),
-            align: 'left',
-            fixed: 'right',
-            width: 120,
-            scopedSlots: { customRender: 'operation' }
-          }
-        ],
-        selectedRowKeys: [],
-        pageSize: 10,
-        pageNo: 1,
-        total: 0
-      }
-    },
-    mounted() {
-      this.getList()
-    },
-    methods: {
-      monitoringProcessClick(row){
-        let newUrl = this.$router.resolve({
-          path: '/processDetails',
-          query: {
-            prcNum: row.prcNum,
-            prcType:row.flowType,
-            prcId:row.actiProcInstId,
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      RelatedItemsClick(item) {
-        let newUrl = this.$router.resolve({
-          path: '/ProjectDetails',
-          query: {
-            id: item.projectLibraryId,
-            projectName: item.projectName,
-            projectNameId: item.projectNameId,
-            targetMarket: item.targetMarket,
-            studioEngineer:item.studioEngineer,
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      standardInformationClick(item){
-        let newUrl = this.$router.resolve({
-          path: '/docManage/library/detail',
-          query: {
-            id: item.bussDocumentLibraryId,
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      viewClick(row) {
-        let query = {}
-        row.router = this.$route.path
-        if (row.flowType == '1') {
-          query = {
-            taskDefinitionKey:row.taskDefinitionKey,
-            taskIds:row.taskId,
-            prcType:row.flowType,
-            prcNum:row.prcNum,
-            isTrue:false,
-          }
-          let newUrl = this.$router.resolve({
-            path: '/handshakeProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
-        }else if(row.flowType == '10'){
-          let newUrl = this.$router.resolve({
-            path: '/ProjectDetails',
-            query: {
-              id: row.projectLibraryId,
-              projectName: row.projectName,
-              projectNameId: row.projectNameId,
-              targetMarket: row.targetMarket,
-              studioEngineer:row.studioEngineer,
-              type:'102',
-            }
-          })
-          window.open(newUrl.href, '_blank')
-        }else if(row.flowType == '2'){
-          row.taskId = row.taskId + ''
-          if (row.taskId.length > 30) {
-            row.taskId = ''
-          }
-          query = {
-            router: row.router,
-            taskIds:row.taskId,
-            actiProcInstId: row.actiProcInstId,
-            projectTaskInventoryId: row.projectLawsInventoryId,
-            projectLibraryId:row.projectLibraryId,
-            id: row.projectLibraryId,
-            studioEngineer: row.studioEngineer,
-            serialNumber: row.serialNumber,
-            TaskKey: row.taskDefinitionKey,
-            isDisplay: false,
-            flowType: 2,
-            Sponsor: 'designInitiatorName',
-            personLiable: 'designDutyName',
-            typeOfDeliverables: 'designDeliverableTypeName',
-            deliverableTemplate: 'designDeliverableTemplate',
-            DueDate: 'designDueDate',
-            remarks: 'designRemark',
-            projectName: row.projectName,
-            targetMarket: row.targetMarket,
-            projectNameId: row.projectNameId,
-            primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
-          }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
-        }else if(row.flowType == '3'){
-          row.taskId = row.taskId + ''
-          if (row.taskId.length > 30) {
-            row.taskId = ''
-          }
-          query = {
-            router: row.router,
-            taskIds:row.taskId,
-            actiProcInstId: row.actiProcInstId,
-            projectTaskInventoryId: row.projectLawsInventoryId,
-            studioEngineer: row.studioEngineer,
-            projectLibraryId:row.projectLibraryId,
-            serialNumber: row.serialNumber,
-            TaskKey: row.taskDefinitionKey,
-            flowType: 3,
-            isDisplay: false,
-            id: row.projectLibraryId,
-            Sponsor: 'prehomoInitiatorName',
-            personLiable: 'prehomoDutyName',
-            typeOfDeliverables: 'prehomoDeliverableTypeName',
-            deliverableTemplate: 'prehomoDeliverableTemplate',
-            DueDate: 'prehomoDueDate',
-            remarks: 'prehomoRemark',
-            projectName: row.projectName,
-            targetMarket: row.targetMarket,
-            projectNameId: row.projectNameId,
-            primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
-          }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
-        }else if(row.flowType == '4'){
-          row.taskId = row.taskId + ''
-          if (row.taskId.length > 30) {
-            row.taskId = ''
-          }
-          query = {
-            router: row.router,
-            taskIds: row.taskId,
-            actiProcInstId: row.actiProcInstId,
-            id: row.projectLibraryId,
-            projectLibraryId: row.projectLibraryId,
-            studioEngineer: row.studioEngineer,
-            serialNumber: row.serialNumber,
-            projectTaskInventoryId: row.projectLawsInventoryId,
-            TaskKey: row.taskDefinitionKey,
-            flowType: 4,
-            isDisplay: false,
-            Sponsor: 'verifyInitiatorName',
-            personLiable: 'verifyDutyName',
-            typeOfDeliverables: 'verifyDeliverableTypeName',
-            deliverableTemplate: 'verifyDeliverableTemplate',
-            DueDate: 'verifyDueDate',
-            remarks: 'verifyRemark',
-            projectName: row.projectName,
-            targetMarket: row.targetMarket,
-            projectNameId: row.projectNameId,
-            primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
-          }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
+        {
+          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('softwaredevelopmententerprise'),
+              align: 'left',
+              dataIndex: 'softwaredevelopmententerprise',
+              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' }
         }
-      },
-      searchQuery(value) {
-        this.queryParam = value
-        this.pageNo = 1
-        this.getList()
-      },
-      searchReset() {
-        this.queryParam = {}
-        this.pageNo = 1
-        this.getList()
-      },
-      pageOnChange(page) {
-        this.pageNo = page
-        this.getList()
-      },
-      SizeChange(page, pageSize) {
-        this.pageNo = 1
-        this.pageSize = pageSize
-        this.getList()
-      },
-      getList() {
-        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
-        Object.keys(queryParam).forEach(val => {
-          if (queryParam[val] instanceof Array) {
-            queryParam[val] = queryParam[val].join(',')
-          }
-        })
-        let query = {
-          pageNo: this.pageNo,
-          pageSize: this.pageSize,
-          ...queryParam
-        }
-        this.loading = true
-        getAction(this.url.list, query).then((res) => {
-          if (res.success) {
-            if (res.result.current > 1 && res.result.records.length == 0) {
-              this.pageNo = 1
-              this.getList()
-              return
-            }
-            this.dataSource = res.result.records || []
-            this.total = res.result.total
-            this.loading = false
-          } else {
-            this.loading = false
-          }
-        })
-      }
+      ],
     }
+  },
+  mounted() {
+    // this.getList()
+  },
+  methods: {
+    clickButtonToUpload(item) {
+      this.$refs.uploadFile.perentHandleFunc()
+      this.$refs.uploadFile.visible = true
+      this.uploadName = item
+      getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+        if (res.success) {
+          this.$refs.uploadFile.perentHandleFunc(res.result)
+        } else {
+          this.$refs.uploadFile.perentHandleFunc()
+        }
+      })
+    },
+    getList() {
+      let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+      Object.keys(queryParam).forEach(val => {
+        if (queryParam[val] instanceof Array) {
+          queryParam[val] = queryParam[val].join(',')
+        }
+      })
+      let query = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        ...queryParam
+      }
+      this.loading = true
+      getAction(this.url.list, query).then((res) => {
+        if (res.success) {
+          if (res.result.current > 1 && res.result.records.length == 0) {
+            this.pageNo = 1
+            this.getList()
+            return
+          }
+          this.dataSource = res.result.records || []
+          this.total = res.result.total
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+    },
+    last(){
+      this.$emit('upgradedonlineup')
+    },
+    next(){
+      this.$emit('upgradedonlinedown')
+    },
+    uploadSuccess(data) {
+      let attIdList = []
+      if (data && data.length > 0) {
+        data.map(item => {
+          attIdList.push({
+            id:item.id,
+            fileName:item.fileName
+          })
+        })
+      }
+      /** 赋值给当前对应的表单文件 */
+      this.fileList.uploadName = attIdList
+      this.fileList.certifyingmaterials = this.$t('viewFile')
+    },
   }
+}
 </script>
 
-<style scoped>
-  @import '~@assets/less/common.less';
-  .page {
-    text-align: right;
-    margin-top: 20px;
-  }
-  .text-operation{
-     margin-right: 8px;
-  }
+<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: 100%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title {
+  white-space: pre-wrap!important;
+}
 </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 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 @@
 <template>
   <div class="box">
-    <a-table
-      ref="table"
-      size="middle"
-      :components="drag(columns,'columns')"
-      :loading="loading"
-      :pagination="false"
-      :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
-      rowKey="id"
-      :data-source="dataSource"
-      :columns="columns"
-    >
-      <!--         -->
-      <span slot="operation" slot-scope="text,record">
-           <a class="text-operation" v-if="record.flowType != '10'"
-              @click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
-          <a class="text-operation"
-             @click="viewClick(record)">{{$t('view')}}</a>
-      </span>
-      <span slot="RelatedItems" slot-scope="text,record">
-          <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
-      </span>
-      <span slot="standardInformation" slot-scope="text,record">
-       <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
-          {{text}}
-        </a>
-        <span v-else>--</span>
-      </span>
-    </a-table>
-    <div class="page" v-if="dataSource && dataSource.length > 0">
-      <a-pagination
-        :show-total="total => $t('total')+` ${total} `+$t('strip')"
-        show-quick-jumper
-        show-size-changer
-        :page-size.sync="pageSize"
-        :total="total"
-        :current="pageNo"
-        @change="pageOnChange"
-        @showSizeChange="SizeChange"
-      />
+    <div class="table-operator">
+      <div class="operator-text">
+        <a-icon type="import" :rotate="270"/>
+        {{$t('dataimport')}}
+      </div>
+      <div 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-dict-select-tag class="box-input"
+                               :disabled="disable"
+                               :placeholder="$t('PleaseSelect')"
+                               :type="'select'"
+                               :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;'>
+                    <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;'>
+                    <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;'>
+                    <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;'>
+                    <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: 522px'>
+          <a-button style='margin-top: 20%;margin-left: 10%;' @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+        </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;'>
+                    <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"
+                               :placeholder="$t('PleaseSelect')"
+                               :type="'select'"
+                               :triggerChange="false"/>
+          </span>
+          <span class='box-text'>
+            <j-dict-select-tag class="box-input"
+                               style='margin-top: 2px'
+                               :disabled="disable"
+                               :placeholder="$t('PleaseSelect')"
+                               :type="'select'"
+                               :triggerChange="false"/>
+          </span>
+          <span class='box-text'>
+            <a-radio-group style='margin-left: 40px;'>
+                    <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;'>
+                    <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"
+                               :placeholder="$t('PleaseSelect')"
+                               :type="'select'"
+                               :triggerChange="false"/>
+          </span>
+          <span class='box-text' style='border-bottom: black solid 1px'>
+            <a-radio-group style='margin-left: 40px;'>
+                    <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 style='margin-top: 20%;margin-left: 10%;' @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+        </div>
+      </div>
+    </a-layout>
+    <div class="bootom-button">
+      <a-button style="margin-right:50px">{{$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" @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
 </template>
 
 <script>
-  import { getAction, postAction, deleteAction } from '@/api/manage'
-  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+import { getAction, postAction, deleteAction } from '@/api/manage'
+import uploadFile from '@/components/uploadFile/file'
 
-  export default {
-    name: 'safetyPrecautions',
-    mixins:[ResizeHeader, ResizeColumnProvide],
-    data() {
-      return {
-        dataSource: [],
-        loading: false,
-        columns: [
-          {
-            title: this.$t('RelatedItems'),
-            align: 'left',
-            dataIndex: 'projectName',
-            scopedSlots: { customRender: 'RelatedItems' },
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('standardInformation'),
-            align: 'left',
-            dataIndex: 'standardInfo',
-            scopedSlots: { customRender: 'standardInformation' },
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('taskType'),
-            align: 'left',
-            dataIndex: 'flowTypeShow',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('LastProcessor'),
-            align: 'left',
-            dataIndex: 'lastAssigneeName',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('CurrentProcessor'),
-            align: 'left',
-            dataIndex: 'assigneeName',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('TaskCutOffTime'),
-            align: 'left',
-            dataIndex: 'endTime',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('taskStatus'),
-            align: 'left',
-            dataIndex: 'statusShow',
-            ellipsis: true,
-            width: 170
-          },
-          {
-            title: this.$t('operation'),
-            align: 'left',
-            fixed: 'right',
-            width: 120,
-            scopedSlots: { customRender: 'operation' }
-          }
-        ],
-        selectedRowKeys: [],
-        pageSize: 10,
-        pageNo: 1,
-        total: 0,
-        url: {
-          list: '/todoCenter/projectProcess/issuedProcess'
+export default {
+  name: 'beupgradedonline',
+  components:{
+    uploadFile
+  },
+  data() {
+    return {
+      dataSource: [
+        {
+          key:1,
+          functionname:'ceshi',
+        }
+      ],
+      loading: false,
+      disable:false,
+      columns: [
+        {
+          title: this.$t('systemname'),
+          align: 'left',
+          dataIndex: 'systemname',
+          ellipsis: true,
+          width: 170
         },
-        queryParam: {}
-      }
-    },
-    mounted() {
-      this.getList()
-    },
-    methods: {
-      monitoringProcessClick(row) {
-        let newUrl = this.$router.resolve({
-          path: '/processDetails',
-          query: {
-            prcNum: row.prcNum,
-            prcType: row.flowType,
-            prcId: row.actiProcInstId
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      RelatedItemsClick(item) {
-        let newUrl = this.$router.resolve({
-          path: '/ProjectDetails',
-          query: {
-            id: item.projectLibraryId,
-            projectName: item.projectName,
-            projectNameId: item.projectNameId,
-            targetMarket: item.targetMarket,
-            studioEngineer: item.studioEngineer
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      standardInformationClick(item) {
-        let newUrl = this.$router.resolve({
-          path: '/docManage/library/detail',
-          query: {
-            id: item.bussDocumentLibraryId
-          }
-        })
-        window.open(newUrl.href, '_blank')
-      },
-      viewClick(row) {
-        let query = {}
-        row.router = this.$route.path
-        if (row.flowType == '1') {
-          query = {
-            taskDefinitionKey: row.taskDefinitionKey,
-            taskIds: row.taskId,
-            prcType: row.flowType,
-            prcNum: row.prcNum,
-            isTrue: false
-          }
-          let newUrl = this.$router.resolve({
-            path: '/handshakeProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
-        } else if (row.flowType == '10') {
-          let newUrl = this.$router.resolve({
-            path: '/ProjectDetails',
-            query: {
-              id: row.projectLibraryId,
-              projectName: row.projectName,
-              projectNameId: row.projectNameId,
-              targetMarket: row.targetMarket,
-              studioEngineer: row.studioEngineer,
-              type: '102'
-            }
-          })
-          window.open(newUrl.href, '_blank')
-        } else if (row.flowType == '2') {
-          row.taskId = row.taskId + ''
-          if (row.taskId.length > 30) {
-            row.taskId = ''
-          }
-          query = {
-            router: row.router,
-            taskIds: row.taskId,
-            actiProcInstId: row.actiProcInstId,
-            projectTaskInventoryId: row.projectLawsInventoryId,
-            projectLibraryId: row.projectLibraryId,
-            id: row.projectLibraryId,
-            studioEngineer: row.studioEngineer,
-            serialNumber: row.serialNumber,
-            TaskKey: row.taskDefinitionKey,
-            isDisplay: false,
-            flowType: 2,
-            Sponsor: 'designInitiatorName',
-            personLiable: 'designDutyName',
-            typeOfDeliverables: 'designDeliverableTypeName',
-            deliverableTemplate: 'designDeliverableTemplate',
-            DueDate: 'designDueDate',
-            remarks: 'designRemark',
-            projectName: row.projectName,
-            targetMarket: row.targetMarket,
-            projectNameId: row.projectNameId,
-            primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
-          }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
-        } else if (row.flowType == '3') {
-          row.taskId = row.taskId + ''
-          if (row.taskId.length > 30) {
-            row.taskId = ''
-          }
-          query = {
-            router: row.router,
-            taskIds: row.taskId,
-            actiProcInstId: row.actiProcInstId,
-            projectTaskInventoryId: row.projectLawsInventoryId,
-            studioEngineer: row.studioEngineer,
-            projectLibraryId: row.projectLibraryId,
-            serialNumber: row.serialNumber,
-            TaskKey: row.taskDefinitionKey,
-            flowType: 3,
-            isDisplay: false,
-            id: row.projectLibraryId,
-            Sponsor: 'prehomoInitiatorName',
-            personLiable: 'prehomoDutyName',
-            typeOfDeliverables: 'prehomoDeliverableTypeName',
-            deliverableTemplate: 'prehomoDeliverableTemplate',
-            DueDate: 'prehomoDueDate',
-            remarks: 'prehomoRemark',
-            projectName: row.projectName,
-            targetMarket: row.targetMarket,
-            projectNameId: row.projectNameId,
-            primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
-          }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
-        } else if (row.flowType == '4') {
-          row.taskId = row.taskId + ''
-          if (row.taskId.length > 30) {
-            row.taskId = ''
-          }
-          query = {
-            router: row.router,
-            taskIds: row.taskId,
-            actiProcInstId: row.actiProcInstId,
-            id: row.projectLibraryId,
-            projectLibraryId: row.projectLibraryId,
-            studioEngineer: row.studioEngineer,
-            serialNumber: row.serialNumber,
-            projectTaskInventoryId: row.projectLawsInventoryId,
-            TaskKey: row.taskDefinitionKey,
-            flowType: 4,
-            isDisplay: false,
-            Sponsor: 'verifyInitiatorName',
-            personLiable: 'verifyDutyName',
-            typeOfDeliverables: 'verifyDeliverableTypeName',
-            deliverableTemplate: 'verifyDeliverableTemplate',
-            DueDate: 'verifyDueDate',
-            remarks: 'verifyRemark',
-            projectName: row.projectName,
-            targetMarket: row.targetMarket,
-            projectNameId: row.projectNameId,
-            primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
-          }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
+        {
+          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' }
         }
-      },
-      searchQuery(value) {
-        this.queryParam = value
-        this.pageNo = 1
-        this.getList()
-      },
-      searchReset() {
-        this.queryParam = {}
-        this.pageNo = 1
-        this.getList()
-      },
-      pageOnChange(page) {
-        this.pageNo = page
-        this.getList()
-      },
-      SizeChange(page, pageSize) {
-        this.pageNo = 1
-        this.pageSize = pageSize
-        this.getList()
-      },
-      getList() {
-        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
-        Object.keys(queryParam).forEach(val => {
-          if (queryParam[val] instanceof Array) {
-            queryParam[val] = queryParam[val].join(',')
-          }
-        })
-        let query = {
-          pageNo: this.pageNo,
-          pageSize: this.pageSize,
-          ...queryParam
-        }
-        this.loading = true
-        getAction(this.url.list, query).then((res) => {
-          if (res.success) {
-            if (res.result.current > 1 && res.result.records.length == 0) {
-              this.pageNo = 1
-              this.getList()
-              return
-            }
-            this.dataSource = res.result.records || []
-            this.total = res.result.total
-            this.loading = false
-          } else {
-            this.loading = false
-          }
-        })
-      }
+      ],
     }
+  },
+  mounted() {
+    // this.getList()
+  },
+  methods: {
+    clickButtonToUpload(item) {
+      this.$refs.uploadFile.perentHandleFunc()
+      this.$refs.uploadFile.visible = true
+      this.uploadName = item
+      getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+        if (res.success) {
+          this.$refs.uploadFile.perentHandleFunc(res.result)
+        } else {
+          this.$refs.uploadFile.perentHandleFunc()
+        }
+      })
+    },
+    getList() {
+      let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+      Object.keys(queryParam).forEach(val => {
+        if (queryParam[val] instanceof Array) {
+          queryParam[val] = queryParam[val].join(',')
+        }
+      })
+      let query = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        ...queryParam
+      }
+      this.loading = true
+      getAction(this.url.list, query).then((res) => {
+        if (res.success) {
+          if (res.result.current > 1 && res.result.records.length == 0) {
+            this.pageNo = 1
+            this.getList()
+            return
+          }
+          this.dataSource = res.result.records || []
+          this.total = res.result.total
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+    },
+    last(){
+      this.$emit('safetyPrecautionsup')
+    },
+    next(){
+      this.$emit('safetyPrecautionsdown')
+    },
+    uploadSuccess(data) {
+      let attIdList = []
+      if (data && data.length > 0) {
+        data.map(item => {
+          attIdList.push({
+            id:item.id,
+            fileName:item.fileName
+          })
+        })
+      }
+      /** 赋值给当前对应的表单文件 */
+      this.fileList.uploadName = attIdList
+      this.fileList.certifyingmaterials = this.$t('viewFile')
+    },
   }
+}
 </script>
 
-<style scoped>
-  @import '~@assets/less/common.less';
-  .page {
-    text-align: right;
-    margin-top: 20px;
-  }
+<style lang='less' scoped>
+@import '~@assets/less/common.less';
 
-  .text-operation {
-    margin-right: 8px;
-  }
+.box {
+  padding: 0 24px 24px 24px;
+  box-sizing: border-box;
+}
 
-  /*/deep/.ant-table-column-title{*/
-  /*  font-weight: bold!important;*/
-  /*}*/
+.bootom-button{
+  text-align: center!important;
+}
 
-  /*/deep/.ant-table-thead > tr > th {*/
-  /*  background: #f3f6f6;*/
-  /*}*/
+.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: 50px;
+}
+//::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: nowrap;
+}
+//::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: 50px;
+  border: black solid 1px;
+  vertical-align: top;
+  border-right: none;
+  border-bottom: none;
+  overflow: hidden; /*超出部分隐藏*/
+  text-overflow: ellipsis; /*超出部分省略号表示*/
+  white-space: nowrap;
+}
+.sider-span{
+  display: inline-block;
+  width: 100%;
+  height: 50px;
+  margin-top: 74px;
+}
+.sider-span1{
+  display: inline-block;
+  width: 100%;
+  height: 50px;
+  margin-top: 8px;
+}
 </style>
\ 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 @@
         <a-icon type="form"/>
         {{$t('fillintherecord')}}
       </div>
+      <div @click="historicalrecordClick"
+           class="operator-text">
+        <a-icon type="copy"/>
+        {{$t('historicalrecord')}}
+      </div>
     </div>
     <a-tabs class="tabs" v-model="tabActive" @change="callback">
-      <a-tab-pane :key="$t('upgradetargetmodel')" :tab="$t('upgradetargetmodel')">
+      <a-tab-pane disabled :key="$t('upgradetargetmodel')" :tab="$t('upgradetargetmodel')">
         <upgradetargetmodel v-if="tabActive == $t('upgradetargetmodel')" @basicInformationForm='basicInformationForm' ref="dealtWithRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('thetargetvehicleofthisupgrade')"  :tab="$t('thetargetvehicleofthisupgrade')">
+      <a-tab-pane disabled :key="$t('thetargetvehicleofthisupgrade')"  :tab="$t('thetargetvehicleofthisupgrade')">
         <thetargetvehicleofthisupgrade v-if="tabActive == $t('thetargetvehicleofthisupgrade')" @upgradeRequirementsup='upgradeRequirementsup' @upgradeRequirementsdown='upgradeRequirementsdown' ref="doneListRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('upgradeimpactassessment')"  :tab="$t('upgradeimpactassessment')">
+      <a-tab-pane disabled :key="$t('upgradeimpactassessment')"  :tab="$t('upgradeimpactassessment')">
         <upgradeimpactassessment v-if="tabActive == $t('upgradeimpactassessment')" @safetyPrecautionsup='safetyPrecautionsup' @safetyPrecautionsdown='safetyPrecautionsdown' ref="SentListRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('upgradehavechanged')"  :tab="$t('upgradehavechanged')">
+      <a-tab-pane disabled :key="$t('upgradehavechanged')"  :tab="$t('upgradehavechanged')">
         <upgradehavechanged v-if="tabActive == $t('upgradehavechanged')" @upgradedonlineup='upgradedonlineup' @upgradedonlinedown='upgradedonlinedown' ref="upgradedonlineRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('auxiliaryupgradehavechanged')"  :tab="$t('auxiliaryupgradehavechanged')">
+      <a-tab-pane disabled :key="$t('auxiliaryupgradehavechanged')"  :tab="$t('auxiliaryupgradehavechanged')">
         <auxiliaryupgradehavechanged v-if="tabActive == $t('auxiliaryupgradehavechanged')" @beupgradedonlineup='beupgradedonlineup' @beupgradedonlinedown='beupgradedonlinedown' ref="beupgradedonlineRef"/>
       </a-tab-pane>
       <a-tab-pane :key="$t('usernotification')" :tab="$t('usernotification')">
@@ -31,7 +36,7 @@
         <informationaboutotherupgradetasks v-if="tabActive == $t('informationaboutotherupgradetasks')" @otherup='otherup' ref="otherRef"/>
       </a-tab-pane>
       <a-tab-pane :key="$t('historicalrecord')" :tab="$t('historicalrecord')">
-        <historicalrecord v-if="tabActive == $t('historicalrecord')" ref="historicalrecordRef"/>
+        <historicalrecord v-if="tabActive == $t('historicalrecord')" ref="historicalrecordRef" @historicalrecordup='historicalrecordup'/>
       </a-tab-pane>
     </a-tabs>
     <!--    填写记录-->
@@ -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 @@
           <a class="text-operation">{{$t('delete')}}</a>
       </span>
     </a-table>
+    <div>
+      <a-button @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+    </div>
     <div class="bootom-button">
       <a-button style="margin-right:50px">{{$t('preservation')}}</a-button>
       <a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue
index aa0ebbeca..976e388e6 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue
@@ -30,7 +30,9 @@
         </div>
       </a-col>
     </a-row>
-
+    <div class="bootom-button">
+      <a-button type="primary" style='margin-top: 50px' @click='back'>{{$t('returntofill')}}</a-button>
+    </div>
   </div>
 </template>
 
@@ -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%;
+  }
 </style>
\ 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 @@
     </div>
     <template>
     </template>
+    <div style='display: flex;margin-bottom: 40px;'>
+      <div style='width: 400px'>
+        <span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('componentname')}}</span>
+        <span class='radio-text' :title="$t('networksecurityrequirements')">
+          {{$t('networksecurityrequirements')}}
+        </span>
+        <span class='radio-text' :title="$t('millimeterwaveradar')">
+          {{$t('millimeterwaveradar')}}
+        </span>
+        <span class='radio-text' :title="$t('ultrasonicradar')">
+          {{$t('ultrasonicradar')}}
+        </span>
+        <span class='text-box'>
+          <span class='text-text' :title="$t('camera')">
+            {{$t('camera')}}
+          </span>
+          <span class='text-text-two' :title="$t('asternimage')">
+            {{$t('asternimage')}}
+          </span>
+          <span class='text-text-two' :title="$t('Monocularbinocularmultiocular')">
+            {{$t('Monocularbinocularmultiocular')}}
+          </span>
+        </span>
+        <span class='text-box'>
+          <span class='text-text' :title="$t('driverattentionmonitoringsystem')">
+            {{$t('driverattentionmonitoringsystem')}}
+          </span>
+          <span class='text-text-two' :title="$t('driversurveillancecamera')">
+            {{$t('driversurveillancecamera')}}
+          </span>
+          <span class='text-text-two' :title="$t('drivermonitoringinfraredsensor')">
+            {{$t('drivermonitoringinfraredsensor')}}
+          </span>
+        </span>
+        <span class='text-box-two' >
+          <span class='text-text' style='height: 450px;line-height: 450px' :title="$t('positioningandnavigationsystem')">
+            {{$t('positioningandnavigationsystem')}}
+          </span>
+          <span class='text-text-three' :title="$t('vehiclesatellitepositioningequipment')">
+            {{$t('vehiclesatellitepositioningequipment')}}
+          </span>
+          <span class='text-text-three' :title="$t('inertialnavigationsystem')">
+            {{$t('inertialnavigationsystem')}}
+          </span>
+          <span class='text-text-three' :title="$t('wheelspeedmeter')">
+            {{$t('wheelspeedmeter')}}
+          </span>
+          <span class='text-text-three' :title="$t('highprecisionmap')">
+            {{$t('highprecisionmap')}}
+          </span>
+          <span class='text-text-five' :title="$t('electronicfence')">
+            {{$t('electronicfence')}}
+          </span>
+        </span>
+        <span class='text-box-three' :title="$t('vehiclecommunicationsystem')">
+          {{$t('vehiclecommunicationsystem')}}
+        </span>
+        <span class='text-box-four'>
+          <span class='four-text-text' :title="$t('signalingdevices')">
+            {{$t('signalingdevices')}}
+          </span>
+          <span class='four-text' :title="$t('driverassistancefunctioncontrols')">
+            {{$t('driverassistancefunctioncontrols')}}
+          </span>
+          <span class='four-text' :title="$t('drivingassistancefunctionindicatorsignaldevice')">
+            {{$t('drivingassistancefunctionindicatorsignaldevice')}}
+          </span>
+          <span class='four-text' :title="$t('steerinwheelreleaseindicatorsignaldevice')">
+            {{$t('steerinwheelreleaseindicatorsignaldevice')}}
+          </span>
+          <span class='four-text' :title="$t('driverattentionindicatorsignaldevice')">
+            {{$t('driverattentionindicatorsignaldevice')}}
+          </span>
+        </span>
+        <span class='text-box-five' :title="$t('automaticDrivingDataRecordingSystem')">
+          {{$t('automaticDrivingDataRecordingSystem')}}
+        </span>
+        <span class='text-box-five' :title="$t('eventdatarecordingsystem')">
+          {{$t('eventdatarecordingsystem')}}
+        </span>
+      </div>
+      <div style='width: 300px'>
+        <span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('fillincontent')}}</span>
+        <span class='radio-text'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text-two'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text-two'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text-two'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text-two'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text-three'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text-four'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text-five'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text-five'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text-five'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text-five'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text-two'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+        <span class='radio-text-two'>
+          <a-radio-group style='margin-left: 40px;'>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+        </span>
+      </div>
+      <div style='width: 300px'>
+        <span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('ParameterName')}}</span>
+        <span v-for='(item,index) in dataSource' class='content-text'>
+          {{item.ParameterName}}
+        </span><br>
+      </div>
+      <div style='width: 700px'>
+        <span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('fillincontent')}}</span>
+        <span v-for='(item,index) in dataSource' class='content-text'>
+          <a-input  v-model="item.val" class="item-input" :placeholder="item.fillincontent"/>
+        </span><br>
+      </div>
+    </div>
     <a-table
       ref="table"
       size="middle"
       :pagination="false"
       :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
-      rowKey="key"
+      rowKey="id"
       bordered
-      :data-source="dataSource"
+      :data-source="dataSourceList"
       :columns="columns"
       style="margin-bottom: 20px"
     >
-
-      <span slot="configuration" slot-scope="text,record">
-            <a-radio-group v-model="record.relevantverification">
+      <!--      可升级-->
+      <span slot="systemclass" slot-scope="text,record">
+            <a-radio-group>
                     <a-radio :value="1"> {{ $t('yes') }} </a-radio>
                     <a-radio :value="2"> {{ $t('not') }} </a-radio>
             </a-radio-group>
       </span>
-      <span slot="fillincontent" slot-scope="text,record">
-<!--            <a-button type="primary" v-model="record.relevantverification">{{$t('uploadattachment')}}</a-button>-->
-        <a-input class="box-input" :placeholder="$t('PleaseEnter')"
-                 v-model="record.fillincontent"></a-input>
+      <!--       技术参数-->
+      <span slot="technicalparameters" slot-scope="text,record">
+          <a-input :placeholder="$t('ifNot')"></a-input>
+      </span>
+      <!--      上传附件-->
+      <span slot="architecturetopologydiagram" slot-scope="text,record">
+          <a-button @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+      </span>
+      <!--      操作列-->
+      <span slot="operation" slot-scope="text,record">
+          <a class="text-operation">{{$t('addcontroller')}}</a>
+          <a class="text-operation">{{$t('delete')}}</a>
       </span>
     </a-table>
     <div class="bootom-button">
@@ -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;
+}
 </style>
\ 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 @@
           <a class="text-operation">{{$t('delete')}}</a>
       </span>
     </a-table>
+    <div>
+      <a-button @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+    </div>
     <div class="bootom-button">
       <a-button style="margin-right:50px">{{$t('preservation')}}</a-button>
       <a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/index.vue b/jero-web/src/views/otamanagement/vehicleinformation/index.vue
index 897410f44..2161d144b 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/index.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/index.vue
@@ -7,31 +7,36 @@
         <a-icon type="form"/>
         {{$t('fillintherecord')}}
       </div>
+      <div @click="historicalrecordClick"
+           class="operator-text">
+        <a-icon type="copy"/>
+        {{$t('historicalrecord')}}
+      </div>
     </div>
     <a-tabs class="tabs" v-model="tabActive" @change="callback">
-      <a-tab-pane :key="$t('basicinformationofvehicletype')" :tab="$t('basicinformationofvehicletype')">
+      <a-tab-pane disabled :key="$t('basicinformationofvehicletype')" :tab="$t('basicinformationofvehicletype')">
         <basicInformation v-if="tabActive == $t('basicinformationofvehicletype')" @basicInformationForm='basicInformationForm' ref="dealtWithRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('onlineupgraderequirements')"  :tab="$t('onlineupgraderequirements')">
+      <a-tab-pane disabled :key="$t('onlineupgraderequirements')"  :tab="$t('onlineupgraderequirements')">
         <upgradeRequirements v-if="tabActive == $t('onlineupgraderequirements')" @upgradeRequirementsup='upgradeRequirementsup' @upgradeRequirementsdown='upgradeRequirementsdown' ref="doneListRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('safetymeasure')"  :tab="$t('safetymeasure')">
+      <a-tab-pane disabled :key="$t('safetymeasure')"  :tab="$t('safetymeasure')">
         <safetyPrecautions v-if="tabActive == $t('safetymeasure')" @safetyPrecautionsup='safetyPrecautionsup' @safetyPrecautionsdown='safetyPrecautionsdown' ref="SentListRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('upgradedonline')"  :tab="$t('upgradedonline')">
+      <a-tab-pane disabled :key="$t('upgradedonline')"  :tab="$t('upgradedonline')">
         <upgradedonline v-if="tabActive == $t('upgradedonline')" @upgradedonlineup='upgradedonlineup' @upgradedonlinedown='upgradedonlinedown' ref="upgradedonlineRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('beupgradedonline')"  :tab="$t('beupgradedonline')">
+      <a-tab-pane disabled :key="$t('beupgradedonline')"  :tab="$t('beupgradedonline')">
         <beupgradedonline v-if="tabActive == $t('beupgradedonline')" @beupgradedonlineup='beupgradedonlineup' @beupgradedonlinedown='beupgradedonlinedown' ref="beupgradedonlineRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('recordparameters')" :tab="$t('recordparameters')">
+      <a-tab-pane disabled :key="$t('recordparameters')" :tab="$t('recordparameters')">
         <recordparameters v-if="tabActive == $t('recordparameters')" @recordparametersup='recordparametersup' @recordparametersdown='recordparametersdown' ref="recordparametersRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('other')" :tab="$t('other')">
+      <a-tab-pane disabled :key="$t('other')" :tab="$t('other')">
         <other v-if="tabActive == $t('other')" @otherup='otherup' ref="otherRef"/>
       </a-tab-pane>
       <a-tab-pane :key="$t('historicalrecord')" :tab="$t('historicalrecord')">
-        <historicalrecord v-if="tabActive == $t('historicalrecord')" ref="historicalrecordRef"/>
+        <historicalrecord v-if="tabActive == $t('historicalrecord')" ref="historicalrecordRef" @historicalrecordup='historicalrecordup'/>
       </a-tab-pane>
     </a-tabs>
     <!--    填写记录-->
@@ -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'