From 428d6e4d219db88538327bd33a5379b125bf03b7 Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Mon, 21 Feb 2022 16:07:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/documentManage/ocr/index.vue    |  22 +-
 .../documentManage/ocr/modules/docTable.vue   |  28 ++-
 .../views/documentManage/splitting/index.vue  | 118 ++++++++++
 .../documentManage/subscribtion/index.vue     |  12 +-
 .../subscribtion/module/subArea.vue           | 210 ++++++++++++++++++
 .../tags/dialog/OnlCgformTagForm.vue          |   1 +
 .../documentManage/tags/dialog/areaManage.vue |   6 +-
 .../documentManage/tags/tabs/tagContent.vue   |  14 +-
 .../documentManage/tags/tabs/tagItem.vue      |   4 +-
 9 files changed, 391 insertions(+), 24 deletions(-)
 create mode 100644 jero-web/src/views/documentManage/splitting/index.vue
 create mode 100644 jero-web/src/views/documentManage/subscribtion/module/subArea.vue

diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue
index 1c2d09694..4e0ac3840 100644
--- a/jero-web/src/views/documentManage/ocr/index.vue
+++ b/jero-web/src/views/documentManage/ocr/index.vue
@@ -232,19 +232,22 @@
             title:'标准编号',
             key: 'standNumber',
             align:"center",
-            dataIndex: 'standNumber'
+            dataIndex: 'standNumber',
+            ellipsis: true,
           },
           {
             title:'标准名称',
             key: 'standName',
             align:"center",
-            dataIndex: 'standName'
+            dataIndex: 'standName',
+            ellipsis: true,
           },
           {
             title:'文本状态',
             key: 'fileType_dictText',
             align:"center",
-            dataIndex: 'fileType_dictText'
+            dataIndex: 'fileType_dictText',
+            ellipsis: true,
           },
           {
             title:'文件名称',
@@ -253,26 +256,30 @@
             dataIndex: 'fileName',
             slots: { title: 'customTitle' },
             scopedSlots: { customRender: 'fileName' },
+            ellipsis: true,
           },
           {
             title:'转换结果',
             key: 'resultContent',
             align:"center",
-            dataIndex: 'resultContent'
+            dataIndex: 'resultContent',
+            ellipsis: true,
           },
           {
             title:'转换时间',
             key: 'createTime',
             align:"center",
             sorter: true,
-            dataIndex: 'createTime'
+            dataIndex: 'createTime',
+            ellipsis: true,
           },
           {
             title:'同步情况',
             key: 'syncState',
             align:"center",
             sorter: true,
-            dataIndex: 'syncState'
+            dataIndex: 'syncState',
+            ellipsis: true,
           },
           {
             title: this.$t('operation'),
@@ -381,9 +388,6 @@
             description:'',
           });
         }
-
-
-
       },
       //同步
       actionSynchron(){
diff --git a/jero-web/src/views/documentManage/ocr/modules/docTable.vue b/jero-web/src/views/documentManage/ocr/modules/docTable.vue
index de95b0322..736c7ed8c 100644
--- a/jero-web/src/views/documentManage/ocr/modules/docTable.vue
+++ b/jero-web/src/views/documentManage/ocr/modules/docTable.vue
@@ -36,7 +36,7 @@
         <div class="doc-table-detail">
           <a-table bordered :data-source="tableSource" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" class="tag-con-table" :pagination="false" >
             <span slot="num" slot-scope="text,records,index">
-              {{ (ipagination.currentPage-1)*ipagination.pageSize+Number(index)+1 }}
+              {{ (queryParams.pageNo-1)*queryParams.pageSize+Number(index)+1 }}
             </span>
           </a-table>
           <div class="page" v-if="tableSource.length > 0">
@@ -65,7 +65,6 @@
     },
     data(){
       return{
-        total:0,
         visible:false,
         queryParams:{
           pageNo:1,
@@ -91,37 +90,43 @@
             key: 'num',
             align:"center",
             scopedSlots: { customRender: 'num' },
-            width:80
+            width:80,
+            ellipsis: true,
           },
           {
             title:'标准编号',
             key: 'standNumber',
             align:"center",
-            dataIndex: 'standNumber'
+            dataIndex: 'standNumber',
+            ellipsis: true,
           },
           {
             title:'标题',
             key: 'standName',
             align:"center",
-            dataIndex: 'standName'
+            dataIndex: 'standName',
+            ellipsis: true,
           },
           {
             title:'文本状态',
             key: 'fileType_dictText',
             align:"center",
-            dataIndex: 'fileType_dictText'
+            dataIndex: 'fileType_dictText',
+            ellipsis: true,
           },
           {
             title:'文件名称',
             key: 'fileName',
             align:"center",
-            dataIndex: 'fileName'
+            dataIndex: 'fileName',
+            ellipsis: true,
           },
           {
             title:'文件信息',
             key: 'fileInfo',
             align:"center",
-            dataIndex: 'fileInfo'
+            dataIndex: 'fileInfo',
+            ellipsis: true,
           },
         ]
       }
@@ -169,4 +174,11 @@
 
     }
   }
+  .doc-table-detail{
+    margin-top: 20px;
+    .page{
+      text-align: right;
+      margin-top: 20px;
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue
new file mode 100644
index 000000000..435c02a9b
--- /dev/null
+++ b/jero-web/src/views/documentManage/splitting/index.vue
@@ -0,0 +1,118 @@
+<template>
+    <div class="splitting">
+      <a-card :bordered="false">
+          <div class="splitting-search-wrapper">
+            <search :flag="'1'" :url="url"/>
+          </div>
+        <div class="table-operator">
+          <a-button @click="handleModule()" type="primary">拆分已入库文本</a-button>
+          <a-button @click="handleExport()" type="primary">导入拆分结果</a-button>
+          <a-button @click="handleDel()" type="danger">批量删除</a-button>
+        </div>
+        <div class="splitting-table">
+          <tableData
+            :flag="'1'"
+            :OperationList="OperationList"
+            @editTable="seeTable"
+            @deleteTable="deleteTable"
+            :url="url"
+            showAction
+            @returnBack="returnBack"
+          />
+        </div>
+      </a-card>
+    </div>
+</template>
+
+<script>
+  import search from '@/components/search/index'
+  import tableData from '@/components/tableDate/index'
+  import frameAssembly from '@/components/frameAssembly/index'
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import eventBUs from '../../../common/event'
+  export default {
+    name: 'splitting',
+    components: {
+      search,
+      tableData,
+      frameAssembly
+    },
+    data(){
+      return{
+        OperationList: [
+          {
+            text: '回传至文档库',
+            ClickEvent: 'returnBack'
+          },
+          {
+            text: '查看',
+            ClickEvent: 'seeTable'
+          },
+          {
+            text: '删除',
+            ClickEvent: 'deleteTable'
+          }
+        ],
+        url: {
+          tableHeader: 'document/bussDocumentLibraryEO/getHeader',      //表格头部字段
+          seachList: 'document/bussDocumentLibraryEO/queryCondition',   //搜索字段
+          tableList: 'document/bussDocumentLibraryEO/queryPageInfo',         //表格数据
+          getAddForm: 'document/bussDocumentLibraryEO/getAddForm',   // 表单的字段
+          addInfo: 'document/bussDocumentLibraryEO/addInfo',      //新增
+          updateInfo: 'document/bussDocumentLibraryEO/updateInfo',   //编辑
+          getDocumentInfo: 'document/bussDocumentLibraryEO/getDocumentInfoById',   //查看
+          deleteBatch: 'document/bussDocumentLibraryEO/deleteBatch' //删除
+        }
+      }
+    },
+    props:{
+
+    },
+    created() {
+
+    },
+    mounted() {
+
+    },
+    methods:{
+      //拆分已入库文本
+      handleModule(){
+
+      },
+      //导入拆分结果
+      handleExport(){
+
+      },
+      //批量删除
+      handleDel(){
+
+      },
+      //回传至文档库
+      returnBack(){
+
+      },
+      //查看
+      seeTable(){
+
+      },
+      //删除
+      deleteTable(){
+
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+
+</style>
+
+<style lang="less">
+.splitting{
+  .splitting-search-wrapper{
+    .table-page-search-submitButtons{
+      float: none!important;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue
index f15052eeb..ff307c2ea 100644
--- a/jero-web/src/views/documentManage/subscribtion/index.vue
+++ b/jero-web/src/views/documentManage/subscribtion/index.vue
@@ -67,14 +67,19 @@
           />
         </div>
       </div>
+      <sub-area v-if="visible" :subVisible="visible" @visible="areaVisible"></sub-area>
     </a-card>
   </div>
 </template>
 <script>
   import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
   // import search from '@/components/search'
+  import subArea from './module/subArea'
   export default {
     name:'subscribtion',
+    components:{
+      subArea
+    },
     data(){
       return{
         selectedRowKeys:[],
@@ -123,6 +128,7 @@
           }
         ],
         tableData:[],  //列表数据
+        visible:false,
       }
     },
     mounted() {
@@ -145,7 +151,7 @@
       },
       //订阅领域管理
       handleBatManage(){
-
+        this.visible=true
       },
       //批量取消收藏
       handleBatCancel(){
@@ -185,8 +191,10 @@
       //点击名称
       titleClick(records){
 
+      },
+      areaVisible(val){
+        this.visible=val
       }
-
     }
   }
 </script>
diff --git a/jero-web/src/views/documentManage/subscribtion/module/subArea.vue b/jero-web/src/views/documentManage/subscribtion/module/subArea.vue
new file mode 100644
index 000000000..7d299031f
--- /dev/null
+++ b/jero-web/src/views/documentManage/subscribtion/module/subArea.vue
@@ -0,0 +1,210 @@
+<template>
+    <div class="sub-area">
+      <a-modal
+        title="订阅领域管理"
+        class="sub-area-modal"
+        :visible="visible"
+        :confirm-loading="confirmLoading"
+        :okText="'保存'"
+        @ok="handleOk"
+        @cancel="handleCancel"
+      >
+        <a-input-search v-model="searchValue" style="margin-bottom: 8px" placeholder="节点快速查找" @change="onChange" />
+        <a-tree
+          v-model="checkedKeys"
+          checkable
+          :expanded-keys="expandedKeys"
+          :auto-expand-parent="autoExpandParent"
+          :tree-data="treeData"
+          :selected-keys="selectedKeys"
+          @select="onSelect"
+          @expand="onExpand"
+        >
+          <template slot="title" slot-scope="{ title }">
+            <span v-if="title.indexOf(searchValue) > -1">
+              {{ title.substr(0, title.indexOf(searchValue)) }}
+              <span style="color: #f50">{{ searchValue }}</span>{{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
+            </span>
+            <span v-else>{{ title }}</span>
+          </template>
+        </a-tree>
+      </a-modal>
+    </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+  export default {
+    name: 'subArea',
+    data(){
+      return{
+        visible:false,
+        confirmLoading:false,
+        checkedKeys:[],
+        selectedKeys: [],
+        expandedKeys: [],
+        autoExpandParent: true,
+        treeData: [
+          {
+            title: '车身结构',
+            key: '0-0',
+            children: [
+              {
+                title: '车身',
+                key: '0-0-0',
+                children: [
+                  { title: '前窗', key: '0-0-0-0' },
+                  { title: '挡风', key: '0-0-0-1' },
+                  { title: '车门', key: '0-0-0-2' },
+                ],
+              },
+              {
+                title: '底盘',
+                key: '0-0-1',
+              },
+              {
+                title: '车机系统',
+                key: '0-0-2',
+              },
+            ],
+          },
+          {
+            title: '软件中心',
+            key: '0-1',
+            children: [
+              { title: '软件一', key: '0-1-0-0' },
+              { title: '软件二', key: '0-1-0-1' },
+              { title: '软件三', key: '0-1-0-2' },
+            ],
+          },
+        ],
+        dataList:[],
+        searchValue:''
+      }
+    },
+    props:{
+      subVisible:Boolean
+    },
+    watch: {
+      checkedKeys(val) {
+        console.log('onCheck', val);
+      },
+    },
+    mounted() {
+      this.visible=this.subVisible
+    },
+    methods:{
+      //获取数据
+      loadData(){
+        let params = {}
+        getAction(``,params).then(res=> {
+          if(res.success){
+
+          }
+        })
+      },
+      afterVisibleChange(val) {
+        console.log('visible', val);
+      },
+      handleOk(e) {
+        this.confirmLoading = true;
+        this.$emit('visible',false)
+      },
+      handleCancel(e) {
+        this.visible = false;
+        this.$emit('visible',false)
+      },
+      onExpand(expandedKeys) {
+        console.log('onExpand', expandedKeys);
+        // if not set autoExpandParent to false, if children expanded, parent can not collapse.
+        // or, you can remove all expanded children keys.
+        this.expandedKeys = expandedKeys;
+        this.autoExpandParent = false;
+      },
+      onCheck(checkedKeys) {
+        console.log('onCheck', checkedKeys);
+        this.checkedKeys = checkedKeys;
+      },
+      onSelect(selectedKeys, info) {
+        console.log('onSelect', info);
+        this.selectedKeys = selectedKeys;
+      },
+      generateData(_level, _preKey, _tns){
+        const preKey = _preKey || '0';
+        const tns = _tns || this.treeData;
+
+        const children = [];
+        for (let i = 0; i < x; i++) {
+          const key = `${preKey}-${i}`;
+          tns.push({ title: key, key, scopedSlots: { title: 'title' } });
+          if (i < y) {
+            children.push(key);
+          }
+        }
+        if (_level < 0) {
+          return tns;
+        }
+        const level = _level - 1;
+        children.forEach((key, index) => {
+          tns[index].children = [];
+          return this.generateData(level, key, tns[index].children);
+        });
+      },
+      onChange(e) {
+        const value = e.target.value;
+        const expandedKeys = this.dataList
+          .map(item => {
+            if (item.title.indexOf(value) > -1) {
+              return this.getParentKey(item.key, this.treeData);
+            }
+            return null;
+          })
+          .filter((item, i, self) => item && self.indexOf(item) === i);
+        Object.assign(this, {
+          expandedKeys,
+          searchValue: value,
+          autoExpandParent: true,
+        });
+      },
+      generateList(data){
+        for (let i = 0; i < data.length; i++) {
+          const node = data[i];
+          const key = node.key;
+          this.dataList.push({ key, title: key });
+          if (node.children) {
+            this.generateList(node.children);
+          }
+        }
+      },
+      getParentKey(key, tree){
+        let parentKey;
+        for (let i = 0; i < tree.length; i++) {
+          const node = tree[i];
+          if (node.children) {
+            if (node.children.some(item => item.key === key)) {
+              parentKey = node.key;
+            } else if (this.getParentKey(key, node.children)) {
+              parentKey = this.getParentKey(key, node.children);
+            }
+          }
+        }
+        return parentKey;
+      },
+    }
+
+  }
+</script>
+
+<style lang="less" scoped>
+  .sub-area{
+
+  }
+</style>
+
+<style lang="less">
+  .sub-area-modal{
+    .ant-modal-footer{
+      text-align: center;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue
index b6ffb0f8e..b8b91e18c 100644
--- a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue
@@ -316,6 +316,7 @@
               httpurl+=this.url.edit;
               method = 'put';
               this.form.id=this.editId
+
             }
 
             // let formData = Object.assign(this.editId, this.form);
diff --git a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
index e41e463ae..3d598d771 100644
--- a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue
@@ -106,24 +106,28 @@
             key: 'showArea',
             align: "center",
             width: 100,
+            ellipsis: true,
           },
           {
             title: '英文名称',
             align: "center",
             width: 100,
             dataIndex: 'enName',
+            ellipsis: true,
           },
           {
             title: '所属模块',
             align: "center",
             width: 100,
             dataIndex: 'isModel',
+            ellipsis: true,
           },
           {
             title: '排序号',
             align: "center",
             width: 80,
-            dataIndex: 'sort'
+            dataIndex: 'sort',
+            ellipsis: true,
           },
           {
             title: this.$t('operation'),
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
index dcd0882ca..57e10fe5a 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
@@ -221,16 +221,19 @@
 
         let params={
           ...this.form,
-          isTagDict: 1,
-          isReadOnly:0
         }
         this.$refs.ruleForm.validate((valid)=>{
           // console.log('valide',valide)
           if(valid){
             if(this.isEdit==1){
               params.id=''
+              params.isTagDict=1
+              params.isReadOnly=0
               postAction(`sys/dict/add`,params).then(res=>{
                 if(res.success){
+                  this.$notification.success({
+                    message: res.message
+                  })
                   this.loadData()
                   this.contentVisible=false
                   this.form={}
@@ -239,6 +242,9 @@
             }else if(this.isEdit==0){
               putAction(`sys/dict/edit`,params).then(res=>{
                 if(res.success){
+                  this.$notification.success({
+                    message: res.message
+                  })
                   this.loadData()
                   this.contentVisible=false
                   this.form={}
@@ -266,7 +272,11 @@
         }
         deleteAction(`sys/dict/delete`,param).then(res=>{
           if(res.success){
+            this.$notification.success({
+              message: res.message
 
+            })
+            this.loadData()
           }
         })
       },
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
index a01ffbf90..fdf201564 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
@@ -133,7 +133,7 @@
             title: '属性类型',
             align: "center",
             width: 100,
-            dataIndex: 'fieldShowType',
+            dataIndex: 'fieldShowType_dictText',
           },
           {
             title: '字段长度',
@@ -151,7 +151,7 @@
             title: '展示区域',
             align: "center",
             width: 80,
-            dataIndex: 'showArea'
+            dataIndex: 'showArea_dictText'
           },
           {
             title: this.$t('operation'),