From d3fd25c098dde0345e8a51003e93b32af5274a53 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 25 Sep 2023 14:44:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/associatedplattwo.vue          |  2 +-
 .../components/addModel.vue                   | 72 +++++++++----------
 .../components/nonConformance.vue             | 38 ++--------
 .../components/settingList.vue                |  3 +
 .../platformItemLibraryDetails/index.vue      |  3 +-
 5 files changed, 48 insertions(+), 70 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/associatedplattwo.vue b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
index 3ff14e24c..79c12a746 100644
--- a/jero-web/src/views/projectManagement/components/associatedplattwo.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
@@ -110,7 +110,7 @@ export default {
         },
         {
           title: this.$t('NareaOfResponsibility'),
-          dataIndex: 'dutyTerritory',
+          dataIndex: 'dutyTerritory_dictText',
           align: 'left',
           ellipsis: true,
           width: 140
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index d30bae959..fd768320a 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -19,19 +19,8 @@
                 <span class="title-text-text" :title="$t('entryName')">{{$t('entryName')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="projectNameId">
-                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('entryName')"
                          v-model="formInline.projectNameId"></a-input>
-<!--                <a-select :placeholder="$t('PleaseSelect')+$t('modelName')"-->
-<!--                          @change="projectNameChange"-->
-<!--                          v-model="formInline.projectNameId">-->
-<!--                  <a-select-option v-for="(item, key) in projectNameList"-->
-<!--                                   :key="key"-->
-<!--                                   :value="item.id">-->
-<!--                     <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>
@@ -45,6 +34,7 @@
                 <j-dict-select-tag class="box-input" v-model="formInline.brand"
                                    :placeholder="$t('PleaseSelect')+$t('brand')"
                                    :type="'select'"
+                                   @input="handleInput('brand')"
                                    :triggerChange="false" :dictCode="'brand'"/>
               </a-form-model-item>
             </div>
@@ -57,8 +47,8 @@
 <!--                <span class="Required">*</span>-->
                 <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
               </div>
-              <a-form-model-item class="itemModel-multi" prop="ipdInfo">
-                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('configurationItem')"
+              <a-form-model-item class="itemModel" prop="ipdInfo">
+                <a-input class="box-input" :maxLength="200" :placeholder="$t('PleaseEnter')+$t('configurationItem')"
                          v-model="formInline.ipdInfo"></a-input>
               </a-form-model-item>
             </div>
@@ -66,12 +56,14 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="title-text-text" :title="$t('explain')">{{$t('explain')}}</span>
+                <span class="title-text-text" :title="$t('certificationProgram')">{{$t('certificationProgram')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="explanation">
-                <a-textarea :placeholder="$t('pleaseEnter')+$t('explain')"
-                            v-model="formInline.explanation"
-                            :rows="2"/>
+              <a-form-model-item class="itemModel" prop="attestationPlan">
+                <a-input class="box-input"
+                         :disabled="disabled"
+                         :maxLength="200"
+                         v-model="formInline.attestationPlan"
+                         :placeholder="$t('PleaseEnter')+$t('certificationProgram')"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -86,6 +78,7 @@
               <a-form-model-item class="itemModel" :prop="'vehicleDevelopmentPlan'">
                 <a-input class="box-input"
                          :disabled="disabled"
+                         :maxLength="200"
                          v-model="formInline.vehicleDevelopmentPlan"
                          :placeholder="$t('PleaseEnter')+$t('dehicleDevelopmentPlan')"/>
               </a-form-model-item>
@@ -94,13 +87,13 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="title-text-text" :title="$t('certificationProgram')">{{$t('certificationProgram')}}</span>
+                <span class="title-text-text" :title="$t('explain')">{{$t('explain')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="attestationPlan">
-                <a-input class="box-input"
-                         :disabled="disabled"
-                         v-model="formInline.attestationPlan"
-                         :placeholder="$t('PleaseEnter')+$t('certificationProgram')"/>
+              <a-form-model-item class="itemModel" prop="explanation">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('explain')"
+                            v-model="formInline.explanation"
+                            :maxLength="500"
+                            :rows="2"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -278,8 +271,8 @@
               message: this.$t('pleaseEnterTheCorrectWebAddress')
             },
             {
-              max: 300,
-              message: this.$t('configurationInformation') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 200,
+              message: this.$t('configurationInformation') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],
@@ -289,8 +282,8 @@
               message: this.$t('pleaseEnterTheCorrectWebAddress')
             },
             {
-              max: 300,
-              message: this.$t('dehicleDevelopmentPlan') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 200,
+              message: this.$t('dehicleDevelopmentPlan') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],
@@ -307,15 +300,15 @@
               message: this.$t('pleaseEnterTheCorrectWebAddress')
             },
             {
-              max: 300,
-              message: this.$t('certificationProgram') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 200,
+              message: this.$t('certificationProgram') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],
           vehiclePlatform: [
             {
-              max: 100,
-              message: this.$t('ModelPlatform') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              max: 200,
+              message: this.$t('ModelPlatform') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],
@@ -324,19 +317,24 @@
               required: true,
               message: this.$t('entryName') + this.$t('cannotEmpty'),
               trigger: 'blur'
+            },
+            {
+              max: 200,
+              message: this.$t('DigitalPlatform') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
+              trigger: 'blur'
             }
           ],
           digitalPlatform: [
             {
-              max: 100,
-              message: this.$t('DigitalPlatform') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              max: 200,
+              message: this.$t('DigitalPlatform') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],
           softwareVersion: [
             {
-              max: 300,
-              message: this.$t('softwareVersion') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 200,
+              message: this.$t('softwareVersion') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
index 73b821008..ce5c3daf8 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
@@ -24,41 +24,17 @@
           </a-col>
           <a-col :md="6" :sm="8">
             <div class="box-title-text">
-              <div class="title-text" :title="$t('RelatedItems')">
-                <span>{{$t('RelatedItems')}}</span>
+              <div class="title-text" :title="$t('problemType')">
+                <span>{{$t('problemType')}}</span>
               </div>
-              <a-select allowClear
-                        class="box-input"
-                        v-model="queryParam.projectId"
-                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                        showSearch
-                        optionFilterProp="label"
-                        :autoClearSearchValue="false"
-                        :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
-                <a-select-option v-for="(item, key) in projectNameList"
-                                 :key="key"
-                                 :label="item.projectName"
-                                 :value="item.id">
-                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
-                           {{ item.projectName}}
-                     </span>
-                </a-select-option>
-              </a-select>
+              <j-dict-select-tag class="box-input" v-model="queryParam.problemType"
+                                 :placeholder="$t('PleaseSelect')+$t('problemType')"
+                                 :type="'select'"
+                                 @changeQuery="onChange"
+                                 :triggerChange="false" :dictCode="'wen4_ti2_lei4_xing2'"/>
             </div>
           </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :md="6" :sm="8">
-              <div class="box-title-text">
-                <div class="title-text" :title="$t('problemType')">
-                  <span>{{$t('problemType')}}</span>
-                </div>
-                <j-dict-select-tag class="box-input" v-model="queryParam.problemType"
-                                   :placeholder="$t('PleaseSelect')+$t('problemType')"
-                                   :type="'select'"
-                                   @changeQuery="onChange"
-                                   :triggerChange="false" :dictCode="'wen4_ti2_lei4_xing2'"/>
-              </div>
-            </a-col>
             <a-col :md="6" :sm="8">
               <div class="box-title-text">
                 <div class="title-text" :title="$t('statisticalNodes')">
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
index 05ba0869e..ce86526cb 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
@@ -104,6 +104,9 @@
         getAction(this.url.settingQueryForm, { projectId: this.$route.query.id }).then((res) => {
           if (res.success) {
               this.formInline.list = res.result ? res.result : [{}]
+            if(res.result==null ||res.result.length == 0){
+              this.formInline.list=[{}]
+            }
             console.log(this.formInline.list)
 
           }
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
index 6f6a4a2c0..4a276140d 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/index.vue
@@ -6,7 +6,7 @@
                     <a-icon @click="backClick" type="left-circle" theme="filled"
                             style="margin-right: 8px;font-size: 30px;color: #21c9cc;"/>
                   </span>
-        <span>
+        <span :title='this.title'>
              {{ this.title }}
         </span>
       </div>
@@ -568,6 +568,7 @@ export default {
       display: inline-block;
       text-overflow: ellipsis;
       white-space: nowrap;
+      max-width:810px;
       overflow: hidden;
       font-size: 20px;
       font-weight: 400;