diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index b43dc25a6..000d312f5 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1681,5 +1681,8 @@ module.exports = {
   last:'Last',
   designComplianceReviewAdmin:'Design Compliance Review',
   missionAccomplished:'Mission Accomplished',
-
+  yesisselected:'If Yes is selected, enter',
+  forwardXquantity:'For example, forward X quantity, backward X quantity, right X quantity, etc',
+  upgraderecordnumber:'Upgrade record number',
+  Modelandfunctionrecord:'Model and function record "Announcement" batch',
 }
\ 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 5f037e2fc..512587443 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1781,4 +1781,10 @@ module.exports = {
   module:'模块',
   designComplianceReviewAdmin:'设计符合性审查',
   missionAccomplished:'任务完成',
+  yesisselected:'如选择“有”，请输入',
+  forwardXquantity:'如前向X数量，后向X数量，右向X数量等',
+  upgraderecordnumber:'升级备案编号',
+  Modelandfunctionrecord:'车型及功能备案《公告》批次',
+
+
 }
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
index c871bfabf..dbd4052f3 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
@@ -393,7 +393,10 @@ export default {
     },
     // 创建车型
     createvehicleandfunctionrecords() {
-
+      this.$router.push({
+        path: '/upgradeactivityrecord',
+        query: {}
+      })
     },
     viewProcessClick(row) {
       this.$refs.processInformationRef.getData(JSON.parse(JSON.stringify(row)))
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
new file mode 100644
index 000000000..26d9d7611
--- /dev/null
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
@@ -0,0 +1,359 @@
+<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>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'doneList',
+    mixins:[ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        url: {
+          list: '/todoCenter/projectProcess/doneProcess'
+        },
+        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')
+        }
+      },
+      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
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+  .text-operation{
+     margin-right: 8px;
+  }
+</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
new file mode 100644
index 000000000..aa0ebbeca
--- /dev/null
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue
@@ -0,0 +1,380 @@
+<template>
+  <div class="box">
+    <a-row :gutter="24" style='margin-top: 30px'>
+      <a-col :span="24">
+        <div class="box-title-text">
+          <div class="title-text">
+            <span class="dot"></span>
+            <span class="title-text-text"
+                  :title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span>
+            <div class='titlebox'>
+                <span class='titlebox-text'>提交审批</span>
+                <span class='titlebox-text-text'>2023-02-02  14:13:21</span>
+            </div>
+          </div>
+        </div>
+      </a-col>
+    </a-row>
+    <a-row :gutter="24" style='margin-top: 30px'>
+      <a-col :span="24">
+        <div class="box-title-text">
+          <div class="title-text">
+            <span class="dot"></span>
+            <span class="title-text-text"
+                  :title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span>
+            <div class='titlebox'>
+              <span class='titlebox-text'>提交审批</span>
+              <span class='titlebox-text-text'>2023-02-02  14:13:21</span>
+            </div>
+          </div>
+        </div>
+      </a-col>
+    </a-row>
+
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'doneList',
+    mixins:[ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        url: {
+          list: '/todoCenter/projectProcess/doneProcess'
+        },
+        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')
+        }
+      },
+      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
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+  .text-operation{
+     margin-right: 8px;
+  }
+  .box{
+    margin-top: 50px;
+    margin-left: 20%;
+  }
+  .dot{
+    width: 10px;
+    height: 10px;
+    border-radius: 10px;
+    background: #00a0e9;
+    display: block;
+    float: left;
+    margin: 4px;
+  }
+  .title-text-text {
+    font-size: 15px;
+    margin-left: 10px;
+    margin-top: 4px;
+  }
+  .titlebox{
+    width: 816px;
+    height: 70px;
+    margin-top: 5px;
+    margin-left: 9px;
+    border-left: #A3AAAD solid 1px;
+  }
+  .titlebox-text{
+    line-height: 5;
+    margin-left: 60px;
+  }
+  .titlebox-text-text{
+    margin-left: 60px;
+  }
+</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
new file mode 100644
index 000000000..96c1c5846
--- /dev/null
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue
@@ -0,0 +1,171 @@
+<template>
+  <div class="box">
+    <a-spin :spinning="confirmLoading">
+      <a-form-model class="formAdd" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('taskname')">{{$t('taskname')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dutyTerritory">
+                <a-input
+                  :placeholder="$t('pleaseEnter')"
+                  v-model.trim="queryParam.taskname"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('updatereleasetime')">
+                {{$t('updatereleasetime')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="updatereleasetime">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('updatereleasetime')"
+                               @change="dateChange({db_field_name:'updatereleasetime'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="queryParam.updatereleasetime"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('upgradeplanexpirationtime')">
+                {{$t('upgradeplanexpirationtime')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dateofproduction">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('upgradeplanexpirationtime')"
+                               @change="dateChange({db_field_name:'upgradeplanexpirationtime'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="queryParam.upgradeplanexpirationtime"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <div class="bootom-button">
+      <a-button style="margin-right:50px">{{$t('preservation')}}</a-button>
+      <a-button type="primary" @click='last' style="margin-right:50px">{{$t('last')}}</a-button>
+      <a-button type="primary" @click='submit'>{{$t('submit')}}</a-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getAction, postAction, deleteAction } from '@/api/manage'
+import moment from 'moment'
+
+export default {
+  name: 'basicInformation',
+  components:{
+  },
+  data() {
+    return {
+      confirmLoading: false,
+      disabled: false,
+      queryParam:{}
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    last(){
+      this.$emit('otherup')
+    },
+    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') : ''
+    },
+    submit(){
+
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import'~@assets/less/common.less';
+.box {
+  height: 650px;
+  padding: 0 24px 24px 24px;
+  box-sizing: border-box;
+}
+
+.box-title-text-add {
+  line-height: 1.4;
+  display: flex;
+
+}
+
+.title-text-add {
+  width: 114px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+  margin-top: 3px;
+}
+
+.title-text-add-input {
+  width: 80%;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+  margin-top: 3px;
+  margin-bottom: 20px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.box-input {
+  display: inline-block;
+  width: 100%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.formAdd {
+  margin: 0 auto;
+  width: 670px;
+}
+
+.bootom-button{
+  position: absolute;
+  bottom: 0px;
+  left: 40%;
+  text-align: center!important;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
new file mode 100644
index 000000000..a74062a45
--- /dev/null
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
@@ -0,0 +1,212 @@
+<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-spin :spinning="confirmLoading">
+      <a-form-model class="formAdd" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('totalquantity')">{{$t('totalquantity')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dutyTerritory">
+                <a-input class="box-input"
+                         :disabled="disabled"
+                         :placeholder="$t('PleaseSelect')"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('dateofproduction')">
+                {{$t('dateofproduction')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dateofproduction">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('dateofproduction')"
+                               @change="dateChange({db_field_name:'dateofproduction'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.dateofproduction"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('VINcodelist')">
+                {{$t('VINcodelist')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="VINcodelist">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('VINcodelist')"
+                            v-model="formInline.VINcodelist"
+                            :rows="4"/>
+              </a-form-model-item>
+<!--              <a-form-model-item class="itemModel" prop="VINcodelist">-->
+<!--                <a-button type="primary" class="button-text"-->
+<!--                          @click="clickButtonToUpload('VINcodelist')">-->
+<!--                  {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' ||-->
+<!--                  formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')-->
+<!--                  }}-->
+<!--                </a-button>-->
+<!--              </a-form-model-item>-->
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text"></span>
+              </div>
+                            <a-form-model-item class="itemModel" prop="VINcodelist">
+                              <a-button type="primary" class="button-text"
+                                        @click="clickButtonToUpload('VINcodelist')">
+                                {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' ||
+                                formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                                }}
+                              </a-button>
+                            </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <div class="bootom-button">
+      <a-button class='btn' 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>
+  </div>
+</template>
+
+<script>
+import { getAction, postAction, deleteAction } from '@/api/manage'
+import moment from 'moment'
+
+export default {
+  name: 'basicInformation',
+  components:{
+  },
+  data() {
+    return {
+      confirmLoading: false,
+      disabled: false,
+      formInline:{}
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    next(){
+      this.$emit('upgradeRequirementsdown')
+    },
+    last(){
+      this.$emit('upgradeRequirementsup')
+    },
+    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') : ''
+    },
+    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()
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import'~@assets/less/common.less';
+.box {
+  height:500px;
+  padding: 0 24px 24px 24px;
+  box-sizing: border-box;
+}
+
+.box-title-text-add {
+  line-height: 1.4;
+  display: flex;
+
+}
+
+.title-text-add {
+  width: 114px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+  margin-top: 3px;
+}
+
+.title-text-add-input {
+  width: 80%;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+  margin-top: 3px;
+  margin-bottom: 20px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.box-input {
+  display: inline-block;
+  width: 100%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.formAdd {
+  margin: 0 auto;
+  width: 670px;
+}
+
+.bootom-button{
+  position: absolute;
+  bottom: 0px;
+  left: 40%;
+  text-align: center!important;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
new file mode 100644
index 000000000..26d9d7611
--- /dev/null
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
@@ -0,0 +1,359 @@
+<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>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  export default {
+    name: 'doneList',
+    mixins:[ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        url: {
+          list: '/todoCenter/projectProcess/doneProcess'
+        },
+        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')
+        }
+      },
+      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
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+  .text-operation{
+     margin-right: 8px;
+  }
+</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
new file mode 100644
index 000000000..e76e6451d
--- /dev/null
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
@@ -0,0 +1,366 @@
+<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>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
+  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'
+        },
+        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')
+        }
+      },
+      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
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  /*/deep/.ant-table-column-title{*/
+  /*  font-weight: bold!important;*/
+  /*}*/
+
+  /*/deep/.ant-table-thead > tr > th {*/
+  /*  background: #f3f6f6;*/
+  /*}*/
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
new file mode 100644
index 000000000..75c4e1a4a
--- /dev/null
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
@@ -0,0 +1,236 @@
+<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-spin :spinning="confirmLoading">
+      <a-form-model class="formAdd" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('selectTheVehicleTemplate')">{{$t('selectTheVehicleTemplate')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dutyTerritory">
+                <j-dict-select-tag class="box-input"
+                                   :disabled="disabled"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('upgraderecordnumber')">{{$t('upgraderecordnumber')}}</span>
+              </div>
+              <div class="title-text-add-input">
+                <span class="title-text-text">中文</span>
+              </div>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('registrationnumber')">{{$t('registrationnumber')}}</span>
+              </div>
+              <div class="title-text-add-input">
+                <span class="title-text-text">中文</span>
+              </div>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('Modelandfunctionrecord')">{{$t('Modelandfunctionrecord')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <j-dict-select-tag class="box-input"
+                                   :disabled="disabled"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('noticebatch')">{{$t('noticebatch')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dutyTerritory">
+                <j-dict-select-tag class="box-input"
+                                   :disabled="disabled"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('producttrademark')">{{$t('producttrademark')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <j-dict-select-tag class="box-input"
+                                   :disabled="disabled"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('productname')">{{$t('productname')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <j-dict-select-tag class="box-input"
+                                   :disabled="disabled"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('productModel')">{{$t('productModel')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <j-dict-select-tag class="box-input"
+                                   :disabled="disabled"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('Vehicledynamictype')">{{$t('Vehicledynamictype')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <j-dict-select-tag class="box-input"
+                                   :disabled="disabled"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <div class="bootom-button">
+      <a-button style="margin-right:50px">{{$t('preservation')}}</a-button>
+      <a-button type="primary" @click='next'>{{$t('next')}}</a-button>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'basicInformation',
+    components:{
+    },
+    data() {
+      return {
+        confirmLoading: false,
+        disabled: false,
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      next(){
+        this.$emit('basicInformationForm')
+      },
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  @import'~@assets/less/common.less';
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
+  }
+
+  .box-title-text-add {
+    line-height: 1.4;
+    display: flex;
+
+  }
+
+  .title-text-add {
+    width: 114px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+    margin-top: 3px;
+  }
+
+  .title-text-add-input {
+    width: 80%;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+    margin-top: 3px;
+    margin-bottom: 20px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 100%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .formAdd {
+    margin: 0 auto;
+    width: 670px;
+  }
+
+  .bootom-button{
+    text-align: center!important;
+  }
+</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
new file mode 100644
index 000000000..6803a69dd
--- /dev/null
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
@@ -0,0 +1,212 @@
+<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-spin :spinning="confirmLoading">
+      <a-form-model class="formAdd" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('totalquantity')">{{$t('totalquantity')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dutyTerritory">
+                <a-input class="box-input"
+                         :disabled="disabled"
+                         :placeholder="$t('PleaseSelect')"></a-input>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('dateofproduction')">
+                {{$t('dateofproduction')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dateofproduction">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('dateofproduction')"
+                               @change="dateChange({db_field_name:'dateofproduction'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.dateofproduction"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('VINcodelist')">
+                {{$t('VINcodelist')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="VINcodelist">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('VINcodelist')"
+                            v-model="formInline.VINcodelist"
+                            :rows="4"/>
+              </a-form-model-item>
+              <!--              <a-form-model-item class="itemModel" prop="VINcodelist">-->
+              <!--                <a-button type="primary" class="button-text"-->
+              <!--                          @click="clickButtonToUpload('VINcodelist')">-->
+              <!--                  {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' ||-->
+              <!--                  formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')-->
+              <!--                  }}-->
+              <!--                </a-button>-->
+              <!--              </a-form-model-item>-->
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text"></span>
+              </div>
+              <a-form-model-item class="itemModel" prop="VINcodelist">
+                <a-button type="primary" class="button-text"
+                          @click="clickButtonToUpload('VINcodelist')">
+                  {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' ||
+                  formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                  }}
+                </a-button>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <div class="bootom-button">
+      <a-button class='btn' 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>
+  </div>
+</template>
+
+<script>
+import { getAction, postAction, deleteAction } from '@/api/manage'
+import moment from 'moment'
+
+export default {
+  name: 'basicInformation',
+  components:{
+  },
+  data() {
+    return {
+      confirmLoading: false,
+      disabled: false,
+      formInline:{}
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    next(){
+      this.$emit('upgradeRequirementsdown')
+    },
+    last(){
+      this.$emit('upgradeRequirementsup')
+    },
+    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') : ''
+    },
+    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()
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import'~@assets/less/common.less';
+.box {
+  height:500px;
+  padding: 0 24px 24px 24px;
+  box-sizing: border-box;
+}
+
+.box-title-text-add {
+  line-height: 1.4;
+  display: flex;
+
+}
+
+.title-text-add {
+  width: 114px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+  margin-top: 3px;
+}
+
+.title-text-add-input {
+  width: 80%;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+  margin-top: 3px;
+  margin-bottom: 20px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.box-input {
+  display: inline-block;
+  width: 100%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.formAdd {
+  margin: 0 auto;
+  width: 670px;
+}
+
+.bootom-button{
+  position: absolute;
+  bottom: 0px;
+  left: 40%;
+  text-align: center!important;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue
new file mode 100644
index 000000000..18d88cf9d
--- /dev/null
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue
@@ -0,0 +1,337 @@
+<!--升级-->
+<template>
+  <a-card :bordered="false">
+    <div class="table-operator" style="margin-bottom: 8px">
+      <div @click="fillintherecordClick"
+           class="operator-text">
+        <a-icon type="form"/>
+        {{$t('fillintherecord')}}
+      </div>
+    </div>
+    <a-tabs class="tabs" v-model="tabActive" @change="callback">
+      <a-tab-pane :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')">
+        <thetargetvehicleofthisupgrade v-if="tabActive == $t('thetargetvehicleofthisupgrade')" @upgradeRequirementsup='upgradeRequirementsup' @upgradeRequirementsdown='upgradeRequirementsdown' ref="doneListRef"/>
+      </a-tab-pane>
+      <a-tab-pane :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')">
+        <upgradehavechanged v-if="tabActive == $t('upgradehavechanged')" @upgradedonlineup='upgradedonlineup' @upgradedonlinedown='upgradedonlinedown' ref="upgradedonlineRef"/>
+      </a-tab-pane>
+      <a-tab-pane :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')">
+        <usernotification v-if="tabActive == $t('usernotification')" @recordparametersup='recordparametersup' @recordparametersdown='recordparametersdown' ref="recordparametersRef"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('informationaboutotherupgradetasks')" :tab="$t('informationaboutotherupgradetasks')">
+        <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"/>
+      </a-tab-pane>
+    </a-tabs>
+    <!--    填写记录-->
+    <a-drawer
+      :title="$t('fillintherecord')"
+      :width="900"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @close="handleCancel"
+    >
+      <!--      :components="drag(columnshistory,'columnshistory')"-->
+      <a-table
+        class="table"
+        :columns="columnshistory"
+        :pagination="false"
+        :scroll="{x: '100%', y: 400}"
+        :data-source="dataSourcehistory"
+        :loading="loading"
+      >
+           <span slot="content" slot-scope="text,record">
+              <a-tooltip placement="topLeft">
+            <template slot="title">
+              <span v-html="text"></span>
+            </template>
+                <span v-html="text"></span>
+          </a-tooltip>
+           </span>
+        <span slot="detailText" slot-scope="text,record">
+                  <span class="text" :title="text">
+                   {{text && text.length > 10?text.slice(0,9)+'...':text}}
+                  </span>
+            </span>
+      </a-table>
+      <div class="page">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSizehistory"
+          :total="total"
+          :current="pageNohistory"
+          @change="onChangehistory"
+          @showSizeChange="SizeChangehistory"
+        />
+      </div>
+      <div class="drawer-bootom-button" >
+        <a-button @click="handleOk" style="margin-right: 16px" type="primary">{{$t('determine')}}</a-button>
+        <a-button @click="handleCancel" >{{$t('cancel')}}</a-button>
+      </div>
+    </a-drawer>
+  </a-card>
+
+</template>
+
+<script>
+import { getAction, postAction, deleteAction } from '@/api/manage'
+import upgradetargetmodel from './components/upgradetargetmodel'
+import thetargetvehicleofthisupgrade from './components/thetargetvehicleofthisupgrade'
+import upgradeimpactassessment from './components/upgradeimpactassessment'
+import upgradehavechanged from './components/upgradehavechanged'
+import auxiliaryupgradehavechanged from './components/auxiliaryupgradehavechanged'
+import usernotification from './components/usernotification'
+import informationaboutotherupgradetasks from './components/informationaboutotherupgradetasks'
+import historicalrecord from './components/historicalrecord'
+
+export default {
+  name: 'index',
+  components: {
+    upgradetargetmodel,
+    thetargetvehicleofthisupgrade,
+    upgradeimpactassessment,
+    upgradehavechanged,
+    auxiliaryupgradehavechanged,
+    usernotification,
+    informationaboutotherupgradetasks,
+    historicalrecord,
+  },
+  data() {
+    return {
+      title: '',
+      queryParam: {
+        projectName:this.$route.query.projectName?this.$route.query.projectName:''
+      },
+      visible:false,
+      confirmLoading: false,
+      pageNohistory: 1,
+      description:'',
+      isTrue:false,
+      pageSizehistory: 10,
+      total: 0,
+      dataSourcehistory:[],
+      columnshistory: [
+        {
+          title: this.$t('fillincontent'),
+          dataIndex: 'logContent',
+          align: 'left',
+          ellipsis: true,
+          scopedSlots: { customRender: 'content' },
+          width: 180
+        },
+        {
+          title: this.$t('module'),
+          dataIndex: 'remarks',
+          align: 'left',
+          ellipsis: true,
+          width: 100,
+          scopedSlots: { customRender: 'detailText' }
+        },
+        {
+          title: this.$t('completedBy'),
+          dataIndex: 'createTime',
+          align: 'left',
+          ellipsis: true,
+          width: 130
+        },
+        {
+          title: this.$t('completedTime'),
+          dataIndex: 'createTime',
+          align: 'left',
+          ellipsis: true,
+          width: 180
+        },
+      ],
+      toggleSearchStatus: false,
+      tabActive: this.$t('upgradetargetmodel')
+    }
+  },
+  methods: {
+    callback(value) {
+      this.tabActive = value
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    },
+    fillintherecordClick(){
+      this.visible = true
+      return
+      this.bussLogList()
+    },
+    bussLogList(val) {
+      let query = {
+        pageNo: this.pageNohistory,
+        pageSize: this.pageSizehistory,
+        paramsReportDetailId: this.paramsReportDetailId
+      }
+      this.loading = true
+      getAction('report/detailLog/page', query).then((res) => {
+        if (res.success) {
+          this.dataSourcehistory = res.result.records
+          this.total = res.result.total
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+    },
+    handleOk() {
+      this.pageNohistory = 1
+      this.visible = false
+    },
+    handleCancel() {
+      this.pageNohistory = 1
+      this.visible = false
+    },
+    onChangehistory(page, pageSize) {
+      this.pageNohistory = page
+      this.bussLogList()
+    },
+    SizeChangehistory(page, pageSize) {
+      this.pageNohistory = 1
+      this.pageSizehistory = pageSize
+      this.bussLogList()
+    },
+    basicInformationForm(){
+      this.tabActive = this.$t('thetargetvehicleofthisupgrade')
+    },
+    upgradeRequirementsup(){
+      this.tabActive = this.$t('upgradetargetmodel')
+    },
+    upgradeRequirementsdown(){
+      this.tabActive = this.$t('upgradeimpactassessment')
+    },
+    safetyPrecautionsup(){
+      this.tabActive = this.$t('thetargetvehicleofthisupgrade')
+    },
+    safetyPrecautionsdown(){
+      this.tabActive = this.$t('upgradehavechanged')
+    },
+    upgradedonlineup(){
+      this.tabActive = this.$t('upgradeimpactassessment')
+    },
+    upgradedonlinedown(){
+      this.tabActive = this.$t('auxiliaryupgradehavechanged')
+    },
+    beupgradedonlineup(){
+      this.tabActive = this.$t('upgradehavechanged')
+    },
+    beupgradedonlinedown(){
+      this.tabActive = this.$t('usernotification')
+    },
+    recordparametersup(){
+      this.tabActive = this.$t('auxiliaryupgradehavechanged')
+    },
+    recordparametersdown(){
+      this.tabActive = this.$t('informationaboutotherupgradetasks')
+    },
+    otherup(){
+      this.tabActive = this.$t('usernotification')
+    },
+    // taskConfirmationHandlingClick() {
+    //   this.$router.push({
+    //     path: '/toDoTaskConfirmation'
+    //   })
+    // }
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import '~@assets/less/common.less';
+
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.box-button {
+  height: 38px;
+  /*margin-top: 2px;*/
+}
+
+.text-operation {
+  margin-right: 8px;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  z-index: 100;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+::v-deep .ant-table-row:first-child {
+  background: #fff !important;
+  opacity: 0.9;
+}
+
+::v-deep .ant-table-body {
+  background: transparent !important;
+}
+
+::v-deep .ant-table-placeholder {
+  margin-top: 8px !important;
+}
+
+::v-deep .tabs .ant-tabs-nav .ant-tabs-tab-disabled, .ant-tabs-nav .ant-tabs-tab-disabled:hover{
+  color: #333333 !important;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue
index be693d27b..aa0ebbeca 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue
@@ -366,9 +366,9 @@
   .titlebox{
     width: 816px;
     height: 70px;
-    margin-top: 10px;
-    margin-left: 26px;
-    border: #191E29 solid 1px;
+    margin-top: 5px;
+    margin-left: 9px;
+    border-left: #A3AAAD solid 1px;
   }
   .titlebox-text{
     line-height: 5;
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue
index 26d9d7611..8dd986423 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue
@@ -1,359 +1,129 @@
 <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"
-      />
+    <a-spin :spinning="confirmLoading">
+      <a-form-model class="formAdd" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text-add">
+              <div class="title-text-add">
+                <span class="title-text-text" :title="$t('upgradepacketprotectionmeasures')">{{$t('upgradepacketprotectionmeasures')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dutyTerritory">
+                <a-textarea
+                  :placeholder="$t('controlsystem')"
+                  v-model.trim="queryParam.description" :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <div class="bootom-button">
+      <a-button style="margin-right:50px">{{$t('preservation')}}</a-button>
+      <a-button type="primary" @click='last' style="margin-right:50px">{{$t('last')}}</a-button>
+      <a-button type="primary" @click='submit'>{{$t('submit')}}</a-button>
     </div>
   </div>
 </template>
 
 <script>
-  import { getAction, postAction, deleteAction } from '@/api/manage'
-  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+import { getAction, postAction, deleteAction } from '@/api/manage'
 
-  export default {
-    name: 'doneList',
-    mixins:[ResizeHeader, ResizeColumnProvide],
-    data() {
-      return {
-        dataSource: [],
-        loading: false,
-        url: {
-          list: '/todoCenter/projectProcess/doneProcess'
-        },
-        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')
-        }
-      },
-      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
-          }
-        })
-      }
+export default {
+  name: 'basicInformation',
+  components:{
+  },
+  data() {
+    return {
+      confirmLoading: false,
+      disabled: false,
+      queryParam:{}
     }
+  },
+  mounted() {
+
+  },
+  methods: {
+    last(){
+      this.$emit('otherup')
+    },
+    submit(){
+
+    },
   }
+}
 </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 {
+  height: 650px;
+  padding: 0 24px 24px 24px;
+  box-sizing: border-box;
+}
+
+.box-title-text-add {
+  line-height: 1.4;
+  display: flex;
+
+}
+
+.title-text-add {
+  width: 114px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+  margin-top: 3px;
+}
+
+.title-text-add-input {
+  width: 80%;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+  margin-top: 3px;
+  margin-bottom: 20px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.box-input {
+  display: inline-block;
+  width: 100%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.formAdd {
+  margin: 0 auto;
+  width: 670px;
+}
+
+.bootom-button{
+  position: absolute;
+  bottom: 0px;
+  left: 40%;
+  text-align: center!important;
+}
 </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 26d9d7611..787fb4542 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
@@ -1,359 +1,733 @@
 <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>
+    <template>
+    </template>
     <a-table
       ref="table"
       size="middle"
-      :components="drag(columns,'columns')"
-      :loading="loading"
       :pagination="false"
       :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
-      rowKey="id"
+      rowKey="key"
+      bordered
       :data-source="dataSource"
       :columns="columns"
+      style="margin-bottom: 20px"
     >
-      <!--         -->
-      <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 slot="configuration" slot-scope="text,record">
+            <a-radio-group v-model="record.relevantverification">
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
       </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 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>
     </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="bootom-button">
+      <a-button class='btn'>{{$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: 'upgradeRequirements',
+  components:{
+    uploadFile
+  },
+  data() {
+    return {
+      dataSource: [
+        {
+          key: '1',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('Quantity'),
+          fillincontent:this.$t('yesisselected'),
         },
-        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
+        {
+          key: '2',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('layoutposition'),
+          fillincontent:this.$t('forwardXquantity'),
+        },
+        {
+          key: '3',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('specificationmodel'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '4',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('productionenterprise'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '5',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('Quantity'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '6',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('layoutposition'),
+          fillincontent:this.$t('forwardXquantity'),
+        },
+        {
+          key: '7',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('specificationmodel'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '8',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('productionenterprise'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '9',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('Quantity'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '10',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('layoutposition'),
+          fillincontent:this.$t('forwardXquantity'),
+        },
+        {
+          key: '11',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('specificationmodel'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '12',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('productionenterprise'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '13',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('Quantity'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '14',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('layoutposition'),
+          fillincontent:this.$t('forwardXquantity'),
+        },
+        {
+          key: '15',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('specificationmodel'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '16',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('productionenterprise'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '17',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('Quantity'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '18',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('layoutposition'),
+          fillincontent:this.$t('forwardXquantity'),
+        },
+        {
+          key: '19',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('specificationmodel'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '20',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('productionenterprise'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '21',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('Quantity'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '22',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('layoutposition'),
+          fillincontent:this.$t('forwardXquantity'),
+        },
+        {
+          key: '23',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('specificationmodel'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '24',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('productionenterprise'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '25',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('Quantity'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '26',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('layoutposition'),
+          fillincontent:this.$t('forwardXquantity'),
+        },
+        {
+          key: '27',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('specificationmodel'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '28',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('productionenterprise'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '29',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('specificationmodel'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '30',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '31',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('specificationmodel'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '32',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '33',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('specificationmodel'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '34',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '35',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('VersionNumber'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '36',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '37',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('qualitativelydescriberelevantplaces'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '38',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('systemname'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '39',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('systemspecificationmodel'),
+          fillincontent:this.$t('forwardXquantity'),
+        },
+        {
+          key: '40',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('systemproductionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '41',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('softwareversionnumber'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '42',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('softwaredevelopmententerprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '43',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('controlname'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '44',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('hardwarespecificationmodel'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '45',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '46',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('nameofindicatorsignaldevice'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '47',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('hardwarespecificationmodel'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '48',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '49',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('nameofindicatorsignaldevice'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '50',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('hardwarespecificationmodel'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '51',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '52',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('nameofindicatorsignaldevice'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '53',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('hardwarespecificationmodel'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '54',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '55',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('specificationmodel'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '56',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '57',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('specificationmodel'),
+          fillincontent:this.$t('yesisselected'),
+        },
+        {
+          key: '58',
+          componentname: this.$t('networksecurityrequirements'),
+          configuration: this.$t('ineffectiveupgrades'),
+          ParameterName: this.$t('productionenterprise'),
+          fillincontent:this.$t('yesisselected'),
+        },
+
+
+
+
+
+
+
+
+      ],
+      url: {
+      },
+      queryParam: {},
+      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;
+          // }
+        },
+        {
+          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' },
+          ellipsis: true,
+          width: 170
+        },
+        {
+          title: this.$t('fillincontent'),
+          align: 'left',
+          dataIndex: 'fillincontent',
+          scopedSlots: { customRender: 'fillincontent' },
+          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
+          //
+          // }
+        },
+      ],
+      selectedRowKeys: [],
+      fileList:{},
+    }
+  },
+  mounted() {
+    // this.getList()
+  },
+  methods: {
+    click(value){
+      this.fileList = value
+      console.log(this.fileList)
+      if(this.fileList.uploadName){
+        this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName)
       }
+
+      this.$refs.uploadFile.visible = true
     },
-    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
+    uploadSuccess(data) {
+      let attIdList = []
+      if (data && data.length > 0) {
+        data.map(item => {
+          attIdList.push({
+            id:item.id,
+            fileName:item.fileName
           })
-          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')
-        }
-      },
-      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
-          }
         })
       }
+      /** 赋值给当前对应的表单文件 */
+      this.fileList.uploadName = attIdList
+      this.fileList.certifyingmaterials = this.$t('viewFile')
+    },
+    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 = {
+        ...queryParam
+      }
+      getAction(this.url.list, query).then((res) => {
+        if (res.success) {
+          if (res.result.current > 1 && res.result.records.length == 0) {
+            this.getList()
+            return
+          }
+        } else {
+        }
+      })
+    },
+    last(){
+      this.$emit('recordparametersup')
+    },
+    next(){
+      this.$emit('recordparametersdown')
+    },
+    // 合并单元格
+    mergeCellsSlot(record, rowIndex) {
+      // console.log(record, rowIndex)
+      let temIndex = parseInt(rowIndex);
+      const obj = {
+        children: '',
+        attrs: {},
+      };
+      const index = this.dataSource.findIndex((item) => item.key == record.key);
+      // console.log(index)
+      if(index === temIndex && rowIndex === 0){
+        obj.attrs.rowSpan = 4;
+        console.log(obj,'1')
+      }else{
+        obj.attrs.rowSpan = 0
+        console.log(obj,'2')
+      }
+      return obj;
     }
   }
+}
 </script>
 
 <style scoped>
-  @import '~@assets/less/common.less';
-  .page {
-    text-align: right;
-    margin-top: 20px;
-  }
-  .text-operation{
-     margin-right: 8px;
-  }
+@import '~@assets/less/common.less';
+
+.box {
+  padding: 0 24px 24px 24px;
+  box-sizing: border-box;
+}
+
+button{
+  width: 89px;
+  border-radius: 4px;
+  cursor: pointer;
+  background: #00B3BE;
+  height: 30px;
+  border: none;
+  color: white;
+}
+
+.bootom-button{
+  text-align: center!important;
+}
+.btn{
+  width: 63px !important;
+  margin-right:50px;
+  line-height: 1.499;
+  position: relative;
+  display: inline-block;
+  font-weight: 400;
+  white-space: nowrap;
+  text-align: center;
+  background-image: none;
+  border: 1px solid transparent;
+  box-shadow: 0 2px 0 rgba(0, 0, 0, 0.015);
+  cursor: pointer;
+  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+  -webkit-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  -ms-touch-action: manipulation;
+  touch-action: manipulation;
+  height: 32px;
+  padding: 0 15px;
+  font-size: 14px;
+  border-radius: 4px;
+  color: #040B29;
+  background-color: #fff;
+  border-color: #d9d9d9;
+}
+.btn:hover{
+  color: #00B3BE;
+  border-color: #00B3BE;
+}
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/index.vue b/jero-web/src/views/otamanagement/vehicleinformation/index.vue
index 69ba8750d..897410f44 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/index.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/index.vue
@@ -1,3 +1,4 @@
+<!--车型-->
 <template>
   <a-card :bordered="false">
     <div class="table-operator" style="margin-bottom: 8px">