feat: 问题修改

src/views/control/MedicinalView.vue

@@ -17,6 +17,7 @@ const isVisibleBtn = ref(true);
 const isVisibleUpdateInfo = ref(false);
 const zuTaiStatus = ref({});
 const minAndMaxValue = ref({});
+const systemStatus = ref({});
 const setting = ref({
   isVisibleBtnOne: true,
   isVisibleBtnTwo: true
@@ -392,17 +393,22 @@ const waringTips = () => {
     }
   }
 
-  if ( isEmpty(addDifferenceOne) && isEmpty(jylpybjz) && isEmpty(minAddAmount) && zuTaiStatus.value.activeOne == 1) {
-    if (addDifferenceOne > minAddAmount && addDifferenceOne > jylpybjz) {
-      result.threeTips.push('北池');
+  if (zuTaiStatus.value.activeOne == 1 && systemStatus.value.activeOne == 1) {
+    if ( isEmpty(addDifferenceOne) && isEmpty(jylpybjz) && isEmpty(minAddAmount) && zuTaiStatus.value.activeOne == 1) {
+      if (addDifferenceOne > minAddAmount && addDifferenceOne > jylpybjz) {
+        result.threeTips.push('北池');
+      }
     }
   }
- 
-  if ( isEmpty(addDifferenceTwo) && isEmpty(jylpybjz) && isEmpty(minAddAmount) && zuTaiStatus.value.activeTwo == 1) {
-    if (addDifferenceTwo > minAddAmount && addDifferenceTwo > jylpybjz) {
-      result.threeTips.push('南池');
+
+  if (zuTaiStatus.value.activeTwo == 1 && systemStatus.value.activeTwo == 1) {
+    if ( isEmpty(addDifferenceTwo) && isEmpty(jylpybjz) && isEmpty(minAddAmount) && zuTaiStatus.value.activeTwo == 1) {
+      if (addDifferenceTwo > minAddAmount && addDifferenceTwo > jylpybjz) {
+        result.threeTips.push('南池');
+      }
     }
   }
+
   
   const r = Object.entries(questionCollect).map(([ key, value ], index) => {
     if ( !value.length ) return;
@@ -556,11 +562,11 @@ onMounted(async () => {
   aloneTimer = setInterval(getRealAloneData, 3 * 1000)
 
   // 获取是否允许投药开关 - 锡林浩特
-  // await controlApi.getSystemStatus().then(({ data }) => {
-  //   // 0不允许  1允许
-  //   // 系统 未投放  系统 投放中
-  //   systemStatus.value = { ...data };
-  // });
+  await controlApi.getSystemStatus().then(({ data }) => {
+    // 0不允许  1允许
+    // 系统 未投放  系统 投放中
+    systemStatus.value = { ...data };
+  });
 })
 
 onUnmounted(() => {

src/views/control/components/TheEchartPanel.vue

@@ -34,8 +34,10 @@ let selectEnum = new Map([
   ['0', '进水流量'],
   ['1',  '北池-好氧池硝酸盐'],
   ['2',  '南池-好氧池硝酸盐'],
-  ['12', '北池-后反馈设定'],
-  ['13', '南池-后反馈设定'],
+  ['22', '北池-后反馈设定'],
+  ['23', '南池-后反馈设定'],
+  ['12', '北池-缺氧硝酸盐'],
+  ['13', '南池-缺氧硝酸盐'],
   ['3',  '北池-缺氧池氨氮'],
   ['4',  '南池-缺氧池氨氮'],
   ['5',  '进水COD-连续检测'],
@@ -44,7 +46,7 @@ let selectEnum = new Map([
   ['8',  '碳源投加量-北池-计算投药量'],
   ['9',  '碳源投加量-南池-计算投药量'],
   ['10', '碳源投加量-北池-反馈流量'],
-  ['11', '碳源投加量-南池-反馈流量']
+  ['11', '碳源投加量-南池-反馈流量'],
 ])
 
 let echartOptions = [
@@ -113,9 +115,9 @@ const handleSelectOptions = (selectOptionList) => {
   if ( activeIndex.value === 0 ) {
     if ( selectOptionList.length <= 1 && selectOptionList.every(item => item > 11) ) {
       const [item] = selectOptionList;
-      if ( (item == 12 || item == 13) || (!item && item != 0) ) {
+      if ( (item == 22 || item == 23) || (!item && item != 0) ) {
         selectOptions.value.forEach(item => {
-          if ( item.value == 12 || item.value == 13 ) {
+          if ( item.value == 22 || item.value == 23 ) {
             item.disabled = true;
           }
         });
@@ -123,7 +125,7 @@ const handleSelectOptions = (selectOptionList) => {
       }
     } else {
       selectOptions.value.forEach(item => {
-        if ( item.value == 12 || item.value == 13 ) {
+        if ( item.value == 22 || item.value == 23 ) {
           item.disabled = false;
         }
       });
@@ -147,7 +149,7 @@ const initWaterEchart = async () => {
   const tempArr = [];
   
   const tempResult = selectValue.value.map(key => {
-    if (key == 12 || key == 13) return null;
+    if (key == 22 || key == 23) return null;
     const data = echartDataSource.value[key] || [];
 
     tempArr.push(data);
@@ -192,7 +194,7 @@ const getWaterEchartOptions = ({ data, xAxis = [] }) => {
       }
   })
 
-  if ( selectValue.value.includes('12') ) {
+  if ( selectValue.value.includes('22') ) {
     const data = xAxis.map(time => [time, props.htfksdOne]);
     series.push({
       name: '北池-后反馈设定',

src/views/xlht/AnalyseView.vue

@@ -151,7 +151,7 @@ onUnmounted(() => {
               </p>
             </li>
             <li class="board-item">
-              <p>当前设备状态</p>
+              <p class="title">设备运行天数</p>
               <p class="content space-x-[6px]">
                 <span class="num-text">
                   <NNumberAnimation :from="0" :to="boardData.days" :duration="1500"></NNumberAnimation>
@@ -160,7 +160,7 @@ onUnmounted(() => {
               </p>
             </li>
             <li class="board-item">
-              <p>累计化验轮次</p>
+              <p class="title">累计化验轮次</p>
               <p class="content space-x-[6px]">
                 <span class="num-text">
                   <NNumberAnimation :from="0" :to="boardData.counts" :duration="1500"></NNumberAnimation>
@@ -169,7 +169,7 @@ onUnmounted(() => {
               </p>
             </li>
             <li class="board-item">
-              <p>累积化验指标数</p>
+              <p class="title">累积化验指标数</p>
               <p class="content space-x-[6px]">
                 <span class="num-text">
                   <NNumberAnimation :from="0" :to="boardData.totals" :duration="1500"></NNumberAnimation>