feat: 需求变更

src/views/control/MedicinalView.vue

@@ -247,8 +247,7 @@ const handleMedicateAmount = () => {
   const [r1, r2] = getTotalNum();
   
   if ( type == 0 ) {
-    // && dataSourceParams.value.medicineAmountOne != updateNum1
-    if ( !dataSourceParams.value.typeOne ) {
+    if ( !dataSourceParams.value.typeOne && dataSourceParams.value.medicineAmountOne != updateNum1 ) {
       const medicineAmountOne = dataSourceParams.value.medicineAmountOne
       if ( medicineAmountOne && medicineAmountOne != 0 ) {
         resultNumberSet.value.updateNum1 = dataSourceParams.value.medicineAmountOne;
@@ -258,9 +257,7 @@ const handleMedicateAmount = () => {
         resultNumberSet.value.updateNum1 = dataSourceParams.value.medicineAmountOne;
         // isVisibleUpdateInfo.value = true;
       }
-
-      // if (r1 != updateNum1 && dataSourceParams.value.typeOne)
-    } else {
+    } else if (r1 != updateNum1 && dataSourceParams.value.typeOne) {
       resultNumberSet.value.updateNum1 = r1;
       isVisibleUpdateInfo.value = true;
       dataSourceParams.value.tdbOne = tdb;
@@ -269,8 +266,7 @@ const handleMedicateAmount = () => {
   }
 
   if ( type == 1 ) {
-    // && dataSourceParams.value.medicineAmountTwo != updateNum2
-    if (!dataSourceParams.value.typeTwo) {
+    if (!dataSourceParams.value.typeTwo && dataSourceParams.value.medicineAmountTwo != updateNum2) {
       const medicineAmountTwo = dataSourceParams.value.medicineAmountTwo;
       if (medicineAmountTwo && medicineAmountTwo != 0 ) {
         resultNumberSet.value.updateNum2 = dataSourceParams.value.medicineAmountTwo;
@@ -280,8 +276,7 @@ const handleMedicateAmount = () => {
         resultNumberSet.value.updateNum2 = dataSourceParams.value.medicineAmountTwo;
         // isVisibleUpdateInfo.value = true;
       }
-      // if (r2 != updateNum2 && dataSourceParams.value.typeTwo)
-    } else  {
+    } else if (r2 != updateNum2 && dataSourceParams.value.typeTwo) {
       resultNumberSet.value.updateNum2 = r2;
       isVisibleUpdateInfo.value = true;
       dataSourceParams.value.tdbTwo = tdb;

src/views/control/components/TheResultPanel.vue

@@ -30,10 +30,10 @@ const emitUpdate = async () => {
         <ul class="update-message space-x-[16px]" v-show="isVisibleBtn">
           <li class="flex space-x-[4px]">
             <SvgIcon name="control-icon-warning" size="16"></SvgIcon>
-            <span>有新投放方案，北池加药量计算为：{{ nums.updateNum1 || 0 }}L/h， 南池加药量计算为：{{ nums.updateNum2 || 0}}L/h，是否更新？</span>
+            <span>有新投放方案，北池加药量计算：{{ nums.updateNum1 || 0 }}L/h， 南池加药量计算：{{ nums.updateNum2 || 0}}L/h，是否更新？</span>
           </li>
           <li class="space-x-[10px]">
-            <span class="text-[#ed742f] cursor-pointer" @click="emitUpdate">更新投放量</span>
+            <span class="text-[#ed742f] cursor-pointer" @click="emitUpdate">更新投放</span>
             <span class="text-[#88909b] cursor-pointer" @click="isVisibleBtn = false">取消</span>
           </li>
         </ul>
@@ -67,7 +67,7 @@ const emitUpdate = async () => {
                 <div class="circle3" v-show="modelSystemStatus.activeOne === 1"></div>
                 <div class="inner space-y-[4px]">
                   <SvgIcon name="control-icon-result-btn" size="14" />
-                  <span>{{ modelSystemStatus.activeOne === 1 ? "投放中" : "未开启" }}</span>
+                  <span>{{ modelSystemStatus.activeOne === 1 ? "系统投放" : "组态投放" }}</span>
                 </div>
               </div>
             </div>
@@ -99,7 +99,7 @@ const emitUpdate = async () => {
                 <div class="circle3" v-show="modelSystemStatus.activeTwo === 1"></div>
                 <div class="inner space-y-[4px]">
                   <SvgIcon name="control-icon-result-btn" size="14" />
-                  <span>{{ modelSystemStatus.activeTwo === 1 ? "投放中" : "未开启" }}</span>
+                  <span>{{ modelSystemStatus.activeTwo === 1 ? "系统投放" : "组态投放" }}</span>
                 </div>
               </div>
             </div>
@@ -221,8 +221,8 @@ const emitUpdate = async () => {
   .round-btn {
     position: relative;
     @include flex(x, center, center);
-    width: 60px;
-    height: 60px;
+    width: 70px;
+    height: 70px;
     border: 2px solid #E6EFFE;
     border-radius: 50%;
     background: #898EFE;
@@ -236,8 +236,8 @@ const emitUpdate = async () => {
       position: relative;
       @include flex(x, center, center);
       flex-flow: column;
-      width: 48px;
-      height: 48px;
+      width: 58px;
+      height: 58px;
       border-radius: 100%;
       background: #2454FF;
       transition: all 0.3s;
@@ -253,8 +253,8 @@ const emitUpdate = async () => {
   .circle2,
   .circle3 {
     position: absolute;
-    width: 30px;
-    height: 30px;
+    width: 40px;
+    height: 40px;
     background: rgba(137, 142, 254, 1);
     border: 1px solid rgba(137, 142, 254, 0.85);
     border-radius: 999px;

src/views/xlht/AnalyseView.vue

@@ -96,12 +96,12 @@ const initEchartData = async () => {
   const seriesData = [
     { name: "进水总氮", data: seriesData1 },
     { name: "进水COD", data: seriesData2 },
-    { name: "1#好氧硝酸盐", data: seriesData3 },
-    { name: "2#好氧硝酸盐", data: seriesData4 },
-    { name: "1#缺氧氨氮", data: seriesData5 },
-    { name: "2#缺氧氨氮", data: seriesData6 },
-    { name: "1#缺氧硝酸盐", data: seriesData7 },
-    { name: "2#缺氧硝酸盐", data: seriesData8 },
+    { name: "北池好氧硝酸盐", data: seriesData3 },
+    { name: "南池好氧硝酸盐", data: seriesData4 },
+    { name: "北池缺氧氨氮", data: seriesData5 },
+    { name: "南池缺氧氨氮", data: seriesData6 },
+    { name: "北池缺氧硝酸盐", data: seriesData7 },
+    { name: "南池缺氧硝酸盐", data: seriesData8 },
   ]
 
   const option = getEchartLineOptions({ xAxisData, seriesData: seriesData });

src/views/xlht/config.js

@@ -20,37 +20,37 @@ export const columns = [
     render: ({ scJsCod }) => formatTofixed(scJsCod)
   },
   {
-    title: "1#好氧硝酸盐",
+    title: "北池好氧硝酸盐",
     key: "jqr1HyXiaodan",
     width: 120,
     render: ({ scJsZll }) => formatTofixed(scJsZll)
   },
   {
-    title: "2#好氧硝酸盐",
+    title: "南池好氧硝酸盐",
     key: "jqr2HyXiaodan",
     width: 120,
     render: ({ jqr2HyXiaodan }) => formatTofixed(jqr2HyXiaodan)
   },
   {
-    title: "1#缺氧氨氮",
+    title: "北池缺氧氨氮",
     key: "jqr1QyAndan",
     width: 120,
     render: ({ jqr1QyAndan }) => formatTofixed(jqr1QyAndan)
   },
   {
-    title: "2#缺氧氨氮",
+    title: "南池缺氧氨氮",
     key: "jqr2QyAndan",
     width: 120,
     render: ({ jqr2QyAndan }) => formatTofixed(jqr2QyAndan)
   },
   {
-    title: "1#缺氧硝酸盐",
+    title: "北池缺氧硝酸盐",
     key: "jqr1QyXiaodan",
     width: 120,
     render: ({ jqr1QyXiaodan }) => formatTofixed(jqr1QyXiaodan)
   },
   {
-    title: "2#缺氧硝酸盐",
+    title: "南池缺氧硝酸盐",
     key: "jqr2QyXiaodan",
     width: 120,
     render: ({ jqr2QyXiaodan }) => formatTofixed(jqr2QyXiaodan)
@@ -116,7 +116,7 @@ export const getEchartLineOptions = ({ xAxisData, seriesData }) => {
     legend: [
       {
         show: !!xAxisData.length,
-        data: ["进水总氮", "1#好氧硝酸盐", "1#缺氧氨氮", "1#缺氧硝酸盐"],
+        data: ["进水总氮", "北池好氧硝酸盐", "北池缺氧氨氮", "北池缺氧硝酸盐"],
         top: 10,
         left: 10,
         icon: "rect",
@@ -128,7 +128,7 @@ export const getEchartLineOptions = ({ xAxisData, seriesData }) => {
       },
       {
         show: !!xAxisData.length,
-        data: ["进水COD", "2#好氧硝酸盐", "2#缺氧氨氮", "2#缺氧硝酸盐"],
+        data: ["进水COD", "南池好氧硝酸盐", "南池缺氧氨氮", "南池缺氧硝酸盐"],
         top: 35,
         left: 10,
         icon: "rect",