1

src/views/ems/index.vue

@@ -190,29 +190,36 @@
             </div>
           </div>
 
-          <!-- 中间：用能预警分析 -->
+          <!-- 中间：区域用能对比 -->
           <div class="panel panel_center_warning">
             <div class="panel_header">
               <img src="@/assets/home/icon.png" alt="" />
-              <span>用能预警分析</span>
+              <span>区域用能对比</span>
             </div>
-            <div class="panel_content warning_content">
-              <div class="warning_main">
-                <dv-scroll-board
-                  :config="alertConfig"
-                  style="width: 100%; height: 100%"
-                />
-              </div>
-              <div class="warning_stats">
-                <div
-                  class="stat_item"
-                  v-for="(item, index) in warningStats"
-                  :key="index"
+            <div class="panel_content">
+              <div class="chart_tabs">
+                <span
+                  :class="['tab_item', active === '1' ? 'active' : '']"
+                  @click="switchAreaBar('1', 'active', 'regionBarChart')"
+                  >水</span
+                >
+                <span
+                  :class="['tab_item', active === '2' ? 'active' : '']"
+                  @click="switchAreaBar('2', 'active', 'regionBarChart')"
+                  >电</span
+                >
+                <span
+                  :class="['tab_item', active === '4' ? 'active' : '']"
+                  @click="switchAreaBar('4', 'active', 'regionBarChart')"
+                  >煤</span
                 >
-                  <div class="stat_value">{{ item.value }}</div>
-                  <div class="stat_label">{{ item.label }}</div>
-                </div>
               </div>
+              <v-chart
+                ref="areaBarRef"
+                style="height: 100%"
+                :option="areaBarOption"
+                @click="onBarClick"
+              />
             </div>
           </div>
 
@@ -252,7 +259,7 @@
 
         <!-- 第三行 -->
         <div class="row row_3">
-          <!-- 左侧：区域用能对比 -->
+          <!-- 左侧：用能预警分析 -->
           <div class="panel panel_half">
             <div class="panel_header">
               <img
@@ -260,33 +267,25 @@
                 alt=""
                 style="width: 25px; height: 25px"
               />
-              <span>区域用能对比</span>
+              <span>用能预警分析</span>
             </div>
-            <div class="panel_content">
-              <div class="chart_tabs">
-                <span
-                  :class="['tab_item', active === '1' ? 'active' : '']"
-                  @click="switchAreaBar('1', 'active', 'regionBarChart')"
-                  >水</span
-                >
-                <span
-                  :class="['tab_item', active === '2' ? 'active' : '']"
-                  @click="switchAreaBar('2', 'active', 'regionBarChart')"
-                  >电</span
-                >
-
-                <span
-                  :class="['tab_item', active === '4' ? 'active' : '']"
-                  @click="switchAreaBar('4', 'active', 'regionBarChart')"
-                  >煤</span
+            <div class="panel_content warning_content">
+              <div class="warning_main">
+                <dv-scroll-board
+                  :config="alertConfig"
+                  style="width: 100%; height: 100%"
+                />
+              </div>
+              <div class="warning_stats">
+                <div
+                  class="stat_item"
+                  v-for="(item, index) in warningStats"
+                  :key="index"
                 >
+                  <div class="stat_value">{{ item.value }}</div>
+                  <div class="stat_label">{{ item.label }}</div>
+                </div>
               </div>
-              <v-chart
-                ref="areaBarRef"
-                style="height: 100%"
-                :option="areaBarOption"
-                @click="onBarClick"
-              />
             </div>
           </div>
 
@@ -1177,27 +1176,27 @@
           statisticsCycle: this.statisticsCycle
         }).then((res) => {
           console.log(res, 'res');
-          // 专业配色方案 - 科技风渐变
+          // 专业配色方案 - 高对比度
           const electricityColors = [
             '#00d4ff',
-            '#00a8ff',
-            '#0099ff',
-            '#0077ff',
-            '#0055ff'
+            '#ff6b6b',
+            '#ffd93d',
+            '#6bcb77',
+            '#9b59b6'
           ];
           const waterColors = [
             '#00f5a0',
-            '#00d4aa',
-            '#00b894',
-            '#009e7d',
-            '#008b6b'
+            '#ff6b6b',
+            '#ffd93d',
+            '#4d96ff',
+            '#ff9f43'
           ];
           const coalColors = [
             '#ff9f43',
-            '#ff8c42',
-            '#ff7b38',
-            '#ff6b35',
-            '#ff5722'
+            '#ff6b6b',
+            '#ffd93d',
+            '#6bcb77',
+            '#00d4ff'
           ];
 
           this.areaCompareOption = {
@@ -1322,7 +1321,7 @@
             },
             {
               label: '今日用煤量(T)',
-              value: res.todaycoalUsage,
+              value: res.todayCoalUsage,
               chartOption: {}
             },
             {