Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java

@@ -146,7 +146,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 		this.updateById(lawsMonthlyReportManageEO);
 
 		// 同步es
-		syncElasticsearch(id, issueStatus, issueTime);
+//		syncElasticsearch(id, issueStatus, issueTime);
 	}
 
 	private void syncElasticsearch(String id, String issueStatus, Date issueTime) {

jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue

@@ -10,8 +10,8 @@
                   <div class="title-text" :title="$t('title')">
                     <span>{{$t('title')}}</span>
                   </div>
-                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                  <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                           v-model="queryParams.title"></a-input>
+                           v-model="queryParams.title"></j-input>
                 </div>
               </a-col>
               <span style="float: right;overflow: hidden;margin-right: 11px"
@@ -60,7 +60,10 @@
               </div>
               <!--                    </a-tooltip>-->
             </div>
-            <div @click="CancelCollectionClick" class="text-text-right-text">{{$t('CancelCollection')}}</div>
+            <div @click="CancelCollectionClick(item)"
+                 :title="$t('CancelCollection')"
+                 class="text-text-right-text">{{$t('CancelCollection')}}
+            </div>
           </div>
         </div>
       </a-checkbox-group>
@@ -98,7 +101,8 @@
         loading: false,
         queryParams: {},
         url: {
-          getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page'
+          getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseCollectEO/queryCollectPageList',
+          deleteBatch: '/problemKnowledgeBase/problemKnowledgeBaseCollectEO/deleteBatch'
         }
       }
     },
@@ -107,7 +111,6 @@
     },
     watch: {
       checkboxText: function(value) {
-        console.log(value)
         this.conList.forEach(val => {
           val.checked = false
         })
@@ -159,9 +162,11 @@
           this.$confirm({
             content: _this.$t('BatchCancelCollection'),
             onOk() {
-              getAction('', {}).then((res) => {
+              let checkboxText = JSON.parse(JSON.stringify(_this.checkboxText))
+              deleteAction(_this.url.deleteBatch, { ids: checkboxText.join(',') }).then((res) => {
                 if (res.success) {
                   _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.checkboxText = []
                   _this.getList()
                 } else {
                   _this.$message.warning(res.message)
@@ -178,7 +183,7 @@
         this.$confirm({
           content: _this.$t('confirmCancelCollection'),
           onOk() {
-            getAction('', {}).then((res) => {
+            deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
               if (res.success) {
                 _this.$message.success(_this.$t('OperationSuccessful'))
                 _this.getList()
@@ -221,7 +226,7 @@
             if (this.conList && this.conList.length > 0) {
               this.conList.forEach(val => {
                 if (val.content) {
-                  val.contentOne = this.getText(val.content)
+                  val.content = this.getText(val.content)
                 }
               })
             }

jero-web/src/views/documentManage/collection/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="collection">
     <a-card :bordered="false">
-      <a-tabs :model="activeTab" @change="callback">
+<!--      <a-tabs :model="activeTab" @change="callback">-->
-        <a-tab-pane :key="$t('DocumentLibrary')" :tab="$t('DocumentLibrary')">
+<!--        <a-tab-pane :key="$t('DocumentLibrary')" :tab="$t('DocumentLibrary')">-->
           <div class="collection-search-wrapper">
             <div class="collection-search-header">
               <div class="table-page-search-wrapper">
@@ -90,11 +90,11 @@
               />
             </div>
           </div>
-        </a-tab-pane>
+<!--        </a-tab-pane>-->
-        <a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')">
+<!--        <a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')">-->
-          <problemKnowledgeBaseList ref="problemKnowledgeBaseListRef"/>
+<!--          <problemKnowledgeBaseList ref="problemKnowledgeBaseListRef"/>-->
-        </a-tab-pane>
+<!--        </a-tab-pane>-->
-      </a-tabs>
+<!--      </a-tabs>-->
     </a-card>
   </div>
 </template>

jero-web/src/views/documentTools/searchCenter/index.vue

@@ -65,10 +65,10 @@
                 <a-tab-pane :key="$t('whole')" :tab="$t('whole')"></a-tab-pane>
                 <a-tab-pane :key="$t('DocumentLibrary')" :tab="$t('DocumentLibrary')" force-render>
                 </a-tab-pane>
-                <a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')" force-render>
+<!--                <a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')" force-render>-->
-                </a-tab-pane>
+<!--                </a-tab-pane>-->
-                <a-tab-pane :key="$t('monthlyReportRegulations')" :tab="$t('monthlyReportRegulations')" force-render>
+<!--                <a-tab-pane :key="$t('monthlyReportRegulations')" :tab="$t('monthlyReportRegulations')" force-render>-->
-                </a-tab-pane>
+<!--                </a-tab-pane>-->
               </a-tabs>
             </div>
           </div>