AI智能标注/bug

src/api/collect/collect.js

@@ -322,6 +322,24 @@ export function FetchAIResultZhulu(params) {
   })
 }
 
+// 手动解析电子原文
+export function FetchManualAnalysis(data) {
+  return request({
+    url: 'api/collect/manualAnalysis',
+    method: 'post',
+    data
+  })
+}
+
+// 获取已解析的文本
+export function FetchAnalysisedText(params) {
+  return request({
+    url: 'api/collect/getAnalysisedText',
+    method: 'get',
+    params
+  })
+}
+
 export default {
   collectAdd,
   collectEdit,
@@ -354,5 +372,7 @@ export default {
   FetchBusinessFlowTitle,
   FetchBecomeDocument,
   FetchInitExternalReceptionDetailsList,
-  FetchAIResultZhulu
+  FetchAIResultZhulu,
+  FetchManualAnalysis,
+  FetchAnalysisedText
 }

src/views/AIAssistant/AIKeywords/archivesList.vue

@@ -3,17 +3,17 @@
     <div class="ai-keyword-archives">
       <div class="collect-header">
         <h4 class="is-juannei">{{ collectTitle }} </h4>
-        <div class="head-search" style="align-items: center;">
+        <div class="head-search" style="align-items: center; margin-right: 10px;">
           <treeselect
             v-model="query.archive_ctg_no"
             :options="classifyOptions"
             style="width: 180px; margin-right: 10px;"
             flat
             :multiple="false"
+            :clearable="false"
             :normalizer="normalizer"
             placeholder="请选择档案分类"
-            @input="handleSearch(collectLevel)"
-            @select="handleSearch(collectLevel)"
+            @select="node=>treeSelectInput(node)"
           >
             <p
               slot="option-label"
@@ -24,8 +24,8 @@
               <template> {{ node.label }} </template>
             </p>
           </treeselect>
-          <el-input v-model="query.search" clearable size="small" placeholder="输入题名或档号" prefix-icon="el-icon-search" style="width: 200px;" class="filter-item" @keyup.enter.native="handleSearch(collectLevel)" @clear="handleSearch(collectLevel)" />
-          <el-button class="filter-item filter-search" size="mini" type="success" icon="el-icon-search" @click="handleSearch(collectLevel)">搜索</el-button>
+          <el-input v-model="query.search" clearable size="small" placeholder="输入题名或档号" prefix-icon="el-icon-search" style="width: 200px;" class="filter-item" @keyup.enter.native="handleSearch()" @clear="handleSearch()" />
+          <el-button class="filter-item filter-search" size="mini" type="success" icon="el-icon-search" @click="handleSearch()">搜索</el-button>
           <el-button class="filter-item filter-refresh" size="mini" type="warning" icon="el-icon-refresh-left" @click="resetQuery">重置</el-button>
         </div>
       </div>
@@ -40,6 +40,8 @@
           height="calc(100vh - 600px)"
           :row-class-name="tableRowClassName"
           :row-key="rowKey"
+          @row-click="clickRowHandler"
+          @cell-dblclick="tableDoubleClick"
         >
           <el-table-column label="序号" width="55" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -116,7 +118,7 @@
           <el-table-column type="selection" width="55" :reserve-selection="true" align="center" />
           <el-table-column label="序号" width="55" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ (page.page === 1 ? 0 : (page.page === 0 ? 0 : page.page - 1)) * page.size + scope.$index + 1 }}</span>
+              <span>{{ (filePage.page === 1 ? 0 : (filePage.page === 0 ? 0 : filePage.page - 1)) * filePage.size + scope.$index + 1 }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="file_name" label="原文名称" show-overflow-tooltip min-width="140" />
@@ -126,36 +128,36 @@
               {{ getFileSize(scope.row.file_size) }}
             </template>
           </el-table-column>
-          <el-table-column prop="file_state" label="解析状态" min-width="60" align="center" class-name="parse-column">
+          <el-table-column prop="is_analysis" label="解析状态" min-width="60" align="center" class-name="parse-column">
             <template slot-scope="scope">
-              <span v-if="scope.row.file_state===0" class="row-state">未解析</span>
-              <span v-if="scope.row.file_state===1" class="row-state row-warehousing state-active">解析中</span>
-              <span v-if="scope.row.file_state===2" class="row-state row-binding  state-active">已解析</span>
+              <span v-if="scope.row.is_analysis===-1" class="row-state">未解析</span>
+              <span v-if="scope.row.is_analysis===0" class="row-state row-warehousing state-active">解析中</span>
+              <span v-if="scope.row.is_analysis===1" class="row-state row-binding  state-active">已解析</span>
             </template>
           </el-table-column>
-          <el-table-column prop="file_state" label="解析操作" min-width="60" align="center" class-name="parse-column">
+          <el-table-column prop="is_analysis" label="解析操作" min-width="60" align="center" class-name="parse-column">
             <template slot-scope="scope">
-              <el-button v-if="scope.row.file_state===0" size="mini" class="check-btn" style="padding: 5px; margin: 0;" @click="handleCurrentAIOcr(scope.row)">
+              <el-button v-if="scope.row.is_analysis===-1" size="mini" class="check-btn" style="padding: 5px; margin: 0;" @click="handleCurrentAIOcr(scope.row)">
                 <i class="iconfont icon-wenjianjiexi" />
                 解析
               </el-button>
-              <el-button v-if="scope.row.file_state===2" size="mini" class="check-btn" style="padding: 5px; margin: 0;" @click="handleEditAIOcr(scope.row)">
+              <el-button v-if="scope.row.is_analysis===1" size="mini" class="check-btn" style="padding: 5px; margin: 0;" @click="handleEditAIOcr(scope.row)">
                 <i class="iconfont icon-bianji" />
                 编辑
               </el-button>
             </template>
           </el-table-column>
-          <el-table-column prop="file_mark_state" label="标注状态" min-width="60" align="center" class-name="mark-column">
+          <el-table-column prop="is_mark" label="标注状态" min-width="60" align="center" class-name="mark-column">
             <template slot-scope="scope">
-              <span v-if="scope.row.file_mark_state===0" class="row-state">未标注</span>
-              <span v-if="scope.row.file_mark_state===1" class="row-state row-binding  state-active">已标注</span>
+              <span v-if="scope.row.is_mark===0" class="row-state">未标注</span>
+              <span v-if="scope.row.is_mark===1" class="row-state row-binding  state-active">已标注</span>
             </template>
           </el-table-column>
-          <el-table-column prop="file_mark_state" label="标注操作" min-width="60" align="center" class-name="mark-column">
+          <el-table-column prop="is_mark" label="标注操作" min-width="60" align="center" class-name="mark-column">
             <template slot-scope="scope">
-              <el-button v-if="scope.row.file_state===2" size="mini" class="check-btn" style="padding: 5px; margin: 0;" @click="handleMarkKeyword(scope.row)">
+              <el-button v-if="scope.row.is_analysis===1" size="mini" class="check-btn" style="padding: 5px; margin: 0;" @click="handleMarkKeyword(scope.row)">
                 <i class="iconfont icon-bianji" />
-                {{ scope.row.file_mark_state===1 ? '编辑' :'标注' }}
+                {{ scope.row.is_mark===1 ? '编辑' :'标注' }}
               </el-button>
             </template>
           </el-table-column>
@@ -175,21 +177,24 @@
     </div>
     <EditOcrContent ref="ocrRefs" />
     <KeywordMark ref="markRefs" />
+    <!-- 档案详情 -->
+    <ArchivesInfo ref="archivesInfo" :selected-category="selectedCategory" :arc-id="arcId" :is-title-type="3" :is-collect="true" />
   </div>
 </template>
 
 <script>
 import { header, form } from '@crud/crud'
-import { FetchInitCategoryViewTable, FetchInitCategoryView } from '@/api/collect/collect'
+import { FetchInitCategoryViewTable, FetchInitCategoryView, FetchManualAnalysis } from '@/api/collect/collect'
 import { FetchArchivesClassTree } from '@/api/system/archivesClass'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { mapGetters } from 'vuex'
 import EditOcrContent from './module/editOcrContent'
 import KeywordMark from './module/keywordMark'
+import ArchivesInfo from '@/views/collectReorganizi/collectionLibrary/module/archivesInfo/index'
 export default {
   name: 'Sorted',
-  components: { EditOcrContent, KeywordMark, Treeselect },
+  components: { EditOcrContent, KeywordMark, Treeselect, ArchivesInfo },
   mixins: [
     header(),
     form({})
@@ -202,6 +207,11 @@ export default {
       }
     }
   },
+  provide() {
+    return {
+      parentsData: this
+    }
+  },
   data() {
     return {
       query: {
@@ -219,64 +229,10 @@ export default {
         size: 10,
         total: 0
       },
+      currentParentRow: {},
+      parentId: null,
       fileLoading: false,
-      fileData: [
-        {
-          'create_time': '2025-3-6 10:29:43',
-          'file_name': 'DAT 18-2022 档案著录规则_02.png',
-          'file_type': 'png',
-          'file_dpi': '1653px*2339px',
-          'id': '6D48990DF88B21EB7609EB',
-          'archive_id': 'EC7D3E9798DE5DD7A6DFC0',
-          'file_size': 436989,
-          'file_state': 0,
-          'file_mark_state': 0
-        },
-        {
-          'create_time': '2025-3-6 10:29:43',
-          'file_name': 'DAT 18-2022 档案著录规则_04.png',
-          'file_type': 'png',
-          'file_dpi': '1653px*2339px',
-          'id': '7A699E8D7FB01E3D7C1653',
-          'archive_id': 'EC7D3E9798DE5DD7A6DFC0',
-          'file_size': 512453,
-          'file_state': 1,
-          'file_mark_state': 0
-        },
-        {
-          'create_time': '2025-3-6 10:29:43',
-          'file_name': 'DAT 18-2022 档案著录规则_00.png',
-          'file_type': 'png',
-          'file_dpi': '1653px*2339px',
-          'id': '8A1F52E855304609020EB3',
-          'archive_id': 'EC7D3E9798DE5DD7A6DFC0',
-          'file_size': 289748,
-          'file_state': 2,
-          'file_mark_state': 0
-        },
-        {
-          'create_time': '2025-3-6 10:29:43',
-          'file_name': 'DAT 18-2022 档案著录规则_01.png',
-          'file_type': 'png',
-          'file_dpi': '1653px*2339px',
-          'id': 'A20895478FDC988B7EA6D5',
-          'archive_id': 'EC7D3E9798DE5DD7A6DFC0',
-          'file_size': 686235,
-          'file_state': 2,
-          'file_mark_state': 0
-        },
-        {
-          'create_time': '2025-3-6 10:29:43',
-          'file_name': 'DAT 18-2022 档案著录规则_03.png',
-          'file_type': 'png',
-          'file_dpi': '1653px*2339px',
-          'id': 'D594A10A3C78F3A5EB17B9',
-          'archive_id': 'EC7D3E9798DE5DD7A6DFC0',
-          'file_size': 466450,
-          'file_state': 2,
-          'file_mark_state': 1
-        }
-      ],
+      fileData: [],
       filePage: {
         page: 1,
         size: 10,
@@ -341,10 +297,11 @@ export default {
         'project_class': null,
         'archive_ctg_no': null
       }
-      this.handleSearch(this.collectLevel)
-    },
-    handleSearch(collectLevel) {
-
+      this.currentParentRow = {}
+      this.parentId = null
+      this.fileData = []
+      this.$refs.tableFile.clearSelection()
+      this.getAiFileList()
     },
     rowKey(row) {
       return row.id
@@ -372,51 +329,105 @@ export default {
             }
           })
           this.$nextTick(() => {
+            console.log('2222')
             this.getAiFileList()
           })
         }
       })
     },
-    async getAiFileList() {
-      this.loading = true
-      this.archivesTable = []
+    getAiFileList() {
+      if (!this.parentId) {
+        this.loading = true
+        this.archivesTable = []
+      } else {
+        this.fileLoading = true
+      }
+      this.fileData = []
       const params = {
         'categoryId': this.selectedCategory.id,
-        'categoryLevel': 3,
-        'parentId': null,
-        'ignore': true,
+        'categoryLevel': this.parentId ? 4 : 3,
+        'parentId': this.parentId ? this.parentId : null,
+        'ignore': !this.parentId,
         'isdel': false,
-        'page': this.page.page === 0 ? 0 : this.page.page - 1,
+        'page': !this.parentId ? (this.page.page === 0 ? 0 : this.page.page - 1) : 0,
         'size': this.page.size,
-        'sort': this.arrySort,
-        'retention': null,
-        'security_class': null,
-        'search': this.query.search,
-        'medium_type': null,
-        'doc_type': null,
-        'archive_year': null,
-        'organ_or_function': null,
+        'sort': !this.parentId ? this.arrySort : null,
+        'search': !this.parentId ? this.query.search : null,
         'fonds_no': this.selectedCategory.fondsId,
-        'project_class': this.query.project_class,
-        'archive_ctg_no': this.query.archive_ctg_no
+        'project_class': !this.parentId ? this.query.project_class : null,
+        'archive_ctg_no': !this.parentId ? this.query.archive_ctg_no : null
       }
-      const res = await FetchInitCategoryView(params)
-      this.archivesTable = res.list.content
-      this.page.total = res.list.totalElements
-      this.loading = false
+      FetchInitCategoryView(params).then((res) => {
+        if (this.parentId) {
+          this.fileData = res.list.content
+          this.filePage.total = res.list.totalElements
+        } else {
+          this.archivesTable = res.list.content
+          this.page.total = res.list.totalElements
+        }
+
+        setTimeout(() => {
+          this.loading = false
+          this.fileLoading = false
+        }, 500)
+      })
+    },
+    handleSearch() {
+      this.parentId = null
+      this.fileData = []
+      this.$refs.tableFile.clearSelection()
+      this.page.page = 1
+      this.getAiFileList()
+    },
+    treeSelectInput(value) {
+      console.log(value)
+      this.query.archive_ctg_no = value.code
+      this.parentId = null
+      this.fileData = []
+      this.$refs.tableFile.clearSelection()
+      this.handleSearch()
     },
     handleSizeChange(size) {
       this.page.size = size
       this.page.page = 1
+      this.parentId = null
+      this.fileData = []
+      this.$refs.tableFile.clearSelection()
       this.getAiFileList()
     },
     handleCurrentPage(val) {
       this.page.page = val
+      this.parentId = null
+      this.fileData = []
+      this.$refs.tableFile.clearSelection()
       this.getAiFileList()
     },
+    clickRowHandler(row) {
+      console.log('tableRow', row)
+      this.currentParentRow = row
+      this.parentId = row.id
+      this.$refs.tableFile.clearSelection()
+      this.getAiFileList()
+    },
+    tableDoubleClick(row) {
+      this.arcId = row.id
+      this.$nextTick(() => {
+        this.$refs.archivesInfo.isHasFile = true
+        this.$refs.archivesInfo.detailTitle = '文件详情'
+        this.$refs.archivesInfo.getDetial(3, row.id)
+        this.$refs.archivesInfo.isFourTest = true
+        this.$refs.archivesInfo.archivesInfoVisible = true
+        this.$refs.archivesInfo.archivesTabIndex = 0
+      })
+    },
+
     // 文件刷新
     refreshFile() {
-
+      this.parentId = this.currentParentRow.id
+      if (this.parentId) {
+        this.$refs.tableFile.clearSelection()
+        this.getAiFileList()
+      }
     },
     // table - 双击查看详情
     tableDoubleClickFile(row) {
@@ -430,8 +441,6 @@ export default {
     },
     // 批量解析
     batchAIOcrFile() {
-      console.log('fileSelections', this.fileSelections)
-
       this.$confirm('当前所选文件即将进行批量解析' + '<span>你是否还要继续？</span>', '提示', {
         confirmButtonText: '继续',
         cancelButtonText: '取消',
@@ -440,43 +449,35 @@ export default {
       }).then(() => {
         // 筛选出已解析得文件，避免重复解析
         const filteredFiles = this.fileSelections.filter(file => file.file_state !== 2)
-        console.log(filteredFiles)
-        // const params = {
-        //   'categoryId': this.selectedCategory.id,
-        //   'archivesIds': archivesIds
-        // }
-        // FetchDisbandArchives(params).then((res) => {
-        //   if (res.code !== 500) {
-        //     this.$message({ message: '提交解析文件成功', type: 'success', offset: 8 })
-        //     this.handleSearch(this.collectLevel)
-        //   } else {
-        //     this.$message({ message: '提交解析文件失败', type: 'error', offset: 8 })
-        //   }
-        // }).catch(err => {
-        //   console.log(err)
-        // })
+        this.handleAnalysis(filteredFiles)
       }).catch(() => {
       })
     },
     // 单独解析文件
     handleCurrentAIOcr(row) {
-      // const params = {
-      //   'categoryId': this.selectedCategory.id,
-      //   'archivesIds': archivesIds
-      // }
-      // FetchDisbandArchives(params).then((res) => {
-      //   if (res.code !== 500) {
-      //     this.$message({ message: '提交解析文件成功', type: 'success', offset: 8 })
-      //     this.handleSearch(this.collectLevel)
-      //   } else {
-      //     this.$message({ message: '提交解析文件失败', type: 'error', offset: 8 })
-      //   }
-      // }).catch(err => {
-      //   console.log(err)
-      // })
+      this.fileSelections = []
+      this.fileSelections.push(row)
+      console.log('this.fileSelections', this.fileSelections)
+      this.handleAnalysis(this.fileSelections)
+    },
+    handleAnalysis(filteredFiles) {
+      const params = {
+        'categoryId': this.selectedCategory.id,
+        'fileJsonString': JSON.stringify(filteredFiles)
+      }
+      FetchManualAnalysis(params).then((res) => {
+        console.log('res', res)
+        if (res.code !== 500) {
+          this.$message({ message: '提交解析文件成功', type: 'success', offset: 8 })
+        } else {
+          this.$message({ message: '提交解析文件失败', type: 'error', offset: 8 })
+        }
+      }).catch(err => {
+        console.log(err)
+      })
     },
     handleEditAIOcr(row) {
-      this.$refs.ocrRefs.ocrVisible = true
+      this.$refs.ocrRefs.getFileConent(row)
     },
     handleMarkKeyword(row) {
       this.$refs.markRefs.markVisible = true

src/views/AIAssistant/AIKeywords/index.vue

@@ -126,9 +126,12 @@ export default {
         localStorage.setItem('currentArchivesKey', JSON.stringify(val))
         this.selectedCategory = val
         this.$nextTick(() => {
+          this.$refs.archivesListRef.parentId = null
+          this.$refs.archivesListRef.fileData = []
+          this.$refs.archivesListRef.$refs.tableFile.clearSelection()
           this.$refs.archivesListRef.page.page = 1
-          this.$refs.archivesListRef.getViewTable()
           this.$refs.archivesListRef.getInitArchivesClass()
+          this.$refs.archivesListRef.getViewTable()
         })
       }
     },

src/views/AIAssistant/AIKeywords/module/editOcrContent.vue

@@ -2,7 +2,22 @@
   <!-- 编辑解析 -->
   <el-dialog class="aiFile-dialog" title="编辑解析" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :visible.sync="ocrVisible" :before-close="handleCloseDialog">
     <div class="setting-dialog">
+      <div v-show="onlyFile" style="display: flex; justify-content: space-between; height: 700px;">
+        <div id="printArea" ref="output" v-loading="filePrewLoading" class="well-box" :style="{overflowY : !filePrewLoading ? 'auto' : 'hidden'}" />
+        <div v-for="(item, index) in swiperImg" :key="index">
+          <div
+            v-loading="ocrLoading"
+            class="aiText"
+            :class="{ editable: editingIndex === index }"
+            contenteditable="false"
+            @click="startEditing(index)"
+            @blur="saveEditing(index)"
+            v-html="item.textWithBr"
+          />
+        </div>
+      </div>
       <swiper
+        v-show="!onlyFile"
         ref="mySwiper"
         class="swiper-server"
         :options="swiperOptionServer"
@@ -13,7 +28,7 @@
       >
         <swiper-slide v-for="(item, index) in swiperImg" :key="index" class="swiper-slide-server">
           <div class="aiImg">
-            <img src="~@/assets/images/test/4.png">
+            <img :src="item.ocr_path">
           </div>
           <div
             class="aiText"
@@ -35,6 +50,9 @@
 </template>
 
 <script>
+import { FetchAnalysisedText } from '@/api/collect/collect'
+import { FetchBase64ByFileId } from '@/api/archivesManage/library'
+import { getExtend, readBuffer, render } from '@/components/util'
 import { mapGetters } from 'vuex'
 import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import 'swiper/css/swiper.css'
@@ -51,21 +69,6 @@ export default {
       displayedText: '',
       isTxtEditing: new Array(3).fill(false),
       swiperImg: [
-        {
-          'file_path': '~@/assets/images/test/1.png',
-          'ocr_path': 'D:/ProjectsFTZN/Python/Project_AI_dangan/service_AI_archives_fileParsing/files\\img\\ocr_1.jpg',
-          'content': 'ICS 01.140.30\nA13\nGB\n中华人民共和国国家标准\nGB/T7408-2005/ISO8601:2000\n代替GB/T7408-1994\n数据元和交换格式\n信息交换\n日期和时间表示法\nDataelementsandinterchangeformats-\nInformation interchange-Representation of dates and times\n(ISO8601:2000,IDT)\n2005-03-28发布\n2005-10-01实施\n中华人民共和国国家质量监督检验检疫总局\n发布\n中国国家标准化管理委员会'
-        },
-        {
-          'file_path': '~@/assets/images/test/2.png',
-          'ocr_path': 'D:/ProjectsFTZN/Python/Project_AI_dangan/service_AI_archives_fileParsing/files\\img\\ocr_2.jpg',
-          'content': 'GB/T7408--2005/ISO8601:2000\n目\n次\n前言\n1范围\n2规范性引用文件\n3术语和定义\n4基本原则\n5表示法\n....\nX\n附录A（资料性附录）举例\n20\nA.1日期（见表A.1）\n20\nA.2\n日的时间（见表A.2）\n20\nA.3\n日期和该日的时间的组合（见表A.3）\n21\nA.4\n时间间隔（见表A.4）\n22\nA.5\n循环时间间隔（见表A.5）\n22'
-        },
-        {
-          'file_path': '~@/assets/images/test/3.png',
-          'ocr_path': 'D:/ProjectsFTZN/Python/Project_AI_dangan/service_AI_archives_fileParsing/files\\img\\ocr_3.jpg',
-          'content': 'GB/T7408-2005/ISO8601:2000\n前言\n本标准等同采用国际标准ISO8601一2000《数据元和交换格式信息交换日期和时间表示法》\n（英文版），并且代替GB/T7408一1994《数据元和交换格式信息交换日期和时间表示法》。\n本标准与GB/T7408-1994相比主要变化如下：\n增加日期和时间历法系统（本版的4.3）；\n一一完善1994年版本的日期和时间的各种表示法（本版本的5.1，5.2，5.3，5.4）；\n一增加时间间隔和循环时间间隔的表示法（本版本的5.5，5.6）。\n本标准的附录A为资料性附录。\n本标准由中国标准化研究院提出。\n本标准由全国电子业务标准化技术委员会归口。\n本标准起草单位：中国标准化研究院。\n本标准主要起草人：章建方、刘碧松、魏宏、孙文峰、刘颖。'
-        }
       ],
       swiperOptionServer: {
         autoplay: false,
@@ -79,7 +82,34 @@ export default {
             return '<span class="' + className + '">' + (index + 1) + '</span>'
           }
         }
-      }
+      },
+      onlyFile: true,
+      src: '',
+      filePrewLoading: false,
+      // 上个渲染实例
+      last: null,
+      // 隐藏头部，当基于消息机制渲染，将隐藏
+      hidden: false,
+      printObj: {
+        id: 'printArea',
+        preview: true, // 是否启动预览模式，默认是false
+        previewTitle: '电子原文预览', // 打印预览的标题
+        previewPrintBtnLabel: '预览结束，开始打印',
+        zIndex: 20002, // 预览窗口的z-index，默认是20002，最好比默认值更高
+        extraCss: '', // 打印可引入外部的一个css文件
+        extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>,<style> #printArea { height: auto !important; } <style>', // 打印头部文字
+        previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+        previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+        beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+        openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+        closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+        clickMounted() { console.log('点击v-print绑定的按钮了！') },
+        standard: '',
+        extarCss: ''
+      },
+      timer: null,
+      toFile: null,
+      fileCurrent: null
     }
   },
   computed: {
@@ -105,11 +135,142 @@ export default {
     }
   },
   created() {
-    this.swiperImg = this.processedSwiperImg
+
   },
   mounted() {
   },
   methods: {
+    getFileConent(row) {
+      this.ocrLoading = true
+      this.swiperImg = []
+      const params = {
+        'filePath': row.file_path
+      }
+      FetchAnalysisedText(params).then((res) => {
+        this.ocrVisible = true
+        const resultJson = JSON.parse(res)
+        console.log('resultJson', resultJson.data)
+        console.log('resultJson.length', resultJson.data.length)
+        console.log('resultJson.length2', resultJson.data[0].ocr_path)
+
+        // 非多个图片的情况,用自身的预览
+        if (resultJson.data.length === 1) {
+          console.log('非多个图片的情况,用自身的预览')
+          if (resultJson.data[0].ocr_path === null) {
+            this.onlyFile = true
+            this.$nextTick(() => {
+              this.getBase64ByFileId(row)
+            })
+          } else {
+            this.onlyFile = false
+          }
+        } else {
+          this.onlyFile = false
+          console.log('多张图片,用swiper')
+        }
+
+        this.swiperImg = resultJson.data
+        this.swiperImg = this.processedSwiperImg
+      }).catch(err => {
+        console.log(err)
+      })
+    },
+    getBase64ByFileId(row) {
+      this.filePrewLoading = true
+      const params = {
+        'fileId': row.id
+      }
+      FetchBase64ByFileId(params).then(res => {
+        console.log('res', res)
+        var base64String = res
+        var fileName = row.file_name
+        var mimeType = row.file_type
+        this.toFile = this.base64ToFile(base64String, fileName, mimeType)
+        if (this.toFile) {
+          this.handleChange()
+        }
+      })
+    },
+    base64ToFile(base64String, fileName, mimeType) {
+      var byteCharacters = atob(base64String)
+      var byteArrays = []
+      for (var offset = 0; offset < byteCharacters.length; offset += 512) {
+        var slice = byteCharacters.slice(offset, offset + 512)
+        var byteNumbers = new Array(slice.length)
+        for (var i = 0; i < slice.length; i++) {
+          byteNumbers[i] = slice.charCodeAt(i)
+        }
+        var byteArray = new Uint8Array(byteNumbers)
+        byteArrays.push(byteArray)
+      }
+      var file = new Blob(byteArrays, { type: mimeType })
+      file.name = fileName
+      return file
+    },
+    async handleChange(e) {
+      try {
+        clearTimeout(this.timer)
+        // const [file] = e.target.files
+        // console.log('file', file)
+        const fileReader = new FileReader()
+        fileReader.readAsArrayBuffer(this.toFile)
+        fileReader.onload = () => {
+          this.src = fileReader.result
+        }
+        const arrayBuffer = await readBuffer(this.toFile)
+        this.last = await this.displayResult(arrayBuffer, this.toFile)
+
+        this.$nextTick(() => {
+          // 取得扩展名
+          // const extend = getExtend(this.toFile.name)
+          // 加水印
+          const maskDiv = document.getElementsByClassName('mask_div')
+          const imgMaskDiv = document.getElementsByClassName('weterbox')
+
+          if (imgMaskDiv.length === 1) {
+            document.getElementsByClassName('water-mask')[0].removeChild(imgMaskDiv[0])
+          }
+          // docx-wrapper docx
+          for (var j = maskDiv.length - 1; j >= 0; j--) {
+            document.getElementsByClassName('water-mask')[0].removeChild(maskDiv[j])
+          }
+
+          // if (!extend.includes('pdf')) {
+          //   this.getWatermark()
+          // }
+        })
+      } catch (e) {
+        console.error(e)
+      } finally {
+        this.timer = setTimeout(() => {
+          this.filePrewLoading = false
+          this.ocrLoading = false
+        }, 1000)
+      }
+    },
+    displayResult(buffer, file) {
+      // 取得文件名
+      const { name } = file
+      // 取得扩展名
+      const extend = getExtend(name)
+      // 输出目的地
+      const { output } = this.$refs
+      console.log('output', output)
+      // 生成新的dom
+      const node = document.createElement('div')
+      // 添加孩子，防止vue实例替换dom元素
+      if (this.last) {
+        output.removeChild(this.last.$el)
+        this.last.$destroy()
+      }
+
+      console.log('output', output)
+      const child = output.appendChild(node)
+      // 调用渲染方法进行渲染
+      return new Promise((resolve, reject) =>
+        render(buffer, extend, child).then(resolve).catch(reject)
+      )
+    },
     startEditing(index) {
       this.editingIndex = index
       const slide = this.$el.querySelectorAll('.swiper-slide-server')[index]
@@ -186,25 +347,40 @@ export default {
           width: 100%;
         }
       }
-      .aiText {
-        flex: 1;
-        padding: 0 10px;
-        white-space: pre-wrap;
-        word-wrap: break-word;
-        font-family: monospace;
-        background-color: #f4f4f4;
-        padding: 10px;
-        border: 1px solid #ccc;
-        border-radius: 4px;
-        height: calc(100vh - 245px);
-        overflow: hidden;
-        overflow-y: auto;
-      }
+
     }
   }
 }
 
+.aiText {
+  width: 600px;
+  padding: 0 10px;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+  font-family: monospace;
+  background-color: #f4f4f4;
+  padding: 10px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  height: calc(100vh - 240px);
+  overflow: hidden;
+  overflow-y: auto;
+}
+
 .dialog-footer{
   margin-top: 0;
 }
+
+.well-box{
+  position: relative;
+  width: 800px;
+  border: 1px solid #edeff3;
+  background-color: #f6f8fc;
+  height: calc(100vh - 240px);
+  margin-right: 20px;
+  overflow: hidden;
+}
+::v-deep .home_wrap .pdf_down{
+  display: none;
+}
 </style>

src/views/collectReorganizi/collectionLibrary/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" />
       </div>
     </div>
   </el-dialog>
@@ -53,9 +55,10 @@ import { FetchDetailsById, FetchArchivesMetadata } from '@/api/collect/collect'
 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({})
   ],
@@ -159,6 +162,10 @@ export default {
         this.$refs.archivesListModuleRef.parentId = this.arcId
         this.$refs.archivesListModuleRef.isDetail = true
         this.$refs.archivesListModuleRef.getViewTable()
+      } else if (this.archivesTabIndex === 6) {
+        console.log(this.$refs.markInfoRefs)
+        this.$refs.markInfoRefs.currentArcId = this.arcId
+        this.$refs.markInfoRefs.getArchivesOperateLog(this.arcId)
       }
       this.$nextTick(() => {
         if (this.$refs.uploadFile) {

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

@@ -0,0 +1,79 @@
+<template>
+  <!--档案详情-标注信息-->
+  <div class="fourTest-container">
+    <el-table class="archives-table" :data="tableData" style="min-width: 100%" height="calc(100vh - 440px)">
+      <el-table-column prop="operateType" label="标注对象" min-width="60" />
+      <el-table-column prop="opinion" label="标注" />
+    </el-table>
+    <!-- <el-pagination
+      v-if="tableData.length !== 0"
+      :current-page="page.page"
+      :total="page.total"
+      :page-size="page.size"
+      :pager-count="5"
+      layout="total, prev, pager, next, sizes"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentPage"
+    /> -->
+  </div>
+</template>
+
+<script>
+import { FetchArchivesOperateLog } from '@/api/archivesManage/library'
+export default {
+  name: 'MarkInfo',
+  components: { },
+  mixins: [],
+  data() {
+    return {
+      currentArcId: null,
+      tableData: [],
+      page: {
+        page: 0,
+        size: 10,
+        total: 0
+      }
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+  },
+  methods: {
+    getArchivesOperateLog(arcId) {
+      // 1.归档 2.退回 3.开放 4.销毁 5.赋权 6.在线7.离线 8.新香增 9.编辑 10.删除 11.装盒 12.拆盒 13.标签绑定 14.标签解绑 15.入库 16.出库 17.附件新增 18.附件删除 19.实体档案归还
+      const params = {
+        'archivesId': arcId,
+        // 'operateType': null,
+        'page': this.page.page,
+        'size': this.page.size
+        // 'startTime': '',
+        // 'endTime': ''
+      }
+      FetchArchivesOperateLog(params).then(data => {
+        if (data.content && data.content.length !== 0) {
+          this.tableData = data.content
+          this.page.total = data.totalElements
+        } else {
+          this.tableData = []
+          this.page.total = 0
+        }
+      })
+    },
+    handleSizeChange(size) {
+      this.page.size = size
+      this.page.page = 0
+      this.getArchivesOperateLog(this.currentArcId)
+    },
+    handleCurrentPage(val) {
+      this.page.page = val
+      this.getArchivesOperateLog(this.currentArcId)
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+@import "~@/assets/styles/collect-reorganizi.scss";
+</style>

src/views/system/user/index.vue

@@ -364,18 +364,20 @@ export default {
     [CRUD.HOOK.afterToCU](crud, form) {
       this.getRoles()
       this.getPosts()
+    },
+    // 新增前将多选的值设置为空
+    [CRUD.HOOK.beforeToAdd](crud, form) {
+      this.postDatas = []
+      this.roleDatas = []
+      crud.form.id = null
 
       if (this.leftFondsId) {
         this.changeFondsValue(this.leftFondsId)
         form.fonds.id = this.leftFondsId
-        form.dept.id = this.query.deptsId ? this.query.deptsId : null
+        this.leftDeptsId = null
+        form.dept.id = this.crud.query.deptsId ? this.crud.query.deptsId : null
       }
     },
-    // 新增前将多选的值设置为空
-    [CRUD.HOOK.beforeToAdd]() {
-      this.postDatas = []
-      this.roleDatas = []
-    },
     // 初始化编辑时候的角色与岗位
     [CRUD.HOOK.beforeToEdit](crud, form) {
       this.lastValue = ''
@@ -384,9 +386,8 @@ export default {
       form.posts = []
       this.leftDeptsId = crud.form.deptId
       if (this.leftFondsId) {
-        form.fonds.id = this.leftFondsId
-        form.dept.id = this.leftDeptsId
         this.changeFondsValue(this.leftFondsId)
+        form.fonds.id = this.leftFondsId
         this.levelNumber = 4
       }
       if (form.roleIds.includes(',')) {
@@ -437,6 +438,8 @@ export default {
         const data = { id: job.id }
         userPosts.push(data)
       })
+
+      crud.form.id = crud.form.userId
     },
     // 提交前做的操作
     [CRUD.HOOK.afterValidateCU](crud) {
@@ -453,12 +456,12 @@ export default {
         this.$message({ message: '角色不能为空', type: 'warning', offset: 8 })
         return false
       }
-
-      if (crud.form.userId) {
-        crud.form.id = crud.form.userId
-      } else {
-        crud.form.id = null
-      }
+      // console.log('crud.form.userId', crud.form.userId)
+      // if (crud.form.userId) {
+      //   crud.form.id = crud.form.userId
+      // } else {
+      //   crud.form.id = null
+      // }
       crud.form.roles = userRoles
       crud.form.posts = userPosts
       delete crud.form.deptsId
@@ -468,6 +471,8 @@ export default {
       delete crud.form.roleIds
       delete crud.form.deptsName
       delete crud.form.job
+
+      console.log(' crud.form', crud.form)
       return true
     },
     clickRowHandler(row) {
@@ -539,25 +544,29 @@ export default {
       const selectedKey = this.$refs.tree.getCurrentNode()
       // const selectedParentVal = this.$refs.tree.getNode(selectedKey).parent.data.id
       console.log('selectedKey', selectedKey)
+      console.log('data.pid', data.pid)
       if (data.pid === 0) {
-        this.query.deptsId = null
-        this.query.deptsName = null
+        this.crud.query.deptsId = null
+        this.crud.query.deptsName = null
         this.leftFondsId = null
         this.leftDeptsId = null
       } else {
+        console.log('data.fondsNo', data.fondsNo)
         if (data.fondsNo) {
           const selectedParentVal = this.$refs.tree.getNode(selectedKey).data.id
-          this.query.fondsId = data.id
-          this.query.deptsId = null
-          this.query.deptsName = null
+          this.crud.query.fondsId = data.id
+          this.crud.query.deptsId = null
+          this.crud.query.deptsName = null
           this.leftFondsId = selectedParentVal
         } else {
           const selectedParentVal = this.$refs.tree.getNode(selectedKey).parent.data.id
-          this.query.deptsId = data.id
-          this.query.deptsName = data.deptsName
+          console.log('const selectedParentVal ', selectedParentVal)
+          this.crud.query.deptsId = data.id
+          this.crud.query.deptsName = data.deptsName
           this.leftFondsId = selectedParentVal
         }
       }
+      this.crud.query.fondsId = this.leftFondsId
       this.crud.toQuery()
     },
     getFondsDatas() {
@@ -621,6 +630,10 @@ export default {
           }
           return obj
         })
+
+        if (this.leftDeptsId) {
+          this.form.dept.id = this.leftDeptsId
+        }
       })
     },
     // 获取弹窗内部门数据