档案优化

src/utils/upload.js

@@ -44,6 +44,16 @@ export function archivesUpload(api, file, categoryId, archivesId, fileJsonString
   }
   return axios.post(api, data, config)
 }
+// 收集库 - 目录上传
+export function catalogUpload(api, file, fondsId) {
+  var data = new FormData()
+  data.append('file', file)
+  data.append('fondsId', fondsId)
+  const config = {
+    headers: { 'Authorization': getToken() }
+  }
+  return axios.post(api, data, config)
+}
 
 // 预归档档案上传附件
 export function reDocumentUpload(api, file, documentId) {
@@ -78,6 +88,7 @@ export function batchMountUpload(api, file, params) {
   data.append('checkRepeatType', params.checkRepeatType)
   data.append('matchingMode', params.matchingMode)
   data.append('fields', params.fields)
+  data.append('fondsId', params.fondsId)
   const config = {
     headers: {
       'Authorization': getToken()
@@ -99,6 +110,7 @@ export function remoteConnectiontUpload(api, params) {
   data.append('fields', params.fields)
   data.append('protocol', params.protocol)
   data.append('zipFilePath', params.zipFilePath)
+  data.append('fondsId', params.fondsId)
   const config = {
     headers: {
       'Authorization': getToken()

src/views/AIAssistant/AICataloging/running/index.vue

@@ -131,8 +131,8 @@
         <div class="dialog-delt">
           <ul style="line-height: 24px; padding: 0 10px;">
             <li>AI辅助著录可支持的文件格式包括：</li>
-            <li style="margin-bottom: 10px;">1.文本文件：<br><span style="font-weight: bold;">doc/docx、txt</span></li>
-            <li style="margin-bottom: 10px;">2.电子表格和演示文稿：<br><span style="font-weight: bold;">xls/xlsx、ppt/pptx</span></li>
+            <li style="margin-bottom: 10px;">1.文本文件：<br><span style="font-weight: bold;">doc/docx/wps、txt</span></li>
+            <li style="margin-bottom: 10px;">2.电子表格和演示文稿：<br><span style="font-weight: bold;">xls/xlsx/et、ppt/pptx/dps</span></li>
             <li style="margin-bottom: 10px;">3.图像文件：<br><span style="font-weight: bold;">jpge/jpg、png</span></li>
             <li>4.其他文件：<br> <span style="font-weight: bold;">pdf、ofd</span></li>
             <li style="color: #0C0E1E; margin-top: 20px;">注意：目前支持<span style="color: #ED4A41;">单次上传多个图像文件或1个非图像文件，单个文件的大小不得超过10M</span>。文件解析耗时根据文件的大小以及类型各有不同，用户可在上传成功后手动点击“刷新”按钮更新文件解析状态。</li>

src/views/AIAssistant/AIIntelligentCoding/aiForm.vue

@@ -98,12 +98,12 @@
                     <input ref="fileInput" type="file" style="display: block; width: 40px; position: absolute; top: 0; left: 0; opacity: 0; pointer-events: none;" @change="handleFileChange">
                     <el-popover
                       placement="top-start"
-                      width="270"
+                      width="250"
                       trigger="hover"
                     >
                       <div>
                         此处可支持的文件格式包括：<br>
-                        <span style="display:inline-block; font-weight: bold; margin-bottom: 10px;">doc/docx、txt、xls/xlsx、ppt/pptx、pdf、ofd</span>
+                        <span style="display:inline-block; font-weight: bold; margin-bottom: 10px;">doc/docx/wps、txt、xls/xlsx/et、ppt/pptx/dps、pdf、ofd</span>
                         注意：单次只可上传1个文件，且文件的大小不得超过10M。
                       </div>
                       <i slot="reference" class="iconfont icon-attachment" @click="openFileSelector" />

src/views/archivesManage/managementLibrary/anjuan/index.vue

@@ -59,6 +59,9 @@ export default {
       this.anjuanDrawer = false
       this.$parent.parentsProjectId = null
       this.$parent.parentsProjectRow = null
+
+      localStorage.removeItem('currentPageSize')
+      localStorage.removeItem('currentPage')
     }
   }
 }

src/views/archivesManage/managementLibrary/file/index.vue

@@ -164,6 +164,7 @@ export default {
     },
     closeDrawer() {
       localStorage.removeItem('currentPageSize')
+      localStorage.removeItem('currentPage')
       this.fileDrawer = false
       if (this.selectedCategory.arrangeType === 1) {
         this.$parent.parentsAnjuanId = null

src/views/archivesManage/managementLibrary/index.vue

@@ -630,6 +630,7 @@ export default {
         this.$refs.anjuanEle.$refs.ajContent.activeIndex = 0
       }
       this.$nextTick(() => {
+        this.$refs.anjuanEle.$refs.ajContent.$refs.tableList.currentPage = 1
         this.$refs.anjuanEle.$refs.ajContent.$refs.tableList.page.page = 0
         this.$refs.anjuanEle.$refs.ajContent.$refs.tableList.getCommonData(2, this.parentsProjectId)
         this.$refs.anjuanEle.$refs.ajContent.test = data
@@ -640,6 +641,7 @@ export default {
       if (this.selectedCategory.arrangeType === 1 || (this.selectedCategory.arrangeType === 3 && this.$refs.anjuanEle.$refs.ajContent.activeIndex === 1) || (this.selectedCategory.arrangeType === 2 && this.$refs.anjuanEle.$refs.ajContent.activeIndex === 1)) {
         this.$refs.fileEle.fileDrawer = true
         this.$nextTick(() => {
+          this.$refs.fileEle.currentPage = 1
           this.$refs.fileEle.page.page = 0
           this.$refs.fileEle.getCommonData(4, this.parentsAnjuanId)
           this.$refs.fileEle.test = data
@@ -648,7 +650,9 @@ export default {
         })
       } else {
         this.$refs.juanneiEle.juanneiDrawer = true
+        console.log('this.$refs.juanneiEle.page', this.$refs.juanneiEle)
         this.$nextTick(() => {
+          this.$refs.juanneiEle.currentPage = 1
           this.$refs.juanneiEle.page.page = 0
           this.$refs.juanneiEle.getCommonData(3, this.parentsAnjuanId)
           this.$refs.juanneiEle.test = data

src/views/archivesManage/managementLibrary/juannei/index.vue

@@ -213,6 +213,8 @@ export default {
       this.juanneiDrawer = false
       this.$parent.parentsAnjuanId = null
       this.$parent.parentsAnjuanRow = null
+      localStorage.removeItem('currentPageSize')
+      localStorage.removeItem('currentPage')
     },
     rowKey(row) {
       return row.id

src/views/archivesManage/managementLibrary/module/archivesInfo/index.vue

@@ -13,6 +13,7 @@
           <li :class="{'active-tab-nav': archivesTabIndex == 2}" @click="changeActiveTab(2)">元数据</li>
           <li v-if="isFourTest" :class="{'active-tab-nav': archivesTabIndex == 3}" @click="changeActiveTab(3)">四性检测</li>
           <li v-if="isFourTest && isHasFile" :class="{'active-tab-nav': archivesTabIndex == 4}" @click="changeActiveTab(4)">操作记录</li>
+          <li v-if="isFourTest && isHasFile" :class="{'active-tab-nav': archivesTabIndex == 6}" @click="changeActiveTab(6)">标注信息</li>
         </ul>
         <!-- 基本信息 -->
         <div v-if="archivesTabIndex==0" class="base-info item-content">
@@ -42,6 +43,7 @@
         <FourTestInfo v-show="archivesTabIndex===3" ref="fourTestInfoRefs" />
         <HandleInfo v-show="archivesTabIndex===4" ref="handleInfoRefs" />
         <ArchivesListModule v-show="archivesTabIndex===5" ref="archivesListModuleRef" :selected-category="selectedCategory" :is-title-type="isTitleType" :is-collect="isCollect" />
+        <MarkInfo v-show="archivesTabIndex===6" ref="markInfoRefs" :selected-category="selectedCategory" />
       </div>
     </div>
   </el-dialog>
@@ -54,9 +56,10 @@ import { FetchIsAuthByLookType } from '@/api/archivesManage/library'
 import UploadFile from '../uploadFile/index'
 import FourTestInfo from '../fourTestInfo/index'
 import HandleInfo from '../handleInfo/index'
+import MarkInfo from '../markInfo/index'
 export default {
   name: 'ArchivesInfo',
-  components: { UploadFile, FourTestInfo, HandleInfo },
+  components: { UploadFile, FourTestInfo, HandleInfo, MarkInfo },
   mixins: [
     form({})
   ],
@@ -170,6 +173,10 @@ export default {
         this.$refs.archivesListModuleRef.parentId = this.arcId
         this.$refs.archivesListModuleRef.isDetail = true
         this.$refs.archivesListModuleRef.getViewTable()
+      } else if (this.archivesTabIndex === 6) {
+        this.$refs.markInfoRefs.archivesDetailsData = this.archivesDetailsData
+        this.$refs.markInfoRefs.currentArcId = this.arcId
+        this.$refs.markInfoRefs.getFileMarkList(this.arcId)
       }
       this.$nextTick(() => {
         if (this.$refs.uploadFile) {

src/views/archivesManage/managementLibrary/module/fourTestInfo/index.vue

@@ -2,7 +2,7 @@
   <!--四性检测-档案详情内-->
   <div class="fourTest-container">
     <div class="double-click-btn"><i class="iconfont icon-zhuyi-lan" /><span>双击列表数据查看报告详情</span></div>
-    <el-table :data="tableData" style="min-width: 100%" height="calc(100vh - 440px)" @cell-dblclick="tableDoubleClick">
+    <el-table :data="tableData" style="min-width: 100%" height="calc(100vh - 453px)" @cell-dblclick="tableDoubleClick">
       <el-table-column prop="create_by" label="检测人" min-width="80" />
       <el-table-column prop="create_time" label="检测时间" min-width="150">
         <template slot-scope="scope">
@@ -42,7 +42,7 @@
     <!--分页组件-->
     <el-pagination
       v-if="tableData.length !== 0"
-      :current-page="page.page"
+      :current-page="page.page+1"
       :total="page.total"
       :page-size="page.size"
       :pager-count="5"
@@ -98,7 +98,7 @@ export default {
       this.getFourCheckRecord(this.currentArcId)
     },
     handleCurrentPage(val) {
-      this.page.page = val
+      this.page.page = val - 1
       this.getFourCheckRecord(this.currentArcId)
     },
     tableDoubleClick(row) {

src/views/archivesManage/managementLibrary/module/handleInfo/index.vue

@@ -14,12 +14,12 @@
           <div>{{ scope.row.update_time | parseTime }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="remarks" label="备注" min-width="60" />
+      <el-table-column prop="remarks" label="备注" min-width="180" show-overflow-tooltip />
     </el-table>
     <!--分页组件-->
     <el-pagination
       v-if="tableData.length !== 0"
-      :current-page="page.page"
+      :current-page="page.page+1"
       :total="page.total"
       :page-size="page.size"
       :pager-count="5"
@@ -103,7 +103,7 @@ export default {
       this.getArchivesOperateLog(this.currentArcId)
     },
     handleCurrentPage(val) {
-      this.page.page = val
+      this.page.page = val - 1
       this.getArchivesOperateLog(this.currentArcId)
     }
   }

src/views/archivesManage/managementLibrary/module/markInfo/index.vue

@@ -0,0 +1,119 @@
+<template>
+  <!--档案详情-标注信息-->
+  <div class="fourTest-container">
+    <el-table class="archives-table" :data="tableData" style="min-width: 100%" height="calc(100vh - 440px)">
+      <el-table-column prop="file_name" label="标注对象" min-width="60">
+        <template slot-scope="scope">
+          <p v-if="scope.row.type">【档案】{{ scope.row.file_name }}</p>
+          <p v-else>【原文】{{ scope.row.file_name }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column prop="keyworks" label="标注">
+        <template slot-scope="scope">
+          <!-- <p>{{ scope.row.keyworks ? scope.row.keyworks:'-' }}</p> -->
+          <div v-if="scope.row.keyworks && scope.row.keyworks.trim()!== ''">
+            <el-tag
+              v-for="tag in scope.row.keyworks.split(',')"
+              :key="tag"
+              type="info"
+            >
+              {{ tag.trim() }}
+            </el-tag>
+
+          </div>
+          <p v-else>-</p>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { FetchInitFileMarkCategoryView } from '@/api/collect/collect'
+export default {
+  name: 'MarkInfo',
+  components: { },
+  mixins: [],
+  props: {
+    selectedCategory: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      archivesDetailsData: [],
+      currentArcId: null,
+      tableData: [],
+      page: {
+        page: 0,
+        size: 10,
+        total: 0
+      }
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+  },
+  methods: {
+    getFileMarkList(arcId) {
+      const params = {
+        'categoryId': this.selectedCategory.id,
+        'archivesId': this.currentArcId
+      }
+      console.log(params)
+      FetchInitFileMarkCategoryView(params).then(data => {
+        const arcTitleData = this.archivesDetailsData.filter(item => item.fieldName === 'maintitle')
+        if (data.returnlist.length !== 0) {
+          this.tableData = data.returnlist
+        } else {
+          this.tableData = []
+        }
+
+        try {
+          if (Array.isArray(arcTitleData) && arcTitleData.length > 0) {
+            const context = arcTitleData[0].context
+            const allKeywords = data.returnlist.reduce((acc, item) => {
+              return acc.concat(item.keyworks || [])
+            }, []).join(', ') // 拼接成字符串
+            this.tableData.unshift({
+              type: 1,
+              file_name: context,
+              keyworks: allKeywords
+            })
+            console.log('this.tableData', this.tableData)
+          } else {
+            console.warn('arcTitleData')
+          }
+        } catch (error) {
+          console.error(error)
+        }
+      })
+    },
+    handleSizeChange(size) {
+      this.page.size = size
+      this.page.page = 0
+      this.getArchivesOperateLog(this.currentArcId)
+    },
+    handleCurrentPage(val) {
+      this.page.page = val - 1
+      this.getArchivesOperateLog(this.currentArcId)
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+@import "~@/assets/styles/collect-reorganizi.scss";
+.fourTest-container{
+  height: calc(100vh - 380px) !important;
+  overflow: hidden;
+}
+::v-deep .el-tag.el-tag--info{
+  margin: 0 8px 0 0 !important;
+}
+</style>

src/views/archivesStatistics/ureport/designer/index.vue

@@ -1,6 +1,10 @@
 <template>
   <div v-loading="loading" :style="'height:'+ height">
-    <iframe :src="src" frameborder="no" style="width: 100%;height: 100%" scrolling="auto" />
+    <div v-if="!isMaintenance" class="maintenance-message">
+      <img style="display: block; width: 500px;" src="~@/assets/images/4011.png">
+      <p>页面正在维护中...</p>
+    </div>
+    <iframe v-else ref="myIframe" :src="url" frameborder="no" style="width: 100%;height: 100%" scrolling="auto" />
   </div>
 </template>
 <script>
@@ -8,23 +12,70 @@ export default {
   name: 'Ureport',
   data() {
     return {
-      src: '',
-      height: document.documentElement.clientHeight - 94.5 + 'px;',
-      loading: true
+      url: '',
+      height: document.documentElement.clientHeight - 122 + 'px;',
+      loading: true,
+      isMaintenance: false
     }
   },
-  mounted: function() {
-    setTimeout(() => {
-      this.loading = false
-    }, 230)
-    const that = this
-
+  mounted() {
+    this.getIframeState()
+  },
+  methods: {
+    getIframeState() {
       const linkSrc = process.env.NODE_ENV === 'production' ? window.g.ApiUrl : process.env.VUE_APP_BASE_API
-    this.src = linkSrc + '/ureport/designer'
-    // this.src = '/ureport/designer'
+      this.url = linkSrc + '/ureport/designer'
+
+      fetch(this.url)
+        .then(response => {
+          if (response.ok) {
+            const that = this
+            this.isMaintenance = true
+            console.log('地址能正常运行')
+            this.$nextTick(() => {
+              const iframe = this.$refs.myIframe
+              iframe.addEventListener('load', () => {
+                if (iframe.contentWindow) {
+                  console.log('iframe内容已加载完成')
+                  this.loading = false
+                } else {
+                  console.log('iframe内容加载出现错误')
+                  this.loading = false
+                }
+              })
               window.onresize = function temp() {
                 that.height = document.documentElement.clientHeight - 94.5 + 'px;'
               }
+            })
+          } else {
+            this.isMaintenance = false
+            console.log('地址无法正常运行，状态码：', response.status)
+          }
+          setTimeout(() => {
+            this.loading = false
+          }, 230)
+        })
+        .catch(error => {
+          console.log('地址无法正常运行，错误信息：', error)
+          this.isMaintenance = false
+          this.loading = false
+        })
+    }
   }
 }
 </script>
+
+<style lang='scss' scoped>
+.maintenance-message{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: calc(100vh - 215px);
+  p{
+    font-size: 26px;
+    font-weight: bold;
+    margin-left: 20px;
+    color: #000;
+  }
+}
+</style>

src/views/collectReorganizi/batchConnection/index.vue

@@ -156,6 +156,7 @@ export default {
       this.currentCategory = data
       if (data) {
         this.crud.query.categoryId = data.id
+        this.crud.query.fondsId = data.fondsId
         this.crud.refresh()
       }
     },

src/views/collectReorganizi/batchConnection/module/form.vue

@@ -253,6 +253,7 @@ export default {
       }
       this.btnLoading = true
       this.$refs['form'].validate((valid) => {
+        console.log('this.currentCategory', this.currentCategory)
         if (valid) {
           let newhitchRemark = this.hitchRemarkArray.map(item => item.replace(/^\$|\$$|\*$/g, ''))
           newhitchRemark = newhitchRemark.filter(item => item !== '')
@@ -263,7 +264,8 @@ export default {
               'mountType': 1, // 挂接方式  1.本地挂接 2.远程挂接 3.上传目录 （目前只有1）
               'checkRepeatType': this.form.checkRepeatType,
               'matchingMode': this.form.matchingMode,
-              'fields': newhitchRemark
+              'fields': newhitchRemark,
+              'fondsId': this.currentCategory.fondsId
             }
             console.log(params)
             batchMountUpload(this.baseApi + '/api/collect/batchMount',
@@ -286,6 +288,7 @@ export default {
               'cPassword': this.form.filePath.cpassword,
               'cPort': this.form.filePath.cport,
               'categoryId': this.currentCategory.id,
+              'fondsId': this.currentCategory.fondsId,
               'checkRepeatType': this.form.checkRepeatType,
               'matchingMode': this.form.matchingMode,
               'fields': newhitchRemark,

src/views/collectReorganizi/collectionLibrary/anjuan/index.vue

@@ -59,6 +59,8 @@ export default {
       this.anjuanDrawer = false
       this.$parent.parentsProjectId = null
       this.$parent.parentsProjectRow = null
+      localStorage.removeItem('currentPageSize')
+      localStorage.removeItem('currentPage')
     }
   }
 }

src/views/collectReorganizi/collectionLibrary/file/index.vue

@@ -173,6 +173,7 @@ export default {
     },
     closeDrawer() {
       localStorage.removeItem('currentPageSize')
+      localStorage.removeItem('currentPage')
       this.fileDrawer = false
       if (this.selectedCategory.arrangeType === 1) {
         this.$parent.parentsAnjuanId = null

src/views/collectReorganizi/collectionLibrary/index.vue

@@ -625,6 +625,7 @@ export default {
         this.$refs.anjuanEle.$refs.ajContent.activeIndex = 0
       }
       this.$nextTick(() => {
+        this.$refs.anjuanEle.$refs.ajContent.$refs.tableList.currentPage = 1
         this.$refs.anjuanEle.$refs.ajContent.$refs.tableList.page.page = 0
         this.$refs.anjuanEle.$refs.ajContent.$refs.tableList.getCommonData(2, this.parentsProjectId)
         this.$refs.anjuanEle.$refs.ajContent.test = data
@@ -637,6 +638,7 @@ export default {
       if (this.selectedCategory.arrangeType === 1 || (this.selectedCategory.arrangeType === 3 && this.$refs.anjuanEle.$refs.ajContent.activeIndex === 1) || (this.selectedCategory.arrangeType === 2 && this.$refs.anjuanEle.$refs.ajContent.activeIndex === 1)) {
         this.$refs.fileEle.fileDrawer = true
         this.$nextTick(() => {
+          this.$refs.fileEle.currentPage = 1
           this.$refs.fileEle.page.page = 0
           this.$refs.fileEle.getCommonData(4, this.parentsAnjuanId)
           this.$refs.fileEle.test = data
@@ -645,6 +647,7 @@ export default {
       } else {
         this.$refs.juanneiEle.juanneiDrawer = true
         this.$nextTick(() => {
+          this.$refs.juanneiEle.currentPage = 1
           this.$refs.juanneiEle.page.page = 0
           this.$refs.juanneiEle.getCommonData(3, this.parentsAnjuanId)
           this.$refs.juanneiEle.test = data
@@ -657,6 +660,7 @@ export default {
       this.parentsJuanneiId = parentId
       this.$refs.fileEle.fileDrawer = true
       this.$nextTick(() => {
+        this.$refs.fileEle.currentPage = 1
         this.$refs.fileEle.page.page = 0
         this.$refs.fileEle.getCommonData(4, this.parentsJuanneiId)
         this.$refs.fileEle.test = data

src/views/collectReorganizi/collectionLibrary/juannei/index.vue

@@ -155,6 +155,8 @@ export default {
       this.juanneiDrawer = false
       this.$parent.parentsAnjuanId = null
       this.$parent.parentsAnjuanRow = null
+      localStorage.removeItem('currentPageSize')
+      localStorage.removeItem('currentPage')
     },
     rowKey(row) {
       return row.id

src/views/collectReorganizi/collectionLibrary/module/archivesFilling/index.vue

@@ -149,12 +149,12 @@ export default {
             'categoryLevel': this.collectLevel
           }
           FetchBecomeDocument(params).then((res) => {
-            const resultData = JSON.parse(res.message)
-            console.log('resultData', resultData)
             if (res.code !== 500) {
               this.$message({ message: '归档操作提交成功', type: 'success', offset: 8 })
               this.$emit('close-dialog')
             } else {
+              const resultData = JSON.parse(res.message)
+              console.log('resultData', resultData)
               // const message = JSON.parse(res.message)
               // this.$message.error(message.fail.join(',') + '归档操作提交失败')
               this.$message({ message: '四性检测未通过,归档操作提交失败', type: 'error', offset: 8 })

src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue

@@ -594,6 +594,7 @@ export default {
           this.formTitle = '新增案卷'
         } else {
           console.log('222')
+          this.quickPaperArcId = []
           this.formTitle = '新增' + this.collectTitle
           this.quickPaper = false
         }

src/views/collectReorganizi/collectionLibrary/module/collectMoveFile/index.vue

@@ -202,7 +202,8 @@ export default {
         'fonds_no': this.currentCategory.fondsId,
         'search': this.query.search,
         'page': this.page.page - 1,
-        'size': this.page.size
+        'size': this.page.size,
+        'sort': this.arrySort
       }
       FetchInitCategoryView(params).then((res) => {
         if (res.code !== 500) {

src/views/collectReorganizi/collectionLibrary/module/fourTestInfo/index.vue

@@ -42,7 +42,7 @@
     <!--分页组件-->
     <el-pagination
       v-if="tableData.length !== 0"
-      :current-page="page.page"
+      :current-page="page.page+1"
       :total="page.total"
       :page-size="page.size"
       :pager-count="5"
@@ -98,7 +98,7 @@ export default {
       this.getFourCheckRecord(this.currentArcId)
     },
     handleCurrentPage(val) {
-      this.page.page = val
+      this.page.page = val - 1
       this.getFourCheckRecord(this.currentArcId)
     },
     tableDoubleClick(row) {

src/views/collectReorganizi/collectionLibrary/module/handleInfo/index.vue

@@ -19,7 +19,7 @@
     <!--分页组件-->
     <el-pagination
       v-if="tableData.length !== 0"
-      :current-page="page.page"
+      :current-page="page.page+1"
       :total="page.total"
       :page-size="page.size"
       :pager-count="5"
@@ -103,7 +103,7 @@ export default {
       this.getArchivesOperateLog(this.currentArcId)
     },
     handleCurrentPage(val) {
-      this.page.page = val
+      this.page.page = val - 1
       this.getArchivesOperateLog(this.currentArcId)
     }
   }

src/views/collectReorganizi/collectionLibrary/module/markInfo/index.vue

@@ -100,7 +100,7 @@ export default {
       this.getArchivesOperateLog(this.currentArcId)
     },
     handleCurrentPage(val) {
-      this.page.page = val
+      this.page.page = val - 1
       this.getArchivesOperateLog(this.currentArcId)
     }
   }

src/views/collectReorganizi/collectionLibrary/module/quickPaper/index.vue

@@ -2,6 +2,7 @@
   <!--快速组卷-->
   <el-dialog class="tip-dialog" title="快速组卷" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :visible.sync="quickVisible">
     <div class="setting-dialog">
+      <div class="double-click-btn"><i class="iconfont icon-zhuyi-lan" /><span>说明：系统根据“成文日期”快速匹配同一年度月份的数据</span></div>
       <div class="fourTest-container">
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-form-item label="选择年月" prop="date">
@@ -143,4 +144,8 @@ export default {
     color: #ED4A41;
   }
 }
+.double-click-btn{
+  position: static;
+  margin: -10px 0 10px 0;
+}
 </style>

src/views/collectReorganizi/collectionLibrary/module/uploadOriginal/index.vue

@@ -51,7 +51,7 @@
 <script>
 import { FetchInitFileCategoryView } from '@/api/collect/collect'
 import { getCurrentTime } from '@/utils/index'
-import { upload, archivesUpload } from '@/utils/upload'
+import { catalogUpload, archivesUpload } from '@/utils/upload'
 import { mapGetters } from 'vuex'
 export default {
   name: 'UploadOriginal',
@@ -178,8 +178,9 @@ export default {
       if (this.uploadType === 2) {
         this.uplaodLoading = true
         // 原文目录上传
-        upload(this.baseApi + '/api/collect/catalogUpload',
-          this.fileList[0]
+        catalogUpload(this.baseApi + '/api/collect/catalogUpload',
+          this.fileList[0],
+          this.selectedCategory.fondsId
         ).then(res => {
           if (res.data.code === 200) {
             // 暂不用写太详细的失败成功信息，只要200，就操作成功

src/views/components/category/PreviewForm.vue

@@ -14,7 +14,8 @@
                 :normalizer=" isTableType === 1 ? normalizerFonds : (isTableType === 2 ? normalizerClassify : normalizer)"
                 :clearable="false"
                 placeholder=""
-                flat
+                :flat="false"
+                :multiple="false"
                 :style="{ width: item.editLength+'px'}"
                 :disabled="isDisabled|| (item.fieldName === 'fonds_no' && (isDesFormType === 'arcives' || isDesFormType === 'manageArcives')) "
                 :validate-event="!isDisabled"
@@ -754,8 +755,27 @@ export default {
 
         // 处理除 archive_year 外的字段最大长度验证
         if (item.fieldName !== 'archive_year' && item.isColumnLength) {
-          rule.max = parseInt(item.isColumnLength) // 添加最大长度验证规则
-          rule.message = `输入内容最多为${item.isColumnLength}个字符的${item.fieldCnName}`
+          rule.validator = (rule, value, callback) => {
+            // 如果输入值为空字符串，直接认为验证通过
+            if (item.isRequired === null && value === '') {
+              callback()
+              return
+            }
+
+            let errorMessage = null
+            const maxLength = parseInt(item.isColumnLength)
+
+            if (maxLength && typeof value === 'string' && value.length > maxLength) {
+              errorMessage = `输入内容最多为${maxLength}个字符的${item.fieldCnName}`
+            }
+
+            if (errorMessage) {
+              rule.message = errorMessage
+              callback(new Error(errorMessage))
+            } else {
+              callback()
+            }
+          }
         }
 
         // 处理 archive_year 字段的验证
@@ -837,7 +857,7 @@ export default {
       delete this.addOrUpdateForm.id
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.$emit('formLoadingShow', true)
+          // this.$emit('formLoadingShow', true)
           // 预归档库
           if (this.isDesFormType === 'prearchiveLibrary') {
             if (this.fileOriginal === null) {

src/views/system/processManage/modelDesign/index.vue

@@ -3,7 +3,13 @@
     <!-- http://192.168.99.84:8080/flowable-ui/modeler/#/processes -->
     <!-- :src="baseApi+'/flowable-ui/modeler'" -->
     <!-- src="http://192.168.99.67:11110/flowable-ui/modeler/" -->
+
+    <div v-if="!isMaintenance" class="maintenance-message">
+      <img style="display: block; width: 500px;" src="~@/assets/images/4011.png">
+      <p>页面正在维护中...</p>
+    </div>
     <iframe
+      v-else
       ref="myIframe"
       class="iframe"
       frameborder="0"
@@ -25,18 +31,31 @@ export default {
   data() {
     return {
       loading: true,
-      url: ''
+      url: '',
+      isMaintenance: false
     }
   },
   created() {
   },
   mounted() {
+    this.getIframeState()
+  },
+  methods: {
+    getIframeState() {
       const linkSrc = process.env.NODE_ENV === 'production' ? window.g.ApiUrl : process.env.VUE_APP_BASE_API
       if (this.currentModelId) {
         this.url = linkSrc + '/flowable-ui/modeler/#/processes/' + this.currentModelId
       } else {
         this.url = linkSrc + '/flowable-ui/modeler'
       }
+
+      fetch(this.url)
+        .then(response => {
+          console.log('response', response)
+          if (response.ok) {
+            this.isMaintenance = true
+            console.log('地址能正常运行')
+            this.$nextTick(() => {
               const iframe = this.$refs.myIframe
               iframe.addEventListener('load', () => {
                 if (iframe.contentWindow) {
@@ -49,11 +68,20 @@ export default {
                   this.loading = false
                 }
               })
-    // const iframeWindow = iframeElement.contentWindow
-    // const iframeDocument = iframeWindow.document
-    // const iframeInnerElement = iframeDocument.querySelector('.login-button')
-  },
-  methods: {
+            })
+          } else {
+            this.isMaintenance = false
+            console.log('地址无法正常运行，状态码：', response.status)
+          }
+          this.loading = false
+          console.log('this.isMaintenance', this.isMaintenance)
+        })
+        .catch(error => {
+          console.log('地址无法正常运行，错误信息：', error)
+          this.isMaintenance = false
+          this.loading = false
+        })
+    }
   }
 }
 </script>
@@ -63,4 +91,16 @@ export default {
   width: 100%;
   height: calc(100vh - 215px);
 }
+.maintenance-message{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: calc(100vh - 215px);
+  p{
+    font-size: 26px;
+    font-weight: bold;
+    margin-left: 20px;
+    color: #000;
+  }
+}
 </style>