Merge branch 'dev_2nd_LCYH' of http://git.hzwlsoft.com/laws-nio/laws-weilai into dev_2nd_LCYH

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

@@ -236,8 +236,8 @@
         projectNameList:[],
         formRules:[],
         url: {
-          exportData: '/ota/otaBaCxList/exportData',
-          importZipUrl: '/ota/otaBaCxList/importData',//导入
+          exportData: '/ota/otaBaCxJbxx/exportData',
+          importZipUrl: '/ota/otaBaCxJbxx/importData',//导入
         },
         form:{},
         projectNameList1:['传统动力汽车','节能汽车','新能源汽车','其他'],
@@ -254,7 +254,7 @@
     methods: {
       // 模板下载
       handleModule() {
-        downloadFile('ota/otaBaCxList/exportTemplate', '车型及功能备案' + '.zip', {})
+        downloadFile('ota/otaBaCxJbxx/exportTemplate', '车型及功能备案' + '.zip', {})
       },
       getSelect(){
          getAction('/ota/otaBaCxList/list').then(res=>{

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

@@ -115,8 +115,8 @@ import ImportFile from '@/components/ImportFileData/index'
     data() {
       return {
         url: {
-          exportData: '/ota/otaBaCxList/exportData',
-          importZipUrl: '/ota/otaBaCxList/importData',//导入
+          exportData: '/ota/otaBaCxKsjjsmccs/exportData',
+          importZipUrl: '/ota/otaBaCxKsjjsmccs/importData',//导入
         },
         dataSource: [
           {
@@ -288,7 +288,7 @@ import ImportFile from '@/components/ImportFileData/index'
     methods: {
       // 模板下载
       handleModule() {
-        downloadFile('ota/otaBaCxList/exportTemplate', '车型及功能备案' + '.zip', {})
+        downloadFile('ota/otaBaCxKsjjsmccs/exportTemplate', '车型及功能备案' + '.zip', {})
       },
       getList() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))

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

@@ -20,7 +20,7 @@
     </a-spin>
     <div class="bootom-button">
       <a-button style="margin-right:50px" @click="save">{{$t('preservation')}}</a-button>
-      <a-button type="primary" @click='last' style="margin-right:50px">{{$t('last')}}</a-button>
+      <a-button type="primary" style='margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
       <a-button type="primary" @click='submit'>{{$t('submit')}}</a-button>
     </div>
   </div>
@@ -54,8 +54,6 @@ export default {
         getAction('/ota/otaBaCxQt/queryByOtaId',{otaIdT:localStorage.getItem('otaIdT'),otaId:localStorage.getItem('otaId')}).then(res=>{
           console.log(res);
         })
-      }
-     
       },
     save(){
       this.$refs.ruleForm.validate( valid =>{
@@ -73,8 +71,10 @@ export default {
       this.$emit('otherup')
     },
     submit(){
-     this.save()
+      this.save()
     },
+      },
+
   }
 
 </script>

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

@@ -294,8 +294,8 @@ export default {
     return {
       radioList:9,
       url: {
-        exportData: '/ota/otaBaCxList/exportData',
-        importZipUrl: '/ota/otaBaCxList/importData',//导入
+        exportData: '/ota/otaBaCxJsfzbacs/exportData',
+        importZipUrl: '/ota/otaBaCxJsfzbacs/importData',//导入
       },
       dataSource: [
         {
@@ -763,8 +763,6 @@ export default {
           fillincontent:this.$t('yesisselected'),
         },
       ],
-      url: {
-      },
       queryParam: {},
       dataSourceList: [
         {

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

@@ -57,8 +57,8 @@ import ImportFile from '@/components/ImportFileData/index'
     data() {
       return {
         url: {
-          exportData: '/ota/otaBaCxList/exportData',
-          importZipUrl: '/ota/otaBaCxList/importData',//导入
+          exportData: '/ota/otaBaCxAqcs/exportData',
+          importZipUrl: '/ota/otaBaCxAqcs/importData',//导入
         },
         dataSource: [
           {
@@ -160,9 +160,6 @@ import ImportFile from '@/components/ImportFileData/index'
         pageSize: 10,
         pageNo: 1,
         total: 0,
-        url: {
-          list: '/todoCenter/projectProcess/issuedProcess'
-        },
         queryParam: {}
       }
     },
@@ -173,7 +170,7 @@ import ImportFile from '@/components/ImportFileData/index'
     methods: {
       // 模板下载
       handleModule() {
-        downloadFile('ota/otaBaCxList/exportTemplate', '车型及功能备案' + '.zip', {})
+        downloadFile('ota/otaBaCxAqcs/exportTemplate', '车型及功能备案' + '.zip', {})
       },
       getData(){
           getAction('/ota/otaBaCxAqcs/queryByOtaId',{otaIdT:localStorage.getItem('otaIdT'),otaId:localStorage.getItem('otaId')}).then(res=>{

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

@@ -45,8 +45,8 @@ export default {
   data() {
     return {
       url: {
-        exportData: '/ota/otaBaCxList/exportData',
-        importZipUrl: '/ota/otaBaCxList/importData',//导入
+        exportData: '/ota/otaBaCxZxsjyq/exportData',
+        importZipUrl: '/ota/otaBaCxZxsjyq/importData',//导入
       },
       dataSource: [
         {
@@ -202,7 +202,7 @@ export default {
   methods: {
     // 模板下载
     handleModule() {
-      downloadFile('ota/otaBaCxList/exportTemplate', '车型及功能备案' + '.zip', {})
+      downloadFile('ota/otaBaCxZxsjyq/exportTemplate', '车型及功能备案' + '.zip', {})
     },
     getData(){
       console.log(localStorage.getItem('otaId'));

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

@@ -111,32 +111,38 @@ import ImportFile from '@/components/ImportFileData/index'
     data() {
       return {
         url: {
-          exportData: '/ota/otaBaCxList/exportData',
-          importZipUrl: '/ota/otaBaCxList/importData',//导入
+          exportData: '/ota/otaBaCxKsjxtmccs/exportData',
+          importZipUrl: '/ota/otaBaCxKsjxtmccs/importData',//导入
         },
         dataSource: [
           {
             xtlb:'动力系统',
+            tpt:'',
             key:'1'
           },
           {
             xtlb:'传动系统',
+            tpt:'',
             key:'2'
           },
           {
             xtlb:'转向系统',
+            tpt:'',
             key:'3'
           },
           {
             xtlb:'制动系统',
+            tpt:'',
             key:'4'
           },
           {
             xtlb:'车身系统',
+            tpt:'',
             key:'5'
           },
              {
             xtlb:'车载能源系统',
+            tpt:'',
             key:'6'
           },
           ],
@@ -289,7 +295,7 @@ import ImportFile from '@/components/ImportFileData/index'
     methods: {
       // 模板下载
       handleModule() {
-        downloadFile('ota/otaBaCxList/exportTemplate', '车型及功能备案' + '.zip', {})
+        downloadFile('ota/otaBaCxKsjxtmccs/exportTemplate', '车型及功能备案' + '.zip', {})
       },
       getData(){
           getAction('/ota/otaBaCxKsjxtmccs/queryByOtaId',{otaIdT:localStorage.getItem('otaIdT'),otaId:localStorage.getItem('otaId')}).then(res=>{
@@ -367,21 +373,25 @@ import ImportFile from '@/components/ImportFileData/index'
         this.$emit('upgradedonlinedown')
       },
       uploadSuccess(data) {
-        console.log(data)
         let attIdList = []
         if (data && data.length > 0) {
           data.map(item => {
             attIdList.push(item.id || data.name)
           })
         }
+        this.dataSource.forEach((item) => {
+          if(item.key == this.type){
+            item.tpt = attIdList.join(',')
+          }
+        })
+        this.$forceUpdate()
         // /** 赋值给当前对应的表单文件 */
         // this.fileList.uploadName = attIdList.join(',')
         // this.fileList.certifyingmaterials = this.$t('viewFile')
       },
       clickButtonToUpload(current,index) {
-        console.log(current)
         this.type = index
-        console.log(this.type)
+        console.log(current)
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true
         this.uploadName = current
@@ -397,7 +407,7 @@ import ImportFile from '@/components/ImportFileData/index'
       addlineAtMid(record){
         let randomNum=Math.floor(Math.random()*99999999999+1)
           let obj = {xtlb:record.xtlb,key:randomNum}
-           
+
           this.dataSource.splice(this.dataSource.indexOf(record)+1,0,obj)
       },
       //最后一行加

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

@@ -132,7 +132,7 @@ export default {
       columnshistory: [
         {
           title: this.$t('fillincontent'),
-          dataIndex: 'logContent',
+          dataIndex: 'content',
           align: 'left',
           ellipsis: true,
           scopedSlots: { customRender: 'content' },
@@ -140,7 +140,7 @@ export default {
         },
         {
           title: this.$t('module'),
-          dataIndex: 'remarks',
+          dataIndex: 'module',
           align: 'left',
           ellipsis: true,
           width: 100,
@@ -148,7 +148,7 @@ export default {
         },
         {
           title: this.$t('completedBy'),
-          dataIndex: 'createTime',
+          dataIndex: 'createBy',
           align: 'left',
           ellipsis: true,
           width: 130
@@ -175,17 +175,14 @@ export default {
     },
     fillintherecordClick(){
       this.visible = true
-      return
       this.bussLogList()
     },
     bussLogList(val) {
       let query = {
-        pageNo: this.pageNohistory,
-        pageSize: this.pageSizehistory,
-        paramsReportDetailId: this.paramsReportDetailId
+        otaId:localStorage.getItem('otaId')
       }
       this.loading = true
-      getAction('report/detailLog/page', query).then((res) => {
+      getAction('ota/otaBaCxTxjl/page', query).then((res) => {
         if (res.success) {
           this.dataSourcehistory = res.result.records
           this.total = res.result.total