From c1e9483aba31beac7c39923b343ea761f6be27bd Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 26 Sep 2023 15:59:39 +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

---
 .../certificationList/components/addModel.vue |  2 +-
 .../components/flowstatusdetial.vue           |  5 ++
 .../components/addModelconformance.vue        | 48 ++++---------------
 .../components/detilModel.vue                 | 46 ++++--------------
 .../components/nonConformance.vue             | 22 ++++-----
 5 files changed, 36 insertions(+), 87 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
index 12c7ddba4..b0e712ec4 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -876,7 +876,7 @@
           this.queryPersonByProject(value.dutyTerritory.join(','))
         }
         console.log(value)
-        if(value.projectCertificationInventoryEOS && value.projectCertificationInventoryEOS.length > 0){
+        if(value.projectCertificationInventoryEOS && (value.projectCertificationInventoryEOS.length > 0 || value.projectCertificationInventoryEOS == null)){
           this.flowdisabled = true
           this.$refs.uploadFile.disabled = true
         }
diff --git a/jero-web/src/views/projectManagement/components/flowstatusdetial.vue b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue
index a708b55dc..3d115990a 100644
--- a/jero-web/src/views/projectManagement/components/flowstatusdetial.vue
+++ b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue
@@ -246,6 +246,11 @@ export default {
   left: 33%;
   font-size: 14px;
   color: #040B29;
+  width: 60%;
+  overflow: hidden; /*超出部分隐藏*/
+  text-overflow: ellipsis; /*超出部分省略号表示*/
+  white-space: nowrap; /*强制单行显示*/
+  display: inline-block; /*转换为行内块元素*/
 }
 .title-text-description{
   display: inline-block;
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
index 0bdd14ac0..decbb240e 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
@@ -84,25 +84,24 @@
                 <div class="title-text">
                   <!--                  <span class="Required">*</span>-->
                   <span class="title-text-text"
-                        :title="$t('RelatedItems')">{{$t('RelatedItems')}}</span>
+                        :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="contentTemplate">
                   <a-select allowClear
                             class="box-input"
-                            v-model="formInline.projectId"
+                            v-model="formInline.problemState"
                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
                             showSearch
-                            mode="multiple"
                             optionFilterProp="label"
                             :autoClearSearchValue="false"
-                            :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
-                    <a-select-option v-for="(item, key) in projectNameList"
+                            :placeholder="$t('PleaseSelect')+$t('Problemstate')">
+                    <a-select-option v-for="(item, key) in ProblemstateList"
+                                     :label='item'
                                      :key="key"
-                                     :label="item.projectName"
-                                     :value="item.id">
-                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
-                           {{ item.projectName}}
-                     </span>
+                                     :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
+                  </span>
                     </a-select-option>
                   </a-select>
                 </a-form-model-item>
@@ -138,34 +137,7 @@
                 </a-form-model-item>
               </div>
             </a-col>
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <!--                  <span class="Required">*</span>-->
-                  <span class="title-text-text"
-                        :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="contentTemplate">
-                  <a-select allowClear
-                            class="box-input"
-                            v-model="formInline.problemState"
-                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                            showSearch
-                            optionFilterProp="label"
-                            :autoClearSearchValue="false"
-                            :placeholder="$t('PleaseSelect')+$t('Problemstate')">
-                    <a-select-option v-for="(item, key) in ProblemstateList"
-                                     :label='item'
-                                     :key="key"
-                                     :value="item">
-                  <span style="display: inline-block;width: 100%" :title=" item">
-                    {{ item }}
-                  </span>
-                    </a-select-option>
-                  </a-select>
-                </a-form-model-item>
-              </div>
-            </a-col>
+
           </a-row>
           <a-row :gutter="24">
             <a-col :span="24">
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue
index 1fed49c1b..62eea355b 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/detilModel.vue
@@ -78,25 +78,24 @@
                 <div class="title-text">
                   <!--                  <span class="Required">*</span>-->
                   <span class="title-text-text"
-                        :title="$t('RelatedItems')">{{$t('RelatedItems')}}</span>
+                        :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="contentTemplate">
                   <a-select allowClear
                             class="box-input"
-                            v-model="formInline.projectId"
+                            v-model="formInline.problemState"
                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
                             showSearch
-                            mode="multiple"
                             :disabled="disabled"
                             optionFilterProp="label"
                             :autoClearSearchValue="false">
-                    <a-select-option v-for="(item, key) in projectNameList"
+                    <a-select-option v-for="(item, key) in ProblemstateList"
+                                     :label='item'
                                      :key="key"
-                                     :label="item.projectName"
-                                     :value="item.id">
-                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
-                           {{ item.projectName}}
-                     </span>
+                                     :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
+                  </span>
                     </a-select-option>
                   </a-select>
                 </a-form-model-item>
@@ -133,34 +132,7 @@
                 </a-form-model-item>
               </div>
             </a-col>
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <!--                  <span class="Required">*</span>-->
-                  <span class="title-text-text"
-                        :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="contentTemplate">
-                  <a-select allowClear
-                            class="box-input"
-                            v-model="formInline.problemState"
-                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                            showSearch
-                            :disabled="disabled"
-                            optionFilterProp="label"
-                            :autoClearSearchValue="false">
-                    <a-select-option v-for="(item, key) in ProblemstateList"
-                                     :label='item'
-                                     :key="key"
-                                     :value="item">
-                  <span style="display: inline-block;width: 100%" :title=" item">
-                    {{ item }}
-                  </span>
-                    </a-select-option>
-                  </a-select>
-                </a-form-model-item>
-              </div>
-            </a-col>
+
           </a-row>
           <a-row :gutter="24">
             <a-col :span="24">
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
index ce5c3daf8..b742f6763 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
@@ -230,14 +230,14 @@ export default {
           sorter:true,
           ellipsis: true
         },
-        {
-          title: this.$t('RelatedItems'),
-          align: 'left',
-          dataIndex: 'projectName',
-          width: 170,
-          sorter:true,
-          ellipsis: true
-        },
+        // {
+        //   title: this.$t('RelatedItems'),
+        //   align: 'left',
+        //   dataIndex: 'projectName',
+        //   width: 170,
+        //   sorter:true,
+        //   ellipsis: true
+        // },
         {
           title: this.$t('problemType'),
           align: 'left',
@@ -404,9 +404,9 @@ export default {
       this.queryParam.problemType_dictText = value
     },
     getList() {
-      if(this.queryParam.problemType_dictText){
-        delete this.queryParam.problemType
-      }
+      // if(this.queryParam.problemType_dictText){
+      //   delete this.queryParam.problemType
+      // }
       let query = {
         pageNo: this.pageNo,
         pageSize: this.pageSize,