Merge branch '2025-04-23/fetaure-CarbonSourceFeeding'

src/views/control/EchartLeft.vue

@@ -118,7 +118,7 @@ const getEchartOptions = (list) => {
     },
     grid: {
       top: '35px',
-      bottom: '30px',
+      bottom: '22px',
       left: '8%',
       right: '5%',
       // containLabel: true  // 这个啥？看下面
@@ -176,7 +176,6 @@ const getEchartOptions = (list) => {
   return option;
 }
 
-
 // 下拉框选择事件
 const handleSelectOptions = (selectedList) => {
   selectValue.value = selectedList;
@@ -251,9 +250,9 @@ onUnmounted(() => {
   <div class="echart-container">
     <div class="header">
       <BaseTitle title="指标趋势" type="2" class="flex-shrink-0"></BaseTitle>
-      <div class="flex items-center space-x-[4px]">
+      <div class="flex items-center space-x-[4px] pl-[30px]">
         <NDatePicker
-          class="w-[250px]"
+          style="width: 250px;"
           clearable
           size="small"
           type="daterange"
@@ -265,16 +264,18 @@ onUnmounted(() => {
           v-model:formatted-value="datePickerValue"
           :theme-overrides="datePickerThemeOverrides"
         ></NDatePicker>
-        <NSelect
-          class="w-[220px]"
-          multiple
-          :options="selectOptions"
-          :value="selectValue"
-          :on-update:value="handleSelectOptions"
-          :theme-overrides="selectThemeOverrides"
-          size="small"
-          max-tag-count="responsive"
-        />
+        <div style="max-width: 240px;">
+          <NSelect
+            class="w-full"
+            multiple
+            :options="selectOptions"
+            :value="selectValue"
+            :on-update:value="handleSelectOptions"
+            :theme-overrides="selectThemeOverrides"
+            size="small"
+            max-tag-count="responsive"
+          />
+        </div>
       </div>
     </div>
     <div class="content">

src/views/control/EchartRight.vue

@@ -22,8 +22,7 @@ const datePickerThemeOverrides = {
 }
 
 const getEchartOptions = (list) => {
-  console.log("list", list);
-  const colors = ['#43FF1E', '#249AFF']
+  const colors = ['#43FF1E', '#249AFF'];
 
   const series = list.map(({ name, data }, i) => {
     const d1 = data.map(({ time, value }) => {
@@ -73,7 +72,7 @@ const getEchartOptions = (list) => {
     },
     grid: {
       top: '35px',
-      bottom: '30px',
+      bottom: '22px',
       left: '8%',
       right: '5%',
       // containLabel: true 
@@ -164,7 +163,7 @@ const initEchartData = async() => {
         const val = item[key];
         return {
           time: item.addHour,
-          value: val ? val.toFixed(2) : 0
+          value: val ? val.toFixed(4) : 0
         }
       })
       return {

src/views/control/MedicinalView.vue

@@ -180,6 +180,7 @@ const getWarningInfo = async () => {
       content.push('• 好氧池硝酸盐超管控值')
     }
     if (content.length) {
+      
       warningCollectList.value.push({
         title: '反硝化异常报警',
         content,
@@ -188,6 +189,8 @@ const getWarningInfo = async () => {
     }
   }
 
+ 
+
   if (isEmpty(qycYxy) && isEmpty(qycAd) && isEmpty(hycXsy) && isEmpty(xhycbjz)) {
     if ((qycYxy + qycAd - hycXsy) > xhycbjz) {
       warningCollectList.value.push({
@@ -380,10 +383,13 @@ onUnmounted(() => {
 
 <style lang="scss" scoped>
 .control-container {
+  display: flex;
+  flex-flow: column;
   height: 100%;
   .arg-section {
     @include flex(x, start, start);
-    height: 57%;
+    height: 60%;
+    min-height: 400px;
     padding: 16px 14px;
     border: 1px solid #fff;
     border-radius: 10px;
@@ -524,7 +530,8 @@ onUnmounted(() => {
 
   .echart-section {
     @include flex(x, start, start);
-    height: 43%;
+    flex: 1;
+    // height: 43%;
     padding-top: 16px;
   }