zhangwenya 8 månader sedan
förälder
incheckning
b6b59ba795

+ 6 - 3
src/views/risk/r2/index.vue

@@ -13,10 +13,13 @@
     <el-table v-loading="loading" :data="modelData" border width="100%">
       <el-table-column prop="riskId" label="风险ID" align="center" width="80"/>
       <el-table-column prop="metricsName" label="指标名称" align="left"/>
-      <el-table-column label="运行业对象" align="left" width="250">
+      <el-table-column label="运行业对象" align="left" width="250">
         <template #default="scope">
-          <span v-for="(item,index) in scope.row.riskObjList" :key="item.objId">
-            {{ item.objName }} <span v-if="index != scope.row.riskObjList.length-1">,</span>
+          <span v-if="scope.row.objType == '1'">全部</span>
+          <span v-else>
+            <span v-for="(item,index) in scope.row.riskObjList" :key="item.objId">
+              {{ item.objName }} <span v-if="index != scope.row.riskObjList.length-1">,</span>
+            </span>
           </span>
         </template>
       </el-table-column>

+ 6 - 1
src/views/risk/r3/components/historyAnalyse.vue

@@ -9,7 +9,12 @@
   <el-table v-loading="loading" :data="analysisList" border width="100%" size="small" style="margin-top:10px">
     <el-table-column label="#" type="index" width="80" align="center"/>
     <el-table-column label="指标名称" prop="metricsName"/>
-    <el-table-column label="运行业务对象" prop="objName"/>
+    <el-table-column label="运行业务对象" prop="objName">
+      <template #default="scope">
+        <span v-if="scope.row.objType == '1'">全部</span>
+        <span v-else>{{scope.row.objName}}</span>
+      </template>
+    </el-table-column>
     <el-table-column label="分析时间" prop="analyseTime"/>
     <el-table-column label="分析结果" prop="result" />
     <el-table-column label="操作" width="100">

+ 9 - 5
src/views/risk/r3/components/hzAnalyse.vue

@@ -14,8 +14,11 @@
     <el-table-column label="指标名称" prop="metricsName"/>
     <el-table-column label="运行业务对象" width="250">
       <template #default="scope">
-        <span v-for="(item,index) in scope.row.riskObjList" :key="item.objId">{{ item.objName }}
-          <span v-if="index != scope.row.riskObjList.length-1">,</span>
+        <span v-if="scope.row.objType == '1'">全部</span>
+        <span v-else>
+          <span v-for="(item,index) in scope.row.riskObjList" :key="item.objId">
+            {{ item.objName }} <span v-if="index != scope.row.riskObjList.length-1">,</span>
+          </span>
         </span>
       </template>
     </el-table-column>
@@ -69,10 +72,11 @@ import {delModel} from "@/api/risk/model"
 import {onMounted} from "vue";
 import addHz from "./addHz.vue"
 import {analysisAtOnce} from "@/api/risk/r2"
+
 const props = defineProps({
-  riskType:{
-    type:String,
-    default:"1"
+  riskType: {
+    type: String,
+    default: "1"
   }
 })
 

+ 3 - 1
src/views/risk/r5/components/chart.vue

@@ -7,6 +7,9 @@ const chartTop = ref(null)
 function initChart(data){
   const myChart = echarts.init(chartTop.value)
   const option = {
+    tooltip: {
+      trigger: 'axis'
+    },
     grid: {
       left: '1%',
       right: '1%',
@@ -49,7 +52,6 @@ function initChart(data){
       {
         data: data.data,
         type: 'line',
-        areaStyle: {}
       }
     ]
   };