From c1360bdc4932caf0ada4645205bd96a35e7ff740 Mon Sep 17 00:00:00 2001
From: xiangcongshuai <xiangcongshuai@supervision.ltd>
Date: Thu, 8 Aug 2024 17:08:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=AC=94=E5=BD=95=E6=A1=88=E4=BB=B6?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/caseDetails/index.js                  |  10 +-
 src/components/Pagination/index.vue           |   2 +-
 src/components/Search/index.vue               |   6 +-
 src/config/net.config.js                      |   2 +-
 src/layouts/components/TabsBar/index.vue      |   2 +-
 src/views/404.vue                             |   4 +-
 .../caseDetails/components/CaseAnalysis.vue   |   2 +-
 .../caseDetails/components/CaseRecord.vue     |  36 ++++--
 .../caseDetails/components/TripletInfo.vue    |   8 +-
 .../components/edit/AddCaseUser.vue           |  52 ++++++--
 .../components/edit/EditRecord.vue            |  30 +++--
 src/views/caseDetails/index.vue               |   2 +-
 .../components/EditCaseInfo.vue               |  15 ++-
 .../components/ModelAnalysis.vue              |   2 +-
 src/views/caseManagement/index.vue            | 117 +++++++++---------
 src/views/login/index.vue                     |   2 +-
 src/views/ruleEngine/indexRule/index.vue      |   4 +-
 17 files changed, 181 insertions(+), 115 deletions(-)

diff --git a/src/api/caseDetails/index.js b/src/api/caseDetails/index.js
index ec85b16..255bcaa 100644
--- a/src/api/caseDetails/index.js
+++ b/src/api/caseDetails/index.js
@@ -159,4 +159,12 @@ export function caseScoreDetail(data) {
     method: 'get',
     params: data
   })
-}
\ No newline at end of file
+}
+/** 修改案件人员 */
+export function updatePerson(data) {
+  return request({
+    url: `/modelCase/updatePerson`,
+    method: 'post',
+    data
+  })
+}
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index f5afd9f..d95a710 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -37,7 +37,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [20, 40, 50, 100, 200]
+        return [12, 20, 40, 50, 100, 200]
       }
     },
     layout: {
diff --git a/src/components/Search/index.vue b/src/components/Search/index.vue
index 62a26d0..af31041 100644
--- a/src/components/Search/index.vue
+++ b/src/components/Search/index.vue
@@ -131,8 +131,8 @@
                       format="yyyy-MM-dd HH:mm:ss"
                       type="datetimerange"
                       range-separator="至"
-                      start-placeholder="开始时间"
-                      end-placeholder="结束时间"
+                      start-placeholder="开始"
+                      end-placeholder="结束"
                     />
                     <template v-else-if="item.type==='radio'">
                       <el-radio v-model="SearchformInline[index]" :label="item.option[0].value">{{ item.option[0].label }}</el-radio>
@@ -146,8 +146,8 @@
         </el-col>
         <el-col v-if="direction === 'row'" :span="4">
           <el-form-item  style="text-align: center">
-            <el-button size="mini" icon="el-icon-refresh" plain @click="clearSearchformInline">重置</el-button>
             <el-button size="mini" type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+            <el-button size="mini" icon="el-icon-refresh" plain @click="clearSearchformInline">重置</el-button>
           </el-form-item>
         </el-col>
         <el-col v-else :span="3">
diff --git a/src/config/net.config.js b/src/config/net.config.js
index f8258a8..023ad03 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.25:8097/fu-hsi-server'
+      ? 'http://192.168.10.27: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/layouts/components/TabsBar/index.vue b/src/layouts/components/TabsBar/index.vue
index 6a7e7e5..adc7a1d 100644
--- a/src/layouts/components/TabsBar/index.vue
+++ b/src/layouts/components/TabsBar/index.vue
@@ -238,7 +238,7 @@ export default {
       if (latestView) {
         this.$router.push(latestView)
       } else {
-        this.$router.push('/index')
+        this.$router.push('/case-management')
       }
     },
     async toThisTag() {
diff --git a/src/views/404.vue b/src/views/404.vue
index e068df8..26b6621 100644
--- a/src/views/404.vue
+++ b/src/views/404.vue
@@ -88,9 +88,9 @@ export default {
         if (this.jumpTime) {
           this.jumpTime--
         } else {
-          this.$router.push({ path: '/' })
+          this.$router.push({ path: '/case-management' })
           this.$store.dispatch('tabsBar/delOthersRoutes', {
-            path: '/'
+            path: '/case-management'
           })
           clearInterval(this.timer)
         }
diff --git a/src/views/caseDetails/components/CaseAnalysis.vue b/src/views/caseDetails/components/CaseAnalysis.vue
index 5edb177..4b4fbb5 100644
--- a/src/views/caseDetails/components/CaseAnalysis.vue
+++ b/src/views/caseDetails/components/CaseAnalysis.vue
@@ -9,7 +9,7 @@
           <div class="title">{{ caseInfo.caseName }}</div>
           <div class="time">{{ caseInfo.evaluationTime }}</div>
           <div class="desc">
-            <span>按照伏羲智能分析模型赋分规则，该案综合得分为<span :class="['score', caseInfo.totalScore >= 70 ? 'success' : 'warning']">{{ caseInfo.commonScore }}</span>+<span :class="['score', caseInfo.totalScore >= 70 ? 'success' : 'warning']">{{ caseInfo.specificCrimeScore }}</span>=<span :class="['score', caseInfo.totalScore >= 70 ? 'success' : 'warning']">{{ caseInfo.totalScore }}</span>分，认定“<span :class="['score', caseInfo.totalScore >= 70 ? 'success' : 'warning']">{{ caseInfo.scoreDesc }}</span>”</span>
+            <span>按照取证智能分析大模型指标设置及赋分规则，该案共性指标<span :class="['score', caseInfo.totalScore >= 70 ? 'success' : 'warning']">{{ caseInfo.commonScore }}</span>分，入罪指标<span :class="['score', caseInfo.totalScore >= 70 ? 'success' : 'warning']">{{ caseInfo.specificCrimeScore }}</span>分，综合得分<span :class="['score', caseInfo.totalScore >= 70 ? 'success' : 'warning']">{{ caseInfo.totalScore }}</span>分，初步判定“<span :class="['score', caseInfo.totalScore >= 70 ? 'success' : 'warning']">{{ caseInfo.scoreDesc }}</span>”</span>
           </div>
         </div>
         <div class="card">
diff --git a/src/views/caseDetails/components/CaseRecord.vue b/src/views/caseDetails/components/CaseRecord.vue
index 3824407..96cebcb 100644
--- a/src/views/caseDetails/components/CaseRecord.vue
+++ b/src/views/caseDetails/components/CaseRecord.vue
@@ -9,19 +9,23 @@
 <template>
   <div class="record-content">
     <div v-if="isEdit" class="flex-row" style="align-items: center; justify-content: space-between">
-      <el-dropdown @command="handleSelect">
-        <el-button type="primary">添加笔录<i class="el-icon-arrow-down el-icon--right" /></el-button>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="1">文档笔录</el-dropdown-item>
-          <el-dropdown-item command="2">图像笔录</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
+      <div>
+        <el-dropdown @command="handleSelect">
+          <el-button type="primary">添加笔录<i class="el-icon-arrow-down el-icon--right" /></el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item command="1">文档笔录</el-dropdown-item>
+            <el-dropdown-item command="2">图像笔录</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+        <el-button type="primary" style="margin-left: 16px;" @click="addUser">添加人员</el-button>
+      </div>
+
       <el-input v-model="searchName" placeholder="搜索名称" style="width: 300px" />
     </div>
     <vxe-grid v-bind="gridOptions" style="margin-top: 10px">
       <template #opera="{row}">
         <el-button v-if="row.children.length === 0" type="text" icon="el-icon-video-play" :disabled="!isEdit" title="笔录分析" @click="handleCreateAtlas(row)" />
-        <el-button v-if="row.children.length === 0" type="text" icon="el-icon-edit" title="编辑" :disabled="!isEdit" @click="handelEdit(row)" />
+        <el-button type="text" icon="el-icon-edit" title="编辑" :disabled="!isEdit" @click="handelEdit(row)" />
         <el-button v-if="row.children.length === 0" type="text" icon="el-icon-delete" :disabled="!isEdit" style="color: red" title="删除" @click="handleDel(row)" />
       </template>
     </vxe-grid>
@@ -33,6 +37,8 @@
         @pagination="fetchData"
       />
     </div>
+    <!--新增用户-->
+    <add-case-user ref="addUser" @reloadData="fetchData" :case-id="caseId" />
     <!--选择三元组信息入库-->
     <triplet-info ref="triplet" />
     <!--选择上传方式-->
@@ -51,10 +57,11 @@ import SelectUpload from '@/views/caseDetails/components/edit/SelectUpload.vue'
 import OcrRecord from '@/views/caseDetails/components/edit/OcrRecord.vue'
 import TripletInfo from '@/views/caseDetails/components/TripletInfo.vue'
 import { queryRecordList, delRecords } from '@/api/caseDetails'
+import AddCaseUser from './edit/AddCaseUser.vue'
 import { debounce } from '@/utils'
 export default {
   name: 'CaseRecord',
-  components: { TripletInfo, OcrRecord, SelectUpload, EditRecord },
+  components: { TripletInfo, OcrRecord, SelectUpload, EditRecord, AddCaseUser },
   mixins: [mixin],
   props: {
     // 是否编辑
@@ -82,7 +89,7 @@ export default {
           { title: '序号', type: 'seq', treeNode: true },
           { title: '姓名', field: 'name', sortable: true },
           // { title: '笔录序号', field: 'recordNum', sortable: true },
-          { title: '角色', field: 'role' },
+          { title: '角色', field: 'roleName' },
           { title: '供述材料', field: 'confessionMaterial' },
           { title: '询问人', field: 'lawAsker' },
           { title: '进度', field: 'percentage' },
@@ -131,6 +138,9 @@ export default {
       this.fetchData()
       this.$emit('reloadData')
     },
+    addUser() {
+      this.$refs.addUser.show()
+    },
     // 添加笔录
     handleAdd() {
       this.$refs.type.show()
@@ -145,7 +155,11 @@ export default {
     },
     // 编辑
     handelEdit(row) {
-      this.$refs.edit.show(row, true)
+      if (row.children.length > 0) {
+        this.$refs.addUser.show(row)
+      } else {
+        this.$refs.edit.show(row, true)
+      }
     },
     // 删除
     handleDel(row) {
diff --git a/src/views/caseDetails/components/TripletInfo.vue b/src/views/caseDetails/components/TripletInfo.vue
index 1fc11f1..ebe7217 100644
--- a/src/views/caseDetails/components/TripletInfo.vue
+++ b/src/views/caseDetails/components/TripletInfo.vue
@@ -65,6 +65,7 @@ export default {
         title: {
           title: '选择三元组信息入库'
         },
+        width: '1300px',
         top: '50px',
         hiddenFooter: true,
         appendToBody: true
@@ -72,6 +73,7 @@ export default {
       gridOptions: {
         ...mixin.data().gridOptions,
         loading: false,
+        height: 650,
         columns: [
           { type: 'checkbox', width: '80px' },
           { title: '头节点', field: 'startNode' },
@@ -89,9 +91,6 @@ export default {
       selectionRows: []
     }
   },
-  mounted() {
-    this.tableHeight(650)
-  },
   methods: {
     // 显示弹窗
     show(data) {
@@ -196,7 +195,7 @@ export default {
       this.$refs.xTable.getCheckboxRecords().map(item => {
         ids.push(item.id)
       })
-      saveTripletInfo({ ids }).then(res => {
+      saveTripletInfo({ ids, recordId: this.lastPageData['id'] }).then(res => {
         loading.close()
         const { code, msg } = res
         code === 200 ? this.$baseMessage.success(msg || '保存成功!') : this.$baseMessage.error(msg || '保存失败!')
@@ -212,6 +211,7 @@ export default {
   display: flex;
   background: #FFFFFF;
   height: 750px;
+  width: 1240px;
   .left {
     width: 750px;
     border-right: 1px solid #EAEAEA;
diff --git a/src/views/caseDetails/components/edit/AddCaseUser.vue b/src/views/caseDetails/components/edit/AddCaseUser.vue
index 5e75abd..6a2d65e 100644
--- a/src/views/caseDetails/components/edit/AddCaseUser.vue
+++ b/src/views/caseDetails/components/edit/AddCaseUser.vue
@@ -14,13 +14,13 @@
     <template slot="content">
       <el-form ref="userForm" :model="userForm" :rules="userRules" label-width="80px">
         <el-form-item label="姓名" prop="name">
-          <el-input v-model="userForm['name']" placeholder="请输入姓名" />
+          <el-input v-model="userForm['name']" :disabled="isCaseActorFlag" placeholder="请输入姓名" />
         </el-form-item>
         <el-form-item label="身份证号" prop="idCard">
           <el-input v-model="userForm['idCard']" placeholder="请输入身份证号" />
         </el-form-item>
         <el-form-item label="角色" prop="roleCode">
-          <el-select v-model="userForm['roleCode']" placeholder="请选择角色" style="width: 100%">
+          <el-select v-model="userForm['roleCode']" :disabled="isCaseActorFlag" placeholder="请选择角色" style="width: 100%">
             <el-option
               v-for="item in roleList"
               :key="item.value"
@@ -36,7 +36,7 @@
 
 <script>
 import { validIdCard } from '@/utils/validate'
-import { addUser } from '@/api/caseDetails'
+import { addUser, updatePerson, queryUserList } from '@/api/caseDetails'
 
 export default {
   name: 'AddCaseUser',
@@ -65,24 +65,56 @@ export default {
         idCard: [{ required: true, message: '身份证号不能为空', trigger: 'blur' }, { validator: validIdCard, trigger: 'blur' }],
         role: [{ required: true, message: '角色不能为空', trigger: 'blur' }]
       },
+      isEdit: false,
+      userList: [],
       // 角色
-      roleList: JSON.parse(sessionStorage.getItem('case_role'))
+      roleList: JSON.parse(sessionStorage.getItem('case_role')),
+      // 是否案件行为人
+      isCaseActorFlag: false
     }
   },
   methods: {
     // 显示弹窗
-    show() {
+    show(row) {
       this.dialogOption.show = true
-      this.userForm = {}
+      this.isCaseActorFlag = false
+      if (row) {
+        this.getUserList()
+        this.isEdit = true
+        this.userForm = JSON.parse(JSON.stringify(row))
+        this.$set(this.userForm, 'idCard', row.personIdCard)
+        this.$set(this.userForm, 'roleCode', row.role)
+        this.$set(this.userForm, 'id', row.personId)
+      } else {
+        this.userForm = {}
+        this.isEdit = false
+      }
+      this.drawerOption.title = this.isEdit ? '编辑涉案人员' : '添加涉案人员'
+    },
+    // 获取人员列表
+    getUserList() {
+      queryUserList({ caseId: this.$route.params.id }).then(res => {
+        this.userList = res.data
+        if (this.userList[0].id === this.userForm.personId) {
+          this.isCaseActorFlag = true
+        }
+      })
     },
     // 涉案人员提交
     handleSubmit() {
       this.$refs.userForm.validate(async valid => {
         if (valid) {
-          const { code, msg } = await addUser({ ...this.userForm, caseId: this.$route.params['id'] })
-          code === 200 ? this.$baseMessage.success(msg || '新增成功！') : this.$baseMessage.error(msg || '新增失败！')
-          this.dialogOption.show = false
-          this.$emit('reloadData')
+          if (this.isEdit) {
+            const { code, msg } = await updatePerson({ ...this.userForm, caseId: this.$route.params['id'] })
+            code === 200 ? this.$baseMessage.success('编辑成功！') : this.$baseMessage.error(msg || '编辑失败！')
+            this.dialogOption.show = false
+            this.$emit('reloadData')
+          } else {
+            const { code, msg } = await addUser({ ...this.userForm, caseId: this.$route.params['id'] })
+            code === 200 ? this.$baseMessage.success(msg || '新增成功！') : this.$baseMessage.error(msg || '新增失败！')
+            this.dialogOption.show = false
+            this.$emit('reloadData')
+          }
         }
       })
     }
diff --git a/src/views/caseDetails/components/edit/EditRecord.vue b/src/views/caseDetails/components/edit/EditRecord.vue
index 48e968f..8c733b0 100644
--- a/src/views/caseDetails/components/edit/EditRecord.vue
+++ b/src/views/caseDetails/components/edit/EditRecord.vue
@@ -27,10 +27,10 @@
         <!--        </el-col>-->
         <el-col :span="24">
           <el-form ref="form" :model="recordForm" :rules="rules" label-width="80px">
-            <el-form-item label="姓名" prop="name">
+            <el-form-item label="姓名" prop="personId">
               <div class="flex-row" style="justify-content: space-between">
                 <el-select
-                  v-model="recordForm.name"
+                  v-model="recordForm.personId"
                   :disabled="isEdit"
                   placeholder="请选择姓名"
                   style="width: 83%"
@@ -39,8 +39,8 @@
                   <el-option
                     v-for="item in userList"
                     :key="item.id"
-                    :value="item.name"
-                    :label:="item.name"
+                    :value="item.id"
+                    :label="item.name"
                   >
                     <span>{{ `${item.name}-${item['roleName']}` }}</span>
                   </el-option>
@@ -55,7 +55,7 @@
               </div>
             </el-form-item>
             <el-form-item v-if="isEdit" label="角色" prop="role">
-              <el-select v-model="recordForm.role" placeholder="请选择角色" style="width: 100%">
+              <el-select v-model="recordForm.role" :disabled="isEdit" placeholder="请选择角色" style="width: 100%">
                 <el-option
                   v-for="item in roleList"
                   :key="item.value"
@@ -97,6 +97,7 @@
                 :headers="{
                   token: token
                 }"
+                :disabled="isEdit"
                 class="upload-demo"
                 :action="uploadOption.action"
                 :accept="uploadOption.accept"
@@ -108,7 +109,7 @@
                 :on-exceed="handleExceed"
                 :file-list="fileList"
               >
-                <el-button size="small" type="primary" icon="el-icon-upload2">选择文件</el-button>
+                <el-button :disabled="isEdit" size="small" type="primary" icon="el-icon-upload2">选择文件</el-button>
                 <div slot="tip" class="el-upload__tip">支持扩展名：docx、doc，单个文档小于5mb</div>
               </el-upload>
             </el-form-item>
@@ -161,7 +162,7 @@ export default {
         fileIdList: []
       },
       rules: {
-        name: [{ required: true, message: '姓名不能为空!', trigger: 'blur' }],
+        personId: [{ required: true, message: '姓名不能为空!', trigger: 'blur' }],
         indexNum: [{ required: true, message: '次数不能为空!', trigger: 'blur' }],
         roleCode: [{ required: true, message: '角色不能为空!', trigger: 'blur' }],
         lawAsker: [{ required: true, message: '询问人不能为空!', trigger: 'blur' }],
@@ -195,18 +196,19 @@ export default {
   // },
   mounted() {
     this.caseId = this.$route.params.id
-    this.getUserList()
   },
   methods: {
     show(data, isEdit) {
       this.isEdit = isEdit
       // 弹窗宽度变化
       // this.drawerOption.width = isEdit ? '50%' : '35%'
-      this.recordForm = isEdit ? data : { fileIdList: [] }
+      const formData = isEdit ? JSON.parse(JSON.stringify(data)) : { fileIdList: [] }
+      this.recordForm = isEdit ? formData : { fileIdList: [] }
       // 处理编辑时时间选择器
-      if (isEdit && data['confessionStartTime'] && data['confessionEndTime']) {
-        this.$set(this.recordForm, 'confessionTime', [data['confessionStartTime'], data['confessionEndTime']])
+      if (isEdit && formData['confessionStartTime'] && formData['confessionEndTime']) {
+        this.$set(this.recordForm, 'confessionTime', [formData['confessionStartTime'], formData['confessionEndTime']])
       }
+      this.getUserList()
       this.fileList = []
       if (isEdit) {
         const list = []
@@ -230,8 +232,10 @@ export default {
     },
     // 人员选中
     handleSelectChange(val) {
-      const roleName = this.userList.find(item => item.name === val).roleName
-      this.$set(this.recordForm, 'role', roleName)
+      // const roleName = this.userList.find(item => item.id === val).roleName
+      const name = this.userList.find(item => item.id === val).name
+      this.$set(this.recordForm, 'role', val)
+      this.$set(this.recordForm, 'name', name)
     },
     // 新增用户
     handleAdd() {
diff --git a/src/views/caseDetails/index.vue b/src/views/caseDetails/index.vue
index 2b3e149..79e6b78 100644
--- a/src/views/caseDetails/index.vue
+++ b/src/views/caseDetails/index.vue
@@ -53,7 +53,7 @@
             <!-- <el-descriptions-item label="立案时间">{{ caseData.registerTime || '暂未添加，上传笔录后自动生成' }}</el-descriptions-item>
             <el-descriptions-item label="受理时间">{{ caseData.acceptTime || '暂未添加，上传笔录后自动生成' }}</el-descriptions-item> -->
            
-            <el-descriptions-item label="行为人">{{ caseData.lawActorName || '暂未添加，上传笔录后自动生成' }}</el-descriptions-item>
+            <el-descriptions-item label="行为人">{{ caseData.caseActorName || '暂未添加，上传笔录后自动生成' }}</el-descriptions-item>
             <el-descriptions-item label="当事人">{{ caseData.lawParty || '暂未添加，上传笔录后自动生成' }}</el-descriptions-item>
             <el-descriptions-item label="案件概述" span="24">
               <div slot="default" class="case-summarize">
diff --git a/src/views/caseManagement/components/EditCaseInfo.vue b/src/views/caseManagement/components/EditCaseInfo.vue
index e28dbbd..f9c03e9 100644
--- a/src/views/caseManagement/components/EditCaseInfo.vue
+++ b/src/views/caseManagement/components/EditCaseInfo.vue
@@ -34,6 +34,12 @@
         <el-form-item label="案件概述" prop="caseDetail">
           <el-input v-model="caseForm['caseDetail']" type="textarea" :rows="5" placeholder="请输入案件概述" />
         </el-form-item>
+        <el-form-item label="行为人" prop="caseActorName">
+          <el-input v-model="caseForm['caseActorName']" :disabled="isEdit" maxlength="10" placeholder="请输入行为人姓名" />
+        </el-form-item>
+        <el-form-item label="身份证号" prop="caseActorIdCard">
+          <el-input v-model="caseForm['caseActorIdCard']" :disabled="isEdit" placeholder="请输入身份证号" />
+        </el-form-item>
       </el-form>
     </template>
   </cs-drawer>
@@ -41,7 +47,7 @@
 
 <script>
 import { addCaseInfo, checkCaseNo } from '@/api/caseManagement'
-
+import { validIdCard } from '@/utils/validate'
 export default {
   name: 'EditCaseInfo',
   data() {
@@ -78,7 +84,8 @@ export default {
         caseType: '',
         caseStatus: '',
         crimeMode: '',
-        caseDetail: ''
+        caseDetail: '',
+        idCard: ''
       },
       // 校验规则
       rules: {
@@ -90,7 +97,9 @@ export default {
         caseType: [{ required: true, message: '案件类型不能为空!', trigger: 'blur' }],
         caseStatus: [{ required: false, message: '案件状态不能为空!', trigger: 'blur' }],
         crimeMode: [{ required: true, message: '到案方式不能为空!', trigger: 'blur' }],
-        caseDetail: [{ required: true, message: '案件概述不能为空!', trigger: 'blur' }]
+        caseDetail: [{ required: true, message: '案件概述不能为空!', trigger: 'blur' }],
+        caseActorName: [{ required: true, message: '行为人不能为空!', trigger: 'blur' }],
+        caseActorIdCard: [{ required: true, message: '身份证号不能为空', trigger: 'blur' }, { validator: validIdCard, trigger: 'blur' }]
       },
       // 是否是编辑
       isEdit: false
diff --git a/src/views/caseManagement/components/ModelAnalysis.vue b/src/views/caseManagement/components/ModelAnalysis.vue
index a0012f8..fe47010 100644
--- a/src/views/caseManagement/components/ModelAnalysis.vue
+++ b/src/views/caseManagement/components/ModelAnalysis.vue
@@ -18,7 +18,7 @@
           <el-col :span="12">
             <el-form-item label="行为人">
               <div class="flex-row">
-                <el-input v-model="caseData['lawActorName']" :disabled="!doreEdit" />
+                <el-input v-model="caseData['caseActorName']" :disabled="!doreEdit" />
                 <el-button v-show="false" :plain="!doreEdit" type="primary" style="margin-left: 10px" @click="handelDore">{{ doreEdit ? '保存' : '修改' }}</el-button>
               </div>
             </el-form-item>
diff --git a/src/views/caseManagement/index.vue b/src/views/caseManagement/index.vue
index fe25d24..b4daebd 100644
--- a/src/views/caseManagement/index.vue
+++ b/src/views/caseManagement/index.vue
@@ -8,7 +8,7 @@
 
 <template>
   <div ref="htmlContent" class="content">
-    <cs-search title="案件检索" :data="searchData" :span="8" @onSearch="onSearch" @getData="onSearch" />
+    <cs-search title="案件检索" :data="searchData" :span="4" direction="row" @onSearch="onSearch" @getData="onSearch" />
     <div class="case-content">
       <div class="flex-row header">
         <el-button type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd">新增</el-button>
@@ -19,66 +19,66 @@
         <input ref="file" type="file" style="display: none" @change="uploadFile">
       </div>
       <el-row :gutter="20" type="flex" class="list-content">
-        <vuedraggable v-model="caseList" animation="400" handle=".mover" style="width: 100%">
-          <transition-group class="list-span">
-            <el-col v-for="item in caseList" :key="item.id" :span="6">
-              <div class="list-item" @click="handleClick(item)">
-                <div class="flex-row item-header">
-                  <div class="flex-row" style="align-items: center;flex: 1">
-                    <el-tag
-                      v-if="item.caseStatus && item.identifyResultName "
-                      :type="item.caseStatus === '1' ? 'success' : 'warning'"
-                      style="margin-right: 5px"
-                    >
-                      {{ item.identifyResultName }}
-                    </el-tag>
-                    <span class="main-title">{{ item.caseName }}</span>
-                  </div>
-                  <div>
-                    <img src="~@/assets/caseManagement/duihua@2x.png" class="tag-icon" @click.stop="handleContact(item)">
-                    <img src="~@/assets/caseManagement/tuola@2x.png" class="tag-icon mover">
-                  </div>
+
+        <div class="list-span">
+          <el-col v-for="item in caseList" :key="item.id" :span="6">
+            <div class="list-item" @click="handleClick(item)">
+              <div class="flex-row item-header">
+                <div class="flex-row" style="align-items: center;flex: 1">
+                  <el-tag
+                    v-if="item.caseStatus && item.identifyResultName "
+                    :type="item.caseStatus === '1' ? 'success' : 'warning'"
+                    style="margin-right: 5px"
+                  >
+                    {{ item.identifyResultName }}
+                  </el-tag>
+                  <span class="main-title">{{ item.caseName }}</span>
                 </div>
-                <div class="item-body">
-                  <el-row :gutter="10" style="padding: 10px;">
-                    <el-col :span="8">
-                      <span class="item-body-top etc">{{ `行为人：${item['lawActorName'] ? item['lawActorName'] : '-'}` }}</span>
-                    </el-col>
-                    <el-col :span="16">
-                      <span class="item-body-top etc">{{ `案件编号：${item.caseNo}` }}</span>
-                    </el-col>
-                    <!--                    <el-col :span="8">-->
-                    <!--                      <span class="item-body-top etc">{{ `证据数量：${item.evidenceNum}` }}</span>-->
-                    <!--                    </el-col>-->
-                    <el-col :span="24" style="margin-top: 10px">
-                      <span class="item-body-top etc">{{ `当事人：${item.lawParty}` }}</span>
-                    </el-col>
-                  </el-row>
-                  <div class="item-body-bottom">
-                    <div class="flex-row" style="align-items: center; justify-content: space-between;padding: 10px;min-height: 40px">
-                      <div class="flex-column">
-                        <div class="flex-row" style="align-items: center;margin-bottom: 5px">
-                          <i v-if="item.isAnalysing" class="el-icon-loading" style="margin-right: 5px" />
-                          <span class="status-title">{{ formatterStatusName(item) }}</span>
-                        </div>
-                        <span class="subtitle">{{ item.updateTime }}</span>
-                      </div>
-                      <div v-show="item['totalScore']" class="flex-column" style="align-items: center">
-                        <span :class="['score', item.totalScore >= 70 ? 'success' : 'warning']">{{ item.totalScore }}</span>
-                        <span class="subtitle">综合得分</span>
+                <div>
+                  <img src="~@/assets/caseManagement/duihua@2x.png" class="tag-icon" @click.stop="handleContact(item)">
+                  <!-- <img src="~@/assets/caseManagement/tuola@2x.png" class="tag-icon mover"> -->
+                </div>
+              </div>
+              <div class="item-body">
+                <el-row :gutter="10" style="padding: 10px;">
+                  <el-col :span="8">
+                    <span class="item-body-top etc">{{ `行为人：${item['caseActorName'] ? item['caseActorName'] : '-'}` }}</span>
+                  </el-col>
+                  <el-col :span="16">
+                    <span class="item-body-top etc">{{ `案件编号：${item.caseNo}` }}</span>
+                  </el-col>
+                  <!--                    <el-col :span="8">-->
+                  <!--                      <span class="item-body-top etc">{{ `证据数量：${item.evidenceNum}` }}</span>-->
+                  <!--                    </el-col>-->
+                  <el-col :span="24" style="margin-top: 10px">
+                    <span class="item-body-top etc">{{ `当事人：${item.lawParty}` }}</span>
+                  </el-col>
+                </el-row>
+                <div class="item-body-bottom" :style="{borderColor:item.totalScore ? '#9DEACD' : '#90BDFF'}">
+                  <div class="flex-row" style="align-items: center; justify-content: space-between;padding: 10px;min-height: 40px">
+                    <div class="flex-column">
+                      <div class="flex-row" style="align-items: center;margin-bottom: 5px">
+                        <i v-if="item.isAnalysing" class="el-icon-loading" style="margin-right: 5px" />
+                        <span class="status-title">{{ formatterStatusName(item) }}</span>
                       </div>
+                      <span class="subtitle">{{ item.updateTime }}</span>
                     </div>
-                    <div class="flex-row bottom-buttons">
-                      <div @click.stop="handleDel(item)">删除</div>
-                      <div @click.stop="handleEdit(item)">编辑</div>
-                      <div :class="[item['isAnalysing'] ? 'disabled' : '']" @click.stop="handleAnalysis(item)">模型分析</div>
+                    <div v-show="item['totalScore']" class="flex-column" style="align-items: center">
+                      <span :class="['score', item.totalScore >= 70 ? 'success' : 'warning']">{{ item.totalScore }}</span>
+                      <span class="subtitle">综合得分</span>
                     </div>
                   </div>
+                  <div class="flex-row bottom-buttons">
+                    <div :class="[item['isAnalysing'] ? 'disabled' : '']" @click.stop="handleAnalysis(item)">模型分析</div>
+                    <div @click.stop="handleEdit(item)">编辑</div>
+                    <div @click.stop="handleDel(item)">删除</div>
+                  </div>
                 </div>
               </div>
-            </el-col>
-          </transition-group>
-        </vuedraggable>
+            </div>
+          </el-col>
+        </div>
+
       </el-row>
       <div style="text-align: center">
         <cs-page
@@ -117,7 +117,7 @@ export default {
       searchData: [
         { label: '案件编号', model: 'caseNo', type: 'input' },
         { label: '案件名称', model: 'caseName', type: 'input' },
-        { label: '认定结果', model: 'identifyResult', type: 'select', option: JSON.parse(sessionStorage.getItem('identify_result')) },
+        { label: '认定结果', model: 'identifyResult', type: 'selectMultiple', option: JSON.parse(sessionStorage.getItem('identify_result')) },
         { label: '行为人', model: 'lawActor', type: 'input' },
         { label: '当事人', model: 'lawParty', type: 'input' },
         { label: '最新时间', model: 'updateTime', type: 'datetimerange' }
@@ -275,7 +275,7 @@ export default {
     padding: 20px;
     box-sizing: border-box;
     margin-top: 10px;
-    height: calc(100% - 170px);
+    height: calc(100% - 140px);
     .header {
       align-items: center;
       justify-content: space-between;
@@ -286,8 +286,7 @@ export default {
       height: calc(100% - 32px - 32px - 20px);
       flex-wrap: wrap;
       .list-span {
-        display: flex;
-        flex-wrap: wrap;
+        width: 100%;
       }
       .list-item {
         background: #F2F5F9;
@@ -325,7 +324,7 @@ export default {
           }
           .item-body-bottom {
             background: #ffffff;
-            border-top: 3px solid $base-color-default;
+            border-top: 3px solid;
             border-top-left-radius: 8px;
             border-top-right-radius: 8px;
             margin: 0 10px;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index acd169d..c12ac04 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -97,7 +97,7 @@ export default {
           this.$store
             .dispatch('user/login', this.loginForm)
             .then(() => {
-              this.$router.push('/index')
+              this.$router.push('/case-management')
               this.loading = false
             })
             .catch(() => {
diff --git a/src/views/ruleEngine/indexRule/index.vue b/src/views/ruleEngine/indexRule/index.vue
index 23e142f..eece565 100644
--- a/src/views/ruleEngine/indexRule/index.vue
+++ b/src/views/ruleEngine/indexRule/index.vue
@@ -74,8 +74,8 @@ export default {
         { label: '指标名称', model: 'name', type: 'input' },
         { label: '指标类别', model: 'indexType', type: 'select', option: JSON.parse(sessionStorage.getItem('index_type')) },
         // { label: '证据名称', model: 'doer', type: 'input' },
-        { label: '案件类型', model: 'caseType', type: 'select', option: JSON.parse(sessionStorage.getItem('case_type')) }
-        // { label: '原子指标', model: 'name', type: 'input' },
+        { label: '案件类型', model: 'caseType', type: 'select', option: JSON.parse(sessionStorage.getItem('case_type')) },
+        { label: '原子指标', model: 'atomicIndexName', type: 'input' }
       ],
       // 表格配置
       gridOptions: {