From 6e905f9b336c32212d9f609b9a358fd6cd2fead4 Mon Sep 17 00:00:00 2001
From: yuekuo <yuekuo@syxysoft.com>
Date: Fri, 31 Mar 2023 11:27:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/upgradetargetmodel.vue         | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
index 34055d829..9a0a26e79 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
@@ -43,13 +43,11 @@
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('upgraderecordnumber')">{{ $t('upgraderecordnumber') }}</span>
               </div>
-              <div style="width:78%">
                 <!-- <span class="title-text-text">中文</span> -->
-                <a-form-model-item prop="babh">
+                <a-form-model-item class="itemModel" prop="babh">
                   <a-input class="box-input" v-model="form.babh" :title='form.babh' :placeholder="$t('pleaseEnter')"
-                    style="width:93%" :max-length="50"></a-input>
+                    style="width:100%" :max-length="50"></a-input>
                 </a-form-model-item>
-              </div>
             </div>
           </a-col>
           <a-col :span="24">
@@ -57,12 +55,12 @@
               <div class="title-text-add">
                 <span class="title-text-text" :title="$t('theNameOfFirm')">{{ $t('theNameOfFirm') }}</span>
               </div>
-              <div class="title-text-add-input">
                 <!-- <span class="title-text-text">中文</span> -->
+                <a-form-model-item class="itemModel">
                 <a-input class="box-input" v-model="form.qymc" :title='form.qymc' :placeholder="$t('pleaseEnter')"
-                  disabled style="width:93%" :max-length="50"></a-input>
+                  disabled style="width:100%" :max-length="50"></a-input>
+                </a-form-model-item>
               </div>
-            </div>
           </a-col>
 
           <a-col :span="24">
@@ -123,32 +121,33 @@
               <div class="title-text-add">
                 <span class="title-text-text plus2" :title="$t('Vehicledynamictype')">{{ $t('Vehicledynamictype') }}</span>
               </div>
-              <a-form-model-item class="itemModel" style="width: 38%;margin-right:12px">
-                <!-- <j-dict-select-tag class="box-input"
-                                   :disabled="disabled"
-                                   @change="projectNameChange"
-                                   :placeholder="$t('PleaseSelect')"
-                                   :type="'select'"
-                                   :triggerChange="false"
-                                   v-model="form.Vehicledynamictype"/> -->
-                <a-select class="box-input" v-model="form.dllx1" :disabled="disabled" :placeholder="$t('PleaseSelect')"
-                  @change="changeSelect($event, target)">
+              <a-form-model-item class="itemModel " >
+                <div style="display:flex;flex-wrap: nowrap;width: 100%;">
+                  <div style="width: 90%;margin-right: 20px;">
+                  <a-select class="box-input" v-model="form.dllx1" :disabled="disabled" :placeholder="$t('PleaseSelect')"
+                  @change="changeSelect($event, target)"
+                  style="width: 100%;"
+                 >
                   <a-select-option v-for="(item, key) in projectNameList1" :key="key" :value="item">
                     {{ item }}
                   </a-select-option>
                 </a-select>
+                  </div>
+                  <div style="width: 100%;">
+                    <a-select v-model="form.dllx2" class="box-input" :disabled="disabled" :placeholder="$t('PleaseSelect')"
+                        @change="update2"
+                        style="width: 100%;"
+                      >
+                        <a-select-option v-for="(item, key) in projectNameList2" :key="key" :value="item">
+                          {{ item }}
+                        </a-select-option>
+                      </a-select>
+                  </div>
+              </div>
+             
+             
               </a-form-model-item>
-              <a-form-model-item class="itemModel" style="width: 40%;">
-                <a-select v-model="form.dllx2" class="box-input" :disabled="disabled" :placeholder="$t('PleaseSelect')"
-                  @change="update2">
-                  <a-select-option v-for="(item, key) in projectNameList2" :key="key" :value="item">
-                    {{ item }}
-                    <!-- <span style="display: inline-block;width: 100%" :title=" item.projectName ">
-                           {{ item.projectName}}
-                     </span> -->
-                  </a-select-option>
-                </a-select>
-              </a-form-model-item>
+
             </div>
           </a-col>
 
@@ -430,6 +429,7 @@ export default {
   width: calc(100% - 130px);
   display: inline-block;
   margin-top: 2px;
+  max-width: 486px;
 }
 
 .box-input {
@@ -461,4 +461,6 @@ export default {
 .Required {
   color: red;
   margin-right: 3px;
-}</style>
\ No newline at end of file
+}
+
+</style>
\ No newline at end of file

From 7d4edacf2a71b6c1be9d31f83fd0bd9b8abee9d7 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 31 Mar 2023 11:48:32 +0800
Subject: [PATCH 2/3] bug 67621

---
 .../components/usernotification.vue                    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
index a1ba7c8ec..0ebe13f88 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
@@ -155,9 +155,10 @@
           <a-col :span="24">
             <div class="plus">
               <div class="title-text-add">
-                <span class="title-text-text" :title="$t('usernotificationmode')">{{$t('usernotificationmode')}}</span>
+                <h1 style='position: relative;left: -8px;'>{{$t('usernotificationmode')}}</h1>
+<!--                <span class="title-text-text" :title="$t('usernotificationmode')">{{$t('usernotificationmode')}}</span>-->
               </div>
-              <a-form-model-item class="itemModel" prop="gzyhfs">
+              <a-form-model-item class="itemModel" prop="gzyhfs" style='margin-top: 40px;'>
                 <j-multi-select-tag class="box-input"
                                     v-model="formInline.gzyhfs"
                                     :placeholder="$t('PleaseSelect')"
@@ -170,9 +171,10 @@
           <a-col :span="24">
             <div class="plus">
               <div class="title-text-add">
-                <span class="title-text-text" :title="$t('userinformstherelevantfile')">{{$t('userinformstherelevantfile')}}</span>
+                <h1 style='position: relative;left: -34px;'>{{$t('userinformstherelevantfile')}}</h1>
+<!--                <span class="title-text-text" :title="$t('userinformstherelevantfile')">{{$t('userinformstherelevantfile')}}</span>-->
               </div>
-              <a-form-model-item class="itemModel" prop="gzscnr">
+              <a-form-model-item class="itemModel" prop="gzscnr" style='margin-top: 40px;'>
                 <a-button type="primary" @click="clickButtonToUpload('xgwj')" v-model="formInline.xgwj">
                   {{ (formInline.xgwj === 'null' || formInline.xgwj === '' ||
                   formInline.xgwj == null) ? $t('uploadattachment') : $t('viewUploadedFiles')

From 7fc7c84473085cda0ab829df6250cc74890d5734 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Fri, 31 Mar 2023 13:26:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7-?=
 =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/basicInformation.vue           | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
index a66145229..d4cebc19b 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
@@ -155,17 +155,19 @@
               <div class="title-text-add">
                 <span class="title-text-text plus3" :title="$t('Vehicledynamictype')">{{$t('Vehicledynamictype')}}</span>
               </div>
-              <a-form-model-item class="itemModel" style="width: 38%">
-                  <a-select class="box-input" v-model="form.dllx1"  allowClear :disabled="disabled"  :placeholder="$t('PleaseSelect')" @change="changeSelect($event,target)">
-                    <a-select-option v-for="(item, key) in projectNameList1"
-                                   :key="key"
-                                   :value="item">
-                                   {{ item }}
-                    </a-select-option>
-                  </a-select>
-              </a-form-model-item>
-              <a-form-model-item class="itemModel" style="width: 40%;margin-left:20px">
-                <a-select v-model="form.dllx2" class="box-input"   allowClear :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="update">
+                <a-form-model-item class="itemModel">
+                <div style="display:flex;flex-wrap: nowrap;width: 100%;">
+                  <div style="width: 90%;margin-right: 20px;">
+                      <a-select class="box-input" style="width: 100%;" v-model="form.dllx1"  allowClear :disabled="disabled"  :placeholder="$t('PleaseSelect')" @change="changeSelect($event,target)">
+                        <a-select-option v-for="(item, key) in projectNameList1"
+                                       :key="key"
+                                       :value="item">
+                                       {{ item }}
+                        </a-select-option>
+                      </a-select>
+                </div>
+                <div style="width: 100%;">
+                      <a-select v-model="form.dllx2" class="box-input"   allowClear :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="update">
                   <a-select-option v-for="(item, key) in projectNameList2"
                                    :key="key"
                                    :value="item">
@@ -175,7 +177,9 @@
                      </span> -->
                   </a-select-option>
                 </a-select>
-              </a-form-model-item>
+                </div>
+                </div>
+                </a-form-model-item>
             </div>
           </a-col>
           <a-col :span="24">
@@ -343,7 +347,7 @@ import { message } from 'ant-design-vue'
             if(res.result.dllx2 == null){
               res.result.dllx2 = undefined
             }
-           
+
             if(res.result.cplb == null){
               res.result.cplb = undefined
             }
@@ -380,7 +384,7 @@ import { message } from 'ant-design-vue'
             if(otaId==null || otaId == undefined){
               otaId=''
             }
-          
+
             postAction('/ota/otaBaCxJbxx/add',{ otaId:otaId,...this.form}).then( res => {
            if(res.code == 200){
             localStorage.setItem('otaId', res.result.otaId)
@@ -419,7 +423,7 @@ import { message } from 'ant-design-vue'
         if(this.form.dllx1=='其他'){
           this. projectNameList2=['其他']
         }
-        
+
 
       },
       update(){