From 658141010d82ce2ff402e5b1538e01eb5a49ae93 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 29 Mar 2023 10:51:49 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=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

---
 jero-web/src/common/lang/en-us.js             |   1 +
 jero-web/src/common/lang/zh-cn.js             |   1 +
 .../upgradeactivity/components/gnxtwh.vue     | 110 ++++++++++++++----
 3 files changed, 90 insertions(+), 22 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 18121d70b..8a2f611e0 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1734,4 +1734,5 @@ module.exports = {
   gnxtwh:'Functional system maintenance',
   gnxt:'Functional system',
   dykzq:'Corresponding controller',
+  nomorethan:'No more than 10',
 }
\ 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 2f643ba49..c50b848cf 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1836,4 +1836,5 @@ module.exports = {
   gnxtwh:'功能系统维护',
   gnxt:'功能系统',
   dykzq:'对应控制器',
+  nomorethan:'不能超过10个',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
index 1cf59e6b4..4a73f8b06 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
@@ -28,7 +28,7 @@
       >
         <span slot="detailText" slot-scope="text,record">
                   <span class="text" :title="text">
-                   {{text && text.length > 10?text.slice(0,9)+'...':text}}
+                   {{text && text.length > 100?text.slice(0,99)+'...':text}}
                   </span>
             </span>
         <span slot="operation" slot-scope="text,record">
@@ -58,7 +58,7 @@
       </div>
     </a-drawer>
     <a-modal
-      :title="$t('newlyAdded')"
+      :title="title"
       :width="600"
       :visible="visibleadd"
       :confirm-loading="confirmLoading"
@@ -66,7 +66,7 @@
       @ok="handleaddOk"
       @cancel="handleaddCancel"
     >
-      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm" style='margin-left: -40px'>
         <a-row :gutter="24">
           <a-col :span="24">
             <div class="box-title-text">
@@ -75,32 +75,37 @@
                 <span class="title-text-text" :title="$t('gnxt')">
                 {{$t('gnxt')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="bazt">
+              <a-form-model-item class="itemModel" prop="gnxt">
                 <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('gnxt')"
+                         style='width: 80%;'
                          v-model="formInline.gnxt"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
           <div v-for="(item,index) in formInline.dataList" :key="index">
-            <div class="header-text">
-              {{$t('dykzq')}}
-              <a-icon class="icon-text" @click="addClick(index)" type="plus-circle"/>
-              <a-icon class="icon-text" v-if="formInline.dataList.length > 1" @click="deleteClick(index)"
-                      type="minus-circle"  :disabled="disabled"/>
-            </div>
-            <div style='margin-left: 25px'>
-              <a-row :gutter="24">
+            <div style='margin-left: 26px'>
+              <a-row :gutter="24" style='height:0px'>
                 <a-col :span="24">
                   <div class="box-title-text">
                     <div class="title-text">
                       <span class="title-text-text" :title="$t('dykzq') + (index+1)">{{$t('dykzq') + (index+1)}}</span>
                     </div>
-                    <a-form-model-item class="itemModel">
+                    <a-form-model-item class="itemModel"
+                                       :prop="'dataList.'+index+'.dykzq'"
+                                       :rules="[{ required: true, message: $t('dykzq') + $t('cannotEmpty'), trigger: 'blur'},
+                                   {max: 50,message: $t('relevantSections') + $t('cannotExceed') + 50 + $t('Characters'),trigger: 'blur'
+                                    }]">
                       <a-input class="box-input"
                                :disabled="disabled"
                                v-model="item.dykzq"
+                               style='width: 87%;'
                                :placeholder="$t('PleaseEnter')+$t('dykzq')"/>
                     </a-form-model-item>
+                    <div class="header-text">
+                      <a-icon class="icon-text" @click="addClick(index)" type="plus-circle"/>
+                      <a-icon class="icon-text" v-if="formInline.dataList.length > 1" @click="deleteClick(index)"
+                              type="minus-circle"  :disabled="disabled"/>
+                    </div>
                   </div>
                 </a-col>
               </a-row>
@@ -115,7 +120,7 @@
 </template>
 
 <script>
-import { getAction, postAction ,deleteAction } from '@/api/manage'
+import { getAction, postAction ,deleteAction, putAction } from '@/api/manage'
 import uploadFile from '@/components/uploadFile/file'
 import { mapGetters } from 'vuex'
 
@@ -128,6 +133,7 @@ export default {
     return {
       loading: false,
       dataSourcehistory:[],
+      title:'',
       columnshistory: [
         {
           title: this.$t('gnxt'),
@@ -142,18 +148,34 @@ export default {
           dataIndex: 'dykzq',
           align: 'left',
           ellipsis: true,
-          width: 100,
           scopedSlots: { customRender: 'detailText' }
         },
         {
           title: this.$t('operation'),
           align: 'left',
           fixed: 'right',
-          width: 220,
+          width: 100,
           scopedSlots: { customRender: 'operation' }
         }
       ],
-      rules:[],
+      rules: {
+        gnxt: [
+          {
+            required: true,
+            message: this.$t('gnxt') + this.$t('cannotEmpty'),
+            trigger: 'blur'
+          },
+          {max: 50,message: this.$t('relevantSections') + this.$t('cannotExceed') + 50 + this.$t('Characters'),trigger: 'blur'
+          }
+        ],
+        // dykzq: [
+        //   {
+        //     required: true,
+        //     message: this.$t('dykzq') + this.$t('cannotEmpty'),
+        //     trigger: 'blur'
+        //   }
+        // ],
+      },
       pageSizehistory: 10,
       total: 0,
       pageNohistory: 1,
@@ -161,7 +183,14 @@ export default {
       visibleadd: false,
       disabled: false,
       showButton:false,
-      formInline: {},
+      formInline: {
+        dataList:[
+          {
+            dykzq:'',
+          }
+        ],
+        gnxt:''
+      },
       confirmLoading: false,
       acceptcode:'',
       projectNameList: [],
@@ -169,7 +198,8 @@ export default {
       url:{
         addModel:''
       },
-      record:{}
+      record:{},
+      type:''
     }
   },
   mounted() {
@@ -182,13 +212,35 @@ export default {
       this.bussLogList()
     },
     addHandleClick(){
+      this.title = this.$t('add')
+      this.type = 'add'
       this.visibleadd = true
+      this.formInline.gnxt = ''
       this.formInline.dataList = [{}]
+      this.$nextTick(() => {
+        this.$refs.ruleForm.clearValidate()
+      })
     },
-    editClick(){
-
+    editClick(item){
+      this.title = this.$t('edit')
+      this.type = 'edit'
+      this.formInline.gnxt = item.gnxt
+      let List = item.dykzq.split(',')
+      let arr = []
+      List.forEach((item,index)=>{
+        arr.push({dykzq:List[index]})
+      })
+      this.formInline.dataList = arr
+      this.visibleadd = true
+      this.$nextTick(() => {
+        this.$refs.ruleForm.clearValidate()
+      })
     },
     addClick(index){
+      if(this.formInline.dataList.length + 1 > 10){
+        this.$message.warning(this.$t('nomorethan'))
+        return
+      }
       this.formInline.dataList.splice(index + 1, 0, {})
       this.formInline = { ...this.formInline }
     },
@@ -209,13 +261,22 @@ export default {
         dykzqList.push(item.dykzq)
       })
       this.formInline.dykzq = dykzqList.join(',')
+      let url = ''
+      let action = ''
+      if(this.type == 'add'){
+        url = 'ota/otaBaSjGnxtwh/add'
+        action = postAction
+      }else{
+        url = 'ota/otaBaSjGnxtwh/edit'
+        action = putAction
+      }
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           let query = {
             ...this.formInline
           }
           this.confirmLoading = true
-          postAction('ota/otaBaSjGnxtwh/add', query).then((res) => {
+          action(url, query).then((res) => {
             if (res.success) {
               this.$message.success(this.$t('OperationSuccessful'))
               this.visibleadd = false
@@ -231,6 +292,7 @@ export default {
     },
     handleaddCancel() {
       this.visibleadd = false
+      this.formInline = {}
     },
     onChangehistory(page, pageSize) {
       this.pageNohistory = page
@@ -320,6 +382,10 @@ export default {
 }
 
 .header-text {
+  position: relative;
+  top: 11px;
+  left: -70px;
+  width: 55px;
   font-size: 16px;
   font-weight: 500;
 }

From c713d9bef662b77410e5311e7db143463819ab15 Mon Sep 17 00:00:00 2001
From: yuekuo <yuekuo@syxysoft.com>
Date: Wed, 29 Mar 2023 10:58:06 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vehicleinformation/components/beupgradedonline.vue          | 2 +-
 .../vehicleinformation/components/upgradedonline.vue            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
index 4149a596b..df3be5491 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
@@ -22,7 +22,7 @@
       style="margin-bottom: 20px"
     >
      <span slot="functionname" slot-scope="text,record">
-          <a-input :placeholder="$t('pleaseEnter')" v-model="record.gnmc" :max-length="500"></a-input>
+          <a-input :placeholder="$t('pleaseEnter')" v-model="record.gnmc" :max-length="50"></a-input>
       </span>
       <!--      配置情况-->
       <span slot="configuration" slot-scope="text,record" >
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
index 2ea022b96..888fd051c 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
@@ -21,7 +21,7 @@
       style="margin-bottom: 20px"
     >
     <span slot="sys" slot-scope="text,record">
-          <a-input :placeholder="$t('pleaseEnter')" v-model="record.xtlb" :max-length="500"></a-input>
+          <a-input :placeholder="$t('pleaseEnter')" v-model="record.xtlb" :max-length="50"></a-input>
       </span>
 <!--      可升级-->
       <span slot="systemclass" slot-scope="text,record">

From 37bbe82753fa9d5bd293206e62fd8a1f5590b243 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 29 Mar 2023 10:59:59 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=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

---
 .../otamanagement/upgradeactivity/components/gnxtwh.vue   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
index 4a73f8b06..99c367baa 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
@@ -199,7 +199,8 @@ export default {
         addModel:''
       },
       record:{},
-      type:''
+      type:'',
+      id:'',
     }
   },
   mounted() {
@@ -216,6 +217,7 @@ export default {
       this.type = 'add'
       this.visibleadd = true
       this.formInline.gnxt = ''
+      this.id = ''
       this.formInline.dataList = [{}]
       this.$nextTick(() => {
         this.$refs.ruleForm.clearValidate()
@@ -225,6 +227,7 @@ export default {
       this.title = this.$t('edit')
       this.type = 'edit'
       this.formInline.gnxt = item.gnxt
+      this.id = item.id
       let List = item.dykzq.split(',')
       let arr = []
       List.forEach((item,index)=>{
@@ -273,7 +276,8 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           let query = {
-            ...this.formInline
+            ...this.formInline,
+            id:this.id
           }
           this.confirmLoading = true
           action(url, query).then((res) => {

From 001cdafc3d95267137e75617fa49e8a33cd3c485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Wed, 29 Mar 2023 11:07:02 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B=E4=B8=8E=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8D=E7=AC=A6=EF=BC=8C=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js              |  4 ++++
 jero-web/src/common/lang/zh-cn.js              |  4 ++++
 .../projectRegulationTasks/index.vue           | 18 +++++++++---------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 8a2f611e0..6307e5a29 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1734,5 +1734,9 @@ module.exports = {
   gnxtwh:'Functional system maintenance',
   gnxt:'Functional system',
   dykzq:'Corresponding controller',
+  releaseRegulatoryList:'Release of regulatory list',
+  preHomoFlow:'Pre-Homo flow',
+  verifyConformanceConfirmation:'Verify conformance confirmation',
+  designConformanceVerification:'Design conformance verification',
   nomorethan:'No more than 10',
 }
\ 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 c50b848cf..52bc1eeed 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1836,5 +1836,9 @@ module.exports = {
   gnxtwh:'功能系统维护',
   gnxt:'功能系统',
   dykzq:'对应控制器',
+  releaseRegulatoryList:'法规清单发布',
+  preHomoFlow:'Pre-Homo流程',
+  verifyConformanceConfirmation:'验证符合性确认',
+  designConformanceVerification:'设计符合性确认',
   nomorethan:'不能超过10个',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
index 6e94a9c68..6b7901469 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
@@ -124,24 +124,24 @@
         },
         toggleSearchStatus: false,
         taskTypeList: [
+          // {
+          //   name: this.$t('confirmationOfRegulationsList'),
+          //   value: '10'
+          // },
           {
-            name: this.$t('confirmationOfRegulationsList'),
+            name: this.$t('releaseRegulatoryList'),
             value: '10'
           },
           {
-            name: this.$t('listTaskConfirmation'),
-            value: '1'
-          },
-          {
-            name: this.$t('designComplianceReview'),
+            name: this.$t('designConformanceVerification'),
             value: '2'
           },
           {
-            name: this.$t('preHomeConfirmation'),
-            value: '3'
+            name: this.$t('preHomoFlow'),
+            value: '21'
           },
           {
-            name: this.$t('verificationComplianceReview'),
+            name: this.$t('verifyConformanceConfirmation'),
             value: '4'
           }
         ],