From 66c3f8eb03a8c0f3b450adee687dc772c919948c Mon Sep 17 00:00:00 2001
From: yuekuo <yuekuo@syxysoft.com>
Date: Wed, 29 Mar 2023 16:26:47 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/upgradetargetmodel.vue             | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
index 591c724e9..08939f295 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
@@ -111,7 +111,7 @@
           <a-col :span="24">
             <div class="box-title-text-add">
               <div class="title-text-add">
-                <span class="title-text-text" :title="$t('Vehicledynamictype')">{{$t('Vehicledynamictype')}}</span>
+                <span class="title-text-text plus2" :title="$t('Vehicledynamictype')">{{$t('Vehicledynamictype')}}</span>
               </div>
               <a-form-model-item class="itemModel" style="width: 38%">
                 <!-- <j-dict-select-tag class="box-input"
@@ -274,9 +274,12 @@ import ImportFile from '@/components/ImportFileData/index'
            if(res.code==200){
             this.selectListPc=[]
             res.result.forEach(item=>{
-              let obj={}
-               obj=item
-               this.selectListPc.push(obj)
+              if(item.ggpc !="" && item.ggpc !=null){
+                let obj={}
+                obj=item
+                this.selectListPc.push(obj)
+              }
+             
             })
            }
          })
@@ -395,6 +398,10 @@ import ImportFile from '@/components/ImportFileData/index'
     margin-top: 5px;
     line-height: 1.4 !important;
   }
+  .plus2{
+       word-break: break-all;
+    line-height: 1.3;
+  }
   .Required {
   color: red;
   margin-right: 3px;

From 1354947530ddefb77a3b067ec40c46674576b41c Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 29 Mar 2023 16:43:20 +0800
Subject: [PATCH 2/6] bug 67553

---
 .../components/upgradeimpactassessment.vue    | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
index e7ec6ed0c..c1da12f15 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
@@ -92,8 +92,8 @@
       </tr>
       <tr>
         <td colspan="2" align="left" height="50px">{{$t('conditionsareupgradesperformed')}}</td>
-        <td height="50px">
-          <j-dict-select-tag class="box-input"
+        <td height="50px" style='position: relative'>
+          <j-dict-select-tag class="box-input1"
                              style='margin-top: 2px'
                              :disabled="disable"
                              v-model="form.zxsj"
@@ -105,8 +105,8 @@
       </tr>
       <tr>
         <td colspan="2" align="left" height="50px">{{$t('upgradefailureorinterruption')}}</td>
-        <td height="50px">
-          <j-multi-select-tag class="box-input"
+        <td height="50px" style='position: relative'>
+          <j-multi-select-tag class="box-input1"
                               v-model="form.aqjz"
                               style='margin-top: 2px'
                               :disabled="disable"
@@ -136,8 +136,8 @@
       </tr>
       <tr>
         <td colspan="2" align="left" height="50px">{{$t('upgradepackagetest')}}</td>
-        <td height="50px">
-          <j-multi-select-tag class="box-input"
+        <td height="50px" style='position: relative'>
+          <j-multi-select-tag class="box-input1"
                                 style='margin-top: 2px'
                                 :disabled="disable"
                                 v-model="form.sjbcs"
@@ -441,12 +441,19 @@ this.$forceUpdate()
 
 .box-input {
   display: inline-block;
-  width: 70%;
+  width: calc(70% - 30px);
   height: 38px;
   margin-top: 10px;
   margin-left: 40px;
 }
-
+.box-input1 {
+  display: inline-block;
+  width: calc(100% - 80px);
+  position: absolute;
+  height: 38px;
+  margin-left: 40px;
+  top: 4px;
+}
 ::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title {
   white-space: pre-wrap!important;
 }
@@ -545,4 +552,7 @@ this.$forceUpdate()
   padding: 0 45px;
   display: flex;
 }
+::v-deep .box-input1 .ant-select-selection__rendered {
+  //width: 200px !important;
+}
 </style>
\ No newline at end of file

From 90d91b566652c130efb3f4240ef2331e7bb179ae Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 29 Mar 2023 16:50:54 +0800
Subject: [PATCH 3/6] bug 67590

---
 .../components/upgradeimpactassessment.vue                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
index c1da12f15..6f7e5f449 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
@@ -86,7 +86,7 @@
             form.clfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
             }}
           </a-button>
-          <span class="spanone">{{$t('notetwo')}}</span>
+          <span class="spanone">{{$t('notethree')}}</span>
           <span class="spanone">{{$t('format')}}</span>
         </td>
       </tr>

From ae0e90e6c820128c7fb6f8a608369a9a96fefd79 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 29 Mar 2023 17:22:53 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/otamanagement/upgradeactivity/components/gnxtwh.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
index 99c367baa..4bb063ae6 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
@@ -388,7 +388,7 @@ export default {
 .header-text {
   position: relative;
   top: 11px;
-  left: -70px;
+  left: -39px;
   width: 55px;
   font-size: 16px;
   font-weight: 500;

From 76cab7a0bb80d0e068f1b76188409d993c5c2e4b Mon Sep 17 00:00:00 2001
From: yuekuo <yuekuo@syxysoft.com>
Date: Wed, 29 Mar 2023 17:31:24 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thetargetvehicleofthisupgrade.vue         |  11 +-
 .../upgradeimpactassessment copy.vue          | 541 ------------------
 .../components/upgradetargetmodel.vue         |  10 +-
 3 files changed, 16 insertions(+), 546 deletions(-)
 delete mode 100644 jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment copy.vue

diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
index 67b396f2d..4367f3867 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
@@ -144,6 +144,8 @@ export default {
             this.formInline.vinList=res.result.vinList
             this.formInline.csv=res.result.csv
             this.formInline.dateofproduction=[]
+            res.result.scrqks=res.result.scrqks == null ? "" : res.result.scrqks
+            res.result.scrqjs=res.result.scrqjs == null ? "" : res.result.scrqjs
             this.formInline.dateofproduction.push(res.result.scrqks)
             this.formInline.dateofproduction.push(res.result.scrqjs)
             this.formInline.id = res.result.vinList
@@ -159,8 +161,13 @@ export default {
       obj.zsl = this.formInline.zsl
       obj.csv = this.formInline.csv
       if(this.formInline.dateofproduction){
-        obj.scrqks = this.formInline.dateofproduction[0]
-        obj.scrqjs = this.formInline.dateofproduction[1]
+        if(this.formInline.dateofproduction.length>0){
+          obj.scrqks = this.formInline.dateofproduction[0] 
+        obj.scrqjs = this.formInline.dateofproduction[1] 
+        }else{
+          obj.scrqks=''
+          obj.scrqjs =''
+        }
       }else{
         obj.scrqks=''
         obj.scrqjs =''
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment copy.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment copy.vue
deleted file mode 100644
index fb6045b3d..000000000
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment copy.vue	
+++ /dev/null
@@ -1,541 +0,0 @@
-<template>
-  <!-- 第三页 -->
-  <div class="box">
-    <div class="table-operator">
-      <div class="operator-text">
-        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'"  @getList="getData"/>
-      </div>
-      <div @click='handleModule' class="operator-text">
-        <a-icon type="download"/>
-        {{$t('templateDownload')}}
-      </div>
-    </div>
-    <a-layout style='margin-bottom: 48px;'>
-      <a-layout style='height: 60px'>
-        <a-layout-sider style='border: black solid 1px;'>
-          <span class='sider-span1'>{{$t('upgradePurpose')}}</span>
-        </a-layout-sider>
-          <a-layout-content style='border: black solid 1px;border-left: none;border-bottom: none;'>
-            <j-multi-select-tag class="box-input"
-                               v-model="form.sjmd"
-                               @change="update"
-                               :disabled="disable"
-                               :placeholder="$t('PleaseSelect')"
-                               :type="'select'"
-                               :dictCode="'uipgrade_purpose'"
-                               :triggerChange="false"/>
-          </a-layout-content>
-      </a-layout>
-      <a-layout>
-        <a-layout-sider style='border: black solid 1px;border-top: none;border-bottom: none'>
-          <span class='sider-span'>{{$t('impactassessmentofupgradeactivities')}}</span>
-        </a-layout-sider>
-        <a-layout-content style='max-width: 522px'>
-          <span class='content-text' :title="$t('correspondingvehicletype')">{{$t('correspondingvehicletype')}}</span>
-          <span class='content-text' :title="$t('technicalperformancechanges')">{{$t('technicalperformancechanges')}}</span>
-          <span class='content-text' :title="$t('technicalstandardsandsafetytechnicalconditions')">{{$t('technicalstandardsandsafetytechnicalconditions')}}</span>
-          <span class='content-text' :title="$t('autoautonomousdrivingfunction')">{{$t('autoautonomousdrivingfunction')}}</span>
-        </a-layout-content>
-        <a-layout-content style='width: 5.5%'>
-          <span class='content-text'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.sfbgcs">
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
-          </span>
-          <span class='content-text'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.sjxnbh">
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
-          </span>
-          <span class='content-text'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.fhgd">
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
-          </span>
-          <span class='content-text'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.zdjsxg">
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
-          </span>
-        </a-layout-content>
-        <a-layout-content style='border: black solid 1px;border-left: none;border-bottom: none;max-width: 428px'>
-          <a-button type="primary" style='margin-top: 15%;margin-left: 10%;'
-                    @click="clickButtonToUpload('bgfj')">
-            {{ (form.bgfj === 'null' || form.bgfj === '' ||
-            form.bgfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
-            }}
-          </a-button>
-          <span class="spanone">{{$t('notetwo')}}</span>
-          <span class="spanone">{{$t('format')}}</span>
-        </a-layout-content>
-      </a-layout>
-      <div class='box-layout'>
-        <div class='layout-box'>
-          <span class='box-text' :title="$t('vehiclepriortothereleaseoftheupgrade')">{{$t('vehiclepriortothereleaseoftheupgrade')}}</span>
-          <span class='box-text' :title="$t('conditionsareupgradesperformed')">{{$t('conditionsareupgradesperformed')}}</span>
-          <span class='box-text' :title="$t('upgradefailureorinterruption')">{{$t('upgradefailureorinterruption')}}</span>
-          <span class='box-text' :title="$t('upgradeactivitiesaffectvehiclesafety')">{{$t('upgradeactivitiesaffectvehiclesafety')}}</span>
-          <span class='box-text' :title="$t('upgradeactivityprovidesuserconfirmationoptions')">{{$t('upgradeactivityprovidesuserconfirmationoptions')}}</span>
-          <span class='box-text' :title="$t('upgradepackagetest')">{{$t('upgradepackagetest')}}</span>
-          <span class='box-text' style='border-bottom: black solid 1px' :title="$t('reliabilityofonlineupgradeactivities')">{{$t('reliabilityofonlineupgradeactivities')}}</span>
-        </div>
-        <div class='layout-box-second'>
-          <span class='box-text'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.jrxxg">
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
-          </span>
-          <span class='box-text'>
-            <j-dict-select-tag class="box-input"
-                               style='margin-top: 2px'
-                               :disabled="disable"
-                               v-model="form.zxsj"
-                               :placeholder="$t('PleaseSelect')"
-                               :type="'select'"
-                               dictCode="conditions_upgrades"
-                               :triggerChange="false"/>
-          </span>
-          <span class='box-text'>
-            <j-multi-select-tag class="box-input"
-                               v-model="form.aqjz"
-                               style='margin-top: 2px'
-                               :disabled="disable"
-                               dictCode="upgrade_failed"
-                               :placeholder="$t('PleaseSelect')"
-                               :type="'select'"
-                               :triggerChange="false"/>
-          </span>
-          <span class='box-text'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.sfyxaq">
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
-          </span>
-          <span class='box-text'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.yhqr">
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
-          </span>
-          <span class='box-text'>
-            <j-multi-select-tag class="box-input"
-                               style='margin-top: 2px'
-                               :disabled="disable"
-                               v-model="form.sjbcs"
-                               :placeholder="$t('PleaseSelect')"
-                               dictCode="package_test"
-                               :type="'select'"
-                               :triggerChange="false"/>
-          </span>
-          <span class='box-text' style='border-bottom: black solid 1px'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.aqkkx">
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
-          </span>
-        </div>
-        <div class='layout-box-three'>
-          <a-button type="primary" style='margin-top: 15%;margin-left: 10%;'
-                    @click="clickButtonToUpload('clfj')">
-            {{ (form.clfj === 'null' || form.clfj === '' ||
-            form.clfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
-            }}
-          </a-button>
-          <span class="spanone">{{$t('notethree')}}</span>
-          <span class="spanone">{{$t('format')}}</span>
-        </div>
-      </div>
-    </a-layout>
-    <div class="bootom-button">
-      <a-button style="margin-right:50px" @click="save">{{$t('preservation')}}</a-button>
-      <a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
-      <a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
-    </div>
-    <uploadFile ref="uploadFile" :acceptcode="'doc,docx,pdf'" @uploadSuccess="uploadSuccess"></uploadFile>
-  </div>
-</template>
-
-<script>
-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,
-    ImportFile
-  },
-  data() {
-    return {
-      dataSource: [
-        {
-          key:1,
-          functionname:'ceshi',
-        }
-      ],
-      url: {
-        exportData: '/ota/otaBaSjSjyxpg/exportData',
-        importZipUrl: '/ota/otaBaSjSjyxpg/importData?otaId=' + localStorage.getItem('otaId'),//导入
-      },
-      loading: false,
-      disable:false,
-      columns: [
-        {
-          title: this.$t('systemname'),
-          align: 'left',
-          dataIndex: 'systemname',
-          ellipsis: true,
-          width: 170
-        },
-        {
-          title: this.$t('adjustmentofchangedBulletinparameters'),
-          align: 'left',
-          dataIndex: 'adjustmentofchangedBulletinparameters',
-          ellipsis: true,
-          width: 170,
-          children: [
-            {
-              title: this.$t('preupgrade'),
-              align: 'left',
-              dataIndex: 'preupgrade',
-              scopedSlots: { customRender: 'preupgrade' },
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('afterupgrade'),
-              align: 'left',
-              dataIndex: 'afterupgrade',
-              scopedSlots: { customRender: 'afterupgrade' },
-              ellipsis: true,
-              width: 170
-            },
-          ]
-        },
-        {
-          title: this.$t('controllerparameter'),
-          align: 'left',
-          dataIndex: 'controllerparameter',
-          ellipsis: true,
-          width: 170,
-          children: [
-            {
-              title: this.$t('nameoftheupgradedelectroniccontroller'),
-              align: 'left',
-              dataIndex: 'nameoftheupgradedelectroniccontroller',
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('adaptivehardwareversion'),
-              align: 'left',
-              dataIndex: 'adaptivehardwareversion',
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('beforethesoftwareversionupgraded'),
-              align: 'left',
-              dataIndex: 'beforethesoftwareversionupgraded',
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('afterthesoftwareversionupgraded'),
-              align: 'left',
-              dataIndex: 'afterthesoftwareversionupgraded',
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('beforetheOSversionupgraded'),
-              align: 'left',
-              dataIndex: 'beforetheOSversionupgraded',
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('aftertheoperatingsystemversionupgraded'),
-              align: 'left',
-              dataIndex: 'aftertheoperatingsystemversionupgraded',
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('softwablackevelopmententerprise'),
-              align: 'left',
-              dataIndex: 'softwablackevelopmententerprise',
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('initialpackageforintegrityinflammatorydata'),
-              align: 'left',
-              dataIndex: 'initialpackageforintegrityinflammatorydata',
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('upgradepackageintegrityverificationdata'),
-              align: 'left',
-              dataIndex: 'upgradepackageintegrityverificationdata',
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('upgradepackagesize'),
-              align: 'left',
-              dataIndex: 'upgradepackagesize',
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('differentialupgradeornot'),
-              align: 'left',
-              dataIndex: 'differentialupgradeornot',
-              ellipsis: true,
-              width: 170
-            },
-          ]
-        },
-        {
-          title: this.$t('operation'),
-          align: 'left',
-          fixed: 'right',
-          width: 200,
-          scopedSlots: { customRender: 'operation' }
-        }
-      ],
-      form:{
-        sjmd:'',
-        fhgd:1,
-        zdjsxg:2,
-        sfyxaq:2,
-        yhqr:1,
-        aqkkx:1,
-        zxsj:2,
-        aqjz:'2',
-        sjbcs:'3,4'
-      }
-    }
-  },
-  mounted() {
-    // this.getList()
-    this.getData()
-  },
-  methods: {
-    update(){
-this.$forceUpdate()
-    },
-    // 模板下载
-    handleModule() {
-      downloadFile('ota/otaBaSjSjyxpg/exportTemplate', '升级影响评估' + '.zip', {})
-    },
-    clickButtonToUpload(item) {
-      this.$refs.uploadFile.perentHandleFunc()
-      this.$refs.uploadFile.visible = true
-      this.uploadName = item
-      getAction('sys/common/getFileInfos', { id: this.form[item] }).then((res) => {
-        if (res.success) {
-          this.$refs.uploadFile.perentHandleFunc(res.result)
-        } else {
-          this.$refs.uploadFile.perentHandleFunc()
-        }
-      })
-    },
-    uploadSuccess(data) {
-      let attIdList = []
-      if(data && data.length>0){
-        data.map(item => {
-          attIdList.push(item.id || data.name)
-        })
-        /** 赋值给当前对应的表单文件 */
-        this.form[this.uploadName] = attIdList.join(',')
-        this.form = { ...this.form }
-        // console.log('form',this.formInline)
-      }else{
-        this.form[this.uploadName] = ''
-        this.form = { ...this.form }
-        // console.log('form',this.formInline)
-
-      }
-    },
-    getData(){
-      let otaIdT=localStorage.getItem('otaIdT')
-        if(otaIdT==null){
-          otaIdT=''
-        }
-        let otaId=localStorage.getItem('otaId')
-        if(otaId==null){
-          otaId=''
-        }
-        getAction('/ota/otaBaSjSjyxpg/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
-           if(res.code==200){
-            this.form=res.result==null ? {
-        sjmd:'',
-        fhgd:1,
-        zdjsxg:2,
-        sfyxaq:2,
-        yhqr:1,
-        aqkkx:1,
-        zxsj:2,
-        aqjz:'2',
-        sjbcs:'3,4'
-      } : res.result
-           }
-        })
-    },
-    save(){
-      let otaId = localStorage.getItem('otaId')
-      if(otaId == null || otaId == undefined){
-        otaId=''
-      }
-       this.form.otaId=otaId
-       postAction('/ota/otaBaSjSjyxpg/add',this.form).then(res=>{
-        if(res.code==200){
-          this.$message.success(this.$t('SavedSuccessfully'))
-           this.getData()
-        }
-       })
-    },
-    last(){
-      this.save()
-      this.$emit('safetyPrecautionsup')
-    },
-    next(){
-      this.save()
-      this.$emit('safetyPrecautionsdown')
-    },
-  }
-}
-</script>
-
-<style lang='less' scoped>
-@import '~@assets/less/common.less';
-
-.box {
-  padding: 0 24px 24px 24px;
-  box-sizing: border-box;
-}
-
-.bootom-button{
-  text-align: center!important;
-}
-
-.text-operation{
-  margin-right: 8px;
-}
-
-.box-input {
-  display: inline-block;
-  width: 70%;
-  height: 38px;
-  margin-top: 10px;
-  margin-left: 40px;
-}
-
-::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title {
-  white-space: pre-wrap!important;
-}
-#components-layout-demo-basic {
-  text-align: center;
-}
-::v-deep  .ant-layout-footer {
-  line-height: 1.5;
-}
-::v-deep  .ant-layout-sider {
-  line-height: 50px;
-  background: white;
-}
-::v-deep  .ant-layout-content {
-  min-height: 60px;
-  line-height: 20px;
-}
-//::v-deep  > .ant-layout {
-//  margin-bottom: 48px;
-//}
-::v-deep  > .ant-layout:last-child {
-  margin: 0;
-}
-.content-text{
-  display: inline-block;
-  width: 100%;
-  height: 50px;
-  border: black solid 1px;
-  border-left: none;
-  border-bottom: none;
-  vertical-align: top;
-  overflow: hidden; /*超出部分隐藏*/
-  // text-overflow: ellipsis; /*超出部分省略号表示*/
-  white-space: wrap;
-  display: flex;
-  // justify-content: center;
-  align-items: center;
-  line-height: 1.3;
-}
-//::v-deep .sider .ant-layout-sider .ant-layout-sider-dark{
-//  min-width: 723px !important;
-//  mmax-width: 723px !important;
-//  width: 723px !important;
-//  flex: 0 0 200px;
-//}
-.box-layout{
-  display: flex;
-  //justify-content: space-between;
-}
-.layout-box{
-  width: 721px;
-  height:350px;
-}
-.layout-box-second{
-  max-width: 425.859px;
-  width:32.5%;
-  height:350px;
-}
-.layout-box-three{
-  border: black solid 1px;
-  max-width: 427.859px;
-  min-width: 227.859px;
-  width: 427.859px;
-  height:350px;
-}
-.box-text{
-  display: inline-block;
-  width: 100%;
-  height: 50px;
-  line-height: 1.3;
-  border: black solid 1px;
-  vertical-align: top;
-  border-right: none;
-  border-bottom: none;
-  overflow: hidden; /*超出部分隐藏*/
-  // text-overflow: ellipsis; /*超出部分省略号表示*/
-  white-space: wrap;
-  display: flex;
-  // justify-content: center;
-  align-items: center;
-}
-.sider-span{
-  display: inline-block;
-  width: 100%;
-  height: 50px;
-  margin-top: 74px;
-}
-.sider-span1{
-  display: inline-block;
-  width: 100%;
-  height: 50px;
-  margin-top: 8px;
-}
-.spanone{
-  white-space: pre-wrap;
-  padding: 0 45px;
-  display: flex;
-}
-</style>
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
index 08939f295..e4f9fb135 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
@@ -67,7 +67,7 @@
                 <span class="title-text-text" :title="$t('Modelandfunctionrecord')">{{$t('Modelandfunctionrecord')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="bapc">
-                <a-select  :disabled="disabled" class="box-input" v-model="form.bapc" allowClear     :placeholder="$t('PleaseSelect')" @change="changeId">
+                <a-select  :disabled="disabled" class="box-input" v-model="form.bapc"    :placeholder="$t('PleaseSelect')" @change="changeId">
                   <a-select-option v-for="(item , key ) in selectListPc" :key="key" :value="item.id" >
                     {{ item.ggpc }}
                   </a-select-option>
@@ -314,8 +314,12 @@ import ImportFile from '@/components/ImportFileData/index'
         this.form.cpsb = item.cpsb 
         this.form.cpmc = item.cpmc
         this.form.cpxh = item.cpxh
-        this.form.babh = item.cpdjbh
-        }
+        getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{
+          this.form.dllx1=res.result.dllx1
+          this.form.dllx2=res.result.dllx2
+          this.$forceUpdate()
+        })
+      }
      })
      this.$forceUpdate()
       },

From 5ab0c3c91dbb480da0b98a7db7efa3a4c76a7cf7 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 29 Mar 2023 17:33:38 +0800
Subject: [PATCH 6/6] bug 67613

---
 .../views/otamanagement/upgradeactivity/components/gnxtwh.vue  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
index 4bb063ae6..54bb647c5 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
@@ -71,7 +71,7 @@
           <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('gnxt')">
                 {{$t('gnxt')}}</span>
               </div>
@@ -88,6 +88,7 @@
                 <a-col :span="24">
                   <div class="box-title-text">
                     <div class="title-text">
+                      <span class="Required">*</span>
                       <span class="title-text-text" :title="$t('dykzq') + (index+1)">{{$t('dykzq') + (index+1)}}</span>
                     </div>
                     <a-form-model-item class="itemModel"