From 00e513b32a2c170b33fa7eb6994da1e2ef1ea171 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Thu, 13 Oct 2022 11:54:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/problemKnowledgeBaseAdd.vue    | 12 ++-
 .../components/problemKnowledgeBaseList.vue   |  3 +-
 .../problemKnowledgeBaseRelease.vue           | 80 ++++++++++++++-----
 3 files changed, 74 insertions(+), 21 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
index abeca523f..487daf815 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
@@ -179,7 +179,10 @@
             </a-row>
           </a-form-model>
           <div class="submit-button">
-            <a-button class="box-button" type="primary" @click="submit">{{$t('submit')}}</a-button>
+            <a-button class="box-button" type="primary" @click="submit('Draft')">
+              {{$t('tempSave')}}
+            </a-button>
+            <a-button class="box-button" type="primary" @click="submit('Have released')">{{$t('release')}}</a-button>
           </div>
         </div>
       </div>
@@ -601,7 +604,10 @@
         this.formInline[this.uploadName] = attIdList.join(',')
         this.formInline = { ...this.formInline }
       },
-      submit() {
+      tempSaveClick(){
+
+      },
+      submit(releaseStatus) {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             let formInline = JSON.parse(JSON.stringify(this.formInline))
@@ -633,6 +639,7 @@
                 })
               })
             }
+            formInline.releaseStatus = releaseStatus
             Action(url, formInline).then((res) => {
               if (res.success) {
                 this.$message.success(this.$t('OperationSuccessful'))
@@ -784,6 +791,7 @@
   .box-button {
     height: 38px;
     margin-top: 4px;
+    margin-left: 10px;
   }
 
   .box-button-index {
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
index 78057a352..daab20b60 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
@@ -344,7 +344,8 @@
           pageNo: this.pageNo,
           pageSize: this.pageSize,
           searchStr: this.searchStr,
-          problemTypes: selectedTags.join(',')
+          problemTypes: selectedTags.join(','),
+          releaseStatus:'Have released'
         }
         this.loading = true
         getAction(this.url.getInfoList, query).then((res) => {
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
index cc029a5c3..16bc05889 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
@@ -12,16 +12,40 @@
       <div style="padding-top: 68px;background: #fff">
         <div class="detail-content" style="padding: 30px">
           <div class="search-detail-wrap">
-            <a-form layout="inline" @keyup.enter.native="onSearch">
-              <div class="box-title-text">
-                <div class="title-text" :title="$t('searchContent')">
-                  <span>{{$t('searchContent')}}</span>
+            <a-form layout="inline" style="width: 1200px;margin: 0 auto" @keyup.enter.native="onSearch">
+              <a-row :gutter="24">
+                <a-col :span="10">
+                  <div class="box-title-text">
+                    <div class="title-text" :title="$t('searchContent')">
+                      <span>{{$t('searchContent')}}</span>
+                    </div>
+                    <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('searchContent')"
+                             v-model="queryParam.searchStr"></a-input>
+                  </div>
+                </a-col>
+                <a-col :span="10">
+                  <div class="box-title-text">
+                    <div class="title-text" :title="$t('releaseStatus')">
+                      <span>{{$t('releaseStatus')}}</span>
+                    </div>
+                    <a-select :placeholder="$t('PleaseSelect')+$t('releaseStatus')"
+                              v-model="queryParam.releaseStatus">
+                      <a-select-option v-for="(item, key) in releaseStatusList"
+                                       :key="key"
+                                       :value="item.value">
+                     <span class="selectText" :title=" item.name ">
+                           {{ item.name}}
+                     </span>
+                      </a-select-option>
+                    </a-select>
+                  </div>
+                </a-col>
+                <div style="text-align: right">
+                  <a-button class="box-button" type="primary" @click="onSearch">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="ResetSearch">{{$t('reset')}}
+                  </a-button>
                 </div>
-                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('searchContent')"
-                         v-model="searchStr"></a-input>
-                <a-button class="box-button" type="primary" @click="onSearch">{{$t('query')}}</a-button>
-                <a-button class="box-button" style="margin-left: 8px" @click="ResetSearch">{{$t('reset')}}</a-button>
-              </div>
+              </a-row>
             </a-form>
           </div>
           <div v-if="conList.length > 0" style="height: calc(100vh - 240px);overflow:auto;">
@@ -41,6 +65,9 @@
                   <div class="text-content">
                     {{item.contentOne}}
                   </div>
+                  <div class="text-text-right-text-One">
+                    {{item.releaseStatus == 'Draft'?$t('draft'):$t('HaveReleased')}}
+                  </div>
                   <div class="text-text-right-text">
                     <a style="margin-right: 10px" @click="edit(item)"
                        v-if="userInfoQuery.username == item.createBy || administrators">{{$t('edit')}}</a>
@@ -85,7 +112,17 @@
         conList: [],
         total: 0,
         pageSize: 10,
-        searchStr: '',
+        queryParam: {},
+        releaseStatusList: [
+          {
+            name: this.$t('draft'),
+            value: 'Draft'
+          },
+          {
+            name: this.$t('HaveReleased'),
+            value: 'Have released'
+          }
+        ],
         loading: false,
         administrators: false,
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
@@ -126,7 +163,7 @@
         this.getList()
       },
       ResetSearch() {
-        this.searchStr = ''
+        this.queryParam = {}
         this.pageNo = 1
         this.getList()
       },
@@ -140,7 +177,7 @@
           pageNo: this.pageNo,
           pageSize: this.pageSize,
           createBy: this.userInfo().username,
-          searchStr: this.searchStr
+          ...this.queryParam
         }
         this.loading = true
         getAction(this.url.getInfoList, query).then((res) => {
@@ -285,11 +322,21 @@
 
   .text-text-right {
     padding: 19px 19px;
-    width: calc(100% - 180px);
+    width: calc(100% - 300px);
     box-sizing: border-box;
     /*margin-left: 38px;*/
   }
 
+  .text-text-right-text-One {
+    width: 120px;
+    height: 100%;
+    text-align: center;
+    position: absolute;
+    right: 180px;
+    top: 50%;
+    transform: translate-Y(-50%);
+  }
+
   .text-text-right-text {
     width: 180px;
     height: 100%;
@@ -365,16 +412,13 @@
 
   .search-detail-wrap {
     width: 100%;
-    margin: 0 auto;
+    margin-bottom: 16px;
   }
 
   .box-title-text {
     line-height: 1.4;
     display: flex;
     align-items: center;
-    margin-bottom: 10px;
-    text-align: center;
-    justify-content: center;
   }
 
   .title-text {
@@ -394,7 +438,7 @@
   .box-input {
     /*min-width: 200px;*/
     display: inline-block;
-    width: 50%;
+    width: 100%;
     height: 38px;
     margin-top: 2px;
     margin-right: 16px;