From c25d7510b9e7cc376461d2e882ca0895a8f6459d Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 2 Aug 2022 16:49:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98=E7=9F=A5?=
 =?UTF-8?q?=E8=AF=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../components/problemKnowledgeBaseAdd.vue    | 46 +++--------
 .../components/problemKnowledgeBaseList.vue   | 18 +----
 .../problemKnowledgeBaseRelease.vue           | 62 ++++++++++-----
 .../components/problemKnowledgeBaseView.vue   | 77 ++++++++++++++++++-
 6 files changed, 133 insertions(+), 72 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index db7e44757..7ed400d42 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1219,4 +1219,5 @@ module.exports = {
   thereWhichCannotDeleted:'There are sub headings under this title, which cannot be deleted',
   sdt:'sdt',
   dre:'dre',
+  applicableInstructionsMarketList:'Applicable instructions of market list',
 }
\ 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 13a03d29c..4611497fe 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1322,4 +1322,5 @@ module.exports = {
   thereWhichCannotDeleted:'该标题下存在子标题无法进行删除',
   sdt:'工程接口人',
   dre:'填写人',
+  applicableInstructionsMarketList:'市场清单适用说明',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
index 2b654d9c4..bb5cacdb6 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
@@ -69,34 +69,19 @@
                 <div class="box-title-text">
                   <div class="title-text">
                     <span class="Required">*</span>
-                    <span class="title-text-text" :title="$t('category')">{{$t('category')}}</span>
+                    <span class="title-text-text"
+                          :title="$t('problemClassification')">{{$t('problemClassification')}}</span>
                   </div>
                   <a-form-model-item class="itemModel" prop="projectStatus">
                     <j-dict-select-tag class="box-input" v-model="formInline.projectStatus"
                                        :disabled="disabled"
                                        @input="handleInput('projectStatus')"
-                                       :placeholder="$t('PleaseSelect')+$t('category')"
+                                       :placeholder="$t('PleaseSelect')+$t('problemClassification')"
                                        :type="'select'"
                                        :triggerChange="false" :dictCode="'project_status'"/>
                   </a-form-model-item>
                 </div>
               </a-col>
-              <a-col :span="8">
-                <div class="box-title-text">
-                  <div class="title-text">
-                    <span class="title-text-text"
-                          :title="$t('problemClassification')">{{$t('problemClassification')}}</span>
-                  </div>
-                  <a-form-model-item class="itemModel" prop="vehiclePlatform">
-                    <a-input class="box-input"
-                             :disabled="disabled"
-                             v-model="formInline.vehiclePlatform"
-                             :placeholder="$t('PleaseEnter')+$t('problemClassification')"/>
-                  </a-form-model-item>
-                </div>
-              </a-col>
-            </a-row>
-            <a-row :gutter="24">
               <a-col :span="8">
                 <div class="box-title-text">
                   <div class="title-text">
@@ -113,34 +98,21 @@
                   </a-form-model-item>
                 </div>
               </a-col>
+            </a-row>
+            <a-row :gutter="24">
               <a-col :span="8">
                 <div class="box-title-text">
                   <div class="title-text">
-                    <span class="title-text-text" :title="$t('documentNumber')">{{$t('documentNumber')}}</span>
+                    <span class="title-text-text" :title="$t('standardNo')">{{$t('standardNo')}}</span>
                   </div>
                   <a-form-model-item class="itemModel" prop="vehiclePlatform">
                     <a-input class="box-input"
                              :disabled="disabled"
                              v-model="formInline.vehiclePlatform"
-                             :placeholder="$t('PleaseEnter')+$t('documentNumber')"/>
+                             :placeholder="$t('PleaseEnter')+$t('standardNo')"/>
                   </a-form-model-item>
                 </div>
               </a-col>
-              <a-col :span="8">
-                <div class="box-title-text">
-                  <div class="title-text">
-                    <span class="title-text-text" :title="$t('documentTitle')">{{$t('documentTitle')}}</span>
-                  </div>
-                  <a-form-model-item class="itemModel" :prop="'digitalPlatform'">
-                    <a-input class="box-input"
-                             :disabled="disabled"
-                             v-model="formInline.digitalPlatform"
-                             :placeholder="$t('PleaseEnter')+$t('documentTitle')"/>
-                  </a-form-model-item>
-                </div>
-              </a-col>
-            </a-row>
-            <a-row :gutter="24">
               <a-col :span="8">
                 <div class="box-title-text">
                   <div class="title-text">
@@ -405,4 +377,8 @@
     border: 1px #00B3BE solid;
     color: #00B3BE;
   }
+
+  .box-button {
+    height: 38px;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
index a3631bcf8..73fe2200f 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
@@ -44,26 +44,10 @@
                :class="{ 'null-input':item.checked }">
             <div class="text-header" @click="titleClick(item)">
               <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
-                <template slot="title">
-                  <span v-html="item.module_type"></span>
-                </template>
-                <span class="text-header-text" style="cursor: pointer" v-html="item.module_type"></span>
-                <template slot="title">
-                  <span v-html="item.serial_number"></span>
-                </template>
-                <span style="cursor: pointer"
-                      class="text-header-text"
-                      v-html="item.serial_number"></span>
                 <template slot="title">
                   <span v-html="item.title"></span>
                 </template>
                 <span class="text-header-text" style="cursor: pointer" v-html="item.title"></span>
-                <template slot="title">
-                  <span v-html="item.file_name"></span>
-                </template>
-                <span class="text-header-text" style="cursor: pointer" v-html="item.file_name"></span>
-              </a-tooltip>
-              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
               </a-tooltip>
             </div>
             <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
@@ -296,7 +280,7 @@
       font-weight: bold;
       color: #040B29;
       display: inline-block;
-      max-width: 180px;
+      max-width: calc(100% - 180px);
       text-overflow: ellipsis;
       white-space: nowrap;
       overflow: hidden;
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
index 1cb6d2823..628bdec05 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
@@ -13,32 +13,16 @@
         <div class="detail-content" style="padding: 30px">
           <div v-if="conList.length > 0" style="height: calc(100vh - 180px);overflow:auto;">
             <div v-for="(item,index) in conList" :key="item.id">
-              <div style="margin-bottom: 10px;position: relative">
+              <div style="margin-bottom: 10px;position: relative;overflow: hidden">
                 <!--          <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>-->
                 <div class="text-text-right"
                      :class="{ 'null-input':item.checked }">
                   <div class="text-header" @click="titleClick(item)">
                     <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
-                      <template slot="title">
-                        <span v-html="item.module_type"></span>
-                      </template>
-                      <span class="text-header-text" style="cursor: pointer" v-html="item.module_type"></span>
-                      <template slot="title">
-                        <span v-html="item.serial_number"></span>
-                      </template>
-                      <span style="cursor: pointer"
-                            class="text-header-text"
-                            v-html="item.serial_number"></span>
                       <template slot="title">
                         <span v-html="item.title"></span>
                       </template>
                       <span class="text-header-text" style="cursor: pointer" v-html="item.title"></span>
-                      <template slot="title">
-                        <span v-html="item.file_name"></span>
-                      </template>
-                      <span class="text-header-text" style="cursor: pointer" v-html="item.file_name"></span>
-                    </a-tooltip>
-                    <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
                     </a-tooltip>
                   </div>
                   <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
@@ -49,6 +33,10 @@
                     </div>
                   </a-tooltip>
                 </div>
+                <div class="text-text-right-text">
+                  <a style="margin-right: 10px" @click="edit(item)">{{$t('edit')}}</a>
+                  <a @click="deleteData(item)">{{$t('delete')}}</a>
+                </div>
               </div>
             </div>
           </div>
@@ -87,7 +75,8 @@
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
         pageNo: 1,
         url: {
-          getInfoList: 'search/document/getFullTextInfoList'
+          getInfoList: 'search/document/getFullTextInfoList',
+          deleteBatch: ''
         }
       }
     },
@@ -128,6 +117,30 @@
           }
         })
         window.open(newUrl.href, '_blank')
+      },
+      edit(val) {
+        this.$router.push({
+          path: '/problemKnowledgeBaseAdd',
+          query: {
+            id: val.id
+          }
+        })
+      },
+      deleteData(val) {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('ConfirmDelete'),
+          onOk() {
+            getAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.getList()
+              } else {
+                _this.$message.warning(res.message)
+              }
+            })
+          }
+        })
       }
     }
   }
@@ -210,10 +223,21 @@
 
   .text-text-right {
     padding: 19px 0;
+    width: calc(100% - 180px);
     box-sizing: border-box;
     /*margin-left: 38px;*/
   }
 
+  .text-text-right-text {
+    width: 180px;
+    height: 100%;
+    text-align: center;
+    position: absolute;
+    right: 0;
+    top: 50%;
+    transform: translate-Y(-50%);
+  }
+
   .null-input {
     background-color: #F2F4F8;
   }
@@ -231,7 +255,7 @@
       font-weight: bold;
       color: #040B29;
       display: inline-block;
-      max-width: 180px;
+      max-width: calc(100% - 180px);
       text-overflow: ellipsis;
       white-space: nowrap;
       overflow: hidden;
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue
index 958c3f3a5..e00c3ad3e 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue
@@ -1,5 +1,21 @@
 <template>
+  <div class="doc-detail">
+    <div class="doc-detail-wrap">
+      <div class="doc-detail-header" style="position: fixed;top: 0">
+        <div class="doc-detail-title">
+           <span style="line-height: 66px;display: inline-block;float: left">
+             <a-icon type="arrow-left" style="margin-right: 6px;"/>
+           </span>
+          {{$t('applicableInstructionsMarketList')}}
+        </div>
+      </div>
+      <div style="padding-top: 68px;background: #fff">
+        <div class="detail-content" style="padding: 24px">
 
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -8,6 +24,65 @@
   }
 </script>
 
-<style scoped>
+<style scoped lang="less">
+  @import '~@assets/less/common.less';
 
+  .doc-detail {
+    background: #fff;
+    height: 100%;
+
+    .doc-detail-wrap {
+      .doc-detail-header {
+        width: 100%;
+        height: 68px;
+        line-height: 68px;
+        padding: 0 0 0 32px;
+        box-sizing: border-box;
+        display: flex;
+        justify-content: space-between;
+        border-bottom: 2px #eff1f3 solid;
+        z-index: 1000;
+        background: #fff;
+
+        .doc-detail-title {
+          display: inline-block;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+          font-size: 20px;
+          font-weight: 400;
+          color: #040B29;
+          line-height: 68px;
+        }
+
+        .doc-detail-right {
+          width: 800px;
+          line-height: 68px;
+          display: flex;
+
+          .doc-detail-btn {
+            margin-left: 10px;
+          }
+        }
+      }
+
+      .content-box {
+        padding: 0 32px;
+        box-sizing: border-box;
+      }
+
+      .header-text {
+        font-size: 16px;
+        font-weight: 400;
+        height: 80px;
+        color: #000F16;
+        line-height: 80px;
+      }
+
+      .processBackground-text {
+        font-size: 16px;
+        color: #000F16;
+      }
+    }
+  }
 </style>
\ No newline at end of file