ota查看修改

jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue

@@ -185,9 +185,9 @@
                 <span class="title-text-text" :title="$t('communicationTerminal')">{{$t('communicationTerminal')}}</span>
               </div>
               <a-form-model-item class="itemModel">
-                <j-dict-select-tag class="box-input"
+                <j-multi-select-tag class="box-input"
                                    :disabled="disabled"
-                                   dictCode="communication_terminal"
+                                   :dictCode="'communication_terminal'"
                                    :placeholder="$t('PleaseSelect')"
                                    :type="'select'"
                                    :triggerChange="false"
@@ -242,7 +242,9 @@ import { message } from 'ant-design-vue'
           exportData: '/ota/otaBaCxJbxx/exportData',
           importZipUrl: '/ota/otaBaCxJbxx/importData',//导入
         },
-        form:{},
+        form:{
+          txzd:''
+        },
         projectNameList1:['传统动力汽车','节能汽车','新能源汽车','其他'],
         projectNameList2:[],
         selectList:[],
@@ -270,9 +272,6 @@ import { message } from 'ant-design-vue'
        localStorage.setItem('otaIdT',value)
       
        this.$forceUpdate()
-        if(this.$route.query.type == 1){
-          return
-        }
        this.getData()
       },
       // 模板下载
@@ -299,9 +298,6 @@ import { message } from 'ant-design-vue'
          })
       },
       getData(){
-        if(this.$route.query.type == 1){
-          return
-        }
         let otaIdT=localStorage.getItem('otaIdT')
         if(otaIdT==null){
           otaIdT=''

jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue

@@ -88,8 +88,8 @@
       </span>
     </a-table>
     <div>
-      <a-button @click="clickButtonToUpload('fileKey')" type="primary">  {{ (formInline.fileKey === 'null' || formInline.fileKey === '' ||
+      <a-button @click="clickButtonToUpload(fileList)" type="primary">  {{ (fileList === 'null' || fileList === '' ||
-                        formInline.fileKey == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+        fileList == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                         }}</a-button>
       <p>注:附件包括测试项目清单、测试报告．测试标准或技术规范</p> 
       <p>&nbsp;&nbsp;&nbsp;&nbsp;支持doc/docx/pdf格式,大小50M以内</p>
@@ -296,39 +296,11 @@ import ImportFile from '@/components/ImportFileData/index'
       handleModule() {
         downloadFile('ota/otaBaCxKsjjsmccs/exportTemplate', '车型及功能备案' + '.zip', {})
       },
-      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
-          }
-        })
-      },
       clickButtonToUpload(item) {
       this.$refs.uploadFile.perentHandleFunc()
       this.$refs.uploadFile.visible = true
       this.uploadName = item
-      getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+      getAction('sys/common/getFileInfos', { id: item }).then((res) => {
         if (res.success) {
           this.$refs.uploadFile.perentHandleFunc(res.result)
         } else {

jero-web/src/views/otamanagement/vehicleinformation/components/other.vue

@@ -81,6 +81,10 @@ export default {
     },
     submit(){
       this.save()
+      this.$router.push({
+        path: '/vehicleregistration',
+        query: {}
+      })
     },
       },
 

jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue

@@ -934,26 +934,6 @@ export default {
       this.fileList.uploadName = attIdList
       this.fileList.certifyingmaterials = this.$t('viewFile')
     },
-    getList() {
-      let queryParam = JSON.parse(JSON.stringify(this.queryParam))
-      Object.keys(queryParam).forEach(val => {
-        if (queryParam[val] instanceof Array) {
-          queryParam[val] = queryParam[val].join(',')
-        }
-      })
-      let query = {
-        ...queryParam
-      }
-      getAction(this.url.list, query).then((res) => {
-        if (res.success) {
-          if (res.result.current > 1 && res.result.records.length == 0) {
-            this.getList()
-            return
-          }
-        } else {
-        }
-      })
-    },
     save(){
       let arr =[]
       this.dataSource.map(item=>{

jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue

@@ -22,12 +22,12 @@
       style="margin-bottom: 20px"
     >
       <span slot="havemeasures" slot-scope="text,record">
-                <j-dict-select-tag class="box-input"
+                <j-multi-select-tag class="box-input"
                 v-model="record.info"
                 @change="update"
                 :placeholder="$t('PleaseSelect')"
                 :type="'select'"
-                dictCode="driving_automation_level"
+                :dictCode="record.dictCode"
                 :triggerChange="false"/>
       </span>
       <span slot="certifyingmaterials" slot-scope="text,record">
@@ -190,9 +190,6 @@ import ImportFile from '@/components/ImportFileData/index'
         downloadFile('ota/otaBaCxAqcs/exportTemplate', '车型及功能备案' + '.zip', {})
       },
       getData(){
-        if(this.$route.query.type == 1){
-          return
-        }
         let otaIdT=localStorage.getItem('otaIdT')
         if(otaIdT==null){
           otaIdT=''
@@ -200,10 +197,11 @@ import ImportFile from '@/components/ImportFileData/index'
           getAction('/ota/otaBaCxAqcs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{
          if(res.code == 200){
       
-         this.dataSource[0].info = Number(res.result.bhjz) == 0 ? undefined :Number(res.result.bhjz)
+         this.dataSource[0].info = res.result.bhjz
-          this.dataSource[1].info =Number(res.result.fsxjz)== 0 ? undefined :Number(res.result.fsxjz)
+          this.dataSource[1].info =res.result.fsxjz
-          this.dataSource[2].info= Number(res.result.sjsbcs)== 0 ? undefined :Number(res.result.sjsbcs)
+          // this.dataSource[2].info= Number(res.result.sjsbcs)== 0 ? undefined :Number(res.result.sjsbcs)
-          this.dataSource[3].info=Number(res.result.xxaqjz)== 0 ? undefined :Number(res.result.xxaqjz)
+          this.dataSource[2].info= res.result.sjsbcs
+          this.dataSource[3].info= res.result.xxaqjz
            this.fileList.uploadName = res.result.zmclList
            this.fileList.certifyingmaterials = this.$t('viewFile')
            this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName)
@@ -236,32 +234,6 @@ import ImportFile from '@/components/ImportFileData/index'
 
         this.$refs.uploadFile.visible = true
       },
-      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.loading = false
-          } else {
-            this.loading = false
-          }
-        })
-      },
       save(){
         let obj={}
         obj.otaId=localStorage.getItem('otaId'),

jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue

@@ -205,9 +205,6 @@ export default {
       downloadFile('ota/otaBaCxZxsjyq/exportTemplate', '车型及功能备案' + '.zip', {})
     },
     getData(){
-      if(this.$route.query.type == 1){
-          return
-        }
       console.log(localStorage.getItem('otaId'));
       let otaIdT=localStorage.getItem('otaIdT')
       if(otaIdT==null){

jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue

@@ -305,9 +305,6 @@ import uploadFileOta from '@/components/uploadFileOta/file'
         downloadFile('ota/otaBaCxKsjxtmccs/exportTemplate', '车型及功能备案' + '.zip', {})
       },
       getData(){
-        if(this.$route.query.type == 1){
-          return
-        }
         let otaIdT=localStorage.getItem('otaIdT')
         if(otaIdT==null){
           otaIdT=''

jero-web/src/views/otamanagement/vehicleinformation/index.vue

@@ -179,6 +179,8 @@ export default {
     },
     bussLogList(val) {
       let query = {
+        pageNo: this.pageNohistory,
+        pageSize: this.pageSizehistory,
         otaId:localStorage.getItem('otaId')
       }
       this.loading = true

jero-web/src/views/otamanagement/vehicleregistration/index.vue

@@ -383,9 +383,7 @@ export default {
       localStorage.removeItem('otaIdT')
       this.$router.push({
         path: '/vehicleinformation',
-        query: {
+        query: {}
-          type:1,
-        }
       })
     },
     viewProcessClick(row) {