From 8c030b288e506cbbb4503c255c0c346d4b9cd387 Mon Sep 17 00:00:00 2001
From: xiangcongshuai <xiangcongshuai@supervision.ltd>
Date: Fri, 20 Dec 2024 17:13:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=86=E8=BE=A8=E7=8E=87=E9=97=AE?=
 =?UTF-8?q?=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/config/net.config.js                               |  2 +-
 src/layouts/components/AppMain/index.vue               |  2 +-
 src/views/caseDetails/components/CaseAtlas.vue         |  2 +-
 src/views/caseDetails/components/CaseEvidence.vue      |  3 ++-
 src/views/caseDetails/components/CaseRecord.vue        |  4 ++--
 src/views/caseDetails/components/CommonIndex.vue       |  4 ++--
 src/views/caseDetails/components/IncriminateIndex.vue  |  4 ++--
 src/views/caseDetails/components/InnocentIndex.vue     | 10 +++++-----
 src/views/caseDetails/index.vue                        |  7 ++++---
 src/views/caseManagement/caseRecovery/index.vue        |  2 +-
 src/views/promptManagement/PromptConfig/index.vue      |  2 +-
 src/views/ruleEngine/atomicIndex/index.vue             |  2 +-
 .../ruleEngine/indexRule/components/CustomLogic.vue    |  4 ++++
 src/views/ruleEngine/indexRule/index.vue               |  2 +-
 14 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/config/net.config.js b/src/config/net.config.js
index b717749..bb4a504 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.138:8097/fu-hsi-server'
+      ? 'http://192.168.10.138:9978/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/AppMain/index.vue b/src/layouts/components/AppMain/index.vue
index 2f5f83d..f2de252 100644
--- a/src/layouts/components/AppMain/index.vue
+++ b/src/layouts/components/AppMain/index.vue
@@ -87,7 +87,7 @@ export default {
   .app-main-container {
     height: $base-app-main-height;
     position: relative;
-    overflow: hidden;
+    overflow: auto;
     //padding: 10px;
     margin: 0 2%;
     box-sizing: border-box;
diff --git a/src/views/caseDetails/components/CaseAtlas.vue b/src/views/caseDetails/components/CaseAtlas.vue
index 9ece39f..81d9a9f 100644
--- a/src/views/caseDetails/components/CaseAtlas.vue
+++ b/src/views/caseDetails/components/CaseAtlas.vue
@@ -237,7 +237,7 @@ export default {
     }
   }
   .right {
-    flex: 1;
+    width: calc(100vw - 700px);
     display: flex;
     flex-direction: column;
     background: radial-gradient(circle, rgba(255, 255, 255, 0.05), rgba(66, 135, 255, 0.05));
diff --git a/src/views/caseDetails/components/CaseEvidence.vue b/src/views/caseDetails/components/CaseEvidence.vue
index 679b4a0..1b2c108 100644
--- a/src/views/caseDetails/components/CaseEvidence.vue
+++ b/src/views/caseDetails/components/CaseEvidence.vue
@@ -38,9 +38,10 @@
         <el-input v-model="searchName" class="search" placeholder="搜索名称" style="width: 300px" />
       </div>
       <vxe-grid
+        v-if="gridOptions.data.length > 0"
         ref="entityTable"
         v-bind="gridOptions"
-        style="margin-top: 10px;width: calc(100vw - 618px);"
+        style="margin-top: 10px"
       >
         <template #status="{row}">
           <div v-if="row.processStatus === '2'" class="status">
diff --git a/src/views/caseDetails/components/CaseRecord.vue b/src/views/caseDetails/components/CaseRecord.vue
index 44c30dd..e8f94c3 100644
--- a/src/views/caseDetails/components/CaseRecord.vue
+++ b/src/views/caseDetails/components/CaseRecord.vue
@@ -22,7 +22,7 @@
 
       <el-input v-model="searchName" placeholder="搜索名称" style="width: 300px" />
     </div>
-    <vxe-grid v-bind="gridOptions" style="margin-top: 10px">
+    <vxe-grid v-if="gridOptions.data.length > 0" 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)" /> -->
@@ -120,7 +120,7 @@ export default {
           { title: '最新时间', field: 'updateTime' },
           { title: '操作', slots: { default: 'opera' }, fixed: 'right', width: '200px' }
         ],
-        data: [{ name: '裴金禄', '笔录序号': '1', roleName: '被害人', confessionMaterial: '3', questioner: '1', startTime: '2024/6/26', newDate: '2024/6/26', endTime: '2024/6/26' }]
+        data: []
       }
     }
   },
diff --git a/src/views/caseDetails/components/CommonIndex.vue b/src/views/caseDetails/components/CommonIndex.vue
index 6e785aa..6d60ef6 100644
--- a/src/views/caseDetails/components/CommonIndex.vue
+++ b/src/views/caseDetails/components/CommonIndex.vue
@@ -20,7 +20,7 @@
       <el-option v-for="item in indexSourceList" :key="item.value" :label="item.label" :value="item.value" />
     </el-select>
     <el-input v-model="atomicName" placeholder="原子指标名称" clearable style="width: 200px;margin-left: 16px;" />
-    <vxe-grid v-bind="gridOptions" style="margin-top: 10px">
+    <vxe-grid v-if="gridOptions.data.length > 0" v-bind="gridOptions" style="margin-top: 10px">
       <template #operate="{row}">
         <div class="btn-item">
           <span>{{ row.record }}</span>
@@ -120,7 +120,7 @@ export default {
     isExpand: {
       handler: function(newVal, oldVal) {
         if (newVal !== oldVal) {
-          this.tableHeight(this.isExpand ? 570 : 360)
+          this.tableHeight(this.isExpand ? 590 : 370)
         }
       },
       immediate: true
diff --git a/src/views/caseDetails/components/IncriminateIndex.vue b/src/views/caseDetails/components/IncriminateIndex.vue
index 00cd6e9..2dfb9b6 100644
--- a/src/views/caseDetails/components/IncriminateIndex.vue
+++ b/src/views/caseDetails/components/IncriminateIndex.vue
@@ -20,7 +20,7 @@
       <el-option v-for="item in indexSourceList" :key="item.value" :label="item.label" :value="item.value" />
     </el-select>
     <el-input v-model="atomicName" placeholder="原子指标名称" clearable style="width: 200px;margin-left: 16px;" />
-    <vxe-grid v-bind="gridOptions" style="margin-top: 10px">
+    <vxe-grid v-bind="gridOptions" v-if="gridOptions.data.length > 0" style="margin-top: 10px">
       <template #operate="{row}">
         <div class="btn-item">
           <span>{{ row.record }}</span>
@@ -123,7 +123,7 @@ export default {
     isExpand: {
       handler: function(newVal, oldVal) {
         if (newVal !== oldVal) {
-          this.tableHeight(this.isExpand ? 570 : 360)
+          this.tableHeight(this.isExpand ? 590 : 370)
         }
       },
       immediate: true
diff --git a/src/views/caseDetails/components/InnocentIndex.vue b/src/views/caseDetails/components/InnocentIndex.vue
index 486e8cb..fac85eb 100644
--- a/src/views/caseDetails/components/InnocentIndex.vue
+++ b/src/views/caseDetails/components/InnocentIndex.vue
@@ -20,7 +20,7 @@
       <el-option v-for="item in indexSourceList" :key="item.value" :label="item.label" :value="item.value" />
     </el-select>
     <el-input v-model="atomicName" placeholder="原子指标名称" clearable style="width: 200px;margin-left: 16px;" />
-    <vxe-grid v-bind="gridOptions" style="margin-top: 10px">
+    <vxe-grid v-if="gridOptions.data.length > 0" v-bind="gridOptions" style="margin-top: 10px">
       <template #operate="{row}">
         <div class="btn-item">
           <span>{{ row.record }}</span>
@@ -28,7 +28,7 @@
         </div>
       </template>
       <template #detail="{row}">
-        <span v-if="row.parentIndexName"><a v-if="!row.isRead" style="text-decoration: underline;"  @click="handleDetails(row)">{{ row.indexName }}</a><span style="text-decoration: underline;cursor: pointer;" v-else @click="handleDetails(row)">{{ row.indexName }}</span></span>
+        <span v-if="row.parentIndexName"><a v-if="!row.isRead" style="text-decoration: underline;" @click="handleDetails(row)">{{ row.indexName }}</a><span v-else style="text-decoration: underline;cursor: pointer;" @click="handleDetails(row)">{{ row.indexName }}</span></span>
         <span v-else>{{ row.indexName }}</span>
       </template>
       <template #result="{row}">
@@ -95,8 +95,8 @@ 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',slots: { default: 'detail' }, align: 'left' },
-          { title: '分值', width: '200px', field: 'score' },
+          { title: '指标名称', field: 'indexName', slots: { default: 'detail' }, align: 'left' },
+          { title: '分值', width: '200px', field: 'score' }
           // { title: '数据来源', width: '200px', field: 'indexSource', formatter: ({ cellValue }) => {
           //   return cellValue ? this.indexSourceList.find(item => item.value === cellValue).label : ''
           // } }
@@ -120,7 +120,7 @@ export default {
     isExpand: {
       handler: function(newVal, oldVal) {
         if (newVal !== oldVal) {
-          this.tableHeight(this.isExpand ? 570 : 360)
+          this.tableHeight(this.isExpand ? 580 : 370)
         }
       },
       immediate: true
diff --git a/src/views/caseDetails/index.vue b/src/views/caseDetails/index.vue
index 2ce16f6..b28fa29 100644
--- a/src/views/caseDetails/index.vue
+++ b/src/views/caseDetails/index.vue
@@ -106,7 +106,7 @@
         </div>
       </div>
     </div>
-    <div class="flex-row details-info" :style="{ height: expand ? 'calc(100% - 270px)' : 'calc(100% - 80px)' }">
+    <div class="flex-row details-info" :style="{ height: expand ? 'calc(100% - 300px)' : 'calc(100% - 85px)' }">
       <div class="info-left">
         <el-tree
           v-if="currentKey"
@@ -218,7 +218,6 @@ export default {
     // 是否是编辑
     this.isEdit = this.$route.query.isEdit === '1'
     this.fetchData()
-    
   },
   methods: {
     // 获取当前选中的node
@@ -332,6 +331,7 @@ export default {
     },
     // 模型分析
     handleAnalysis() {
+      if (!this.showFlag) return
       this.showFlag = false
       this.handleConfirmAnalysis()
       let value = 80
@@ -399,6 +399,7 @@ export default {
   height: 100%;
   color: #333333;
   box-sizing: border-box;
+  min-width: 1800px;
   .btn-icon {
     padding: 8px 20px;
 
@@ -627,7 +628,7 @@ export default {
     }
     .info-left {
       min-width: 245px;
-      // overflow-y: auto;
+      overflow-y: auto;
       // overflow-x: hidden;
     }
     .info-right {
diff --git a/src/views/caseManagement/caseRecovery/index.vue b/src/views/caseManagement/caseRecovery/index.vue
index dca61c5..9705028 100644
--- a/src/views/caseManagement/caseRecovery/index.vue
+++ b/src/views/caseManagement/caseRecovery/index.vue
@@ -209,7 +209,7 @@ export default {
       padding: 20px;
       box-sizing: border-box;
       margin-top: 10px;
-      height: calc(100% - 120px);
+      height: calc(100% - 123px);
     }
     .expand-details {
       background: #F6F6F6;
diff --git a/src/views/promptManagement/PromptConfig/index.vue b/src/views/promptManagement/PromptConfig/index.vue
index c3a0d13..e21e8be 100644
--- a/src/views/promptManagement/PromptConfig/index.vue
+++ b/src/views/promptManagement/PromptConfig/index.vue
@@ -128,7 +128,7 @@ export default {
         padding: 20px;
         box-sizing: border-box;
         margin-top: 10px;
-        height: calc(100% - 120px);
+        height: calc(100% - 123px);
       }
       .expand-details {
         background: #F6F6F6;
diff --git a/src/views/ruleEngine/atomicIndex/index.vue b/src/views/ruleEngine/atomicIndex/index.vue
index b0fa1d4..72da271 100644
--- a/src/views/ruleEngine/atomicIndex/index.vue
+++ b/src/views/ruleEngine/atomicIndex/index.vue
@@ -138,7 +138,7 @@ export default {
     padding: 20px;
     box-sizing: border-box;
     margin-top: 10px;
-    height: calc(100% - 120px);
+    height: calc(100% - 123px);
   }
   .expand-details {
     background: #F6F6F6;
diff --git a/src/views/ruleEngine/indexRule/components/CustomLogic.vue b/src/views/ruleEngine/indexRule/components/CustomLogic.vue
index 56e406a..f5a4a35 100644
--- a/src/views/ruleEngine/indexRule/components/CustomLogic.vue
+++ b/src/views/ruleEngine/indexRule/components/CustomLogic.vue
@@ -378,6 +378,10 @@ export default {
       if (val === '3' && subItem.indexSource === '3') {
         this.$set(subItem, 'operator', '>')
       }
+      if (val === '4' && subItem.indexSource === '3') {
+        this.$set(subItem, 'operator', '')
+        this.$set(subItem, 'value', '')
+      }
     },
     // 选择左边属性
     selectPropertyKey(val, items, id) {
diff --git a/src/views/ruleEngine/indexRule/index.vue b/src/views/ruleEngine/indexRule/index.vue
index 29eec69..6e06ff7 100644
--- a/src/views/ruleEngine/indexRule/index.vue
+++ b/src/views/ruleEngine/indexRule/index.vue
@@ -163,7 +163,7 @@ export default {
       padding: 20px;
       box-sizing: border-box;
       margin-top: 10px;
-      height: calc(100% - 120px);
+      height: calc(100% - 123px);
     }
     .expand-details {
       background: #F6F6F6;