From 68f431728411e405c47f108bb61964539a7f3486 Mon Sep 17 00:00:00 2001
From: xiangcongshuai <xiangcongshuai@supervision.ltd>
Date: Wed, 18 Sep 2024 09:22:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=9B=BE=E5=83=8Focr=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/caseDetails/index.js                  |   4 +-
 src/api/caseDetails/ocr.js                    |  16 ++++++++
 src/assets/record/unExpand.png                | Bin 0 -> 648 bytes
 src/config/net.config.js                      |   2 +-
 .../AddEvidence/EvidenceProofread.vue         |  13 +++---
 .../components/AddEvidence/index.vue          |   9 ++++-
 .../AddRecord/components/RecordAnalysis.vue   |  17 +++++---
 .../AddRecord/components/RecordIdentify.vue   |  17 +++++---
 .../AddRecord/components/RecordProofread.vue  |  10 ++++-
 .../AddRecord/components/UploadRecord.vue     |  16 ++++++--
 .../components/AddRecord/index.vue            |  10 ++++-
 .../caseDetails/components/CaseEvidence.vue   |   4 +-
 .../caseDetails/components/CaseRecord.vue     |   8 ++--
 .../caseDetails/components/CommonIndex.vue    |   8 ++--
 .../components/EditEvidence/index.vue         |  13 ++++--
 .../components/IncriminateIndex.vue           |   8 ++--
 .../caseDetails/components/InnocentIndex.vue  |   8 ++--
 .../components/SelectUploadType.vue           |   6 +--
 .../caseDetails/components/TripletInfo.vue    |   3 +-
 .../components/edit/EditEvidence.vue          |  37 ++++++++++++++----
 .../components/edit/EditRecord.vue            |  21 +++++-----
 src/views/caseManagement/index.vue            |   9 +++--
 src/views/index/index.vue                     |  12 +++---
 23 files changed, 168 insertions(+), 83 deletions(-)
 create mode 100644 src/assets/record/unExpand.png

diff --git a/src/api/caseDetails/index.js b/src/api/caseDetails/index.js
index 6f1b6ac..e961a25 100644
--- a/src/api/caseDetails/index.js
+++ b/src/api/caseDetails/index.js
@@ -96,9 +96,9 @@ export function queryCaseDetails(data) {
   })
 }
 /** 获取案件指标详情 */
-export function queryIndexDetail(data) {
+export function queryIndexDetail(data, page, size) {
   return request({
-    url: `${routes.modelCase}/getIndexDetail`,
+    url: `${routes.modelCase}/getIndexDetail?page=${page}&size=${size}`,
     method: 'post',
     data
   })
diff --git a/src/api/caseDetails/ocr.js b/src/api/caseDetails/ocr.js
index 431cfec..e72a4fd 100644
--- a/src/api/caseDetails/ocr.js
+++ b/src/api/caseDetails/ocr.js
@@ -88,4 +88,20 @@ export function updateEvidence(data) {
     method: 'post',
     data
   })
+}
+/** 获取证据基本信息  */
+export function submitTask(data) {
+  return request({
+    url: `/ocr/record/submitTask`,
+    method: 'get',
+    params: data
+  })
+}
+/** 删除笔录中的文件  */
+export function deleteFile(data) {
+  return request({
+    url: `/ocr/record/deleteFile`,
+    method: 'get',
+    params: data
+  })
 }
\ No newline at end of file
diff --git a/src/assets/record/unExpand.png b/src/assets/record/unExpand.png
new file mode 100644
index 0000000000000000000000000000000000000000..b045e802410ba21a507f0c9bb18d2c59ebfc45c7
GIT binary patch
literal 648
zcmV;30(bq1P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px%LP<nHR9HvtR?Cs%Fc4Kk;RC+RW<UrN!b}EC1gnEBd|QZMm<ZN$qbwcBV90>k
z3?>9JSkA6Oz3wfWk~KD#&8K|8CknOHuV43j60n|q&@(*j4ydUk{booA@slw&MZ|}u
zN-nhy0PjhXY>M+r425C%7XWSshCm?VUP}3+63}cm+aluArK)#1C(HLKrF^agM1Mw6
zbTdGQ!(s3H{w|K=eJvoDs;(K+Z<SrMa@Vs<3~|mMMx)W>ma<n$eVSlx*>3^hW<#CJ
zzFuX$^C2O`lrc7U?f1EHWQvTjjg)eIm%S^SrJ)u=yk;AhTI*OTwQxP8Z5*lD^E}Em
z*IF-?Qg4+l%K)Kq_%2P;=k<EMYn$*?Jm-AkdEQ4hJC8+Nk|alBY=)NE1x(0`kH9R<
z=fOGPf*^PTfDiLUp|yTfN>Seb-?ytn2tg|QZ6>y9?E<P8hhi@&3=s)TTx*QQLKH<4
zt@V~MHZg)XX__wDwlH^pV#PGv9U{I+DZlLEYA@Fu6fs5KbZlXpx#FBZ=JR3}_GdgE
zPt7MsBSU6@5W=1-rnO$!RNIvXK`;k^*HiOS)q1DrNABRn*0It$YcM5k&dYE(d|9nl
zrHiyPAlg_nS0!txl62PcufbqIV4Up3i6OI+Fbrb=_+?vz)_QMC8WG=p-(S|v%UKLr
zbM?&{%=J1+yVyl*h8nDamTM(_RY1mEnbvSp(pLvmBnZQh({J-#<C6ShGt@Pi%f8Mt
i<Z^hIm^+{**8Txq!Vxr}5lTk@0000<MNUMnLSTZ2EhX;&

literal 0
HcmV?d00001

diff --git a/src/config/net.config.js b/src/config/net.config.js
index 223c560..f8258a8 100644
--- a/src/config/net.config.js
+++ b/src/config/net.config.js
@@ -5,7 +5,7 @@ const network = {
   // 默认的接口地址 如果是开发环境和生产环境走vab-mock-server，当然你也可以选择自己配置成需要的接口地址
   baseURL:
     process.env.NODE_ENV === 'development'
-      ? 'http://192.168.10.137:8097/fu-hsi-server'
+      ? 'http://192.168.10.25:8097/fu-hsi-server'
       : '/fuHsiApi',
   // 配后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8
   contentType: 'application/json;charset=UTF-8',
diff --git a/src/views/caseDetails/components/AddEvidence/EvidenceProofread.vue b/src/views/caseDetails/components/AddEvidence/EvidenceProofread.vue
index ea8ee02..3179cad 100644
--- a/src/views/caseDetails/components/AddEvidence/EvidenceProofread.vue
+++ b/src/views/caseDetails/components/AddEvidence/EvidenceProofread.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="EvidenceProofread">
     <div class="FormInfo">
-      <el-form ref="form" :model="dataInfo" :rules="rules" label-width="100px" style="margin-top: 10px">
+      <el-form ref="form" :model="selectInfo" :rules="rules" label-width="100px" style="margin-top: 10px">
         <el-row :gutter="10" class="form-content">
           <el-col :span="24">
             <el-form-item label="案件编号">
@@ -35,9 +35,11 @@
             </el-form-item>
           </el-col>
           <div class="expand" @click="handleExpand">
-            <span>收起</span>
-            <span v-show="isExpand">展开</span>
-            <img :src="expandImg" alt="">
+            <span v-show="isExpand">收起</span>
+            <span v-show="!isExpand">展开</span>
+            <img v-show="isExpand" :src="expandImg" alt="">
+
+            <img v-show="!isExpand" :src="unExpandImg" alt="">
             <span class="line" />
           </div>
           <div v-show="isExpand">
@@ -153,6 +155,7 @@ export default {
       // 证据类型
       evidenceTypeList: JSON.parse(sessionStorage.getItem('evidence_type')),
       expandImg: require('@/assets/record/expand.png'),
+      unExpandImg: require('@/assets/record/unExpand.png'),
       caseNo: '',
       caseName: '',
       dataInfo: {},
@@ -214,7 +217,7 @@ export default {
             this.$route
           )
           this.$baseMessage.success('提交成功')
-          this.$router.push({ path: `/case-details/${this.$route.params.id}/${this.$route.query.caseName}`, query: { currentKey: '1-2',isEdit: 1 }})
+          this.$router.push({ path: `/case-details/${this.$route.params.id}/${this.$route.query.caseName}`, query: { currentKey: '1-2', isEdit: 1 }})
         }
       })
     }
diff --git a/src/views/caseDetails/components/AddEvidence/index.vue b/src/views/caseDetails/components/AddEvidence/index.vue
index 35f1159..42bba2e 100644
--- a/src/views/caseDetails/components/AddEvidence/index.vue
+++ b/src/views/caseDetails/components/AddEvidence/index.vue
@@ -66,7 +66,7 @@
               fit="cover"
             />
             <span>{{ item.name }}</span>
-            <img class="del" src="@/assets/record/del_img.png" alt="">
+            <img class="del" @click="del(index)" src="@/assets/record/del_img.png" alt="">
           </div>
           <!-- </transition-group> -->
         </vuedraggable>
@@ -122,8 +122,15 @@ export default {
         this.$message.error('上传头像图片大小不能超过 5MB!')
         return false
       }
+      if (this.fileList >= 12) {
+        this.$message.error('上传文件数量不能超过12张!')
+        return false
+      }
       return true
     },
+    del(index) {
+      this.fileList.splice(index, 1)
+    },
     handleSuccess(res, file) {
       const obj = {
         name: file.name,
diff --git a/src/views/caseDetails/components/AddRecord/components/RecordAnalysis.vue b/src/views/caseDetails/components/AddRecord/components/RecordAnalysis.vue
index 8031b0c..a8ca949 100644
--- a/src/views/caseDetails/components/AddRecord/components/RecordAnalysis.vue
+++ b/src/views/caseDetails/components/AddRecord/components/RecordAnalysis.vue
@@ -14,6 +14,7 @@
 </template>
 <script>
 import FormInfo from './FormInfo.vue'
+import { submitTask } from '@/api/caseDetails/ocr'
 export default {
   name: 'RecordAnalysis',
   components: { FormInfo },
@@ -24,11 +25,15 @@ export default {
   },
   methods: {
     closed() {
-      this.$store.dispatch(
-        'tabsBar/delRoute',
-        this.$route
-      )
-      this.$router.push({ path: `/case-details/${this.$route.params.id}/${this.$route.query.caseName}`, query: { isEdit: 1, caseNo: this.$route.query.caseNo }})
+      submitTask({ recordId: this.$route.query.recordId }).then(res => {
+        if (res.code === 200) {
+          this.$store.dispatch(
+            'tabsBar/delRoute',
+            this.$route
+          )
+          this.$router.push({ path: `/case-details/${this.$route.params.id}/${this.$route.query.caseName}`, query: { isEdit: 1, caseNo: this.$route.query.caseNo }})
+        }
+      })
     }
   }
 }
@@ -66,7 +71,7 @@ export default {
                         font-size: 16px;
                         color: #999999;
                         width: 600px;
-                        text-align: center;   
+                        text-align: center;
                     }
                     .btn {
                         width: 156px;
diff --git a/src/views/caseDetails/components/AddRecord/components/RecordIdentify.vue b/src/views/caseDetails/components/AddRecord/components/RecordIdentify.vue
index 29f79de..8c6d727 100644
--- a/src/views/caseDetails/components/AddRecord/components/RecordIdentify.vue
+++ b/src/views/caseDetails/components/AddRecord/components/RecordIdentify.vue
@@ -16,9 +16,9 @@
           <span>正在识别</span>
         </div>
       </template>
-      <template #opera="{row,index}">
+      <template #opera="{ row, rowIndex}">
         <div class="btn-list">
-          <img src="@/assets/record/reset_identify.png" alt="">
+          <!-- <img src="@/assets/record/reset_identify.png" alt=""> -->
           <!-- <img src="@/assets/record/view_detail.png" alt=""> -->
           <el-image
             style="width: 16px; height: 16px;margin-right: 16px;"
@@ -27,7 +27,7 @@
             fit="cover"
             @click="openDeatils(row)"
           />
-          <img src="@/assets/record/del.png" alt="" @click="del(index)">
+          <img src="@/assets/record/del.png" alt="" @click="del(row,rowIndex )">
         </div>
       </template>
     </vxe-grid>
@@ -43,7 +43,7 @@ import * as vuedraggable from 'vuedraggable'
 import FormInfo from './FormInfo.vue'
 import { baseURL } from '@/config'
 import { commonDownloadFile } from '@/api/config/uploadApi'
-import { saveRecord } from '@/api/caseDetails/ocr'
+import { saveRecord, deleteFile } from '@/api/caseDetails/ocr'
 export default {
   name: 'RecordIdentify',
   components: { vuedraggable, FormInfo },
@@ -86,12 +86,17 @@ export default {
       // this.srcList.push(`${baseURL}${commonDownloadFile}1829334930064207873`)
       return [`${baseURL}${commonDownloadFile}${row.fileId}`]
     },
-    del(index) {
+    del(row, index) {
       if (this.gridOptions.data.length === 1) {
         this.$baseMessage.error('至少保留一条数据!')
         return
       }
-      this.gridOptions.data.splice(index, 1)
+      deleteFile({ recordId: this.$route.query.recordId, fileId: row.fileId }).then(res => {
+        if (res.code === 200) {
+          this.gridOptions.data.splice(index, 1)
+          this.$baseMessage.success('删除成功!')
+        }
+      })
     },
     next() {
       const formData = this.$refs.formInfoRef.recordForm
diff --git a/src/views/caseDetails/components/AddRecord/components/RecordProofread.vue b/src/views/caseDetails/components/AddRecord/components/RecordProofread.vue
index 904dfa0..88ee97b 100644
--- a/src/views/caseDetails/components/AddRecord/components/RecordProofread.vue
+++ b/src/views/caseDetails/components/AddRecord/components/RecordProofread.vue
@@ -10,7 +10,9 @@
             </img>
           </vuedraggable>
         </el-scrollbar>
-        <img v-if="selectInfo.fileId" :src="getImgUrl(selectInfo.fileId)" class="act_img" alt="">
+        <div class="act_img">
+          <img v-if="selectInfo.fileId" :src="getImgUrl(selectInfo.fileId)" alt="">
+        </div>
         <span class="boder1" />
         <span class="boder2" />
         <span class="boder3" />
@@ -127,6 +129,12 @@ export default {
               background: #F6F8F9;
               height: calc(100vh - 400px);
               background-size: 100% 100%;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              img {
+                height: 100%;
+              }
             }
             .actived {
               border: 2px solid #3763FF !important;
diff --git a/src/views/caseDetails/components/AddRecord/components/UploadRecord.vue b/src/views/caseDetails/components/AddRecord/components/UploadRecord.vue
index 9dd8905..97d3484 100644
--- a/src/views/caseDetails/components/AddRecord/components/UploadRecord.vue
+++ b/src/views/caseDetails/components/AddRecord/components/UploadRecord.vue
@@ -68,8 +68,8 @@
                 :preview-src-list="[getImgUrl(item.fileId)]"
                 fit="cover"
               />
-              <span>{{ item.name }}</span>
-              <img class="del" src="@/assets/record/del_img.png" alt="">
+              <span>{{ item.fileName }}</span>
+              <img class="del" src="@/assets/record/del_img.png" alt="" @click="del(index)">
             </div>
             <!-- </transition-group> -->
           </vuedraggable>
@@ -114,18 +114,26 @@ export default {
         this.$message.error('上传头像图片大小不能超过 5MB!')
         return false
       }
+      if (this.fileList >= 12) {
+        this.$message.error('上传文件数量不能超过12张!')
+        return false
+      }
       return true
     },
     handleSuccess(res, file) {
       const obj = {
-        name: file.name,
+        fileName: file.name,
         fileId: res.data
       }
+
       this.fileList.push(obj)
     },
     getImgUrl(id) {
       return `${baseURL}${commonDownloadFile}${id}`
     },
+    del(index) {
+      this.fileList.splice(index, 1)
+    },
     async save() {
       this.$refs.formInfoRef.$refs.form.validate(async valid => {
         if (valid) {
@@ -154,12 +162,14 @@ export default {
         confessionEndTime: formData.confessionTime[1],
         imgRecordStatus: '1',
         indexNum: formData.indexNum,
+        id: this.recordId,
         fileIdList
       }
       saveRecord(params).then(res => {
         if (res.code === 200) {
           this.$baseMessage.success(res.msg || '提交成功!')
           this.$emit('save', res.data)
+          this.recordId = res.data
         }
       })
     }
diff --git a/src/views/caseDetails/components/AddRecord/index.vue b/src/views/caseDetails/components/AddRecord/index.vue
index 2c01241..1b81922 100644
--- a/src/views/caseDetails/components/AddRecord/index.vue
+++ b/src/views/caseDetails/components/AddRecord/index.vue
@@ -33,7 +33,7 @@
       </div>
     </div>
     <!-- <p class="tips">文档格式笔录可直接上传，若非文档格式系统将进行0CR识别，内容人工核实后，支持继续上传或保存结束本次笔录信息上传。</p> -->
-    <upload-record v-show="activeStep === 0" ref="UploadRecordRef" @save="saveOk" />
+    <upload-record v-show="activeStep === 0" ref="UploadRecordRef"  @save="saveOk" />
     <record-identify v-if="activeStep === 1" ref="RecordIdentifyRef" :record-id="recordId" @back="activeStep = 0" @save="saveOk" />
     <record-proofread v-if="activeStep === 2" ref="RecordProofreadRef" :record-id="recordId" @submit="submitRecord" />
     <RecordAnalysis v-if="activeStep === 3" ref="RecordAnalysisRef" />
@@ -113,6 +113,14 @@ export default {
           this.$refs.UploadRecordRef.fileList = res.data
           if (this.activeStep === 1) {
             this.$refs.RecordIdentifyRef.gridOptions.data = res.data
+            for (const item of res.data) {
+              if (item.ocrStatus !== '1') {
+                setTimeout(() => {
+                  this.getFileList()
+                }, 3000)
+                return
+              }
+            }
           } else if (this.activeStep === 2) {
             this.$refs.RecordProofreadRef.dataList = res.data
             this.$refs.RecordProofreadRef.selectInfo = res.data[0]
diff --git a/src/views/caseDetails/components/CaseEvidence.vue b/src/views/caseDetails/components/CaseEvidence.vue
index 66c6b59..e730b2c 100644
--- a/src/views/caseDetails/components/CaseEvidence.vue
+++ b/src/views/caseDetails/components/CaseEvidence.vue
@@ -113,8 +113,8 @@ export default {
     },
     // 添加证据
     handleAdd() {
-      this.$refs.edit.show()
-      // this.$refs.SelectUploadTypeRef.show()
+      // this.$refs.edit.show()
+      this.$refs.SelectUploadTypeRef.show()
     },
     // 编辑
     handelEdit(row) {
diff --git a/src/views/caseDetails/components/CaseRecord.vue b/src/views/caseDetails/components/CaseRecord.vue
index b75f563..3f25de2 100644
--- a/src/views/caseDetails/components/CaseRecord.vue
+++ b/src/views/caseDetails/components/CaseRecord.vue
@@ -10,13 +10,13 @@
   <div class="record-content">
     <div v-if="isEdit" class="flex-row" style="align-items: center; justify-content: space-between">
       <div>
-        <!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd">添加笔录</el-button> -->
-        <el-dropdown @command="handleSelect">
+        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd">添加笔录</el-button>
+        <!-- <el-dropdown @command="handleSelect">
           <el-button type="primary" icon="el-icon-circle-plus-outline">添加笔录</el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="1">文档笔录</el-dropdown-item>
           </el-dropdown-menu>
-        </el-dropdown>
+        </el-dropdown> -->
         <el-button type="primary" style="margin-left: 16px;" @click="addUser">添加人员</el-button>
       </div>
 
@@ -167,7 +167,7 @@ export default {
     },
     // 编辑
     handelEdit(row) {
-      if (row.recordType === '1') {
+      if (row.recordType === '1' && row.imgRecordStatus !== '3') {
         this.$router.push({ path: `/edit-record/${this.caseId}/${row.id}`, query: { caseName: this.$route.params.caseName, caseNo: this.$route.query.caseNo, recordId: row.id, imgRecordStatus: row.imgRecordStatus }})
       } else {
         this.$refs.edit.show(row, true)
diff --git a/src/views/caseDetails/components/CommonIndex.vue b/src/views/caseDetails/components/CommonIndex.vue
index 540ce48..33cfb3c 100644
--- a/src/views/caseDetails/components/CommonIndex.vue
+++ b/src/views/caseDetails/components/CommonIndex.vue
@@ -91,12 +91,12 @@ export default {
           { title: '序号', type: 'seq', width: '80px' },
 
           { title: '分析结果', width: '200px', field: 'indexResult', slots: { default: 'result' }},
+          { title: '笔录结果', width: '200px', slots: { default: 'operate' }, align: 'center' },
           { title: '指标名称', field: 'indexName', align: 'left' },
           { title: '分值', field: 'score', width: '50px' },
           { title: '数据来源', field: 'indexSource', width: '200px', formatter: ({ cellValue }) => {
             return cellValue ? this.indexSourceList.find(item => item.value === cellValue).label : ''
-          } },
-          { title: '笔录结果', width: '200px', slots: { default: 'operate' }, align: 'center' }
+          } }
           // { title: '原子指标', field: 'atomicIndex' }
           // { title: '必要证据', field: 'questioner' },
           // { title: '评估结果', field: 'startTime' },
@@ -149,15 +149,13 @@ export default {
     fetchData() {
       const params = { caseId: this.$route.params['id'],
         indexType: '1',
-        page: this.queryForm.page,
-        size: this.queryForm.size,
         indexName: this.indexName,
         indexResult: this.indexResult,
         indexHasRecord: this.indexHasRecord,
         atomicName: this.atomicName,
         indexSource: this.indexSource
       }
-      queryIndexDetail(params).then(res => {
+      queryIndexDetail(params, this.queryForm.page, this.queryForm.size).then(res => {
         this.gridOptions.data = res.data.records
         this.queryForm.total = res.data.total
       })
diff --git a/src/views/caseDetails/components/EditEvidence/index.vue b/src/views/caseDetails/components/EditEvidence/index.vue
index 5b1ad38..b5886c6 100644
--- a/src/views/caseDetails/components/EditEvidence/index.vue
+++ b/src/views/caseDetails/components/EditEvidence/index.vue
@@ -35,9 +35,12 @@
                 <el-input v-model="dataInfo.property['provider']" placeholder="请输入提供人" />
               </el-form-item>
             </el-col>
-            <div class="expand">
-              <span>收起</span>
-              <img :src="expandImg" alt="">
+            <div class="expand" @click="handleExpand">
+              <span v-show="isExpand">收起</span>
+              <span v-show="!isExpand">展开</span>
+              <img v-show="isExpand" :src="expandImg" alt="">
+
+              <img v-show="!isExpand" :src="unExpandImg" alt="">
               <span class="line" />
             </div>
             <div v-show="isExpand">
@@ -139,6 +142,7 @@ export default {
       // 证据类型
       evidenceTypeList: JSON.parse(sessionStorage.getItem('evidence_type')),
       expandImg: require('@/assets/record/expand.png'),
+      unExpandImg: require('@/assets/record/unExpand.png'),
       caseNo: '',
       caseName: '',
       dataInfo: {
@@ -158,6 +162,9 @@ export default {
     getImgUrl(id) {
       return `${baseURL}${commonDownloadFile}${id}`
     },
+    handleExpand() {
+      this.isExpand = !this.isExpand
+    },
     getData() {
       queryEvidenceInfo({ evidenceId: this.$route.query.evidenceId }).then(res => {
         this.dataInfo = res.data
diff --git a/src/views/caseDetails/components/IncriminateIndex.vue b/src/views/caseDetails/components/IncriminateIndex.vue
index 2aac9a0..172b2ba 100644
--- a/src/views/caseDetails/components/IncriminateIndex.vue
+++ b/src/views/caseDetails/components/IncriminateIndex.vue
@@ -94,12 +94,12 @@ export default {
           { title: '', width: '50px', treeNode: true },
           { title: '序号', type: 'seq', width: '80px' },
           { title: '分析结果', width: '200px', field: 'indexResult', slots: { default: 'result' }},
+          { title: '笔录结果', width: '200px', slots: { default: 'operate' }, align: 'center' },
           { title: '指标名称', field: 'indexName', align: 'left' },
           { title: '分值', width: '200px', field: 'score' },
           { title: '数据来源', field: 'indexSource', width: '200px', formatter: ({ cellValue }) => {
             return cellValue ? this.indexSourceList.find(item => item.value === cellValue).label : ''
-          } },
-          { title: '笔录结果', width: '200px', slots: { default: 'operate' }, align: 'center' }
+          } }
           // { title: '原子指标', field: 'atomicIndex' }
           // { title: '必要证据', field: 'questioner' },
           // { title: '评估结果', field: 'startTime' },
@@ -152,15 +152,13 @@ export default {
     fetchData() {
       const params = { caseId: this.$route.params['id'],
         indexType: '2',
-        page: this.queryForm.page,
-        size: this.queryForm.size,
         indexName: this.indexName,
         indexResult: this.indexResult,
         indexHasRecord: this.indexHasRecord,
         atomicName: this.atomicName,
         indexSource: this.indexSource
       }
-      queryIndexDetail(params).then(res => {
+      queryIndexDetail(params, this.queryForm.page, this.queryForm.size).then(res => {
         this.gridOptions.data = res.data.records
         this.queryForm.total = res.data.total
       })
diff --git a/src/views/caseDetails/components/InnocentIndex.vue b/src/views/caseDetails/components/InnocentIndex.vue
index 4858dab..b77cc66 100644
--- a/src/views/caseDetails/components/InnocentIndex.vue
+++ b/src/views/caseDetails/components/InnocentIndex.vue
@@ -90,12 +90,12 @@ export default {
           { title: '', width: '50px', treeNode: true },
           { title: '序号', type: 'seq', width: '80px' },
           { title: '分析结果', width: '200px', field: 'indexResult', slots: { default: 'result' }},
+          { title: '笔录结果', width: '200px', slots: { default: 'operate' }, align: 'center' },
           { title: '指标名称', field: 'indexName', align: 'left' },
           { title: '分值', width: '200px', field: 'score' },
           { title: '数据来源', width: '200px', field: 'indexSource', formatter: ({ cellValue }) => {
             return cellValue ? this.indexSourceList.find(item => item.value === cellValue).label : ''
-          } },
-          { title: '笔录结果', width: '200px', slots: { default: 'operate' }, align: 'center' }
+          } }
           // { title: '原子指标', field: 'atomicIndex' }
           // { title: '必要证据', field: 'questioner' },
           // { title: '评估结果', field: 'startTime' },
@@ -149,15 +149,13 @@ export default {
     fetchData() {
       const params = { caseId: this.$route.params['id'],
         indexType: '3',
-        page: this.queryForm.page,
-        size: this.queryForm.size,
         indexName: this.indexName,
         indexResult: this.indexResult,
         indexHasRecord: this.indexHasRecord,
         atomicName: this.atomicName,
         indexSource: this.indexSource
       }
-      queryIndexDetail(params).then(res => {
+      queryIndexDetail(params, this.queryForm.page, this.queryForm.size).then(res => {
         this.gridOptions.data = res.data.records
         this.queryForm.total = res.data.total
       })
diff --git a/src/views/caseDetails/components/SelectUploadType.vue b/src/views/caseDetails/components/SelectUploadType.vue
index c551aa2..d0a1e7a 100644
--- a/src/views/caseDetails/components/SelectUploadType.vue
+++ b/src/views/caseDetails/components/SelectUploadType.vue
@@ -7,8 +7,8 @@
       <div class="upload-way">
         <div class="word_list" @click="handleSelect('1')">
           <img class="bg_img" src="../../../assets/record/word_bg.png" alt="">
-          <span class="title">普通笔录文档</span>
-          <span class="desc">笔录为有效的 doc，docx，txt，rtf，wpd格式文件</span>
+          <span class="title">普通文档</span>
+          <span class="desc">文档为有效的 doc，docx，txt，rtf，wpd格式文件</span>
           <div class="up-btn">
             <img src="@/assets/record/upload_btn.png" alt="">
             <span>选择上传</span>
@@ -17,7 +17,7 @@
         <div class="word_list" @click="handleSelect('2')">
           <img class="bg_img" src="../../../assets/record/ocr_bg.png" alt="">
           <span class="title">OCR识别</span>
-          <span class="desc">笔录为有效的 PNG，JPG，JPEG，BMP，WEBP图片格式</span>
+          <span class="desc">图片为有效的 PNG，JPG，JPEG，BMP，WEBP图片格式</span>
           <div class="up-btn">
             <img src="@/assets/record/upload_btn.png" alt="">
             <span>选择上传</span>
diff --git a/src/views/caseDetails/components/TripletInfo.vue b/src/views/caseDetails/components/TripletInfo.vue
index 085891a..ce17f0c 100644
--- a/src/views/caseDetails/components/TripletInfo.vue
+++ b/src/views/caseDetails/components/TripletInfo.vue
@@ -64,7 +64,7 @@ export default {
       dialogOptions: {
         show: false,
         title: {
-          title: '选择三元组信息入库'
+          title: ''
         },
         width: '1300px',
         top: '50px',
@@ -99,6 +99,7 @@ export default {
       this.gridOptions.data = []
       this.selectionRows = []
       this.name = ''
+      this.dialogOptions.title.title = `选择三元组信息入库 - ${data.confessionMaterial}`
       this.fetchData()
     },
     // 查询对应笔录提取到的三元组信息
diff --git a/src/views/caseDetails/components/edit/EditEvidence.vue b/src/views/caseDetails/components/edit/EditEvidence.vue
index cbd5a47..32094bb 100644
--- a/src/views/caseDetails/components/edit/EditEvidence.vue
+++ b/src/views/caseDetails/components/edit/EditEvidence.vue
@@ -46,14 +46,14 @@
             :accept="uploadOption.accept"
             :on-preview="handlePreview"
             :on-remove="handleRemove"
-            :before-remove="beforeRemove"
+            :before-upload="beforeUpload"
             :on-success="handleSuccess"
             multiple
             :on-exceed="handleExceed"
             :file-list="fileList"
           >
             <el-button size="small" type="primary" icon="el-icon-upload2">选择文件</el-button>
-            <div slot="tip" class="el-upload__tip">支持扩展名：docx、bmp、jpg、png，单个文档小于5mb</div>
+            <div slot="tip" class="el-upload__tip">支持扩展名：docx、doc，单个文档小于5mb</div>
           </el-upload>
         </el-form-item>
       </el-form>
@@ -65,6 +65,7 @@
 import { baseURL } from '@/config/net.config'
 import { saveEvidence, updateEvidence } from '@/api/caseDetails'
 import { getAccessToken } from '@/utils/accessToken'
+import { commonDownloadFile } from '@/api/config/uploadApi'
 export default {
   name: 'EditEvidence',
   data() {
@@ -91,7 +92,7 @@ export default {
       // 上传配置
       uploadOption: {
         action: `${baseURL}/minio/uploadFile`,
-        accept: '.docx,.bmp,.jpg,.png'
+        accept: '.docx,.doc'
       },
 
       isEdit: false
@@ -126,6 +127,20 @@ export default {
       this.$refs.form.resetFields()
       this.$refs.form.clearValidate()
     },
+    // 文件列表
+    beforeUpload(file) {
+      const isLt5M = file.size / 1024 / 1024 < 5
+      const filename = file.name
+      const postfix = filename.substring(filename.lastIndexOf('.'))
+      if (!['.doc', '.docx'].includes(postfix)) {
+        this.$message.error('上传图片只能是 doc,docx 格式!')
+        return false
+      }
+      if (!isLt5M) {
+        this.$baseMessage.error('上传文件大小不能超过 5MB!')
+        return false
+      }
+    },
     // 确定
     handleSubmit() {
       this.$refs.form.validate(valid => {
@@ -162,14 +177,22 @@ export default {
       this.evidenceForm.fileIdList = list
     },
     handlePreview(file) {
-      console.log(file)
+      for (const item of this.fileList) {
+        if (item.name === file.name) {
+          if (!item.fileId) return
+          this.downloadFile(`${baseURL}${commonDownloadFile}${item.fileId}`, item.name)
+        }
+      }
+    },
+    downloadFile(url, fileName) {
+      const link = document.createElement('a')
+      link.href = url
+      link.download = fileName
+      link.click()
     },
     handleExceed(files, fileList) {
       this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
     },
-    beforeRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${file.name}？`)
-    },
     handleSuccess(response) {
       if (response.code === 200) {
         this.evidenceForm.fileIdList.push(response.data)
diff --git a/src/views/caseDetails/components/edit/EditRecord.vue b/src/views/caseDetails/components/edit/EditRecord.vue
index fb79c15..088c0ff 100644
--- a/src/views/caseDetails/components/edit/EditRecord.vue
+++ b/src/views/caseDetails/components/edit/EditRecord.vue
@@ -103,8 +103,8 @@
                 :accept="uploadOption.accept"
                 :on-preview="handlePreview"
                 :on-remove="handleRemove"
-                :before-remove="beforeRemove"
                 :on-success="handleSuccess"
+                :before-upload="beforeUpload"
                 multiple
                 :on-exceed="handleExceed"
                 :file-list="fileList"
@@ -179,7 +179,7 @@ export default {
       // 上传配置
       uploadOption: {
         action: `${baseURL}/minio/uploadFile`,
-        accept: '.docx,.bmp,.jpg,.png'
+        accept: '.docx,.doc'
       },
       // 初始化下标
       initialIndex: 0,
@@ -273,9 +273,6 @@ export default {
     handleExceed(files, fileList) {
       this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
     },
-    beforeRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${file.name}？`)
-    },
     handleSuccess(response) {
       if (response.code === 200) {
         this.recordForm.fileIdList.push(response.data)
@@ -329,18 +326,18 @@ export default {
       })
     },
     // 文件列表
-    handleFileChange(file, fileList) {
+    beforeUpload(file) {
       const isLt5M = file.size / 1024 / 1024 < 5
+      const filename = file.name
+      const postfix = filename.substring(filename.lastIndexOf('.'))
+      if (!['.doc', '.docx'].includes(postfix)) {
+        this.$message.error('上传图片只能是 doc,docx 格式!')
+        return false
+      }
       if (!isLt5M) {
         this.$baseMessage.error('上传文件大小不能超过 5MB!')
         return false
       }
-      this.fileList = []
-      for (const x of fileList) {
-        if (x.raw) {
-          this.fileList.push(x.raw)
-        }
-      }
     }
   }
 }
diff --git a/src/views/caseManagement/index.vue b/src/views/caseManagement/index.vue
index 242aa94..13d9103 100644
--- a/src/views/caseManagement/index.vue
+++ b/src/views/caseManagement/index.vue
@@ -12,11 +12,12 @@
     <div class="case-content">
       <div class="flex-row header">
 
-        <el-radio-group v-model="caseDataStatus" size="large" @change="handleChange">
+        <el-radio-group v-model="caseAnalysisStatus" size="large" @change="handleChange">
           <el-radio-button label="">全部</el-radio-button>
           <el-radio-button label="0">未分析</el-radio-button>
           <el-radio-button label="2">已分析</el-radio-button>
         </el-radio-group>
+        
         <el-button type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd">新增</el-button>
         <!-- <div>
           <el-button icon="el-icon-upload2" title="导入案件" circle @click="handleImport" />
@@ -130,7 +131,7 @@ export default {
       ],
       // 案件数据
       caseList: [],
-      caseDataStatus: ''
+      caseAnalysisStatus: ''
     }
   },
   mounted() {
@@ -156,7 +157,7 @@ export default {
       }
       delete params['updateTime']
       if (params.identifyResult && params.identifyResult.length === 0) delete params['identifyResult']
-      params.caseDataStatus = this.caseDataStatus
+      params.caseAnalysisStatus = this.caseAnalysisStatus
       queryCaseList(params, this.queryForm.page, this.queryForm.size).then(res => {
         this.caseList = res.data.records
         this.caseList.forEach(e => {
@@ -276,7 +277,7 @@ export default {
     },
     // 切换tab
     handleChange(val) {
-      this.caseDataStatus = val
+      this.caseAnalysisStatus = val
       this.queryForm.page = 1
       this.fetchData()
     },
diff --git a/src/views/index/index.vue b/src/views/index/index.vue
index 7b15997..a6e4e57 100644
--- a/src/views/index/index.vue
+++ b/src/views/index/index.vue
@@ -12,11 +12,11 @@
           </div>
           <div>
             <div class="flex-row" style="justify-content: space-between;margin-bottom: 10px">
-              <span>证据充足占比</span>
-              <span>{{ `${homeData['evidenceProportion']}%` }}</span>
+              <span>取证不完全占比</span>
+              <span>{{ `${statisticsData['incompleteEvidenceRate']}%` }}</span>
             </div>
             <el-progress
-              :percentage="homeData['evidenceProportion']"
+              :percentage="statisticsData['incompleteEvidenceRate']"
               color="#FFFFFF"
               :show-text="false"
               :stroke-width="15"
@@ -36,11 +36,11 @@
           </div>
           <div>
             <div class="flex-row" style="justify-content: space-between;margin-bottom: 10px">
-              <span>嫌疑人占比</span>
-              <span>{{ `${homeData['doerProportion']}%` }}</span>
+              <span>自动投案占比</span>
+              <span>{{ `${statisticsData['surrenderRate']}%` }}</span>
             </div>
             <el-progress
-              :percentage="homeData['doerProportion']"
+              :percentage="statisticsData['surrenderRate']"
               color="#FFFFFF"
               :show-text="false"
               :stroke-width="15"