From 5d97758c14985c91e40fcbccca064b0bc2a4e951 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 3 Apr 2023 10:24:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ota?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js                           | 3 ++-
 jero-web/src/common/lang/zh-cn.js                           | 3 ++-
 .../components/thetargetvehicleofthisupgrade.vue            | 2 +-
 .../upgradeactivityrecord/components/upgradehavechanged.vue | 6 +++++-
 .../vehicleinformation/components/beupgradedonline.vue      | 4 ++--
 .../otamanagement/vehicleinformation/components/other.vue   | 6 ++++--
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 4b1d8cb60..1b0823753 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1508,7 +1508,7 @@ module.exports = {
   applicationconditions:'Application conditions',
   componentname:'Component name',
   fillincontent:'Fill in content',
-  upgradepacketprotectionmeasures:'Upgrade packet protection measures',
+  upgradepacketprotectionmeasuresa:'Software version (set) identification and storage',
   controlsystem:'This section describes how to identify and save the software upgrade version (set) of the electronic control system',
   vehicledynamictype:'Vehicle dynamic type',
   upgradetargetmodel:'Upgrade target model',
@@ -1744,4 +1744,5 @@ module.exports = {
   uploadedfilelarger:'The uploaded file is larger than',
   marketCertificationListDetails:'Market Certification List Details',
   andTheProcessStatusTheList:'And the process status cannot be the data to be checked in the list',
+  pleasefillintherange:'Please fill in the range',
 }
\ 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 a188678b6..19e18f226 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1669,7 +1669,7 @@ module.exports = {
     '(a)告知车辆用户车辆升级的结果(成功或失败)；\n' +
     '\n' +
     '(b)若升级成功，告知车辆用户已实施的变更，用户手册(如果适用)的任何相关更新。',
-  // upgradepacketprotectionmeasures:'软件版本（集）识别与存储',
+  upgradepacketprotectionmeasuresa:'软件版本（集）识别与存储',
   otaupgradedsecuritymeasuresforvehicles:'车辆OTA升级安全措施',
   authenticityandintegrityprotectionmechanism:'真实性、完整性保护机制(可多选)',
   failsafmechanism:'防失效保护机制(可多选)',
@@ -1847,4 +1847,5 @@ module.exports = {
   marketCertificationList:'市场认证清单',
   marketCertificationListDetails:'市场认证清单详情',
   andTheProcessStatusTheList:'并且流程状态不能为清单待校核的数据',
+  pleasefillintherange:'请填写范围',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
index e153908bb..8e42cbf81 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
@@ -54,7 +54,7 @@
                 {{$t('VINcodelist')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="VINcodelist">
-                <a-textarea :placeholder="$t('pleaseEnter')+$t('VINcodelist')"
+                <a-textarea :placeholder="$t('pleasefillintherange')"
                             v-model="formInline.vinList"
                             :rows="4"
                             :max-length="500"/>
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
index 84873b48c..44d8d2237 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
@@ -58,7 +58,11 @@
         <a-input :placeholder="$t('pleaseEnter')"  v-model="record.sjbdx" :title='record.sjbdx' :max-length="50"></a-input>
         </span>
         <span slot="differentialupgradeornot" slot-scope="text,record" :max-length="50">
-        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.sfcfsj" :title='record.sfcfsj'></a-input>
+<!--        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.sfcfsj" :title='record.sfcfsj'></a-input>-->
+          <a-radio-group v-model="record.sfcfsj">
+            <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+            <a-radio :value="2"> {{ $t('not') }} </a-radio>
+          </a-radio-group>
       </span>
       <!--      操作列-->
       <span slot="operation" slot-scope="text,record">
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
index 541e9bdae..0daffffe9 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
@@ -53,10 +53,10 @@
           <a-input :placeholder="$t('ifNot')" :title="record.sjggcs ? record.sjggcs : $t('ifNot')" v-model="record.sjggcs" :max-length="500"></a-input>
       </span>
       <span slot="functiondescription" slot-scope="text,record">
-          <a-input :placeholder="$t('ifNot')" :title="record.gnms ? record.gnms:$t('ifNot')" v-model="record.gnms" :max-length="500"></a-input>
+          <a-input :placeholder="$t('pleaseEnter')" :title="record.gnms ? record.gnms:$t('pleaseEnter')" v-model="record.gnms" :max-length="500"></a-input>
       </span>
       <span slot="applicationconditions" slot-scope="text,record">
-          <a-input :placeholder="$t('ifNot')" :title="record.sytj ? record.sytj:$t('ifNot')" v-model="record.sytj" :max-length="500"></a-input>
+          <a-input :placeholder="$t('pleaseEnter')" :title="record.sytj ? record.sytj:$t('pleaseEnter')" v-model="record.sytj" :max-length="500"></a-input>
       </span>
       <span slot="functiondeelectronicscription" slot-scope="text,record">
           <a-input :placeholder="$t('pleaseEnter')" :title='record.kzqmc' v-model="record.kzqmc" :max-length="50"></a-input>
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue
index dc0c50501..2459e441a 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue
@@ -6,7 +6,7 @@
           <a-col :span="24">
             <div class="box-title-text-add">
               <div class="title-text-add">
-                <span class="title-text-text" :title="$t('upgradepacketprotectionmeasures')">{{$t('upgradepacketprotectionmeasures')}}</span>
+                <span class="title-text-text" :title="$t('upgradepacketprotectionmeasuresa')">{{$t('upgradepacketprotectionmeasuresa')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="sjbbhcs" >
                 <a-textarea
@@ -43,7 +43,9 @@ export default {
       flag:'',
       rules:{
         sjbbhcs:[
-          { max: 500,message:'最多只能添加500个字符',trigger:'blur'}
+          { max: 500,
+            message:this.$t('upgradepacketprotectionmeasuresa') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+            trigger:'blur'}
         ]
       }
     }