From 8b3d72fdaa282ab92ffd999fcbd62d151bbc33cd Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Thu, 20 Mar 2025 17:26:25 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D/Ai=E7=9F=A5=E8=AF=86?=
 =?UTF-8?q?=E5=9B=BE=E8=B0=B1/AI=E6=99=BA=E8=83=BD=E7=BC=96=E7=A0=94?=
 =?UTF-8?q?=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 .env.production                               |  2 +-
 public/static/config.js                       |  2 +-
 src/layout/components/Sidebar/index.vue       | 12 ++++
 src/utils/upload.js                           |  9 +++
 .../AIAssistant/AIDigitalHuman/index.vue      |  8 ++-
 .../AIIntelligentCoding/aiForm.vue            | 53 +++++++++------
 .../AIAssistant/AIIntelligentCoding/index.vue |  4 +-
 .../AIAssistant/AIknowledgeGraph/index.vue    | 40 +++++------
 .../managementLibrary/index.vue               |  2 +-
 .../managementLibrary/mixins/index.js         | 66 ++++++++++++++++---
 .../module/collectHeader.vue                  |  4 ++
 .../module/exportZip/index.vue                |  6 +-
 .../managementLibrary/module/handOverForm.vue |  7 +-
 .../module/packingBox/index.vue               | 52 +++++++++++----
 .../openInventory/module/detail.vue           | 14 ++--
 .../batchConnection/module/form.vue           |  8 ++-
 .../collectionLibrary/index.vue               |  3 +
 .../module/archivesInfo/index.vue             |  7 +-
 .../module/collectHeader.vue                  | 19 ++----
 .../module/packingBox/index.vue               |  9 ++-
 src/views/components/category/PreviewForm.vue |  6 +-
 src/views/components/echarts/graph.vue        | 36 +++++-----
 src/views/prearchiveLibrary/index.vue         | 20 +++++-
 .../prearchiveLibrary/module/batchFile.vue    |  5 +-
 .../prearchiveLibrary/module/moveFile.vue     |  5 +-
 .../module/businessDetails/index.vue          |  2 +-
 .../runningProcess/module/detail.vue          |  5 +-
 .../system/user/processCenter/module/form.vue |  3 +-
 29 files changed, 278 insertions(+), 133 deletions(-)

diff --git a/.env.development b/.env.development
index 8f3fa89..de82b93 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ ENV = 'development'
 
 # 许镇-本地服地址
 VUE_APP_BASE_API  = 'http://192.168.99.72:11100'
-VUE_APP_AIDEEPSEEK_API = 'http://192.168.99.86:11434'
+VUE_APP_AIDEEPSEEK_API = 'http://192.168.99.86:12123'
 # VUE_APP_BASE_API  = 'http://192.168.99.71:11110'
 
 # VUE_APP_BASE_API  = 'http://192.168.99.107:11100'
diff --git a/.env.production b/.env.production
index 899ea56..17af5ef 100644
--- a/.env.production
+++ b/.env.production
@@ -3,7 +3,7 @@ ENV = 'production'
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
 # VUE_APP_BASE_API  = 'http://192.168.99.107:11100'
-VUE_APP_AIDEEPSEEK_API = 'http://192.168.99.86:11434'
+VUE_APP_AIDEEPSEEK_API = 'http://192.168.99.86:12123'
 # VUE_APP_BASE_API  = 'http://27.19.215.77:11100'
 # VUE_APP_BASE_API  = 'http://27.16.212.58:11100'
 VUE_APP_BASE_API  = 'http://192.168.99.71:11110'
diff --git a/public/static/config.js b/public/static/config.js
index 902d239..835f952 100644
--- a/public/static/config.js
+++ b/public/static/config.js
@@ -3,7 +3,7 @@ window.g = {
   // ApiUrl: 'http://27.16.212.58:11100', // 配置服务器地址,
   ApiUrl: 'http://192.168.99.71:11110',
   // ApiUrl: 'http://192.168.99.107:11100',
-  AIDeepSeekUrl:'http://192.168.99.86:11434',
+  AIDeepSeekUrl:'http://192.168.99.86:12123',
   // ParentPage: {  // 后续看需求配置
   //   CrossDomainProxyUrl: '/Home/CrossDomainProxy',
   //   BtnsApi: '/api/services/app/Authorization/GetBtns',
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 37394c0..4439010 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -10,6 +10,7 @@
         :active-text-color="variables.menuActiveText"
         :collapse-transition="false"
         mode="vertical"
+        @select="handleSelect"
       >
         <sidebar-item v-for="route in sidebarRouters" :key="route.path" :item="route" :base-path="route.path" />
       </el-menu>
@@ -32,6 +33,8 @@ export default {
     activeMenu() {
       const route = this.$route
       const { meta, path } = route
+      console.log('meta', meta)
+      console.log('path', path)
       // if set path, the sidebar will highlight the path you set
       if (meta.activeMenu) {
         return meta.activeMenu
@@ -47,6 +50,15 @@ export default {
     isCollapse() {
       return !this.sidebar.opened
     }
+  },
+  mounted() {
+    console.log('sidebarRouters', this.sidebarRouters)
+  },
+  methods: {
+    handleSelect(key, keyPath) {
+      console.log('el-menu')
+      console.log(key, keyPath)
+    }
   }
 }
 </script>
diff --git a/src/utils/upload.js b/src/utils/upload.js
index 7e1b452..dec7586 100644
--- a/src/utils/upload.js
+++ b/src/utils/upload.js
@@ -136,3 +136,12 @@ export function aiUpload(api, file, fileJsonString) {
   }
   return axios.post(api, data, config)
 }
+// AI 编研
+export function aiEditUpload(api, file) {
+  var data = new FormData()
+  data.append('files', file)
+  const config = {
+    headers: { 'Authorization': getToken() }
+  }
+  return axios.post(api, data, config)
+}
diff --git a/src/views/AIAssistant/AIDigitalHuman/index.vue b/src/views/AIAssistant/AIDigitalHuman/index.vue
index 11d3420..ba263c2 100644
--- a/src/views/AIAssistant/AIDigitalHuman/index.vue
+++ b/src/views/AIAssistant/AIDigitalHuman/index.vue
@@ -34,9 +34,10 @@
           <div class="hot-word">
             <span v-for="(word, index) in hotWords" :key="index" @click="handleHotWordClick(word)">{{ word }}</span>
           </div>
+          <!-- :disabled="isSendBuonDisabled" -->
           <div style="display: flex; justify-content: flex-end; align-items: center;">
             <div :class="isModelDeepseek ? 'model-select' : 'model-select active'" @click="selectModel"><i class="iconfont icon-shendusikao" />深度思考</div>
-            <span class="send-button" :class="{ 'send-disabled-button': isSendButtonDisabled }" :disabled="isSendBuonDisabled" @click="sendMessage">发送</span>
+            <span class="send-button" :class="{ 'send-disabled-button': isSendButtonDisabled }" @click="sendMessage">发送</span>
           </div>
         </div>
       </div>
@@ -114,6 +115,7 @@ export default {
       if (this.inputMessage.trim() === '') return
 
       const linkSrc = process.env.NODE_ENV === 'production' ? window.g.AIDeepSeekUrl : process.env.VUE_APP_AIDEEPSEEK_API
+      console.log('linkSrc', linkSrc)
 
       this.messages.push({ sender: 'user', content: this.inputMessage })
       this.inputMessage = ''
@@ -126,6 +128,8 @@ export default {
           method: 'POST',
           headers: {
             'Content-Type': 'application/json'
+            // 'x-api-key': 'yxk_ollama_83560792'
+            // 'Authorization': 'Bearer yxk_ollama_83560792'
           },
           body: JSON.stringify({
             model: this.modelVal,
@@ -463,7 +467,7 @@ export default {
 }
 ::v-deep .v-note-wrapper .v-note-panel .v-note-show .v-show-content{
   border-radius: 12px;
-  padding: 0 !important;
+  // padding: 0 !important;
 }
 ::v-deep .el-textarea__inner {
   resize: none;
diff --git a/src/views/AIAssistant/AIIntelligentCoding/aiForm.vue b/src/views/AIAssistant/AIIntelligentCoding/aiForm.vue
index 6366da4..817cc43 100644
--- a/src/views/AIAssistant/AIIntelligentCoding/aiForm.vue
+++ b/src/views/AIAssistant/AIIntelligentCoding/aiForm.vue
@@ -123,6 +123,7 @@
 import { form } from '@crud/crud'
 import { mapGetters } from 'vuex'
 import { FetchDictionaryTree } from '@/api/system/dict'
+import { aiEditUpload } from '@/utils/upload'
 
 const defaultForm = { id: null, title: null, researchType: null }
 export default {
@@ -158,11 +159,13 @@ export default {
       },
       isUploading: false,
       progress: 0,
-      animationDuration: 0
+      animationDuration: 0,
+      context: ''
     }
   },
   computed: {
     ...mapGetters([
+      'baseApi',
       'user'
     ])
   },
@@ -210,26 +213,33 @@ export default {
         // const formData = new FormData()
         // formData.append('file', file)
 
-        // try {
-        //   // 发送文件上传请求
-        //   const response = await axios.post('/upload', formData, {
-        //     headers: {
-        //       'Content-Type': 'multipart/form-data'
-        //     }
-        //   })
+        try {
+          aiEditUpload(this.baseApi + '/api/ai/uploadAIResearchFiles',
+            file,
+          ).then(res => {
+            console.log('res.data.data', res.data.data)
+            if (res.data.data !== null) {
+              this.context = res.data.data.results[0].content
+              this.$message({ message: '编研附件传输成功', type: 'success', offset: 8 })
+            } else {
+              this.$message({ message: '编研附件传输失败', type: 'error', offset: 8 })
+            }
+          }).catch(() => {
+            // this.$message({ message: '编研附件传输失败', type: 'error', offset: 8 })
+          })
 
-        //   const endTime = Date.now()
-        //   const uploadTime = (endTime - startTime) / 1000
-        //   this.animationDuration = uploadTime
+          // const endTime = Date.now()
+          // const uploadTime = (endTime - startTime) / 1000
+          // this.animationDuration = uploadTime
 
-        //   // 处理上传成功的逻辑
-        //   this.$message.success('文件上传成功')
-        // } catch (error) {
-        //   // 处理上传失败的逻辑
-        //   this.$message.error('文件上传失败')
-        // } finally {
-        //   this.isUploading = false
-        // }
+          // // 处理上传成功的逻辑
+          // this.$message.success('文件上传成功')
+        } catch (error) {
+          // 处理上传失败的逻辑
+          // this.$message.error('文件上传失败')
+        } finally {
+          this.isUploading = false
+        }
 
         const uploadTime = 2
         this.animationDuration = uploadTime
@@ -281,7 +291,10 @@ export default {
       try {
         this.controller = new AbortController()
         const signal = this.controller.signal
-        this.arequestData.messages.push({ role: 'user', content: this.inputValue })
+        //  'content': `${context}\n\n${prompt}`
+        // this.inputValue
+        console.log('this.context', this.context)
+        this.arequestData.messages.push({ role: 'user', content: `${this.context}\n\n${this.inputValue}` })
         const linkSrc = process.env.NODE_ENV === 'production' ? window.g.AIDeepSeekUrl : process.env.VUE_APP_AIDEEPSEEK_API
         const response = await fetch(linkSrc + '/api/chat', {
           method: 'POST',
diff --git a/src/views/AIAssistant/AIIntelligentCoding/index.vue b/src/views/AIAssistant/AIIntelligentCoding/index.vue
index 11ba175..4000474 100644
--- a/src/views/AIAssistant/AIIntelligentCoding/index.vue
+++ b/src/views/AIAssistant/AIIntelligentCoding/index.vue
@@ -101,8 +101,8 @@ export default {
   mixins: [presenter(), crud()],
   cruds() {
     return CRUD({
-      url: 'api/archivesUtilize/initResearchList',
-      title: '档案编研',
+      url: 'api/ai/initResearchAI',
+      title: 'AI智能编研',
       crudMethod: { ...crudEditing },
       optShow: {
         add: false,
diff --git a/src/views/AIAssistant/AIknowledgeGraph/index.vue b/src/views/AIAssistant/AIknowledgeGraph/index.vue
index 51b2754..ef6c4aa 100644
--- a/src/views/AIAssistant/AIknowledgeGraph/index.vue
+++ b/src/views/AIAssistant/AIknowledgeGraph/index.vue
@@ -43,7 +43,7 @@
 </template>
 <script>
 import crudCategory from '@/api/system/category/category'
-import { FetchInitShowByCategory } from '@/api/ai/ai'
+// import { FetchInitShowByCategory } from '@/api/ai/ai'
 import CRUD, { presenter, header } from '@crud/crud'
 import graph from '@/views/components/echarts/graph.vue'
 
@@ -83,7 +83,6 @@ export default {
   mounted() {
   },
   methods: {
-
     [CRUD.HOOK.afterRefresh]() {
       this.crud.data = this.filterData(this.transformData(this.crud.data))
       this.$nextTick(() => {
@@ -114,6 +113,7 @@ export default {
         } else {
           this.defaultSetting(currentKey)
         }
+        console.log('currentKey', currentKey)
         if (currentKey && currentKey.id) {
           this.$nextTick(() => {
             // 选中节点的门类详情
@@ -138,26 +138,26 @@ export default {
       if (val) {
         localStorage.setItem('currentArchivesKey', JSON.stringify(val))
         this.selectedCategory = val
-        // this.getOrigionGraphData('E0B3627CBED49E53609245', 'Category')
-
-        this.$refs.graphRefs.getOrigionGraphData(null, 'E0B3627CBED49E53609245', 'Category')
-      }
-    },
-    getOrigionGraphData(id, tableName) {
-      // this.selectedCategory.cnName
-      // E0B3627CBED49E53609245
-      const parmas = {
-        'searchKey': 'id', // id / title
-        'searchValue': id,
-        'tableName': tableName // 节点名称
+        this.$nextTick(() => {
+          this.$refs.graphRefs.resetAllData() // 重置 allData
+          this.$refs.graphRefs.getOrigionGraphData(null, val.id, 'Category')
+        })
       }
-      FetchInitShowByCategory(parmas).then((res) => {
-        console.log(res)
-        this.graphData = res
-      }).catch(err => {
-        console.log(err)
-      })
     },
+    // getOrigionGraphData(id, tableName) {
+    //   const parmas = {
+    //     'searchKey': 'id', // id / title
+    //     'searchValue': id,
+    //     'tableName': tableName, // 节点名称
+    //     'querySize': 10
+    //   }
+    //   FetchInitShowByCategory(parmas).then((res) => {
+    //     console.log(res)
+    //     this.graphData = res
+    //   }).catch(err => {
+    //     console.log(err)
+    //   })
+    // },
     filterData(data) {
       return data.filter(node => {
         if (node.children && node.children.length > 0) {
diff --git a/src/views/archivesManage/managementLibrary/index.vue b/src/views/archivesManage/managementLibrary/index.vue
index ba9a5fe..c12cbc4 100644
--- a/src/views/archivesManage/managementLibrary/index.vue
+++ b/src/views/archivesManage/managementLibrary/index.vue
@@ -400,7 +400,7 @@ export default {
       if (this.selectedCategory.arrangeType === 3) {
         const tablistEle = this.$refs.projectEle
         tablistEle.page.page = 0
-        tablistEle.currentPage = 0
+        tablistEle.currentPage = 1
         // 项目下
         if (isQuickFilter) {
           tablistEle.$refs.collectHeaderRef.getInitArchivesClass()
diff --git a/src/views/archivesManage/managementLibrary/mixins/index.js b/src/views/archivesManage/managementLibrary/mixins/index.js
index 294eb1f..618d3ae 100644
--- a/src/views/archivesManage/managementLibrary/mixins/index.js
+++ b/src/views/archivesManage/managementLibrary/mixins/index.js
@@ -154,17 +154,31 @@ export const manageLibraryCrud = {
       FetchInitContorlView(params).then((res) => {
         if (res.code !== 500) {
           this.parentsData.listCategory = res.category
+          const baseCategory = res.category.id
           if (categoryLevel === 1) {
             // 项目
             const projectObj = this.parentsData.$refs.projectEle
-            this.projectData = res.list.content
+            // this.projectData = res.list.content
+
+            this.projectData = res.list.content.map(item => {
+              return {
+                ...item,
+                baseCategory: baseCategory
+              }
+            })
             this.page.total = res.list.totalElements
             this.yearData = res.yearGroup
             if (this.yearData && type !== 'quickFilter') {
               this.$emit('myYearEvent', this.yearData)
             }
             if (type === 'search') {
-              projectObj.projectData = res.list.content
+              // projectObj.projectData = res.list.content
+              this.projectData = res.list.content.map(item => {
+                return {
+                  ...item,
+                  baseCategory: baseCategory
+                }
+              })
               projectObj.currentPage = this.page.page + 1
               // projectObj.page.page = 1
               // projectObj.page.size = 10
@@ -174,7 +188,13 @@ export const manageLibraryCrud = {
           } else if (categoryLevel === 2) {
             // 案卷
             const anjuanObj = this.parentsData.$refs.anjuanEle.$refs.ajContent.$refs.tableList
-            this.anjuanData = res.list.content
+            // this.anjuanData = res.list.content
+            this.anjuanData = res.list.content.map(item => {
+              return {
+                ...item,
+                baseCategory: baseCategory
+              }
+            })
             this.page.total = res.list.totalElements
             this.yearData = res.yearGroup
             if (this.yearData && type !== 'quickFilter') {
@@ -182,7 +202,13 @@ export const manageLibraryCrud = {
             }
             // 搜索/新增/编辑 非 案卷是主页的时候
             if (type === 'search') {
-              anjuanObj.anjuanData = res.list.content
+              // anjuanObj.anjuanData = res.list.content
+              anjuanObj.anjuanData = res.list.content.map(item => {
+                return {
+                  ...item,
+                  baseCategory: baseCategory
+                }
+              })
               anjuanObj.currentPage = this.page.page + 1
               // anjuanObj.page.page = 1
               // anjuanObj.page.size = 10
@@ -193,7 +219,13 @@ export const manageLibraryCrud = {
             if (this.isTitleType === 3) {
               // 案卷下的未整理 / 文件为主页时
               const wjObj = this.parentsData.$refs.anjuanEle.$refs.ajContent.$refs.tableList
-              this.anjuanData = res.list.content
+              // this.anjuanData = res.list.content
+              this.anjuanData = res.list.content.map(item => {
+                return {
+                  ...item,
+                  baseCategory: baseCategory
+                }
+              })
               this.page.total = res.list.totalElements
               this.yearData = res.yearGroup
               if (this.yearData && type !== 'quickFilter') {
@@ -201,7 +233,13 @@ export const manageLibraryCrud = {
               }
               if (type === 'search') {
                 console.log('wjObj', wjObj)
-                wjObj.anjuanData = res.list.content
+                // wjObj.anjuanData = res.list.content
+                wjObj.anjuanData = res.list.content.map(item => {
+                  return {
+                    ...item,
+                    baseCategory: baseCategory
+                  }
+                })
                 wjObj.currentPage = this.page.page + 1
                 // wjObj.page.page = 1
                 // wjObj.page.size = 10
@@ -210,7 +248,13 @@ export const manageLibraryCrud = {
               }
             } else {
               // 卷内
-              this.junneiData = res.list.content
+              // this.junneiData = res.list.content
+              this.junneiData = res.list.content.map(item => {
+                return {
+                  ...item,
+                  baseCategory: baseCategory
+                }
+              })
               this.page.total = res.list.totalElements
               if (type === 'search') {
                 this.parentsData.$refs.juanneiEle.junneiData = res.list.content
@@ -223,7 +267,13 @@ export const manageLibraryCrud = {
             }
           } else {
             // 原文
-            this.fileData = res.list.content
+            // this.fileData = res.list.content
+            this.fileData = res.list.content.map(item => {
+              return {
+                ...item,
+                baseCategory: baseCategory
+              }
+            })
             this.page.total = res.list.totalElements
             if (type === 'search') {
               this.parentsData.$refs.fileEle.fileData = res.list.content
diff --git a/src/views/archivesManage/managementLibrary/module/collectHeader.vue b/src/views/archivesManage/managementLibrary/module/collectHeader.vue
index 191f272..0680bb7 100644
--- a/src/views/archivesManage/managementLibrary/module/collectHeader.vue
+++ b/src/views/archivesManage/managementLibrary/module/collectHeader.vue
@@ -705,6 +705,8 @@ export default {
         }
         FetchRestoreArchives(params).then((res) => {
           if (res.code !== 500) {
+            localStorage.removeItem('currentPageSize')
+            localStorage.removeItem('currentPage')
             this.$message({ message: res, type: 'success', offset: 8 })
             this.handleSearch(this.collectLevel)
           } else {
@@ -739,6 +741,8 @@ export default {
         }
         FetchCompleteDelArchives(params).then((res) => {
           if (res.code !== 500) {
+            localStorage.removeItem('currentPageSize')
+            localStorage.removeItem('currentPage')
             this.$message({ message: res, type: 'success', offset: 8 })
             this.handleSearch(this.collectLevel)
           } else {
diff --git a/src/views/archivesManage/managementLibrary/module/exportZip/index.vue b/src/views/archivesManage/managementLibrary/module/exportZip/index.vue
index b31beb4..d92291d 100644
--- a/src/views/archivesManage/managementLibrary/module/exportZip/index.vue
+++ b/src/views/archivesManage/managementLibrary/module/exportZip/index.vue
@@ -14,7 +14,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="handleClose">取消</el-button>
-          <el-button type="primary" @click.native="onSubmitExport('form')">确定</el-button>
+          <el-button :loading="btnLoading" type="primary" @click.native="onSubmitExport('form')">确定</el-button>
         </div>
       </div>
     </el-dialog>
@@ -39,6 +39,7 @@ export default {
   },
   data() {
     return {
+      btnLoading: false,
       exportZipVisible: false,
       form: {
         catalog: true,
@@ -58,13 +59,16 @@ export default {
   methods: {
     onSubmitExport(formName) {
       this.printTitle = this.form.module
+      this.btnLoading = true
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.$message({ message: 'submit', offset: 8 })
           this.exportZipVisible = false
           this.$refs[formName].resetFields()
+          this.btnLoading = false
         } else {
           console.log('error submit!!')
+          this.btnLoading = false
           return false
         }
       })
diff --git a/src/views/archivesManage/managementLibrary/module/handOverForm.vue b/src/views/archivesManage/managementLibrary/module/handOverForm.vue
index 55cd7e8..70d5ae0 100644
--- a/src/views/archivesManage/managementLibrary/module/handOverForm.vue
+++ b/src/views/archivesManage/managementLibrary/module/handOverForm.vue
@@ -31,7 +31,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitHandOverForm">提交</el-button>
+        <el-button :loading="btnLoading" type="primary" @click="submitHandOverForm">提交</el-button>
       </div>
     </div>
   </el-dialog>
@@ -71,6 +71,7 @@ export default {
   },
   data() {
     return {
+      btnLoading: false,
       overType: 3,
       targetFondsNo: null,
       overDetialTitle: '',
@@ -190,6 +191,7 @@ export default {
       })
     },
     submitHandOverForm() {
+      this.btnLoading = true
       this.$refs['form'].validate((valid) => {
         if (valid) {
           const archivesIds = []
@@ -222,11 +224,14 @@ export default {
               this.$message({ message: res.message, type: 'error', offset: 8 })
             }
             this.handleClose()
+            this.btnLoading = false
           }).catch(err => {
             console.log(err)
+            this.btnLoading = false
           })
         } else {
           console.log('error submit!!')
+          this.btnLoading = false
           return false
         }
       })
diff --git a/src/views/archivesManage/managementLibrary/module/packingBox/index.vue b/src/views/archivesManage/managementLibrary/module/packingBox/index.vue
index b97eb8c..ac07304 100644
--- a/src/views/archivesManage/managementLibrary/module/packingBox/index.vue
+++ b/src/views/archivesManage/managementLibrary/module/packingBox/index.vue
@@ -34,7 +34,7 @@
       >
         <el-table-column prop="create_date" label="操作" width="80" align="center">
           <template slot-scope="scope">
-            <el-button class="packing-handle-btn iconfont" @click="handleCartoning(scope.row)"><svg-icon icon-class="zhuanghe" class="svg-arc-style" />装盒</el-button>
+            <el-button :loading="btnLoading" class="packing-handle-btn iconfont" @click="handleCartoning(scope.row)"><svg-icon icon-class="zhuanghe" class="svg-arc-style" />装盒</el-button>
           </template>
         </el-table-column>
         <el-table-column prop="caseCode" label="盒号" min-width="120" align="center" />
@@ -162,7 +162,7 @@
       </div>
       <div v-if="isPackingOrPartType" slot="footer" class="dialog-footer">
         <el-button type="text">取消</el-button>
-        <el-button type="primary" @click="handleComfireCartoning">确定</el-button>
+        <el-button :loading="btnLoading" type="primary" @click="handleComfireCartoning">确定</el-button>
       </div>
     </div>
   </el-dialog>
@@ -200,6 +200,7 @@ export default {
   },
   data() {
     return {
+      btnLoading: false,
       currentSelections: [],
       arrySort: null,
       tableDisplayFields: [],
@@ -240,23 +241,33 @@ export default {
         return
       }
       switch (this.inputSelect) {
+        case 'caseName':
+          this.caseName = this.caseQuery[this.inputSelect]
+          this.caseCode = null
+          this.tid = null
+          this.barcode = null
+          break
         case 'caseCode':
+          this.caseName = null
           this.caseCode = this.caseQuery[this.inputSelect]
           this.tid = null
           this.barcode = null
           break
         case 'tid':
           this.tid = this.caseQuery[this.inputSelect]
+          this.caseName = null
           this.caseCode = null
           this.barcode = null
           break
         case 'barcode':
           this.barcode = this.caseQuery[this.inputSelect]
+          this.caseName = null
           this.caseCode = null
           this.tid = null
           break
       }
       const params = {
+        'caseName': this.caseName,
         'tid': this.tid,
         'caseCode': this.caseCode,
         'barcode': this.barcode,
@@ -272,7 +283,7 @@ export default {
         this.tableData = res.content
       })
     },
-    async getPackingFileList(id) {
+    async getPackingFileList(id, baseCategory) {
       const parentsId = id
       const params = {
         'categoryId': this.selectedCategory.id,
@@ -298,8 +309,12 @@ export default {
       const data = await FetchInitContorlView(params)
       if (data) {
         if (this.isPackingOrPartType === 1 && this.selectedCategory.arrangeType === 2) {
-          this.archivesTable = data.list.content
-          this.packingData = data.list.content
+          const newData = data.list.content.map(item => ({
+            ...item,
+            baseCategory
+          }))
+          this.archivesTable = newData
+          this.packingData = newData
         } else {
           data.list.content.forEach(item => {
             item.archivesParentsId = id
@@ -310,26 +325,33 @@ export default {
     },
     // 装盒 api
     async handleCartoning(row) {
-      let jnCategoryId
+      // let jnCategoryId
 
       if (this.selectedCategory.arrangeType === 1) {
         this.packingData = this.selections
-        jnCategoryId = this.packFileCategory.id
+        // jnCategoryId = this.packFileCategory.id
       } else {
         const combinedData = []
         const promises = []
-        this.selections.forEach(async(item) => {
+        this.selections.forEach((item) => {
           const promise = this.getPackingFileList(item.id)
             .then(data => {
-              combinedData.push(...data)
+              const newData = data.map(subItem => {
+                return {
+                  ...subItem,
+                  baseCategory: item.baseCategory
+                }
+              })
+              combinedData.push(...newData)
             })
           promises.push(promise)
         })
         await Promise.all(promises)
 
         this.packingData = combinedData
-        jnCategoryId = this.packFileCategory.id
+        // jnCategoryId = this.packFileCategory.id
       }
+      this.btnLoading = true
       const arrParams = this.packingData.map((item) => {
         const json = {}
         json.archivesId = item.id
@@ -340,7 +362,7 @@ export default {
         }
         json.caseId = row.id
         json.caseName = row.caseName
-        json.categoryId = jnCategoryId
+        json.categoryId = item.baseCategory
         return json
       })
       console.log('ddddd', arrParams)
@@ -353,6 +375,7 @@ export default {
         this.$emit('close-dialog')
         this.tableData = []
         this.caseQuery[this.inputSelect] = ''
+        this.btnLoading = false
       })
     },
     // 分卷装盒
@@ -389,14 +412,15 @@ export default {
         this.$message({ message: '左侧档案待选列表全部装盒完成才可保存', type: 'error', offset: 8 })
         return
       }
-      const jnCategoryId = this.packFileCategory.id
+      this.btnLoading = true
+      // const jnCategoryId = this.packFileCategory.id
       const arrParams = this.selectArchivesTable.map(item => {
         const json = {}
         json.archivesId = item.id
         json.archivesParentsId = this.selections[0].id
         json.caseId = item.caseId
         json.caseName = item.caseName
-        json.categoryId = jnCategoryId
+        json.categoryId = item.baseCategory
         return json
       })
       console.log('arrParams', arrParams)
@@ -435,7 +459,7 @@ export default {
               this.arrySort.push(item.fieldName + ',' + item.displayOrderBy)
             }
           })
-          this.getPackingFileList(this.selections[0].id)
+          this.getPackingFileList(this.selections[0].id, this.selections[0].baseCategory)
         }
       })
     }
diff --git a/src/views/archivesManage/openInventory/module/detail.vue b/src/views/archivesManage/openInventory/module/detail.vue
index 676d808..9750ec4 100644
--- a/src/views/archivesManage/openInventory/module/detail.vue
+++ b/src/views/archivesManage/openInventory/module/detail.vue
@@ -32,19 +32,19 @@
       <div v-if="inventType===7" style="display: flex; justify-content: flex-end; margin-bottom: 12px;">
         <el-button class="task-btn" @click="downloadFile"><i class="iconfont icon-xiazai" />下载文件</el-button>
       </div>
-      <el-table ref="table" :data="tableData" style="width: 100%;">
+      <el-table ref="table" :data="tableData" style="width: 100%;" height="calc(100vh - 420px)">
         <el-table-column type="index" align="center" width="55" label="序号" />
-        <el-table-column prop="fondsName" label="所属全宗" />
-        <el-table-column prop="categoryName" label="门类名称" />
+        <el-table-column prop="fondsName" label="所属全宗" min-width="120" />
+        <el-table-column prop="categoryName" label="门类名称" min-width="120" />
         <el-table-column prop="categoryLevel" label="整理方式">
           <template slot-scope="scope">
             <span>{{ scope.row.categoryLevel === 2 ? '案卷整理' : '按件整理' }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="archiveNo" label="项目号/档号" min-width="160" />
-        <el-table-column prop="maintitle" label="题名" />
-        <el-table-column v-if="inventType===4" prop="reason2" label="成文日期" />
-        <el-table-column v-if="inventType===4" prop="reason2" label="保管期限" />
+        <el-table-column prop="archiveNo" label="项目号/档号" min-width="280" show-overflow-tooltip />
+        <el-table-column prop="maintitle" label="题名" min-width="160" show-overflow-tooltip />
+        <el-table-column v-if="inventType===4" prop="reason2" label="成文日期" min-width="140" />
+        <el-table-column v-if="inventType===4" prop="reason2" label="保管期限" min-width="120" />
       </el-table>
     </div>
   </el-dialog>
diff --git a/src/views/collectReorganizi/batchConnection/module/form.vue b/src/views/collectReorganizi/batchConnection/module/form.vue
index d62ed5d..8de8e56 100644
--- a/src/views/collectReorganizi/batchConnection/module/form.vue
+++ b/src/views/collectReorganizi/batchConnection/module/form.vue
@@ -96,7 +96,7 @@
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="text" @click="handleCancel">取消</el-button>
-      <el-button type="primary" @click.native="handleComfired">确定</el-button>
+      <el-button :loading="btnLoading" type="primary" @click.native="handleComfired">确定</el-button>
     </div>
   </el-dialog>
 </template>
@@ -121,6 +121,7 @@ export default {
   },
   data() {
     return {
+      btnLoading: false,
       connectionTitle: '本地挂接',
       localHitchVisible: false,
       hitchRemarkArray: [],
@@ -250,7 +251,7 @@ export default {
       } else {
         this.form.fields = this.hitchRemarkArray.join('')
       }
-
+      this.btnLoading = true
       this.$refs['form'].validate((valid) => {
         if (valid) {
           let newhitchRemark = this.hitchRemarkArray.map(item => item.replace(/^\$|\$$|\*$/g, ''))
@@ -276,6 +277,7 @@ export default {
               }
               this.handleCancel()
               this.crud.refresh()
+              this.btnLoading = false
             })
           } else {
             const params = {
@@ -301,9 +303,11 @@ export default {
               }
               this.handleCancel()
               this.crud.refresh()
+              this.btnLoading = false
             })
           }
         } else {
+          this.btnLoading = false
           return false
         }
       })
diff --git a/src/views/collectReorganizi/collectionLibrary/index.vue b/src/views/collectReorganizi/collectionLibrary/index.vue
index 9cc2441..c883d68 100644
--- a/src/views/collectReorganizi/collectionLibrary/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/index.vue
@@ -397,6 +397,7 @@ export default {
       if (this.selectedCategory.arrangeType === 3) {
         const tablistEle = this.$refs.projectEle
         tablistEle.page.page = 0
+        tablistEle.currentPage = 1
         // 项目下
         if (isQuickFilter) {
           tablistEle.$refs.collectHeaderRef.getInitArchivesClass()
@@ -409,6 +410,7 @@ export default {
         const getActiveIndex = this.$refs.anjuanEle.$refs.ajContent.activeIndex
         const tablistEle = this.$refs.anjuanEle.$refs.ajContent.$refs.tableList
         tablistEle.page.page = 0
+        tablistEle.currentPage = 0
         // 案卷下
         if (isQuickFilter) {
           tablistEle.$refs.collectHeaderRef.getInitArchivesClass()
@@ -430,6 +432,7 @@ export default {
       } else if (this.selectedCategory.arrangeType === 1) {
         const tablistEle = this.$refs.anjuanEle.$refs.ajContent.$refs.tableList
         tablistEle.page.page = 0
+        tablistEle.currentPage = 1
         // 文件下
         if (isQuickFilter) {
           tablistEle.$refs.collectHeaderRef.getInitArchivesClass()
diff --git a/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue b/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue
index 0fa0439..760cb5a 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue
@@ -50,7 +50,7 @@
 </template>
 
 <script>
-import { form } from '@crud/crud'
+// import { form } from '@crud/crud'
 import { FetchDetailsById, FetchArchivesMetadata } from '@/api/collect/collect'
 import UploadFile from '../uploadFile/index'
 import FourTestInfo from '../fourTestInfo/index'
@@ -60,7 +60,7 @@ export default {
   name: 'ArchivesInfo',
   components: { UploadFile, FourTestInfo, HandleInfo, MarkInfo },
   mixins: [
-    form({})
+    // form({})
   ],
   props: {
     selectedCategory: {
@@ -144,11 +144,9 @@ export default {
       if (this.archivesTabIndex === 2) {
         this.setXml()
       } else if (this.archivesTabIndex === 3) {
-        console.log(this.$refs.fourTestInfoRefs)
         this.$refs.fourTestInfoRefs.currentArcId = this.arcId
         this.$refs.fourTestInfoRefs.getFourCheckRecord(this.arcId)
       } else if (this.archivesTabIndex === 4) {
-        console.log(this.$refs.handleInfoRefs)
         this.$refs.handleInfoRefs.currentArcId = this.arcId
         this.$refs.handleInfoRefs.getArchivesOperateLog(this.arcId)
       } else if (this.archivesTabIndex === 5) {
@@ -163,7 +161,6 @@ export default {
         this.$refs.archivesListModuleRef.isDetail = true
         this.$refs.archivesListModuleRef.getViewTable()
       } else if (this.archivesTabIndex === 6) {
-        console.log(this.$refs.markInfoRefs)
         this.$refs.markInfoRefs.archivesDetailsData = this.archivesDetailsData
         this.$refs.markInfoRefs.currentArcId = this.arcId
         this.$refs.markInfoRefs.getFileMarkList(this.arcId)
diff --git a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
index b60e91a..636c1b7 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
@@ -8,7 +8,7 @@
           v-model="query.project_class"
           :options="projectOptions"
           style="width: 180px;"
-          flat
+          :flat="false"
           :multiple="false"
           :normalizer="normalizerProject"
           :default-expand-level="Infinity"
@@ -30,7 +30,7 @@
           v-model="query.archive_ctg_no"
           :options="classifyOptions"
           style="width: 180px;"
-          flat
+          :flat="false"
           :multiple="false"
           :normalizer="normalizer"
           placeholder="请选择档案分类"
@@ -572,8 +572,6 @@ export default {
       } else {
         this.page.size = 10
       }
-      console.log('this.page.size', this.page.size)
-      console.log('this.page.page', this.page.page)
       if (type === 'edit') {
         const params = {
           'categoryId': this.selectedCategory.id,
@@ -606,7 +604,6 @@ export default {
             this.$refs.previewForm.archivesType = 'add'
             this.$refs.previewForm.activeIndex = this.activeIndex
             const savePrevFromData = JSON.parse(localStorage.getItem('savePrevFromData'))
-            console.log('savePrevFromData', savePrevFromData)
             if (savePrevFromData) {
               if ('record_no' in savePrevFromData && 'item_no' in savePrevFromData) {
                 if (savePrevFromData.item_no && !isNaN(Number(savePrevFromData.item_no))) {
@@ -669,8 +666,6 @@ export default {
     },
     // 删除
     toDelete() {
-      console.log('this.page.page333', this.page.page)
-      console.log('this.page.total33333', this.page.total)
       if (this.selections.length === 0) {
         this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 })
         return false
@@ -1266,8 +1261,6 @@ export default {
       //   this.$message('所选条目中存在已装盒档案，请勿重复操作！')
       //   return false
       // }
-      console.log('this.parentsData', this.parentsData)
-      console.log('this.parentsData.listCategory', this.parentsData.listCategory.id)
       this.$refs.packingBox.packingVisible = true
       this.$refs.packingBox.isPackingOrPartType = type
       this.$refs.packingBox.packFileCategory = this.parentsData.listCategory
@@ -1364,6 +1357,8 @@ export default {
         }
         FetchCompleteDelArchives(params).then((res) => {
           if (res.code !== 500) {
+            localStorage.removeItem('currentPageSize')
+            localStorage.removeItem('currentPage')
             this.$message({ message: res, type: 'success', offset: 8 })
             this.handleSearch(this.collectLevel)
           } else {
@@ -1407,7 +1402,6 @@ export default {
         'anId': null
       }
       FetchDoHandleEnterAnalysis(params).then(data => {
-        console.log(data)
         // const inputMessage = data.query + '需要提取得内容部分是' + data.context
         this.sendMessage(data.query, data.context)
       })
@@ -1478,8 +1472,6 @@ export default {
       } finally {
         this.aiResultCaLoading = false
         if (!this.isDialogClosed) {
-          console.log('this.displayedText.', this.displayedText)
-
           // 去除 <think> 和 </think> 之间的内容
           const thinkStartIndex = this.displayedText.indexOf('<think>')
           const thinkEndIndex = this.displayedText.indexOf('</think>')
@@ -1487,16 +1479,13 @@ export default {
           if (thinkStartIndex !== -1 && thinkEndIndex !== -1) {
             lastContent = lastContent.slice(0, thinkStartIndex) + lastContent.slice(thinkEndIndex + '</think>'.length)
           }
-          console.log('lastContent', lastContent)
           // 提取 JSON 部分
           const startIndex = lastContent.indexOf('{')
           const endIndex = lastContent.lastIndexOf('}')
           if (startIndex !== -1 && endIndex !== -1 && endIndex > startIndex) {
             const jsonStr = lastContent.slice(startIndex, endIndex + 1)
-            console.log('jsonStr', jsonStr)
             const jsonData = JSON.parse(jsonStr)
             console.log('提取并过滤后的 JSON 数据:', jsonData)
-            console.log('this.selectedCategory', this.selectedCategory)
             jsonData.fonds_no = this.selectedCategory.fondsNo
             jsonData.archival_category_code = this.selectedCategory.code
             jsonData.is_entity = 1
diff --git a/src/views/collectReorganizi/collectionLibrary/module/packingBox/index.vue b/src/views/collectReorganizi/collectionLibrary/module/packingBox/index.vue
index 83bdbc5..c23235d 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/packingBox/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/packingBox/index.vue
@@ -34,7 +34,7 @@
       >
         <el-table-column prop="create_date" label="操作" width="80" align="center">
           <template slot-scope="scope">
-            <el-button class="packing-handle-btn iconfont" @click="handleCartoning(scope.row)"><svg-icon icon-class="zhuanghe" class="svg-arc-style" />装盒</el-button>
+            <el-button :loading="btnLoading" class="packing-handle-btn iconfont" @click="handleCartoning(scope.row)"><svg-icon icon-class="zhuanghe" class="svg-arc-style" />装盒</el-button>
           </template>
         </el-table-column>
         <el-table-column prop="caseCode" label="盒号" min-width="120" align="center" />
@@ -162,7 +162,7 @@
       </div>
       <div v-if="isPackingOrPartType" slot="footer" class="dialog-footer">
         <el-button type="text">取消</el-button>
-        <el-button type="primary" @click="handleComfireCartoning">确定</el-button>
+        <el-button :loading="btnLoading" type="primary" @click="handleComfireCartoning">确定</el-button>
       </div>
     </div>
   </el-dialog>
@@ -199,6 +199,7 @@ export default {
   },
   data() {
     return {
+      btnLoading: false,
       currentSelections: [],
       arrySort: null,
       tableDisplayFields: [],
@@ -326,7 +327,6 @@ export default {
     // 装盒 api
     async handleCartoning(row) {
       // let jnCategoryId
-      console.log('this.selections', this.selections)
       if (this.selectedCategory.arrangeType === 1) {
         this.packingData = this.selections
         // jnCategoryId = this.packFileCategory.id
@@ -352,6 +352,7 @@ export default {
         // jnCategoryId = this.packFileCategory.id
       }
       console.log('this.packingData', this.packingData)
+      this.btnLoading = true
       const arrParams = this.packingData.map((item) => {
         const json = {}
         json.archivesId = item.id
@@ -375,6 +376,7 @@ export default {
         this.$emit('close-dialog')
         this.tableData = []
         this.caseQuery[this.inputSelect] = ''
+        this.btnLoading = false
       })
     },
     // 分卷装盒
@@ -414,6 +416,7 @@ export default {
       }
       // const jnCategoryId = this.packFileCategory.id
       console.log('this.selectArchivesTable', this.selectArchivesTable)
+      this.btnLoading = true
       const arrParams = this.selectArchivesTable.map(item => {
         const json = {}
         json.archivesId = item.id
diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue
index f45c495..f6fb37f 100644
--- a/src/views/components/category/PreviewForm.vue
+++ b/src/views/components/category/PreviewForm.vue
@@ -838,6 +838,7 @@ export default {
       delete this.addOrUpdateForm.id
       this.$refs[formName].validate((valid) => {
         if (valid) {
+          this.$emit('formLoadingShow', true)
           // 预归档库
           if (this.isDesFormType === 'prearchiveLibrary') {
             if (this.fileOriginal === null) {
@@ -859,6 +860,7 @@ export default {
                 this.crud.refresh()
                 this.fileOriginal = null
               }
+              this.$emit('formLoadingShow', false)
             })
           } else if (this.isDesFormType === 'mergeFile') {
             // 合并成件
@@ -871,13 +873,13 @@ export default {
             }
             FetchMergeToFile(params).then(res => {
               if (res) {
-                this.$message({ message: res.message, type: 'success', offset: 8 })
+                this.$message({ message: res, type: 'success', offset: 8 })
                 this.$emit('close-dialog')
                 this.crud.refresh()
+                this.$emit('formLoadingShow', false)
               }
             })
           } else {
-            this.$emit('formLoadingShow', true)
             // 收集库
             let parentsId = null
             // 2 项目  3 案卷 /文件 4 卷内 6 文件
diff --git a/src/views/components/echarts/graph.vue b/src/views/components/echarts/graph.vue
index fd3656b..cd44b65 100644
--- a/src/views/components/echarts/graph.vue
+++ b/src/views/components/echarts/graph.vue
@@ -40,6 +40,7 @@ export default {
   },
   data() {
     return {
+      graphData: {},
       isShowCodePanel: false,
       isShowNodeTipsPanel: false,
       nodeMenuPanelPosition: { x: 0, y: 0 },
@@ -72,18 +73,17 @@ export default {
     }
   },
   watch: {
-    'graphData': {
-      handler(val) {
-        setTimeout(() => {
-          this.setData()
-        }, 100)
-      },
-      immediate: true,
-      deep: true
-    }
+    // 'graphData': {
+    //   handler(val) {
+    //     setTimeout(() => {
+    //       this.setData()
+    //     }, 100)
+    //   },
+    //   immediate: true,
+    //   deep: true
+    // }
   },
   mounted() {
-    console.log('graphData', this.graphData)
     this.resizeTimer = setInterval(async() => {
       // const graphInstance = this.$refs.graphRef.getInstance();
       // await graphInstance.zoomToFit();
@@ -98,18 +98,19 @@ export default {
     clearInterval(this.resizeTimer)
   },
   methods: {
+    resetAllData() {
+      this.allData = { 'nodes': [], 'lines': [] }
+    },
     getOrigionGraphData(nodeId, id, tableName) {
-      // this.selectedCategory.cnName
-      // E0B3627CBED49E53609245
       const parmas = {
-        'searchKey': 'id', // id / title
+        'searchKey': 'id',
         'searchValue': id,
-        'tableName': tableName // 节点名称
+        'tableName': tableName, // 节点名称
+        'querySize': 10
       }
       FetchInitShowByCategory(parmas).then((res) => {
-        console.log(res)
-        this.graphData2 = res
-        this.setData(this.graphData2, nodeId)
+        this.graphData = res
+        this.setData(this.graphData, nodeId)
       }).catch(err => {
         console.log(err)
       })
@@ -119,7 +120,6 @@ export default {
       // 档案Archives、门类Category、档案分类CategoryClass、全宗Fonds、关键词Keywords、保管期限Retention、保密期限SecrecyPeriod、密级SecurityClass
       const newNodes = nodes.map(item => {
         const newItem = { ...item, id: String(item.id), originId: item.properties.id, text: item.properties.title, type: item.labels[0] }
-
         const typeToColorMap = {
           Archives: '#0348F3',
           Category: '#14C9C9',
diff --git a/src/views/prearchiveLibrary/index.vue b/src/views/prearchiveLibrary/index.vue
index 7d83248..8e53603 100644
--- a/src/views/prearchiveLibrary/index.vue
+++ b/src/views/prearchiveLibrary/index.vue
@@ -106,10 +106,22 @@
           <span class="dialog-right-top" />
           <span class="dialog-left-bottom" />
           <div class="setting-dialog">
-            <PreviewForm ref="previewForm" :form-preview-data.sync="formPreviewData" :selected-category="selectedCategory" :parents-id="parentsId" :arc-id="arcId" :is-des-form-type="isDesFormType" :is-disabled="isDisabled" :selected-document="selectedDocument" :is-has-code="isHasCode" @close-dialog="closeDialog" />
+            <PreviewForm
+              ref="previewForm"
+              :form-preview-data.sync="formPreviewData"
+              :selected-category="selectedCategory"
+              :parents-id="parentsId"
+              :arc-id="arcId"
+              :is-des-form-type="isDesFormType"
+              :is-disabled="isDisabled"
+              :selected-document="selectedDocument"
+              :is-has-code="isHasCode"
+              @close-dialog="closeDialog"
+              @formLoadingShow="formLoadingShow"
+            />
             <div slot="footer" class="dialog-footer" style="margin-top: 85px !important;">
               <el-button type="text" @click="closeDialog">取消</el-button>
-              <el-button type="primary" @click="handlerArchivesSubmit">确定</el-button>
+              <el-button :loading="archivesBtnLoading" type="primary" @click="handlerArchivesSubmit">确定</el-button>
             </div>
           </div>
         </el-dialog>
@@ -165,6 +177,7 @@ export default {
   mixins: [presenter(), header(), preLibraryCrud],
   data() {
     return {
+      archivesBtnLoading: false,
       permission: {
         add: ['admin', 'prearchiveLibrary:add'],
         edit: ['admin', 'prearchiveLibrary:edit'],
@@ -207,6 +220,9 @@ export default {
       this.crud.query.documentId = this.selectedDocument.id
       this.crud.query.sort = this.arrySort
     },
+    formLoadingShow(loadingType) {
+      this.archivesBtnLoading = loadingType
+    },
     handleNodeClick(data) {
       this.selectedDocument = data
       this.getInitDocumentsViewTable()
diff --git a/src/views/prearchiveLibrary/module/batchFile.vue b/src/views/prearchiveLibrary/module/batchFile.vue
index 41968ec..6917e05 100644
--- a/src/views/prearchiveLibrary/module/batchFile.vue
+++ b/src/views/prearchiveLibrary/module/batchFile.vue
@@ -101,7 +101,7 @@
         </div>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="handleClose">取消</el-button>
-          <el-button type="primary" @click="handleComfirmBatchToFile">确定</el-button>
+          <el-button :loading="archivesBtnLoading" type="primary" @click="handleComfirmBatchToFile">确定</el-button>
         </div>
       </div>
     </el-dialog>
@@ -136,6 +136,7 @@ export default {
   },
   data() {
     return {
+      archivesBtnLoading: false,
       selectionsArc: [],
       batchVisible: false,
       rulesOptions: [],
@@ -465,6 +466,7 @@ export default {
       // done()
     },
     handleComfirmBatchToFile() {
+      this.archivesBtnLoading = true
       const getIndicesByMode = (modeValue) => {
         return this.selectStatus.reduce((indices, item, index) => {
           if (item.mode === modeValue) {
@@ -547,6 +549,7 @@ export default {
           this.isTest = false
           this.batchCategory = {}
         }
+        this.archivesBtnLoading = false
       })
     },
     normalizer(node) {
diff --git a/src/views/prearchiveLibrary/module/moveFile.vue b/src/views/prearchiveLibrary/module/moveFile.vue
index d499681..e29b8b2 100644
--- a/src/views/prearchiveLibrary/module/moveFile.vue
+++ b/src/views/prearchiveLibrary/module/moveFile.vue
@@ -70,7 +70,7 @@
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="text" @click="closedDialog">取消</el-button>
-        <el-button type="primary" @click="handleComfirmed">确定</el-button>
+        <el-button :loading="archivesBtnLoading" type="primary" @click="handleComfirmed">确定</el-button>
       </div>
     </div>
   </el-dialog>
@@ -105,6 +105,7 @@ export default {
   },
   data() {
     return {
+      archivesBtnLoading: false,
       selectedCategoryMove: {},
       query: {
         search: ''
@@ -248,6 +249,7 @@ export default {
         this.$message({ message: '请选择要移动到收集库的档案', type: 'warning', offset: 8 })
         return false
       }
+      this.archivesBtnLoading = true
       const archivesIds = this.moveArc.map(item => {
         return item.id
       })
@@ -264,6 +266,7 @@ export default {
         this.query.search = null
         this.selections = []
         this.$emit('refresh')
+        this.archivesBtnLoading = false
       })
     },
     handleSizeChange(size) {
diff --git a/src/views/system/processManage/runningProcess/module/businessDetails/index.vue b/src/views/system/processManage/runningProcess/module/businessDetails/index.vue
index e461b52..28edb47 100644
--- a/src/views/system/processManage/runningProcess/module/businessDetails/index.vue
+++ b/src/views/system/processManage/runningProcess/module/businessDetails/index.vue
@@ -45,7 +45,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-pagination :page-size.sync="setPage.size" :total="setPage.total" :current-page.sync="setPage.page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChangeHandler($event)" @current-change="pageChangeHandler" />
+    <el-pagination :page-size.sync="setPage.size" :total="setPage.total" :current-page.sync="setPage.page+1" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChangeHandler($event)" @current-change="pageChangeHandler" />
     <ArchivesInfo ref="archivesInfo" :category-id="categoryId" :arc-id="arcId" :is-title-type="isTitleType" />
   </div>
 </template>
diff --git a/src/views/system/processManage/runningProcess/module/detail.vue b/src/views/system/processManage/runningProcess/module/detail.vue
index 3257731..2ad9044 100644
--- a/src/views/system/processManage/runningProcess/module/detail.vue
+++ b/src/views/system/processManage/runningProcess/module/detail.vue
@@ -148,6 +148,7 @@ export default {
       console.log('this.isMessage', this.isMessage)
       console.log('this.selectCenterRow', this.selectCenterRow)
       console.log('this.selectRow', this.selectRow)
+      this.tableData = []
       const params = {
         'businessId': this.isMessage ? this.selectCenterRow.businessId : (this.selectRow.id || this.selectRow.businessId),
         'page': this.setPage.page,
@@ -157,8 +158,6 @@ export default {
         if (res.code !== 500) {
           this.baseInfo = res.businessFlow
 
-          console.log('this.baseInfo ', this.baseInfo)
-
           if (res.businessFlow.businessType === 5) {
             this.isUtilize = true
             res.details.content.forEach(item => {
@@ -197,7 +196,7 @@ export default {
     },
     // 当前页改变
     pageChangeHandler(e) {
-      this.setPage.page = e
+      this.setPage.page = e - 1
       this.getBusinessFlowDetails()
     },
     // 每页条数改变
diff --git a/src/views/system/user/processCenter/module/form.vue b/src/views/system/user/processCenter/module/form.vue
index af58cf2..dc6c957 100644
--- a/src/views/system/user/processCenter/module/form.vue
+++ b/src/views/system/user/processCenter/module/form.vue
@@ -180,7 +180,8 @@ export default {
     },
     // 当前页改变
     pageChangeHandler(e) {
-      this.setPage.page = e
+      this.setPage.page = e - 1
+      console.log('this.setPage.page', this.setPage.page)
       this.getBusinessFlowDetails()
     },
     // 每页条数改变