From 543720ed38444054bb00a3137c7838214b36fa22 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 23 May 2022 16:38:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=AB=98=E7=BA=A7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dict/JDictSelectTag.vue    |  4 +--
 .../virtualList/components/addModel.vue       | 25 ++++++++-----------
 .../components/listAddModel.vue               | 20 +++++++--------
 3 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/jero-web/src/components/dict/JDictSelectTag.vue b/jero-web/src/components/dict/JDictSelectTag.vue
index 14054444d..259e77428 100644
--- a/jero-web/src/components/dict/JDictSelectTag.vue
+++ b/jero-web/src/components/dict/JDictSelectTag.vue
@@ -10,7 +10,7 @@
   <a-select v-else-if="tagType=='select'" allowClear :getPopupContainer = "getPopupContainer" :placeholder="placeholder" :disabled="disabled" :value="getValueSting" @change="handleInput">
 <!--    <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>-->
     <a-select-option v-for="(item, key) in dictOptionsValue" :key="key" :value="item.value">
-      <span class="itemOption" :title=" item.text || item.label ">
+      <span class="itemOption-index" :title=" item.text || item.label ">
         {{ item.text || item.label }}
       </span>
     </a-select-option>
@@ -118,7 +118,7 @@
   }
 </script>
 <style scoped>
-  .itemOption {
+  .itemOption-index {
     display: inline-block;
     width: 100%;
     overflow: hidden;
diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
index 425c51539..e19ffb106 100644
--- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
@@ -16,8 +16,8 @@
               <div class="title-text" :title="$t('standard')">
                 <span>{{$t('standard')}}</span>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                       v-model="queryParam.serialNumber"></j-input>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serial_number"></a-input>
             </div>
           </a-col>
           <a-col :md="12" :sm="8">
@@ -25,8 +25,8 @@
               <div class="title-text" :title="$t('title')">
                 <span>{{$t('title')}}</span>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                       v-model="queryParam.title"></j-input>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></a-input>
             </div>
           </a-col>
           <a-col :md="12" :sm="8">
@@ -108,7 +108,7 @@
         columns: [
           {
             title: this.$t('standard'),
-            dataIndex: 'serialNumber',
+            dataIndex: 'serial_number',
             align: 'center',
             ellipsis: true
           },
@@ -120,36 +120,31 @@
           },
           {
             title: this.$t('status'),
-            dataIndex: 'state_dictText',
+            dataIndex: 'state',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('technicalField'),
-            dataIndex: 'technologyTerritory',
+            dataIndex: 'technology_territory',
             align: 'center',
             ellipsis: true
           },
-          // {
-          //   title: this.$t('functionalAreas'),
-          //   dataIndex: 'functionalAreas',
-          //   align: 'center'
-          // },
           {
             title: this.$t('ImplementationDate'),
-            dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
+            dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('vehicleInProductionDate'),
-            dataIndex: 'implementTime',
+            dataIndex: 'implement_time',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('correspondingStandard'),
-            dataIndex: 'correspondingStandard',
+            dataIndex: 'corresponding_standard',
             align: 'center',
             ellipsis: true
           }
diff --git a/jero-web/src/views/projectManagement/components/listAddModel.vue b/jero-web/src/views/projectManagement/components/listAddModel.vue
index de6508602..907686174 100644
--- a/jero-web/src/views/projectManagement/components/listAddModel.vue
+++ b/jero-web/src/views/projectManagement/components/listAddModel.vue
@@ -16,8 +16,8 @@
               <div class="title-text" :title="$t('standard')">
                 <span>{{$t('standard')}}</span>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                       v-model="queryParam.serialNumber"></j-input>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serial_number"></a-input>
             </div>
           </a-col>
           <a-col :md="12" :sm="8">
@@ -25,8 +25,8 @@
               <div class="title-text" :title="$t('title')">
                 <span>{{$t('title')}}</span>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                       v-model="queryParam.title"></j-input>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></a-input>
             </div>
           </a-col>
           <a-col :md="12" :sm="8">
@@ -100,7 +100,7 @@
         columns: [
           {
             title: this.$t('standard'),
-            dataIndex: 'serialNumber',
+            dataIndex: 'serial_number',
             align: 'center',
             ellipsis: true
           },
@@ -112,31 +112,31 @@
           },
           {
             title: this.$t('status'),
-            dataIndex: 'state_dictText',
+            dataIndex: 'state',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('technicalField'),
-            dataIndex: 'technologyTerritory',
+            dataIndex: 'technology_territory',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('ImplementationDate'),
-            dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
+            dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('vehicleInProductionDate'),
-            dataIndex: 'implementTime',
+            dataIndex: 'implement_time',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('correspondingStandard'),
-            dataIndex: 'correspondingStandard',
+            dataIndex: 'corresponding_standard',
             align: 'center',
             ellipsis: true
           }