Browse Source

feat: 水质报警,生化报警的持续时间临时从菜单取值

sunxiao 1 month ago
parent
commit
250141cb66

+ 2 - 2
.env.development

@@ -1,5 +1,5 @@
 # 请求地址
-# VITE_BASE_URL=http://chat.sequoialibra.com:81/apiServe/
-VITE_BASE_URL=http://192.168.40.21:8080/
+VITE_BASE_URL=http://chat.sequoialibra.com:81/apiServe/
+# VITE_BASE_URL=http://192.168.40.21:8080/
 # 请求前缀
 VITE_BASE_PREFIX='' 

+ 0 - 1
src/utils/format.js

@@ -1,7 +1,6 @@
 import dayjs from "dayjs";
 import { ORDER_OPTION_ENUM } from "./enum";
 
-
 export const formatToData = ({ dataSource, warnKey, isNoUnit, statusVal }) => {
   const reuslt = {
     title: dataSource?.title,

+ 12 - 1
src/views/analyse/PymolView.vue

@@ -37,7 +37,7 @@ const onChangeTabs = warningStatus => {
 }
 
 // 打开详情
-const handleOpenContent = async ({ id, reason:title }) => {
+const handleOpenContent = async ({ id, reason:title, counts }) => {
   const { data } = await waterApi.getWaringDetails(id);
   const showVal = JSON.parse(data.showVal);
   const { basic, jsData, csData } = showVal;
@@ -53,6 +53,17 @@ const handleOpenContent = async ({ id, reason:title }) => {
     statusVal: !!warningActive.value ? '系统关闭' : basic['状态']
   });
 
+  /**
+   * 临时修改 - 后续需要删除
+   * */ 
+   textDataSources.value = {
+    ...textDataSources.value,
+    list: textDataSources.value.list.map(item => {
+      if (item.label === '持续时间') item.value = counts;
+      return item
+    })
+  }
+
   jsTableData.value = [jsData];
   csTableData.value = [csData];
 

+ 15 - 2
src/views/analyse/WaterView.vue

@@ -82,10 +82,11 @@ const resetConfiguration = () => {
 /**
  * 报警详情
 */
-const handleOpenContent = async ({ id, category, reason:title }) => {
-
+const handleOpenContent = async (item) => {
+  const  { id, category, reason:title, counts } = item;
   if ( id == flowParams.warningId ) return;
 
+
   flowParams.category = category;
   flowParams.warningId = id;
   flowParams.feedback = '';
@@ -229,6 +230,18 @@ const handleOpenContent = async ({ id, category, reason:title }) => {
     warnKey: '报警值',
     statusVal: !!warningActive.value ? '系统关闭' : basic['状态']
   });
+
+  /**
+   * 临时修改 - 后续需要删除
+   * */ 
+  textDataSources.value = {
+    ...textDataSources.value,
+    list: textDataSources.value.list.map(item => {
+      if (item.label === '持续时间') item.value = counts;
+      return item
+    })
+  }
+
   jsTableData.value = [jsData];
   csTableData.value = [csData];
 

+ 1 - 1
src/views/data/DataView.vue

@@ -92,7 +92,7 @@ const initEchartData = async() => {
   })
 
   const seriesData = [
-    // { name: "进水流量", data: seriesData1 },
+    { name: "进水流量", data: seriesData1 },
     { name: "#1好氧池硝酸盐", data: seriesData2 },
     { name: "#2好氧池硝酸盐", data: seriesData3 },
     { name: "#1缺氧氨氮", data: seriesData4 },