修改bug

jero-web/src/components/OcrAddForm/index.vue

@@ -215,7 +215,7 @@
 </template>
 
 <script>
-  import uploadFile from '@/components/ocrUpload/index'
+  import uploadFile from '@/components/OcrUpload/index'
   import PersonnelSelection from '@/components/PersonnelSelection/index'
   import Standardselection from '@/components/Standardselection/index'
   import { getAction, postAction } from '@/api/manage'

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

@@ -3,7 +3,6 @@
       <a-card :bordered="false">
         <div class="collection-search-wrapper">
           <div class="collection-search-header">
-<!--            <search :url="url" :flag="'1'"></search>-->
             <a-form layout="inline" @keyup.enter.native="searchQuery(queryParams)">
               <a-form-model
                 class="collection-content"
@@ -44,26 +43,26 @@
           </div>
         </div>
         <div class="colloction-table">
-          <a-table
+            <a-table
-            ref="table"
+              ref="table"
-            size="middle"
+              size="middle"
-            rowKey="id"
+              rowKey="id"
-            :columns="columns"
+              :columns="columns"
-            :dataSource="tableData"
+              :dataSource="tableData"
-            :pagination="false"
+              :pagination="false"
-            :loading="loading"
+              :loading="loading"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+              :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-            >
+              >
-              <span slot="serialNumber" slot-scope="text, record">
+                <span slot="serialNumber" slot-scope="text, record">
-                  <a class="table-del"  @click="onDetail(record)">{{record.serialNumber}}</a>
+                    <a class="table-del"  @click="onDetail(record)">{{record.serialNumber}}</a>
-              </span>
+                </span>
-              <span slot="serialtitle" slot-scope="text, record">
+                <span slot="serialtitle" slot-scope="text, record">
-                  <a class="table-del"  @click="onDetail(record)">{{record.title}}</a>
+                    <a class="table-del"  @click="onDetail(record)">{{record.title}}</a>
-              </span>
+                </span>
-              <span slot="action" slot-scope="text, record">
+                <span slot="action" slot-scope="text, record">
-                  <a class="table-del"  @click="onCancel(record)">{{$t('CancelCollection')}}</a>
+                    <a class="table-del"  @click="onCancel(record)">{{$t('CancelCollection')}}</a>
-              </span>
+                </span>
-          </a-table>
+            </a-table>
           <div class="page" v-if="tableData.length > 0">
             <a-pagination
               :show-total="total => $t('total')+` ${total} `+ $t('strip')"
@@ -82,15 +81,8 @@
 </template>
 <script>
   import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
-  import eventBUs from '../../../common/event'
-  import search from '@/components/search/index'
-  // import tableData from '@/components/coTable/index'
   export default {
     name:'collection',
-    components:{
-      search,
-      // tableData
-    },
     data(){
       return{
         selectedRowKeys:[],
@@ -139,17 +131,7 @@
         tableData:[],  //列表数据
         selecIds:[],
         loading:false,
-        url:{
+
-          tableHeader: 'collection/onlCgformCollection/getHeader',      //表格头部字段
-          seachList: 'collection/onlCgformCollection/queryCondition',   //搜索字段
-          tableList: 'collection/onlCgformCollection/page',         //表格数据
-        },
-        OperationList: [
-          {
-            text: this.$t('CancelCollection'),
-            ClickEvent: 'onCancel'
-          }
-        ],
       }
     },
     mounted() {

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

@@ -87,10 +87,10 @@
 <script>
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import search from '@/components/search/index'
-  import tableData from '@/components/ocrTable/index'
+  import TableData from '@/components/OcrTable/index'
-  import addForm from '@/components/ocrAddForm/index'
+  import AddForm from '@/components/OcrAddForm/index'
-  import docTable from './modules/docTable'
+  import DocTable from './modules/DocTable'
-  import ocrUpload from '@/components/ocrUpload/index'
+  import OcrUpload from '@/components/OcrUpload/index'
   import store from '@/store/'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import Vue from 'vue'
@@ -101,10 +101,10 @@
     name: 'ocr',
     components:{
       search,
-      tableData,
+      TableData,
-      addForm,
+      AddForm,
-      ocrUpload,
+      OcrUpload,
-      docTable
+      DocTable
     },
     data(){
       return{
@@ -240,14 +240,8 @@
           that.lockReconnect = false;
         }, 5000);
       },
-
-
-
       //上传
       handleUpload(){
-        // if(this.timer){
-        //   clearInterval(this.timer)
-        // }
         this.fileVisible=true
       },
       //调取已入库文件
@@ -296,15 +290,6 @@
                   .catch( (error) =>{
                     console.log(error);
                   });
-
-                // postAction(`ocr/ocrRecord/deleteBatch`, param).then(res => {
-                //   if (res.success) {
-                //     this.$message.success(this.$t('OperationSuccessful'))
-                //     eventBUs.$emit('searchReset')
-                //   }else{
-                //     this.$message.warning(this.$t('operationFailed'))
-                //   }
-                // })
             },
             onCancel() {},
           });

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

@@ -67,29 +67,22 @@
             />
           </div>
         </div>
-        <split v-if="splitVisible" :splitVisible="splitVisible" @visible="sVisible"></split>
+        <split-text v-if="splitVisible" :splitVisible="splitVisible" @visible="sVisible"></split-text>
-        <imports v-if="importsVisible" :importsVisible="importsVisible" @visible="iVisible"></imports>
+        <import-result v-if="importsVisible" :importsVisible="importsVisible" @visible="iVisible"></import-result>
       </a-card>
     </div>
 </template>
 
 <script>
-  import search from '@/components/search/index'
+  import SplitText from './modules/SplitText'
-  import tableData from '@/components/tableDate/index'
+  import ImportResult from './modules/ImportResult'
-  import frameAssembly from '@/components/frameAssembly/index'
-  import split from './modules/split'
-  import imports from './modules/imports'
   import { getAction, postAction, deleteAction } from '@/api/manage'
-  import eventBUs from '../../../common/event'
 
   export default {
     name: 'splitting',
     components: {
-      search,
+      SplitText,
-      tableData,
+      ImportResult
-      frameAssembly,
-      split,
-      imports
     },
     data(){
       return{

jero-web/src/views/documentManage/splitting/modules/ImportResult.vue

@@ -34,8 +34,10 @@
         </div>
       </div>
       <div class="imports-table-detail">
-        <a-table :data-source="tableSource" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" class="tag-con-table" :pagination="false" >
+        <a-spin :spinning="spinning">
-        </a-table>
+          <a-table :data-source="tableSource" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" class="tag-con-table" :pagination="false" >
+          </a-table>
+        </a-spin>
         <div class="page" v-if="tableSource.length > 0">
           <a-pagination
             :show-total="total =>  $t('total')+` ${total} `+ $t('strip')"
@@ -81,11 +83,11 @@
 
 <script>
   import { getAction, postAction, deleteAction, downFile } from '@/api/manage'
-  import ocrUpload from '@/components/ocrUpload/index'
+  import OcrUpload from '@/components/OcrUpload/index'
   export default {
     name: 'import',
     components:{
-      ocrUpload
+      OcrUpload
     },
     data(){
       return{
@@ -139,6 +141,7 @@
             { required: true, message: this.$t('noFile'), trigger: 'change' },
           ],
         },
+        spinning:false,   //loading标识
       }
     },
     props:{
@@ -151,7 +154,15 @@
     methods:{
       //获取列表数据
       loadData(){
+        this.spinning=true
+        let params={
 
+        }
+        getAction(``,params).then(res=>{
+
+        }).finally(()=>{
+          this.spinning=false
+        })
       },
       afterVisibleChange(val) {
         console.log('visible', val);

jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue

@@ -157,12 +157,12 @@
 <script>
   import Vue from 'vue'
   import splitUpload from '@/components/splitUpload/index'
-  import uEditor from '@/components/ueditor/index'
+  import UEditor from '@/components/ueditor/index'
   export default {
     name: 'splitAddForm',
     components:{
       splitUpload,
-      uEditor
+      UEditor
     },
     data(){
       return{

jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue

@@ -120,7 +120,7 @@
           >
             <p>{{contentValue}}</p>
           </a-modal>
-          <splitAddForm v-if="addVisible" :addVisible="addVisible"  @closeVisible="closeVisible"></splitAddForm>
+          <split-addF-form v-if="addVisible" :addVisible="addVisible"  @closeVisible="closeVisible"></split-addF-form>
           <upload ref="uploadSplit" @uploadSuccess="uploadSuccess"></upload>
         </div>
       </a-card>
@@ -130,11 +130,11 @@
 <script>
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import upload from '@/components/uploadFile/file.vue'
-  import splitAddForm from './splitAddForm'
+  import SplitAddForm from './SplitAddForm'
   export default {
-    name: 'splitDetail',
+    name: 'SplitDetail',
     components:{
-      splitAddForm,
+      SplitAddForm,
       upload
     },
     data() {

jero-web/src/views/documentManage/splitting/modules/SplitText.vue

@@ -34,8 +34,10 @@
           </div>
         </div>
         <div class="split-table-detail">
-          <a-table :data-source="tableSource" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" class="tag-con-table" :pagination="false" >
+          <a-spin :spinning="spinning">
-          </a-table>
+            <a-table :data-source="tableSource" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" class="tag-con-table" :pagination="false" >
+            </a-table>
+          </a-spin>
           <div class="page" v-if="tableSource.length > 0">
             <a-pagination
               :show-total="total => $t('total')+` ${total} `+ $t('strip')"
@@ -59,6 +61,8 @@
 </template>
 
 <script>
+  import { getAction } from '../../../../api/manage'
+
   export default {
     name: 'split',
     data(){
@@ -107,7 +111,8 @@
             dataIndex: 'fileType_dictText',
             ellipsis: true,
           },
-        ]
+        ],
+        spinning:false,  //loading标识
       }
     },
     props:{
@@ -120,7 +125,15 @@
     methods:{
       //获取列表数据
       loadData(){
+        this.spinning=true
+        let params={
 
+        }
+        getAction(``,params).then(res=>{
+
+        }).finally(()=>{
+          this.spinning=false
+        })
       },
       afterVisibleChange(val) {
         console.log('visible', val);

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

@@ -81,16 +81,11 @@
 </template>
 <script>
   import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
-  import search from '@/components/search/index'
+  import SubArea from './module/SubArea'
-  import tableData from '@/components/coTable/index'
-  import subArea from './module/subArea'
-  import eventBUs from '../../../common/event'
   export default {
     name:'subscribtion',
     components:{
-      subArea,
+      SubArea,
-      search,
-      tableData
     },
     data(){
       return{

jero-web/src/views/documentManage/tags/dialog/DicList.vue

@@ -80,8 +80,8 @@
 <script>
 
   import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
-  import listTable from './listTable'
+  import ListTable from './ListTable'
-  import treeTable from './treeTable'
+  import TreeTable from './TreeTable'
   import Vue from 'vue'
   import { UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
   export default {

jero-web/src/views/documentManage/tags/dialog/OnlCgformTagModal.vue

@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <onl-cgform-tag-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></onl-cgform-tag-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import OnlCgformTagForm from './OnlCgformTagForm'
-  export default {
-    name: 'OnlCgformTagModal',
-    components: {
-      OnlCgformTagForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>

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

@@ -16,13 +16,13 @@
 </template>
 
 <script>
-  import tagItem from './tabs/tagItem'
+  import TagItem from './tabs/TagItem'
-  import tagContent from './tabs/tagContent'
+  import TagContent from './tabs/TagContent'
   export default {
     name: 'tags',
     components:{
-      tagItem,
+      TagItem,
-      tagContent
+      TagContent
     },
     data(){
       return{

jero-web/src/views/documentManage/tags/tabs/TagContent.vue

@@ -94,14 +94,14 @@
 <script>
   import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
   // import tabTable from './tabTable'
-  import dicList from '../dialog/dicList'
+  import DicList from '../dialog/DicList'
   import Vue from 'vue'
   import { UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
   export default {
     name: 'tagContent',
     components:{
       // tabTable,
-      dicList
+      DicList
     },
     data(){
       return{

jero-web/src/views/documentManage/tags/tabs/TagItem.vue

@@ -62,15 +62,15 @@
 <script>
   import { putAction,postAction,getAction,deleteAction } from '@/api/manage'
   import JInput from '@/components/jero/JInput'
-  import tabTable from './tabTable'
+  import TabTable from './TabTable'
-  import areaManage from '../dialog/areaManage'
+  import AreaManage from '../dialog/AreaManage'
   import newDrawer from '../dialog/newDrawer'
   export default {
     name: 'tagItem',
     components:{
       JInput,
-      tabTable,
+      TabTable,
-      areaManage,
+      AreaManage,
       newDrawer
     },
     data(){