From 815bf6481585f764b29ad13e310286805d5e70d8 Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Wed, 9 Mar 2022 15:39:33 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/coTable/index.vue     |  5 ++
 .../views/documentManage/collection/index.vue |  9 ++-
 .../src/views/documentManage/ocr/index.vue    | 17 +-----
 .../documentManage/subscribtion/index.vue     | 58 +++----------------
 .../subscribtion/module/subArea.vue           | 28 ++++++---
 5 files changed, 43 insertions(+), 74 deletions(-)

diff --git a/jero-web/src/components/coTable/index.vue b/jero-web/src/components/coTable/index.vue
index c720a7f40..e624c0a73 100644
--- a/jero-web/src/components/coTable/index.vue
+++ b/jero-web/src/components/coTable/index.vue
@@ -12,6 +12,11 @@
         :columns="columns"
         @change="tableOnChange"
       >
+        <span slot="detailClick" slot-scope="text,record">
+              <a class="text" :title="text" @click="detailClick(record)">
+                {{text && text.length > 18?text.slice(0,17)+'...':text}}
+              </a>
+        </span>
         <span slot="operation" slot-scope="record">
                      <a class="text" v-for="(ol,index) in OperationList"
                         @click="OperationClick(ol,record)">
diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue
index fe9d51609..e68488539 100644
--- a/jero-web/src/views/documentManage/collection/index.vue
+++ b/jero-web/src/views/documentManage/collection/index.vue
@@ -52,6 +52,7 @@
             @titleClick="titleClick"
             @onCancel="onCancel"
             @onSelectChange="onSelectChange"
+            @detailClick="detailClick"
           ></tableData>
 <!--          <a-table bordered :data-source="tableData" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" :loading="loading" class="tag-con-table">-->
 <!--            <a slot="serialNumber" slot-scope="text, record" @click="numberClick(record)">{{ text }}</a>-->
@@ -259,8 +260,14 @@
       //点击名称
       titleClick(records){
 
+      },
+      detailClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: item
+        })
+        window.open(newUrl.href, '_blank')
       }
-
     }
   }
 </script>
diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue
index 98e803f26..c5e2a2b26 100644
--- a/jero-web/src/views/documentManage/ocr/index.vue
+++ b/jero-web/src/views/documentManage/ocr/index.vue
@@ -133,20 +133,7 @@
         checkVisible:false,  //校核弹框
         file:'',
         form:{},   //表单数据
-        rules:{
-          attId:[
-            { required: true, message: '请选择文件', trigger: 'change' },
-          ],
-          standNumber:[
-            { required: true, message: '请输入编号', trigger: 'blur' },
-          ],
-          standName:[
-            { required: true, message: '请输入名称', trigger: 'blur' },
-          ],
-          fileType:[
-            { required: true, message: '请选择文本状态', trigger: 'blur' },
-          ]
-        },
+        rules:{},
         url: {
           tableHeader: 'ocr/ocrRecord/getHeader',      //表格头部字段
           seachList: 'ocr/ocrRecord/queryCondition',   //搜索字段
@@ -356,7 +343,7 @@
       },
       //文件详情跳转
       detailClick(val){
-        window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + val.id))
+        window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + val.attId))
       },
       exportVisible(val){
         // this.fileVisible=val
diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue
index 37ecdc82c..0ffa0967d 100644
--- a/jero-web/src/views/documentManage/subscribtion/index.vue
+++ b/jero-web/src/views/documentManage/subscribtion/index.vue
@@ -4,37 +4,6 @@
       <div class="subscribtion-search-wrapper">
         <div class="subscribtion-search-header">
           <search :url="url" :flag="'1'"></search>
-<!--          <a-form layout="inline" @keyup.enter.native="searchQuery(queryParams)">-->
-<!--            <a-form-model-->
-<!--              class="subscribtion-content"-->
-<!--              :model="queryParams"-->
-<!--              ref="tagEditForm"-->
-<!--            >-->
-<!--              <a-row :gutter="44">-->
-<!--                <a-col :md="6" :sm="12">-->
-<!--                  <a-form-model-item :label="'编号'">-->
-<!--                    <j-input :placeholder="'请输入编号'" v-model="queryParams.serialNumber"></j-input>-->
-<!--                  </a-form-model-item>-->
-<!--                </a-col>-->
-<!--                <a-col :md="6" :sm="12">-->
-<!--                  <a-form-model-item :label="'标题'">-->
-<!--                    <j-input :placeholder="'请输入标题'" v-model="queryParams.title"></j-input>-->
-<!--                  </a-form-model-item>-->
-<!--                </a-col>-->
-<!--                <a-col :md="6" :sm="8">-->
-<!--                  <a-form-model-item :label="'状态'">-->
-<!--                    <j-dict-select-tag type="list" v-model="queryParams.state" dictCode="file_type" :placeholder="'请选择状态'" />-->
-<!--                  </a-form-model-item>-->
-<!--                </a-col>-->
-<!--                <a-col :md="6" :sm="8">-->
-<!--                  <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
-<!--                    <a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button>-->
-<!--                    <a-button @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>-->
-<!--                  </span>-->
-<!--                </a-col>-->
-<!--              </a-row>-->
-<!--            </a-form-model>-->
-<!--          </a-form>-->
         </div>
       </div>
       <div class="table-operator">
@@ -56,26 +25,8 @@
           @titleClick="titleClick"
           @onCancel="onCancel"
           @onSelectChange="onSelectChange"
+          @detailClick="detailClick"
         ></tableData>
-<!--        <a-table bordered :data-source="tableData" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" :loading="loading" class="tag-con-table">-->
-<!--          <a slot="serialNumber" slot-scope="text, record" @click="numberClick(record)">{{ text }}</a>-->
-<!--&lt;!&ndash;          <a slot="title" slot-scope="text, record" @click="titleClick(record)">{{ text }}</a>&ndash;&gt;-->
-<!--          <template slot="action" slot-scope="text, record">-->
-<!--              <a class="action-delete" href="javascript:;" @click="onCancel(record)">取消订阅</a>-->
-<!--          </template>-->
-<!--        </a-table>-->
-<!--        <div class="page" v-if="tableData.length > 0">-->
-<!--          <a-pagination-->
-<!--            :show-total="total => `共 ${total} 条`"-->
-<!--            show-quick-jumper-->
-<!--            show-size-changer-->
-<!--            :current="queryParams.pageNo"-->
-<!--            :page-size.sync="queryParams.pageSize"-->
-<!--            :total="total"-->
-<!--            @change="onChangePage"-->
-<!--            @showSizeChange="SizeChange"-->
-<!--          />-->
-<!--        </div>-->
       </div>
       <sub-area v-if="visible" :subVisible="visible" @visible="areaVisible"></sub-area>
     </a-card>
@@ -272,6 +223,13 @@
       },
       areaVisible(val){
         this.visible=val
+      },
+      detailClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: item
+        })
+        window.open(newUrl.href, '_blank')
       }
     }
   }
diff --git a/jero-web/src/views/documentManage/subscribtion/module/subArea.vue b/jero-web/src/views/documentManage/subscribtion/module/subArea.vue
index dfd5e5859..9bac951bd 100644
--- a/jero-web/src/views/documentManage/subscribtion/module/subArea.vue
+++ b/jero-web/src/views/documentManage/subscribtion/module/subArea.vue
@@ -9,7 +9,7 @@
         @ok="handleOk"
         @cancel="handleCancel"
       >
-        <a-input-search v-model="searchValue" style="margin-bottom: 8px" :placeholder="$t('NodeQuickLookup')" @change="onChange" />
+        <a-input-search v-model="searchValue" style="margin-bottom: 8px" :placeholder="$t('NodeQuickLookup')" @change="onChange" @search="onSearch" />
         <a-tree
           v-if="treeData && treeData.length"
           v-model="checkedKeys"
@@ -48,7 +48,8 @@
         autoExpandParent: true,
         treeData: [],
         dataList:[],
-        searchValue:''
+        searchValue:'',
+        data:[]
       }
     },
     props:{
@@ -68,15 +69,21 @@
     methods:{
       //获取数据
       loadData(){
-        let params = {}
+        let params = {
+          title:this.searchValue
+        }
+
         getAction(`sys/category/getSysCategoryTree`,params).then(res=> {
           if(res.success){
-            let data=res.result
-            this.treeData=this.addAttr(data)
+            this.data=[...res.result]
+            this.treeData=this.addAttr(this.data)
             // console.log('treeData',this.treeData)
           }
         })
       },
+      onSearch(){
+        this.loadData()
+      },
       //获取用户的订阅
       getSubscribtion(){
         postAction(`domain/domainUserRel/queryList`,{}).then(res=> {
@@ -96,6 +103,9 @@
         if((Array.isArray(dataI)) && dataI.length>0){
           dataI.forEach((item,index)=>{
             this.$set(item,'key',item.id)
+            // if(item.title.indexOf(this.searchValue)!==-1){
+            //   console.log('item.title',item.title)
+            // }
             let arr = [];
             this.addAttr(item.children,arr);
           });
@@ -155,15 +165,17 @@
         this.autoExpandParent = false;
       },
       onChange(e) {
+        // this.loadData()
         const value = e.target.value;
         const expandedKeys = this.dataList
           .map(item => {
             if (item.title.indexOf(value) > -1) {
-              return this.getParentKey(item.key, this.gData);
+              return this.getParentKey(item.key, this.treeData);
             }
             return null;
           })
           .filter((item, i, self) => item && self.indexOf(item) === i);
+        console.log('item',item)
         Object.assign(this, {
           expandedKeys,
           searchValue: value,
@@ -171,11 +183,11 @@
         })
       },
       onCheck(checkedKeys) {
-        console.log('onCheck', checkedKeys);
+        // console.log('onCheck', checkedKeys);
         this.checkedKeys = checkedKeys;
       },
       onSelect(selectedKeys, info) {
-        console.log('onSelect', info);
+        // console.log('onSelect', info);
         this.selectedKeys = selectedKeys;
       },