From 8fa2fd009210f361376e545a635b880a6822f83a Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Sun, 26 Mar 2023 14:22:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5=20=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auxiliaryupgradehavechanged.vue           |  19 +-
 .../components/historicalrecord.vue           | 291 +-----------------
 .../thetargetvehicleofthisupgrade.vue         |  21 +-
 .../components/upgradehavechanged.vue         |  19 +-
 .../components/upgradeimpactassessment.vue    |  19 +-
 .../components/upgradetargetmodel.vue         |  21 +-
 .../components/usernotification.vue           |  21 +-
 .../components/basicInformation.vue           |   2 +-
 .../components/beupgradedonline.vue           |   2 +-
 .../components/recordparameters.vue           |   2 +-
 .../components/safetyPrecautions.vue          |   2 +-
 .../components/upgradeRequirements.vue        |   2 +-
 .../components/upgradedonline.vue             |   2 +-
 13 files changed, 100 insertions(+), 323 deletions(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
index 3b163c85e..3738deba4 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
@@ -3,10 +3,9 @@
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">
-        <a-icon type="import" :rotate="270"/>
-        {{$t('dataimport')}}
+        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
       </div>
-      <div class="operator-text">
+      <div @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
@@ -73,13 +72,15 @@
 </template>
 
 <script>
-import { getAction, postAction, deleteAction } from '@/api/manage'
+import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
+import ImportFile from '@/components/ImportFileData/index'
 import uploadFile from '@/components/uploadFile/file'
 
 export default {
   name: 'beupgradedonline',
   components:{
-    uploadFile
+    uploadFile,
+    ImportFile
   },
   data() {
     return {
@@ -207,12 +208,20 @@ export default {
           scopedSlots: { customRender: 'operation' }
         }
       ],
+      url: {
+        exportData: '/ota/otaBaSjSjfzbh/exportData',
+        importZipUrl: '/ota/otaBaSjSjfzbh/importData',//导入
+      },
     }
   },
   mounted() {
     // this.getList()
   },
   methods: {
+    // 模板下载
+    handleModule() {
+      downloadFile('ota/otaBaSjSjfzbh/exportTemplate', '本次升级的驾驶辅助功能与参数变化' + '.zip', {})
+    },
     getList() {
       let queryParam = JSON.parse(JSON.stringify(this.queryParam))
       Object.keys(queryParam).forEach(val => {
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue
index 976e388e6..e5eda6a0d 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/historicalrecord.vue
@@ -2,29 +2,14 @@
   <div class="box">
     <a-row :gutter="24" style='margin-top: 30px'>
       <a-col :span="24">
-        <div class="box-title-text">
+        <div class="box-title-text" v-for='(item,index) in dataSource'>
           <div class="title-text">
             <span class="dot"></span>
             <span class="title-text-text"
-                  :title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span>
+                  :title="item.sjzt">{{item.sjzt_dictText}}</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>
+              <span class='titlebox-text'>{{item.sjzt_dictText}}</span>
+              <span class='titlebox-text-text'>{{item.updateTime}}</span>
             </div>
           </div>
         </div>
@@ -47,70 +32,7 @@
       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,
@@ -124,213 +46,14 @@
       back(){
         this.$emit('historicalrecordup')
       },
-      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
+          otaId:localStorage.getItem('otaId')
         }
         this.loading = true
-        getAction(this.url.list, query).then((res) => {
+        getAction('ota/otaBaSjLsjl/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.dataSource = res.result || []
             this.loading = false
           } else {
             this.loading = false
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
index ee265b623..5eede7ed2 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
@@ -3,10 +3,9 @@
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">
-        <a-icon type="import" :rotate="270"/>
-        {{$t('dataimport')}}
+        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
       </div>
-      <div class="operator-text">
+      <div @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
@@ -96,25 +95,35 @@
 </template>
 
 <script>
-import { getAction, postAction, deleteAction } from '@/api/manage'
+import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
+import ImportFile from '@/components/ImportFileData/index'
 import moment from 'moment'
 import uploadFile from '@/components/uploadFile/file'
 export default {
   name: 'basicInformation',
   components:{
-    uploadFile
+    uploadFile,
+    ImportFile
   },
   data() {
     return {
       confirmLoading: false,
       disabled: false,
-      formInline:{}
+      formInline:{},
+      url: {
+        exportData: '/ota/otaBaSjSjmbcl/exportData',
+        importZipUrl: '/ota/otaBaSjSjmbcl/importData',//导入
+      },
     }
   },
   mounted() {
     this.getData()
   },
   methods: {
+    // 模板下载
+    handleModule() {
+      downloadFile('ota/otaBaSjSjmbcl/exportTemplate', '本次升级目标车辆' + '.zip', {})
+    },
     getData(){
       let otaIdT=localStorage.getItem('otaIdT')
         if(otaIdT==null){
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
index bdbcc7f03..52ab6db6b 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
@@ -3,10 +3,9 @@
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">
-        <a-icon type="import" :rotate="270"/>
-        {{$t('dataimport')}}
+        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
       </div>
-      <div class="operator-text">
+      <div @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
@@ -72,13 +71,15 @@
 </template>
 
 <script>
-import { getAction, postAction, deleteAction } from '@/api/manage'
+import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
+import ImportFile from '@/components/ImportFileData/index'
 import uploadFile from '@/components/uploadFile/file'
 
 export default {
   name: 'beupgradedonline',
   components:{
-    uploadFile
+    uploadFile,
+    ImportFile
   },
   data() {
     return {
@@ -217,12 +218,20 @@ export default {
           scopedSlots: { customRender: 'operation' }
         }
       ],
+      url: {
+        exportData: '/ota/otaBaSjSjxtbh/exportData',
+        importZipUrl: '/ota/otaBaSjSjxtbh/importData',//导入
+      },
     }
   },
   mounted() {
     // this.getList()
   },
   methods: {
+    // 模板下载
+    handleModule() {
+      downloadFile('ota/otaBaSjSjxtbh/exportTemplate', '本次升级的系统名称与参数变化' + '.zip', {})
+    },
     clickButtonToUpload(item) {
       this.$refs.uploadFile.perentHandleFunc()
       this.$refs.uploadFile.visible = true
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
index 2c847b969..7a51eb5b3 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
@@ -3,10 +3,9 @@
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">
-        <a-icon type="import" :rotate="270"/>
-        {{$t('dataimport')}}
+        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
       </div>
-      <div class="operator-text">
+      <div @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
@@ -139,13 +138,15 @@
 </template>
 
 <script>
-import { getAction, postAction, deleteAction } from '@/api/manage'
+import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
+import ImportFile from '@/components/ImportFileData/index'
 import uploadFile from '@/components/uploadFile/file'
 
 export default {
   name: 'beupgradedonline',
   components:{
-    uploadFile
+    uploadFile,
+    ImportFile
   },
   data() {
     return {
@@ -155,6 +156,10 @@ export default {
           functionname:'ceshi',
         }
       ],
+      url: {
+        exportData: '/ota/otaBaSjSjyxpg/exportData',
+        importZipUrl: '/ota/otaBaSjSjyxpg/importData',//导入
+      },
       loading: false,
       disable:false,
       columns: [
@@ -290,6 +295,10 @@ export default {
     // this.getList()
   },
   methods: {
+    // 模板下载
+    handleModule() {
+      downloadFile('ota/otaBaSjSjyxpg/exportTemplate', '升级影响评估' + '.zip', {})
+    },
     clickButtonToUpload(item) {
       this.$refs.uploadFile.perentHandleFunc()
       this.$refs.uploadFile.visible = true
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
index 703fbcf2f..a23e260d7 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
@@ -3,10 +3,9 @@
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">
-        <a-icon type="import" :rotate="270"/>
-        {{$t('dataimport')}}
+        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
       </div>
-      <div class="operator-text">
+      <div @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
@@ -36,7 +35,7 @@
               </div>
               <div class="title-text-add-input">
                 <!-- <span class="title-text-text">中文</span> -->
-                <a-input class="box-input" v-model="form.babh"   :placeholder="$t('pleaseEnter')" disabled style="width:100%"></a-input>
+                <a-input class="box-input" v-model="form.babh" :placeholder="$t('pleaseEnter')" disabled style="width:93%"></a-input>
               </div>
             </div>
           </a-col>
@@ -47,7 +46,7 @@
               </div>
               <div class="title-text-add-input">
                 <!-- <span class="title-text-text">中文</span> -->
-                <a-input class="box-input"  v-model="form.qymc"  :placeholder="$t('pleaseEnter')" disabled style="width:100%"></a-input>
+                <a-input class="box-input"  v-model="form.qymc" :placeholder="$t('pleaseEnter')" disabled style="width:93%"></a-input>
               </div>
             </div>
           </a-col>
@@ -159,17 +158,23 @@
 </template>
 
 <script>
-  import { getAction, postAction, deleteAction } from '@/api/manage'
+import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
+import ImportFile from '@/components/ImportFileData/index'
 
   export default {
     name: 'basicInformation',
     components:{
+      ImportFile
     },
     data() {
       return {
         confirmLoading: false,
         disabled: false,
         form:{},
+        url: {
+          exportData: '/ota/otaBaSjSjmbcx/exportData',
+          importZipUrl: '/ota/otaBaSjSjmbcx/importData',//导入
+        },
         projectNameList1:['传统动力汽车','节能汽车','新能源汽车','其他'],
         projectNameList2:[],
       }
@@ -179,6 +184,10 @@
     },
     
     methods: {
+      // 模板下载
+      handleModule() {
+        downloadFile('ota/otaBaSjSjmbcx/exportTemplate', '升级目标车型' + '.zip', {})
+      },
       getData(){
       let otaIdT=localStorage.getItem('otaIdT')
         if(otaIdT==null){
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
index d8bcee843..ee65f5406 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
@@ -3,10 +3,9 @@
   <div class="box">
     <div class="table-operator">
       <div class="operator-text">
-        <a-icon type="import" :rotate="270"/>
-        {{$t('dataimport')}}
+        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
       </div>
-      <div class="operator-text">
+      <div @click='handleModule' class="operator-text">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
@@ -95,24 +94,34 @@
 </template>
 
 <script>
-import { getAction, postAction, deleteAction } from '@/api/manage'
+import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
+import ImportFile from '@/components/ImportFileData/index'
 import moment from 'moment'
 
 export default {
   name: 'basicInformation',
   components:{
+    ImportFile
   },
   data() {
     return {
       confirmLoading: false,
       disabled: false,
-      formInline:{}
+      formInline:{},
+      url: {
+        exportData: '/ota/otaBaSjGgnrfs/exportData',
+        importZipUrl: '/ota/otaBaSjGgnrfs/importData',//导入
+      },
     }
   },
   mounted() {
 
   },
-  methods: {
+  methods: {// 模板下载
+    handleModule() {
+      downloadFile('ota/otaBaSjGgnrfs/exportTemplate', '用户告知内容及方式' + '.zip', {})
+    },
+
     next(){
       this.$emit('recordparametersdown')
     },
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
index da71562f8..256f252a9 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
@@ -276,7 +276,7 @@ import { message } from 'ant-design-vue'
       },
       // 模板下载
       handleModule() {
-        downloadFile('ota/otaBaCxJbxx/exportTemplate', '车型及功能备案' + '.zip', {})
+        downloadFile('ota/otaBaCxJbxx/exportTemplate', '车型基本信息' + '.zip', {})
       },
       getSelect(){
          getAction('/ota/otaBaCxList/list').then(res=>{
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
index 2756441f0..800c3ef73 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
@@ -294,7 +294,7 @@ import ImportFile from '@/components/ImportFileData/index'
     methods: {
       // 模板下载
       handleModule() {
-        downloadFile('ota/otaBaCxKsjjsmccs/exportTemplate', '车型及功能备案' + '.zip', {})
+        downloadFile('ota/otaBaCxKsjjsmccs/exportTemplate', '可在线升级的驾驶辅助功能名称与参数' + '.zip', {})
       },
       clickButtonToUpload(item) {
       this.$refs.uploadFile.perentHandleFunc()
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
index 964bd6a36..ebd14e91e 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
@@ -863,7 +863,7 @@ export default {
   methods: {
     // 模板下载
     handleModule() {
-      downloadFile('ota/otaBaCxList/exportTemplate', '车型及功能备案' + '.zip', {})
+      downloadFile('ota/otaBaCxList/exportTemplate', '驾驶辅助系统基础备案参数' + '.zip', {})
     },
     getData(){
       if(this.$route.query.type == 1){
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
index ce1d9efe7..43fd556fa 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
@@ -187,7 +187,7 @@ import ImportFile from '@/components/ImportFileData/index'
       // 模板下载
       
       handleModule() {
-        downloadFile('ota/otaBaCxAqcs/exportTemplate', '车型及功能备案' + '.zip', {})
+        downloadFile('ota/otaBaCxAqcs/exportTemplate', '安全措施' + '.zip', {})
       },
       getData(){
         let otaIdT=localStorage.getItem('otaIdT')
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
index 335b566a8..e73c5b7c5 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
@@ -202,7 +202,7 @@ export default {
   methods: {
     // 模板下载
     handleModule() {
-      downloadFile('ota/otaBaCxZxsjyq/exportTemplate', '车型及功能备案' + '.zip', {})
+      downloadFile('ota/otaBaCxZxsjyq/exportTemplate', '在线升级要求' + '.zip', {})
     },
     getData(){
       console.log(localStorage.getItem('otaId'));
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
index 9bb282ee3..f009851ba 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
@@ -302,7 +302,7 @@ import uploadFileOta from '@/components/uploadFileOta/file'
     methods: {
       // 模板下载
       handleModule() {
-        downloadFile('ota/otaBaCxKsjxtmccs/exportTemplate', '车型及功能备案' + '.zip', {})
+        downloadFile('ota/otaBaCxKsjxtmccs/exportTemplate', '可在线升级的系统名称与参数' + '.zip', {})
       },
       getData(){
         let otaIdT=localStorage.getItem('otaIdT')

From fc6e6a04aafb3b68665a05987135e5dff85ee14a Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Sun, 26 Mar 2023 14:36:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=A4=87=E6=A1=88=E7=BB=B4=E6=8A=A4=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/maintenance.vue                | 33 ++++++++++++++-----
 .../otamanagement/upgradeactivity/index.vue   |  2 +-
 .../components/upgradetargetmodel.vue         |  2 +-
 .../components/maintenance.vue                |  2 +-
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue
index 14f819761..75237d8fc 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue
@@ -14,11 +14,11 @@
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
-              <!--              <span class="Required">*</span>-->
+                            <span class="Required">*</span>
               <span class="title-text-text" :title="$t('recordstatus')">
                 {{$t('recordstatus')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="recordstatus">
+            <a-form-model-item class="itemModel" prop="bazt">
               <j-dict-select-tag class="box-input" v-model="formInline.bazt"
                                  :placeholder="$t('PleaseSelect')+$t('recordstatus')"
                                  :type="'select'"
@@ -29,11 +29,11 @@
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
-              <!--              <span class="Required">*</span>-->
+                            <span class="Required">*</span>
               <span class="title-text-text" :title="$t('filingtime')">
                 {{$t('filingtime')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="filingtime">
+            <a-form-model-item class="itemModel" prop="batjsj">
               <a-date-picker class="box-input"
                              :placeholder="$t('PleaseSelect')+$t('filingtime')"
                              @change="dateChange({db_field_name:'batjsj'})"
@@ -76,9 +76,25 @@ export default {
       visible: false,
       confirmLoading: false,
       formInline: {
+        bazt:'',
         batjsj:'',
+        bz:'',
       },
       rules: {
+        bazt: [
+          {
+            required: true,
+            message: this.$t('recordstatus') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
+        batjsj: [
+          {
+            required: true,
+            message: this.$t('filingtime') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
         // listConfirmation: [
         //   {
         //     required: true,
@@ -139,7 +155,7 @@ export default {
       if(row instanceof Array){
         this.ids = row.join(',')
       }else{
-        this.formInline.bazt = row.bazt
+        this.formInline.bazt = row.bazt ? row.bazt : undefined
         this.formInline.batjsj = row.batjsj
         this.formInline.bz = row.bz
         this.ids = row.id
@@ -154,7 +170,7 @@ export default {
         if (valid) {
           let query = {
             ...this.formInline,
-            ids:this.ids.join(',')
+            ids:this.ids
           }
           this.confirmLoading = true
           postAction('ota/otaBaSjList/batchRecord', query).then((res) => {
@@ -173,8 +189,9 @@ export default {
     },
     handleCancel() {
       this.formInline = {
-        batjsj:''
-      }
+        bazt:'',
+        batjsj:'',
+        bz:'',}
       this.ids = ''
       this.visible = false
     },
diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
index caba67e40..7ac514e96 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
@@ -274,7 +274,7 @@ export default {
           align: 'left',
           width: 140,
           ellipsis: true,
-          dataIndex: 'bazt'
+          dataIndex: 'bazt_dictText'
         },
         {
           title: this.$t('filingtime'),
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
index a23e260d7..29edf304f 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
@@ -132,7 +132,7 @@
                     </a-select-option>
                   </a-select>
               </a-form-model-item>
-              <a-form-model-item class="itemModel" style="width: 40%;margin-left:20px">
+              <a-form-model-item class="itemModel" style="width: 40%;margin-left:-9px">
                 <a-select v-model="form.dllx2" class="box-input" :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="update">
                   <a-select-option v-for="(item, key) in projectNameList2"
                                    :key="key"
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
index 03eca8753..98267cd05 100644
--- a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
+++ b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
@@ -140,7 +140,7 @@ export default {
       if(row instanceof Array){
         this.ids = row.join(',')
       }else{
-        this.formInline.bazt = row.bazt
+        this.formInline.bazt = row.bazt ? row.bazt : undefined
         this.formInline.batjsj = row.batjsj
         this.formInline.bz = row.bz
         this.ids = row.id