From 3704058fbf96529f8404f78f40dbf1103ad13c92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Tue, 21 Mar 2023 17:48:40 +0800
Subject: [PATCH] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7-?=
 =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=9F=BA=E6=9C=AC=E4=BF=A1-=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E6=8E=AA=E6=96=BD-=E7=B3=BB=E7=BB=9F=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E4=B8=8E=E5=8F=82=E6=95=B0-=E9=A9=BE=E9=A9=B6?=
 =?UTF-8?q?=E8=BE=85=E5=8A=A9=E5=8A=9F=E8=83=BD=E5=90=8D=E7=A7=B0=E4=B8=8E?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   5 +-
 jero-web/src/common/lang/zh-cn.js             |   3 +
 .../components/beupgradedonline.vue           | 462 +++++++---------
 .../components/safetyPrecautions.vue          | 459 +++++++---------
 .../components/upgradedonline.vue             | 494 ++++++++----------
 5 files changed, 604 insertions(+), 819 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 19e21e2ce..dcd256104 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1483,7 +1483,9 @@ module.exports = {
   technicalparameters:'Upgrade Bulletin technical parameters that may change (if any)',
   architecturetopologydiagram:'System - Electronic Controller Architecture Topology diagram (Attachment includes topology diagram description)',
   controllerparameter:'Controller parameter',
-  electroniccontrollername:'Electronic controller name "Hardware"',
+  electronic:'Electronic controller name',
+  electronicController:'Electronic controller name (Hardware)',
+  electroniccontrollername:'Electronic Controller Vehicle Safety Integrity Level (ASIL)',
   electroniccontrollerproductionenterprises:'Electronic controller production enterprises',
   electroniccontrollertype:'Electronic controller type',
   hardwareversioninformation:'Hardware version information',
@@ -1683,4 +1685,5 @@ module.exports = {
   missionAccomplished:'Mission Accomplished',
   taskTypeMismatch:'Task Type Mismatch',
   taskNodeMismatch:'Task Node Mismatch',
+  ifNot:'If not, fill in "none" or "not involved"',
 }
\ 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 7203f5c5f..2cea9fc04 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1585,6 +1585,8 @@ module.exports = {
   technicalparameters:'升级可能变更的《公告》技术参数(如有)',
   architecturetopologydiagram:'系统-电子控制器架构拓扑图(附件需含拓扑图介绍)',
   controllerparameter:'控制器参数',
+  electronic:'电子控制器名称',
+  electronicController:'电子控制器名称(硬件)',
   electroniccontrollername:'电子控制器汽车安全完整性等级(ASIL)',
   electroniccontrollerproductionenterprises:'电子控制器生产企业',
   electroniccontrollertype:'电子控制器型号',
@@ -1783,4 +1785,5 @@ module.exports = {
   missionAccomplished:'任务完成',
   taskTypeMismatch:'任务类型不匹配',
   taskNodeMismatch:'任务节点不匹配',
+  ifNot:'如无，则填写“无”或“不涉及”',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
index 26d9d7611..d0cf8e1dc 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
@@ -1,320 +1,227 @@
 <template>
   <div class="box">
+    <div class="table-operator">
+      <div class="operator-text">
+        <a-icon type="import" :rotate="270"/>
+        {{$t('dataimport')}}
+      </div>
+      <div class="operator-text">
+        <a-icon type="download"/>
+        {{$t('templateDownload')}}
+      </div>
+    </div>
     <a-table
       ref="table"
       size="middle"
-      :components="drag(columns,'columns')"
       :loading="loading"
       :pagination="false"
       :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
       rowKey="id"
+      bordered
       :data-source="dataSource"
       :columns="columns"
+      style="margin-bottom: 20px"
     >
-      <!--         -->
+      <!--      配置情况-->
+      <span slot="configuration" slot-scope="text,record">
+            <a-radio-group>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+      </span>
+      <!--      可升级-->
+      <span slot="whetheritcanbeupgraded" slot-scope="text,record">
+            <a-radio-group>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+      </span>
+      <!--       自动化级别-->
+      <span slot="drivingautomationlevel" slot-scope="text,record">
+                    <j-dict-select-tag class="box-input"
+                                       :disabled="disable"
+                                       :placeholder="$t('PleaseSelect')"
+                                       :type="'select'"
+                                       :triggerChange="false"/>
+      </span>
+      <!--       技术参数-->
+      <span slot="technicalparameters" slot-scope="text,record">
+          <a-input :placeholder="$t('ifNot')"></a-input>
+      </span>
+      <!--      操作列-->
       <span slot="operation" slot-scope="text,record">
-          <a class="text-operation" v-if="record.flowType != '10'"
-            @click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
-          <a class="text-operation"
-             @click="viewClick(record)">{{$t('view')}}</a>
-      </span>
-      <span slot="RelatedItems" slot-scope="text,record">
-          <a @click="RelatedItemsClick(record)" :title="text">
-            {{text}}
-          </a>
-      </span>
-      <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
-          {{text}}
-        </a>
-        <span v-else>--</span>
+          <a class="text-operation">{{$t('addcontroller')}}</a>
+          <a class="text-operation">{{$t('delete')}}</a>
       </span>
     </a-table>
-    <div class="page" v-if="dataSource && dataSource.length > 0">
-      <a-pagination
-        :show-total="total => $t('total')+` ${total} `+$t('strip')"
-        show-quick-jumper
-        show-size-changer
-        :page-size.sync="pageSize"
-        :total="total"
-        :current="pageNo"
-        @change="pageOnChange"
-        @showSizeChange="SizeChange"
-      />
+    <div class="bootom-button">
+      <a-button style="margin-right:50px">{{$t('preservation')}}</a-button>
+      <a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
+      <a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
     </div>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
 </template>
 
 <script>
   import { getAction, postAction, deleteAction } from '@/api/manage'
-  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import uploadFile from '@/components/uploadFile/file'
 
   export default {
-    name: 'doneList',
-    mixins:[ResizeHeader, ResizeColumnProvide],
+    name: 'beupgradedonline',
+    components:{
+      uploadFile
+    },
     data() {
       return {
-        dataSource: [],
+        dataSource: [
+          {
+            key:1,
+            functionname:'ceshi',
+          }
+        ],
         loading: false,
-        url: {
-          list: '/todoCenter/projectProcess/doneProcess'
-        },
-        queryParam: {},
+        disable:false,
         columns: [
           {
-            title: this.$t('RelatedItems'),
+            title: this.$t('functionname'),
             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',
+            dataIndex: 'functionname',
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('Sponsor'),
+            title: this.$t('configuration'),
             align: 'left',
-            dataIndex: 'createBy',
+            dataIndex: 'configuration',
+            ellipsis: true,
+            scopedSlots: { customRender: 'configuration' },
+            width: 170
+          },
+          {
+            title: this.$t('whetheritcanbeupgraded'),
+            align: 'left',
+            dataIndex: 'whetheritcanbeupgraded',
+            scopedSlots: { customRender: 'whetheritcanbeupgraded' },
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('CurrentProcessor'),
+            title: this.$t('drivingautomationlevel'),
             align: 'left',
-            dataIndex: 'assigneeName',
+            dataIndex: 'drivingautomationlevel',
+            scopedSlots: { customRender: 'drivingautomationlevel' },
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('TaskCutOffTime'),
+            title: this.$t('technicalparameters'),
             align: 'left',
-            dataIndex: 'endTime',
+            dataIndex: 'technicalparameters',
+            scopedSlots: { customRender: 'technicalparameters' },
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('taskStatus'),
+            title: this.$t('functiondescription'),
             align: 'left',
-            dataIndex: 'statusShow',
+            dataIndex: 'functiondescription',
             ellipsis: true,
             width: 170
           },
+          {
+            title: this.$t('applicationconditions'),
+            align: 'left',
+            dataIndex: 'applicationconditions',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('controllerparameter'),
+            align: 'left',
+            dataIndex: 'controllerparameter',
+            ellipsis: true,
+            width: 170,
+            children: [
+              {
+                title: this.$t('electronic'),
+                align: 'left',
+                dataIndex: 'electronic',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('electroniccontrollerproductionenterprises'),
+                align: 'left',
+                dataIndex: 'electroniccontrollerproductionenterprises',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('electroniccontrollertype'),
+                align: 'left',
+                dataIndex: 'electroniccontrollertypeone',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('hardwareversioninformation'),
+                align: 'left',
+                dataIndex: 'hardwareversioninformation',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('electroniccontrollertype'),
+                align: 'left',
+                dataIndex: 'electroniccontrollertype',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('hardwareversioninformation'),
+                align: 'left',
+                dataIndex: 'hardwareversioninformationone',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('softwaredevelopmententerprise'),
+                align: 'left',
+                dataIndex: 'softwaredevelopmententerprise',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('operatingsystemversion'),
+                align: 'left',
+                dataIndex: 'operatingsystemversion',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('inflammatorydata'),
+                align: 'left',
+                dataIndex: 'inflammatorydata',
+                ellipsis: true,
+                width: 170
+              },
+            ]
+          },
           {
             title: this.$t('operation'),
             align: 'left',
             fixed: 'right',
-            width: 120,
+            width: 200,
             scopedSlots: { customRender: 'operation' }
           }
         ],
-        selectedRowKeys: [],
-        pageSize: 10,
-        pageNo: 1,
-        total: 0
       }
     },
     mounted() {
-      this.getList()
+      // 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 => {
@@ -342,18 +249,55 @@
             this.loading = false
           }
         })
-      }
+      },
+      last(){
+        this.$emit('beupgradedonlineup')
+      },
+      next(){
+        this.$emit('beupgradedonlinedown')
+      },
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push({
+              id:item.id,
+              fileName:item.fileName
+            })
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.fileList.uploadName = attIdList
+        this.fileList.certifyingmaterials = this.$t('viewFile')
+      },
     }
   }
 </script>
 
-<style scoped>
+<style lang='less' scoped>
   @import '~@assets/less/common.less';
-  .page {
-    text-align: right;
-    margin-top: 20px;
+
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
   }
+
+  .bootom-button{
+    text-align: center!important;
+  }
+
   .text-operation{
-     margin-right: 8px;
+    margin-right: 8px;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 100%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  ::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title {
+    white-space: pre-wrap!important;
   }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
index e76e6451d..f59092b64 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
@@ -1,118 +1,148 @@
 <template>
   <div class="box">
+    <div class="table-operator">
+      <div class="operator-text">
+        <a-icon type="import" :rotate="270"/>
+        {{$t('dataimport')}}
+      </div>
+      <div class="operator-text">
+        <a-icon type="download"/>
+        {{$t('templateDownload')}}
+      </div>
+    </div>
     <a-table
       ref="table"
       size="middle"
-      :components="drag(columns,'columns')"
       :loading="loading"
       :pagination="false"
       :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
       rowKey="id"
+      bordered
       :data-source="dataSource"
       :columns="columns"
+      style="margin-bottom: 20px"
     >
-      <!--         -->
-      <span slot="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="havemeasures" slot-scope="text,record">
+                <j-dict-select-tag class="box-input"
+                                   :placeholder="$t('PleaseSelect')"
+                                   :type="'select'"
+                                   :triggerChange="false"/>
       </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="certifyingmaterials" slot-scope="text,record">
+            <a-button type="primary" v-model="record.relevantverification">{{$t('uploadattachment')}}</a-button>
       </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 uploadFile from '@/components/uploadFile/file'
 
   export default {
     name: 'safetyPrecautions',
-    mixins:[ResizeHeader, ResizeColumnProvide],
+    components:{
+      uploadFile
+    },
     data() {
       return {
-        dataSource: [],
+        dataSource: [
+          {
+            key: '1',
+            aspect: this.$t('upgradepacketprotectionmeasures'),
+            safetymeasure: this.$t('authenticityandintegrityprotectionmechanism'),
+            relevantverification: 'havemeasures',
+            certifyingmaterials: this.$t('uploadattachment'),
+          },
+          {
+            key: '2',
+            aspect: this.$t('otaupgradedsecuritymeasuresforvehicles'),
+            safetymeasure: this.$t('failsafmechanism'),
+            relevantverification: 'havemeasures',
+            certifyingmaterials:'',
+          },
+          {
+            key: '3',
+            aspect: '',
+            safetymeasure: this.$t('vehiclesafetyMeasuresafterUpgradefailure'),
+            relevantverification: 'havemeasures',
+            certifyingmaterials:'',
+          },
+          {
+            key: '4',
+            aspect: '',
+            safetymeasure: this.$t('informationsecuritymechanism'),
+            relevantverification: 'havemeasures',
+            certifyingmaterials:'',
+          },
+        ],
         loading: false,
         columns: [
           {
-            title: this.$t('RelatedItems'),
+            title: this.$t('aspect'),
             align: 'left',
-            dataIndex: 'projectName',
-            scopedSlots: { customRender: 'RelatedItems' },
-            ellipsis: true,
-            width: 170
+            dataIndex: 'aspect',
+            customRender: (value, row, index) => {
+              const obj = {
+                children: '',
+                attrs: {},
+              };
+              if(index === 0){   // 第一行数据开始，跨行合并的长度为数据data的长度
+                obj.attrs.rowSpan = 1;
+                obj.children = this.$t('upgradepacketprotectionmeasures')
+              }else if(index === 1){   // 第一行数据开始，跨行合并的长度为数据data的长度
+                obj.attrs.rowSpan = 3;
+                obj.children = this.$t('otaupgradedsecuritymeasuresforvehicles')
+              }else{
+                obj.attrs.rowSpan = 0
+              }
+              return obj
+
+            }
           },
           {
-            title: this.$t('standardInformation'),
+            title: this.$t('safetymeasure'),
             align: 'left',
-            dataIndex: 'standardInfo',
-            scopedSlots: { customRender: 'standardInformation' },
-            ellipsis: true,
-            width: 170
+            dataIndex: 'safetymeasure',
           },
           {
-            title: this.$t('taskType'),
+            title: this.$t('havemeasures'),
             align: 'left',
-            dataIndex: 'flowTypeShow',
-            ellipsis: true,
-            width: 170
+            dataIndex: 'havemeasures',
+            scopedSlots: { customRender: 'havemeasures' },
           },
           {
-            title: this.$t('LastProcessor'),
+            title: this.$t('certifyingmaterials'),
             align: 'left',
-            dataIndex: 'lastAssigneeName',
-            ellipsis: true,
-            width: 170
+            dataIndex: 'certifyingmaterials',
+            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
+
+            }
           },
-          {
-            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,
@@ -128,190 +158,28 @@
       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')
+      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
       },
-      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()
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push({
+              id:item.id,
+              fileName:item.fileName
+            })
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.fileList.uploadName = attIdList
+        this.fileList.certifyingmaterials = this.$t('viewFile')
       },
       getList() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
@@ -333,34 +201,81 @@
               this.getList()
               return
             }
-            this.dataSource = res.result.records || []
-            this.total = res.result.total
             this.loading = false
           } else {
             this.loading = false
           }
         })
-      }
+      },
+      last(){
+        this.$emit('safetyPrecautionsup')
+      },
+      next(){
+        this.$emit('safetyPrecautionsdown')
+      },
     }
   }
 </script>
 
-<style scoped>
+<style lang='less' scoped>
   @import '~@assets/less/common.less';
-  .page {
-    text-align: right;
-    margin-top: 20px;
+
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
   }
 
-  .text-operation {
-    margin-right: 8px;
+  .box-input {
+    display: inline-block;
+    width: 100%;
+    height: 38px;
+    margin-top: 2px;
   }
 
-  /*/deep/.ant-table-column-title{*/
-  /*  font-weight: bold!important;*/
-  /*}*/
+  button{
+    width: 89px;
+    border-radius: 4px;
+    cursor: pointer;
+    background: #00B3BE;
+    height: 30px;
+    border: none;
+    color: white;
+  }
 
-  /*/deep/.ant-table-thead > tr > th {*/
-  /*  background: #f3f6f6;*/
-  /*}*/
+  .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;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
index 26d9d7611..e8ae9052e 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
@@ -1,359 +1,279 @@
 <template>
   <div class="box">
+    <div class="table-operator">
+      <div class="operator-text">
+        <a-icon type="import" :rotate="270"/>
+        {{$t('dataimport')}}
+      </div>
+      <div class="operator-text">
+        <a-icon type="download"/>
+        {{$t('templateDownload')}}
+      </div>
+    </div>
     <a-table
       ref="table"
       size="middle"
-      :components="drag(columns,'columns')"
-      :loading="loading"
       :pagination="false"
       :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
       rowKey="id"
+      bordered
       :data-source="dataSource"
       :columns="columns"
+      style="margin-bottom: 20px"
     >
-      <!--         -->
+<!--      可升级-->
+      <span slot="systemclass" slot-scope="text,record">
+            <a-radio-group>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            </a-radio-group>
+      </span>
+<!--       技术参数-->
+      <span slot="technicalparameters" slot-scope="text,record">
+          <a-input :placeholder="$t('ifNot')"></a-input>
+      </span>
+<!--      上传附件-->
+      <span slot="architecturetopologydiagram" slot-scope="text,record">
+          <a-button @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+      </span>
+<!--      操作列-->
       <span slot="operation" slot-scope="text,record">
-          <a class="text-operation" v-if="record.flowType != '10'"
-            @click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
-          <a class="text-operation"
-             @click="viewClick(record)">{{$t('view')}}</a>
-      </span>
-      <span slot="RelatedItems" slot-scope="text,record">
-          <a @click="RelatedItemsClick(record)" :title="text">
-            {{text}}
-          </a>
-      </span>
-      <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
-          {{text}}
-        </a>
-        <span v-else>--</span>
+          <a class="text-operation">{{$t('addcontroller')}}</a>
+          <a class="text-operation">{{$t('delete')}}</a>
       </span>
     </a-table>
-    <div class="page" v-if="dataSource && dataSource.length > 0">
-      <a-pagination
-        :show-total="total => $t('total')+` ${total} `+$t('strip')"
-        show-quick-jumper
-        show-size-changer
-        :page-size.sync="pageSize"
-        :total="total"
-        :current="pageNo"
-        @change="pageOnChange"
-        @showSizeChange="SizeChange"
-      />
+    <div class="bootom-button">
+      <a-button style="margin-right:50px">{{$t('preservation')}}</a-button>
+      <a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
+      <a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
     </div>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
 </template>
 
 <script>
   import { getAction, postAction, deleteAction } from '@/api/manage'
-  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import uploadFile from '@/components/uploadFile/file'
 
   export default {
-    name: 'doneList',
-    mixins:[ResizeHeader, ResizeColumnProvide],
+    name: 'upgradedonline',
+    components:{
+      uploadFile
+    },
     data() {
       return {
-        dataSource: [],
-        loading: false,
-        url: {
-          list: '/todoCenter/projectProcess/doneProcess'
-        },
-        queryParam: {},
+        dataSource: [
+          {
+            key:1,
+            systemclass: 'ceshi',
+            vaule: 2,
+          }
+          ],
         columns: [
           {
-            title: this.$t('RelatedItems'),
+            title: this.$t('systemclass'),
             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',
+            dataIndex: 'systemclass',
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('Sponsor'),
+            title: this.$t('whetheritcanbeupgraded'),
             align: 'left',
-            dataIndex: 'createBy',
+            dataIndex: 'whetheritcanbeupgraded',
+            scopedSlots: { customRender: 'systemclass' },
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('CurrentProcessor'),
+            title: this.$t('technicalparameters'),
             align: 'left',
-            dataIndex: 'assigneeName',
+            dataIndex: 'technicalparameters',
+            scopedSlots: { customRender: 'technicalparameters' },
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('TaskCutOffTime'),
+            title: this.$t('architecturetopologydiagram'),
             align: 'left',
-            dataIndex: 'endTime',
+            dataIndex: 'architecturetopologydiagram',
+            scopedSlots: { customRender: 'architecturetopologydiagram' },
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('taskStatus'),
+            title: this.$t('controllerparameter'),
             align: 'left',
-            dataIndex: 'statusShow',
+            dataIndex: 'controllerparameter',
             ellipsis: true,
-            width: 170
+            width: 170,
+            children: [
+              {
+                title: this.$t('electronicController'),
+                align: 'left',
+                dataIndex: 'electronicController',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('electroniccontrollername'),
+                align: 'left',
+                dataIndex: 'electroniccontrollername',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('electroniccontrollerproductionenterprises'),
+                align: 'left',
+                dataIndex: 'electroniccontrollerproductionenterprises',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('electroniccontrollertype'),
+                align: 'left',
+                dataIndex: 'electroniccontrollertype',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('hardwareversioninformation'),
+                align: 'left',
+                dataIndex: 'hardwareversioninformation',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('initialsoftwareversionnumber'),
+                align: 'left',
+                dataIndex: 'initialsoftwareversionnumber',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('initialpackageforintegrityinflammatorydata'),
+                align: 'left',
+                dataIndex: 'initialpackageforintegrityinflammatorydata',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('environmentalprotection'),
+                align: 'left',
+                dataIndex: 'environmentalprotection',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('operatingsystemtype'),
+                align: 'left',
+                dataIndex: 'operatingsystemtype',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('operatingsystemmanufacturer'),
+                align: 'left',
+                dataIndex: 'operatingsystemmanufacturer',
+                ellipsis: true,
+                width: 170
+              },
+              {
+                title: this.$t('operatingsystemversion'),
+                align: 'left',
+                dataIndex: 'operatingsystemversion',
+                ellipsis: true,
+                width: 170
+              },
+            ]
           },
           {
             title: this.$t('operation'),
             align: 'left',
             fixed: 'right',
-            width: 120,
+            width: 200,
             scopedSlots: { customRender: 'operation' }
           }
         ],
-        selectedRowKeys: [],
-        pageSize: 10,
-        pageNo: 1,
-        total: 0
       }
     },
     mounted() {
-      this.getList()
+      // 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
-          }
-        })
-      }
+        // let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        // Object.keys(queryParam).forEach(val => {
+        //   if (queryParam[val] instanceof Array) {
+        //     queryParam[val] = queryParam[val].join(',')
+        //   }
+        // })
+        // let query = {
+        //   pageNo: this.pageNo,
+        //   pageSize: this.pageSize,
+        //   ...queryParam
+        // }
+        // this.loading = true
+        // getAction(this.url.list, query).then((res) => {
+        //   if (res.success) {
+        //     if (res.result.current > 1 && res.result.records.length == 0) {
+        //       this.pageNo = 1
+        //       this.getList()
+        //       return
+        //     }
+        //     this.dataSource = res.result.records || []
+        //     this.total = res.result.total
+        //     this.loading = false
+        //   } else {
+        //     this.loading = false
+        //   }
+        // })
+      },
+      last(){
+        this.$emit('upgradedonlineup')
+      },
+      next(){
+        this.$emit('upgradedonlinedown')
+      },
+      uploadSuccess(data) {
+        // let attIdList = []
+        // if (data && data.length > 0) {
+        //   data.map(item => {
+        //     attIdList.push({
+        //       id:item.id,
+        //       fileName:item.fileName
+        //     })
+        //   })
+        // }
+        // /** 赋值给当前对应的表单文件 */
+        // this.fileList.uploadName = attIdList
+        // this.fileList.certifyingmaterials = this.$t('viewFile')
+      },
+      clickButtonToUpload() {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+      },
     }
   }
 </script>
 
 <style scoped>
   @import '~@assets/less/common.less';
-  .page {
-    text-align: right;
-    margin-top: 20px;
+
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
   }
+
+  .bootom-button{
+    text-align: center!important;
+  }
+
   .text-operation{
-     margin-right: 8px;
+    margin-right: 8px;
+  }
+
+  ::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title {
+    white-space: pre-wrap!important;
   }
 </style>
\ No newline at end of file