OTA管理工具-车型基本信息-在线升级要求

jero-web/src/common/lang/en-us.js

@@ -1671,5 +1671,12 @@ module.exports = {
   thePersonResponsibleForDesignCannotBeBlank:'The person responsible for designing the compliance process cannot be empty',
   recordmaintenance:'Record maintenance',
   module:'module',
-
+  selectTheVehicleTemplate:'Select the vehicle template',
+  theNameOfFirm:'The name of firm',
+  productClass:'Product class',
+  communicationTerminal:'Communication terminal (optional)',
+  otaUpgradeManagementSystem:'OTA upgrade management system',
+  pleaseStateTheDistribution:'Please describe the integration and distribution of the management system and electronic controller',
+  next:'Next',
+  last:'Last',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1769,6 +1769,14 @@ module.exports = {
   theDeadlineComplianceProcessCannotEmpty:'验证符合性流程的截止时间不能为空',
   theDeadlineForTheDesignCannotBeEmpty:'设计符合性流程的截止时间不能为空',
   thePersonResponsibleForDesignCannotBeBlank:'设计符合性流程的责任人不能为空',
+  selectTheVehicleTemplate:'选择车型模板',
+  theNameOfFirm:'企业名称',
+  productClass:'产品类别',
+  communicationTerminal:'通信终端（可多选）',
+  otaUpgradeManagementSystem:'车端OTA升级管理系统',
+  pleaseStateTheDistribution:'请说明管理系统与电子控制器的集成与分布情况',
+  next:'下一步',
+  last:'上一步',
   recordmaintenance:'备案维护',
   module:'模块',
 }

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

@@ -48,7 +48,7 @@
   import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
-    name: 'SentList',
+    name: 'safetyPrecautions',
     mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {

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

@@ -1,319 +1,232 @@
 <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"
+      rowKey="key"
+      bordered
       :data-source="dataSource"
       :columns="columns"
+      style="margin-bottom: 20px"
     >
-      <!--         -->
+
-      <span slot="operation" slot-scope="text,record">
+      <span slot="relevantverification" slot-scope="text,record">
-          <a class="text-operation" v-if="record.flowType != '10'"
+            <a-radio-group v-model="record.relevantverification">
-            @click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
+                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-          <a class="text-operation"
+                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-             @click="viewClick(record)">{{$t('view')}}</a>
+            </a-radio-group>
       </span>
-      <span slot="RelatedItems" slot-scope="text,record">
+      <span slot="certifyingmaterials" slot-scope="text,record">
-          <a @click="RelatedItemsClick(record)" :title="text">
+            <a-button type="primary" v-model="record.relevantverification">{{$t('uploadattachment')}}</a-button>
-            {{text}}
-          </a>
-      </span>
-      <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
-          {{text}}
-        </a>
-        <span v-else>--</span>
       </span>
     </a-table>
-    <div class="page" v-if="dataSource && dataSource.length > 0">
+    <div class="bootom-button">
-      <a-pagination
+      <a-button class='btn'>{{$t('preservation')}}</a-button>
-        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+      <a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
-        show-quick-jumper
+      <a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
-        show-size-changer
-        :page-size.sync="pageSize"
-        :total="total"
-        :current="pageNo"
-        @change="pageOnChange"
-        @showSizeChange="SizeChange"
-      />
     </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',
+    name: 'upgradeRequirements',
-    mixins:[ResizeHeader, ResizeColumnProvide],
+    components:{
+      uploadFile
+    },
     data() {
       return {
-        dataSource: [],
+        dataSource: [
-        loading: false,
+          {
+            key: '1',
+            onlineupgraderequirements: this.$t('networksecurityrequirements'),
+            specificrequirements: this.$t('ineffectiveupgrades'),
+            relevantverification: '',
+            certifyingmaterials:this.$t('uploadattachment'),
+          },
+          {
+            key: '2',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('againstunauthorized'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+          {
+            key: '3',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('communicationinterfacethathasateastusedastandard'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+          {
+            key: '4',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('softwareupgrade'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+          {
+            key: '5',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('Ensurethatsoftware'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+          {
+            key: '6',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('ifanupgrademayaffectvehiclesafety'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+          {
+            key: '7',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('iftheimplementationoftheupgradaffectsdrivingsafety'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+          {
+            key: '8',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('ensurethatthevehicleisinasafecondition'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+          {
+            key: '9',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('priortotheexecutionoftheupgrade'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+          {
+            key: '10',
+            onlineupgraderequirements:'',
+            specificrequirements: this.$t('afterperformingtheupgrade'),
+            relevantverification: '',
+            certifyingmaterials:'',
+          },
+        ],
         url: {
-          list: '/todoCenter/projectProcess/doneProcess'
         },
         queryParam: {},
         columns: [
           {
-            title: this.$t('RelatedItems'),
+            title: this.$t('onlineupgraderequirements'),
             align: 'left',
-            dataIndex: 'projectName',
+            dataIndex: 'onlineupgraderequirements',
-            ellipsis: true,
+            width: 170,
-            scopedSlots: { customRender: 'RelatedItems' },
+            customRender: (value, row, index) => {
-            width: 170
+              const obj = {
+                children: '',
+                attrs: {},
+              };
+              if(index === 0){   // 第一行数据开始，跨行合并的长度为数据data的长度
+                obj.attrs.rowSpan = 2;
+                obj.children = this.$t('networksecurityrequirements')
+              }else if(index === 2){   // 第一行数据开始，跨行合并的长度为数据data的长度
+                obj.attrs.rowSpan = 6;
+                obj.children = this.$t('upgradefunctionrequirements')
+              }else if(index === 8){
+                obj.attrs.rowSpan = 2;
+                obj.children = this.$t('usernotificationrequirement')
+              }else{
+                obj.attrs.rowSpan = 0
+              }
+              return obj;
+            }
           },
           {
-            title: this.$t('standardInformation'),
+            title: this.$t('specificrequirements'),
             align: 'left',
-            dataIndex: 'standardInfo',
+            dataIndex: 'specificrequirements',
-            ellipsis: true,
-            scopedSlots: { customRender: 'standardInformation' },
-            width: 170
           },
           {
-            title: this.$t('taskType'),
+            title: this.$t('relevantverification'),
             align: 'left',
-            dataIndex: 'flowTypeShow',
+            dataIndex: 'relevantverification',
+            scopedSlots: { customRender: 'relevantverification' },
             ellipsis: true,
             width: 170
           },
           {
-            title: this.$t('Sponsor'),
+            title: this.$t('certifyingmaterials'),
             align: 'left',
-            dataIndex: 'createBy',
+            dataIndex: 'certifyingmaterials',
+            scopedSlots: { customRender: 'certifyingmaterials' },
             ellipsis: true,
-            width: 170
+            width: 170,
+            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,
+        fileList:{},
-        pageNo: 1,
-        total: 0
       }
     },
     mounted() {
-      this.getList()
+      // this.getList()
     },
     methods: {
-      monitoringProcessClick(row){
+      click(value){
-        let newUrl = this.$router.resolve({
+        this.fileList = value
-          path: '/processDetails',
+        console.log(this.fileList)
-          query: {
+        if(this.fileList.uploadName){
-            prcNum: row.prcNum,
+          this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName)
-            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')
         }
+
+          this.$refs.uploadFile.visible = true
       },
-      searchQuery(value) {
+      uploadSuccess(data) {
-        this.queryParam = value
+        let attIdList = []
-        this.pageNo = 1
+        if (data && data.length > 0) {
-        this.getList()
+          data.map(item => {
-      },
+            attIdList.push({
-      searchReset() {
+              id:item.id,
-        this.queryParam = {}
+              fileName:item.fileName
-        this.pageNo = 1
+            })
-        this.getList()
+          })
-      },
+        }
-      pageOnChange(page) {
+        /** 赋值给当前对应的表单文件 */
-        this.pageNo = page
+        this.fileList.uploadName = attIdList
-        this.getList()
+        this.fileList.certifyingmaterials = this.$t('viewFile')
-      },
-      SizeChange(page, pageSize) {
-        this.pageNo = 1
-        this.pageSize = pageSize
-        this.getList()
       },
       getList() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
@@ -323,25 +236,23 @@
           }
         })
         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('upgradeRequirementsup')
+      },
+      next(){
+        this.$emit('upgradeRequirementsdown')
       }
     }
   }
@@ -349,11 +260,54 @@
 
 <style scoped>
   @import '~@assets/less/common.less';
-  .page {
+
-    text-align: right;
+  .box {
-    margin-top: 20px;
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
   }
-  .text-operation{
+
-     margin-right: 8px;
+  button{
+    width: 89px;
+    border-radius: 4px;
+    cursor: pointer;
+    background: #00B3BE;
+    height: 30px;
+    border: none;
+    color: white;
+  }
+
+  .bootom-button{
+    text-align: center!important;
+  }
+  .btn{
+    width: 63px !important;
+    margin-right:50px;
+    line-height: 1.499;
+    position: relative;
+    display: inline-block;
+    font-weight: 400;
+    white-space: nowrap;
+    text-align: center;
+    background-image: none;
+    border: 1px solid transparent;
+    box-shadow: 0 2px 0 rgba(0, 0, 0, 0.015);
+    cursor: pointer;
+    transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    -ms-touch-action: manipulation;
+    touch-action: manipulation;
+    height: 32px;
+    padding: 0 15px;
+    font-size: 14px;
+    border-radius: 4px;
+    color: #040B29;
+    background-color: #fff;
+    border-color: #d9d9d9;
+  }
+  .btn:hover{
+    color: #00B3BE;
+    border-color: #00B3BE;
   }
 </style>

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

@@ -7,20 +7,20 @@
         {{$t('fillintherecord')}}
       </div>
     </div>
-    <a-tabs v-model="tabActive" @change="callback">
+    <a-tabs class="tabs" v-model="tabActive" @change="callback">
       <a-tab-pane :key="$t('basicinformationofvehicletype')" :tab="$t('basicinformationofvehicletype')">
         <basicInformation v-if="tabActive == $t('basicinformationofvehicletype')" @basicInformationForm='basicInformationForm' ref="dealtWithRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('onlineupgraderequirements')" :tab="$t('onlineupgraderequirements')">
+      <a-tab-pane :key="$t('onlineupgraderequirements')"  :tab="$t('onlineupgraderequirements')">
         <upgradeRequirements v-if="tabActive == $t('onlineupgraderequirements')" @upgradeRequirementsup='upgradeRequirementsup' @upgradeRequirementsdown='upgradeRequirementsdown' ref="doneListRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('safetymeasure')" disabled :tab="$t('safetymeasure')">
+      <a-tab-pane :key="$t('safetymeasure')"  :tab="$t('safetymeasure')">
         <safetyPrecautions v-if="tabActive == $t('safetymeasure')" @safetyPrecautionsup='safetyPrecautionsup' @safetyPrecautionsdown='safetyPrecautionsdown' ref="SentListRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('upgradedonline')" :tab="$t('upgradedonline')">
+      <a-tab-pane :key="$t('upgradedonline')"  :tab="$t('upgradedonline')">
         <upgradedonline v-if="tabActive == $t('upgradedonline')" @upgradedonlineup='upgradedonlineup' @upgradedonlinedown='upgradedonlinedown' ref="upgradedonlineRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('beupgradedonline')" :tab="$t('beupgradedonline')">
+      <a-tab-pane :key="$t('beupgradedonline')"  :tab="$t('beupgradedonline')">
         <beupgradedonline v-if="tabActive == $t('beupgradedonline')" @beupgradedonlineup='beupgradedonlineup' @beupgradedonlinedown='beupgradedonlinedown' ref="beupgradedonlineRef"/>
       </a-tab-pane>
       <a-tab-pane :key="$t('recordparameters')" :tab="$t('recordparameters')">
@@ -329,4 +329,8 @@ export default {
 ::v-deep .ant-table-placeholder {
   margin-top: 8px !important;
 }
+
+::v-deep .tabs .ant-tabs-nav .ant-tabs-tab-disabled, .ant-tabs-nav .ant-tabs-tab-disabled:hover{
+  color: #333333 !important;
+}
 </style>