feat: 碳源投加 - 锡林浩特联调

src/api/control.js

@@ -19,7 +19,7 @@ export const controlApi = {
   /**
    * 碳源投加 配置记录
    */
-  getEchartList: params => http.get(`/business/medicineParamSetting/getList`, { params }),
+  getBoardEchartList: params => http.get(`/business/medicineParamSetting/getList`, { params }),
   
   /**
    * 碳源投加 配置记录

src/views/control/MedicinalView.vue

@@ -67,11 +67,6 @@ const northColumnData = ref([
   { label: '碳氮比', key: 'tdbTwo', value: null }
 ]);
 
-const tabKeyEnum = {
-  0: 'south',
-  1: 'north'
-}
-
 // water实时数据
 const waterConfigParams = ref({});
 
@@ -87,9 +82,6 @@ const baseSourceParams = ref({
   type: 0
 })
 
-// 当前Tab选中的key
-const tabActiveKey = computed(() => tabKeyEnum[baseSourceParams.value.type]);
-
 // 计算碳氮比
 const tdbNum = computed(() => {
   const type = dataSourceParams.value.type;
@@ -243,7 +235,7 @@ const handleMedicateAmount = () => {
   const tdb = tdbNum.value;
 
   const [r1, r2] = getTotalNum();
-
+  
   if ( type == 0 ) {
     if ( !dataSourceParams.value.typeOne && dataSourceParams.value.medicineAmountOne != updateNum1) {
       resultNumberSet.value.updateNum1 = dataSourceParams.value.medicineAmountOne;
@@ -314,8 +306,8 @@ onMounted(async () => {
       jsLlTypeTwo, jsLlTwo, jsCodTypeTwo, jsCodTwo, hycXsyTypeTwo, hycXsyTwo, qycYxyTypeTwo, qycYxyTwo, qycAdTypeTwo, qycAdTwo, jsTnTypeTwo, jsTnTwo,
       htfksdTwo, jzxsTwo, xzxsTwo, kzxsTwo, slfpxsTwo, tydlTwo, zhxsTwo, sxpsTwo, yymdTwo, zxqdllTwo, tdbTwo,
 
-      medicineAmountOne,
-      medicineAmountTwo
+      medicineAmountOne: typeOne === 0 ? 0 : medicineAmountOne,
+      medicineAmountTwo: typeTwo === 0 ? 0 : medicineAmountTwo,
     };
   })
  

src/views/control/components/BaseInput.vue

@@ -41,6 +41,7 @@ const props = defineProps({
   }
 })
 
+let currentVal = '';
 const isFocusStatus = ref(false);
 
 const emit = defineEmits(['click:confirm', 'on-input', 'on-blur', 'click:cancel']);
@@ -59,13 +60,16 @@ const onFocus = () => {
   isFocusStatus.value = true;
 }
 
-const onBlur = (ev) => {
-  isFocusStatus.value = false;
-  emit('on-blur');
+const onBlur = (e) => {
+  if ( currentVal !== '' ) {
+    isFocusStatus.value = false;
+    emit('on-blur');
+  }
 }
 
 const onInput = (value) => {
   emit('on-input', value);
+  currentVal = value
   modelValue.value = value;
 }
 
@@ -88,7 +92,7 @@ const handleInpValue = (event, type) => {
       round
       style="width: 100%;"
       :readonly="readonly"
-      :precision="2"
+      :precision="3"
       :max="99999.99"
       :min="0"
       :placeholder="placeholder"

src/views/control/components/TheEchartPanel.vue

@@ -221,7 +221,7 @@ const initWaterEchartData = async () => {
 // 系数相关数据
 const intiCoefficientEchartData = async () => {
   const [timeBegin, timeEnd] = datePickerValue.value || [];
-  const { data } = await controlApi.getEchartList({ timeBegin, timeEnd });
+  const { data } = await controlApi.getBoardEchartList({ timeBegin, timeEnd });
   coefficientDataSource.value = data;
   
   const d = data.map(item => ({

src/views/xlht/AnalyseView.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { ref, onMounted, onUnmounted, computed } from 'vue';
-import { NScrollbar, useMessage, NDatePicker, NTabs, NTab, NDataTable, NPagination, NNumberAnimation } from 'naive-ui';
+import { NScrollbar,  NDatePicker,NDataTable, NPagination, NNumberAnimation } from 'naive-ui';
 import * as echarts from 'echarts';
 import { controlApi } from "@/api/control";
 import { columns, getEchartLineOptions } from './config';
@@ -105,7 +105,6 @@ const initEchartData = async () => {
   ]
 
   const option = getEchartLineOptions({ xAxisData, seriesData: seriesData });
-  // data.length ? seriesData : [] 
   echart.setOption(option);
 }
 
@@ -118,8 +117,8 @@ const windowResize = () => echart.resize();
 
 onMounted(async () => {
 
-  controlApi.getCountInfo().then(res => {
-    boardData.value = res;
+  controlApi.getCountInfo().then(({ data }) => {
+    boardData.value = data;
   });
   
   echart = echarts.init(echartRef.value, 'light');
@@ -147,7 +146,8 @@ onUnmounted(() => {
             <li class="board-item">
               <p class="title">当前设备状态</p>
               <p class="content">
-                <span class="blue-text">{{ boardData.status }}化验中</span>
+                
+                <span class="blue-text">{{ boardData.status === 0 ? '未化验' : '化验中' }}</span>
               </p>
             </li>
             <li class="board-item">

src/views/xlht/config.js

@@ -45,30 +45,9 @@ export const columns = [
     key: "jqr2QyXiaodan",
     width: 120,
   },
-  // {
-  //   title: "1#二沉池出水正磷酸盐",
-  //   key: "length",
-  //   width: 160,
-  // },
-  // {
-  //   title: "2#二沉池出水正磷酸盐",
-  //   key: "length",
-  //   width: 160,
-  // },
-  // {
-  //   title: "1#好氧末端正磷酸盐",
-  //   key: "length",
-  //   width: 160,
-  // },
-  // {
-  //   title: "2#好氧末端正磷酸盐",
-  //   key: "length",
-  //   width: 160,
-  // },
 ];
 
 export const getEchartLineOptions = ({ xAxisData, seriesData }) => {
-  console.log( { xAxisData, seriesData } );
   const colorList = [
     "#FF6737",
     "#00AB84",
@@ -93,6 +72,11 @@ export const getEchartLineOptions = ({ xAxisData, seriesData }) => {
         opacity: 0.8,
         color: colorList[index],
       },
+      // tooltip: {
+      //   valueFormatter: function (value) {
+      //     return value;
+      //   },
+      // },
       data: item.data,
     };
   });
@@ -193,37 +177,7 @@ export const getEchartLineOptions = ({ xAxisData, seriesData }) => {
         },
       },
     ],
-    series,
-    // [
-    //   {
-    //     name: "1#进水COD",
-    //     type: "line",
-    //     smooth: true,
-    //     showSymbol: false,
-    //     itemStyle: {
-    //       opacity: 0.8,
-    //       color: "red", // 将来遍历的时候，这里设置color
-    //     },
-    //     data: [30, 50, 80, 40, 64, 28, 100],
-    //   },
-    //   {
-    //     name: "2#好氧硝酸盐",
-    //     type: "line",
-    //     smooth: true,
-    //     showSymbol: false,
-    //     yAxisIndex: 0,
-    //     itemStyle: {
-    //       opacity: 0.8,
-    //       color: "#E6AF08",
-    //     },
-    // tooltip: {
-    //   valueFormatter: function (value) {
-    //     return value;
-    //   },
-    // },
-    //     data: [120, 230, 430, 200, 80, 150, 340],
-    //   },
-    // ],
+    series
   };
   return option;
 };