fix:测试问题修改,权限菜单修改

src/components/ConversationDialog/index.vue

@@ -265,6 +265,10 @@ export default {
     },
     // 发送按钮
     handleSend() {
+      if (this.caseIndex === '' || !this.baseForm.caseId) {
+        this.$baseMessage.error('请选择案件！')
+        return
+      }
       this.conversationList.push({
         type: 'user',
         text: this.caseIndex,

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.137:8097/fu-hsi-server'
       : '/fuHsiApi',
   // 配后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8
   contentType: 'application/json;charset=UTF-8',

src/layouts/components/FullScreenBar/index.vue

@@ -29,9 +29,9 @@ export default {
       }
       screenfull.toggle()
       // 延时刷新是为了解决全屏之后树形结构无法界面变大的问题
-      setTimeout(() => {
-        this.$emit('refresh')
-      }, 1000)
+      // setTimeout(() => {
+      //   this.$emit('refresh')
+      // }, 1000)
     },
     change() {
       this.isFullscreen = screenfull.isFullscreen

src/layouts/components/SideBar/components/VabSideBarItem.vue

@@ -43,7 +43,7 @@ export default {
         this.handleChildren(this.item.children, this.item) &&
         (!this.routeChildren.children ||
             this.routeChildren.notShowChildren) &&
-        !this.item.alwaysShow || this.item.children.length === 1
+        !this.item.alwaysShow
       ) {
         return 'VabMenuItem'
       } else {

src/router/index.js

@@ -60,7 +60,7 @@ export const asyncRoutes = [
     path: '/case',
     name: 'Case',
     component: Layout,
-    permission: 'p_case',
+    permission: 'p_caseManagement',
     meta: { title: '案件管理' },
     children: [
       {

src/views/caseDetails/components/CommonIndex.vue

@@ -60,13 +60,14 @@ export default {
         columns: [
           { title: '', width: '50px', treeNode: true },
           { title: '序号', type: 'seq', width: '50px' },
+          
+          { title: '分析结果', width: '200px', field: 'indexResult', slots: { default: 'result' }},
           { title: '指标名称', field: 'indexName', align: 'left' },
-          { title: '分值', field: 'score' },
-          { title: '数据来源', field: 'indexSource', formatter: ({ cellValue }) => {
+          { title: '分值', field: 'score', width: '50px' },
+          { title: '数据来源', field: 'indexSource', width: '200px', formatter: ({ cellValue }) => {
             return cellValue ? this.indexSourceList.find(item => item.value === cellValue).label : ''
           } },
-          { title: '笔录结果', field: 'record' },
-          { title: '分析结果', field: 'indexResult', slots: { default: 'result' }}
+          { title: '笔录结果', field: 'record' }
           // { title: '原子指标', field: 'atomicIndex' }
           // { title: '必要证据', field: 'questioner' },
           // { title: '评估结果', field: 'startTime' },

src/views/caseDetails/components/IncriminateIndex.vue

@@ -64,13 +64,13 @@ export default {
         columns: [
           { title: '', width: '50px', treeNode: true },
           { title: '序号', type: 'seq', width: '50px' },
+          { title: '分析结果', width: '200px', field: 'indexResult', slots: { default: 'result' }},
           { title: '指标名称', field: 'indexName', align: 'left' },
-          { title: '分值', field: 'score' },
-          { title: '数据来源', field: 'indexSource', formatter: ({ cellValue }) => {
+          { title: '分值', width: '200px', field: 'score' },
+          { title: '数据来源', field: 'indexSource', width: '200px', formatter: ({ cellValue }) => {
             return cellValue ? this.indexSourceList.find(item => item.value === cellValue).label : ''
           } },
-          { title: '笔录结果', field: 'record' },
-          { title: '分析结果', field: 'indexResult', slots: { default: 'result' }}
+          { title: '笔录结果', field: 'record' }
           // { title: '原子指标', field: 'atomicIndex' }
           // { title: '必要证据', field: 'questioner' },
           // { title: '评估结果', field: 'startTime' },

src/views/caseDetails/components/InnocentIndex.vue

@@ -60,13 +60,13 @@ export default {
         columns: [
           { title: '', width: '50px', treeNode: true },
           { title: '序号', type: 'seq', width: '50px' },
+          { title: '分析结果', width: '200px', field: 'indexResult', slots: { default: 'result' }},
           { title: '指标名称', field: 'indexName', align: 'left' },
-          { title: '分值', field: 'score' },
-          { title: '数据来源', field: 'indexSource', formatter: ({ cellValue }) => {
+          { title: '分值', width: '200px', field: 'score' },
+          { title: '数据来源', width: '200px', field: 'indexSource', formatter: ({ cellValue }) => {
             return cellValue ? this.indexSourceList.find(item => item.value === cellValue).label : ''
           } },
           { title: '笔录结果', field: 'record' },
-          { title: '分析结果', field: 'indexResult', slots: { default: 'result' }}
           // { title: '原子指标', field: 'atomicIndex' }
           // { title: '必要证据', field: 'questioner' },
           // { title: '评估结果', field: 'startTime' },

src/views/caseDetails/components/TripletInfo.vue

@@ -23,11 +23,12 @@
             :checkbox-config="{ labelField: '', highlight: true, trigger: 'row', reserve: true , range: true}"
             row-id="id"
             v-bind="gridOptions"
+            @checkbox-all="selectAllEvent"
             @checkbox-change="selectChangeEvent"
           />
 
         </div>
-        <div class="right">
+        <!-- <div class="right">
           <div class="title">{{ `已选择实体（${selectionRows.length * 2}）` }}</div>
           <div class="right_list">
             <div v-for="(item,index) in selectionRows" :key="index" class="right_list_item">
@@ -42,7 +43,7 @@
 
             </span>
           </div>
-        </div>
+        </div> -->
       </div>
       <div style="text-align: center;margin-top: 10px">
         <el-button type="primary" plain style="width: 80px" @click="() => { dialogOptions.show = false }">取消</el-button>
@@ -168,6 +169,29 @@ export default {
         this.$delete(this.selectionRows, dataIndex)
       }
     },
+    // vxe复选框当前页全选中方法(保留翻页选中的数据)：
+    selectAllEvent({ checked, records, reserves }) {
+      // console.log(checked ? '勾选事件' : '取消事件')
+      // console.log('当前选中的数据：' + records)
+      // console.log('翻页时其他页的数据：' + reserves)
+      // 全选中时
+      if (checked) {
+        // 第一次选数据，还未进行翻页时
+        if (reserves.length == 0) {
+          this.selectedRowKeys = records.map(v => v.id)
+          this.selectionRows = records
+        } else {
+          // id集合，翻页存在已选中的数据时,拼接新选中的数据
+          this.selectedRowKeys = [...reserves.map(v => v.id), ...records.map(v => v.id)]
+          // 数据集合，翻页存在已选中的数据时,拼接新选中的数据
+          this.selectionRows = [...reserves, ...records]
+        }
+      } else {
+        // 取消全选时,直接将翻页数据赋值，当前页数据不用加上
+        this.selectionRows = reserves
+        this.selectedRowKeys = reserves.map(v => v.id)
+      }
+    },
     handleSearch() {
       const filterVal = String(this.name).trim().toLowerCase()
       if (filterVal) {
@@ -213,7 +237,7 @@ export default {
   height: 750px;
   width: 1240px;
   .left {
-    width: 750px;
+    width: 100%;
     border-right: 1px solid #EAEAEA;
     padding-right: 30px;
     .search {

src/views/caseDetails/components/edit/EditRecord.vue

@@ -232,9 +232,9 @@ export default {
     },
     // 人员选中
     handleSelectChange(val) {
-      // const roleName = this.userList.find(item => item.id === val).roleName
+      const role = this.userList.find(item => item.id === val).roleCode
       const name = this.userList.find(item => item.id === val).name
-      this.$set(this.recordForm, 'role', val)
+      this.$set(this.recordForm, 'role', role)
       this.$set(this.recordForm, 'name', name)
     },
     // 新增用户

src/views/caseManagement/caseRecovery/index.vue

@@ -12,7 +12,7 @@
           </el-dropdown-menu>
         </el-dropdown>
       </div>
-      <vxe-grid v-bind="gridOptions" style="margin-top: 20px" @checkbox-change="selectChangeEvent">
+      <vxe-grid v-bind="gridOptions" style="margin-top: 20px" @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
         <template #operate="{row}">
           <el-button type="text" @click="resetData(row)">恢复</el-button>
           <el-button type="text" style="color: red" @click="handleDel(row)">删除</el-button>
@@ -150,6 +150,29 @@ export default {
         this.$delete(this.selectionRows, dataIndex)
       }
     },
+    // vxe复选框当前页全选中方法(保留翻页选中的数据)：
+    selectAllEvent({ checked, records, reserves }) {
+      // console.log(checked ? '勾选事件' : '取消事件')
+      // console.log('当前选中的数据：' + records)
+      // console.log('翻页时其他页的数据：' + reserves)
+      // 全选中时
+      if (checked) {
+        // 第一次选数据，还未进行翻页时
+        if (reserves.length == 0) {
+          this.selectedRowKeys = records.map(v => v.id)
+          this.selectionRows = records
+        } else {
+          // id集合，翻页存在已选中的数据时,拼接新选中的数据
+          this.selectedRowKeys = [...reserves.map(v => v.id), ...records.map(v => v.id)]
+          // 数据集合，翻页存在已选中的数据时,拼接新选中的数据
+          this.selectionRows = [...reserves, ...records]
+        }
+      } else {
+        // 取消全选时,直接将翻页数据赋值，当前页数据不用加上
+        this.selectionRows = reserves
+        this.selectedRowKeys = reserves.map(v => v.id)
+      }
+    },
     // 恢复
     async resetData(row) {
       const { code, msg } = await resetDataStatusByIds([row.id])

src/views/promptManagement/index.vue

@@ -107,7 +107,7 @@ export default {
       // 提示词模板配置
       promptGridOptions: {
         ...mixin.data().gridOptions,
-        height: '200px',
+        height: '440px',
         columns: [
           { type: 'seq', width: '50px' },
           { title: '头节点类型', field: 'startEntityType', width: '150px' },
@@ -178,7 +178,7 @@ export default {
     }
   },
   mounted() {
-    this.tableHeight(490)
+    this.tableHeight(700)
     this.$nextTick(() => {
       const _this = this
       _this.treeHeight = (document.documentElement.clientHeight - 150)

src/views/ruleEngine/indexRule/components/EditRule.vue

@@ -185,6 +185,7 @@ export default {
   methods: {
     // 显示弹窗
     show(data, isEdit) {
+      this.activeStep = 0
       this.isEdit = isEdit
       this.drawerOption.show = true
       this.isChange = false

src/views/ruleEngine/indexRule/components/IndexAtlas.vue

@@ -13,7 +13,7 @@
     <template slot="content">
       <div class="expand-details">
         <p>
-          <span>{{ `指标简称：${showData['indexAbbreviation']}` }}</span>
+          <span>{{ `指标简称：${showData['indexAbbreviation']}||''` }}</span>
           <span style="margin-left: 20px">{{ `必要证据：${showData['necessaryEvidenceContent']}` }}</span>
           <span style="margin-left: 20px">{{ `案件类型：${showData['caseType']}` }}</span>
         </p>

src/views/ruleEngine/indexRule/index.vue

@@ -23,7 +23,7 @@
             <div class="expand-details">
               <p>{{ `指标说明：${row['remark']||''}` }}</p>
               <p>
-                <span>{{ `指标简称：${row['shortName']}` }}</span>
+                <span>{{ `指标简称：${row['shortName']||''}` }}</span>
                 <!--                <span style="margin-left: 20px">{{ `必要证据：${row['necessaryEvidenceContent']}` }}</span>-->
               </p>
               <p>{{ `案件类型：${row['caseTypeName']}` }}</p>

src/views/ruleEngine/modelRule/components/CardTable.vue

@@ -1,14 +1,14 @@
 <template>
   <div>
     <vxe-grid v-bind="gridOptions" style="margin-top: 20px;" auto-resize />
-    <div style="text-align: center">
+    <!-- <div style="text-align: center">
       <cs-page
         :page.sync="queryForm.page"
         :limit.sync="queryForm.size"
         :total="queryForm.total"
         @pagination="fetchData"
       />
-    </div>
+    </div> -->
   </div>
 </template>
 <script>
@@ -45,7 +45,7 @@ export default {
     fetchData() {
       queryIndexData({
         indexType: this.indexType
-      }, this.queryForm.page, this.queryForm.size).then(res => {
+      }, this.queryForm.page, 9999).then(res => {
         this.gridOptions.data = res.data.result
         this.queryForm.total = res.data.total
       })