From 5c150b0d261a8cb2341de409085def1d71233fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Tue, 21 Oct 2025 15:42:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E3=80=81?=
 =?UTF-8?q?=E7=94=B5=E4=BB=B7=E5=88=97=E8=A1=A8=E3=80=81=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E3=80=81=E5=9B=BE=E8=A1=A8=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ems/dzjk/sbjk/PointChart.vue   | 44 +++++++++++++++++++++++-
 src/views/ems/site/powerTariff/index.vue | 10 +++---
 src/views/ems/site/sblb/index.vue        | 17 +++++----
 src/views/login.vue                      |  3 +-
 src/views/register.vue                   |  3 +-
 5 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/src/views/ems/dzjk/sbjk/PointChart.vue b/src/views/ems/dzjk/sbjk/PointChart.vue
index 383565b..9ed023c 100644
--- a/src/views/ems/dzjk/sbjk/PointChart.vue
+++ b/src/views/ems/dzjk/sbjk/PointChart.vue
@@ -174,6 +174,48 @@ export default {
                   : `${inner.deviceId}`
               }`,
               type: "line",
+              markPoint: {
+                symbolSize: 30,
+                emphasis: {
+                  disabled:false//打开 鼠标高亮
+                },
+                data: [//最大值、最小值
+                  {
+                    // type: 'max',
+                    name: `最大值`,
+                    coord:[inner.maxDate,inner.maxValue],
+                    relativeTo:'coordinate',
+                    label: {
+                      position: "top",
+                      formatter: item.dataType === 2 ? ([
+                        `最大值:${inner.maxValue}`,
+                        // `平均值:${inner.avgValue}`,
+                        `差值:${inner.diffValue}`,
+                      ]).join('\n') : ([
+                        `最大值:${inner.maxValue}`,
+                        // `平均值:${inner.avgValue}`,
+                      ]).join('\n'),
+                    },
+                  },
+                  {
+                    // type: 'min',
+                    name: `最小值`,
+                    coord:[inner.minDate,inner.minValue],
+                    relativeTo:'coordinate',
+                    label: {
+                      position: "top",
+                      formatter: item.dataType === 2 ? ([
+                        `最小值:${inner.minValue}`,
+                        // `平均值:${inner.avgValue}`,
+                        `差值:${inner.diffValue}`,
+                      ]).join('\n') : ([
+                        `最小值:${inner.minValue}`,
+                        // `平均值:${inner.avgValue}`,
+                      ]).join('\n'),
+                    }
+                  }
+                ]
+              },
               xdata: [],
               data: [],
             });
@@ -200,7 +242,7 @@ export default {
           trigger: "axis",
           axisPointer: {
             // 坐标轴指示器，坐标轴触发有效
-            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+            type: "cross", // 默认为直线，可选为：'line' | 'shadow'
           },
         },
         textStyle: {
diff --git a/src/views/ems/site/powerTariff/index.vue b/src/views/ems/site/powerTariff/index.vue
index 89710d2..609c21e 100644
--- a/src/views/ems/site/powerTariff/index.vue
+++ b/src/views/ems/site/powerTariff/index.vue
@@ -105,8 +105,9 @@ export default {
     //获取站点列表
     getZdList(){
       this.searchLoading=true
-      getAllSites().then(response => {
+      return getAllSites().then(response => {
         this.siteList = response?.data || []
+       if( this.siteList.length>0 ) this.siteId = this.siteList[0].siteId
       }).finally(() => {this.searchLoading=false})
     },
     changeDefaultYear(){
@@ -114,7 +115,6 @@ export default {
     },
     getData(reset=false){
       reset && this.resetTableData()
-      console.log('湖区====',reset,this.tableData.length,this.tableTotal,this.pageNum);
       if(!reset && this.tableData.length>=this.tableTotal) return
       this.loading=true;
       const date = new Date(this.defaultYear).getFullYear()
@@ -163,8 +163,10 @@ export default {
   },
   mounted() {
     this.defaultYear = new Date()
-    this.getZdList()
-    this.getData(true)
+    this.loading=true
+    this.getZdList().then(()=>{
+      this.getData(true)
+    })
   }
 }
 </script>
diff --git a/src/views/ems/site/sblb/index.vue b/src/views/ems/site/sblb/index.vue
index e0f25a9..284e1da 100644
--- a/src/views/ems/site/sblb/index.vue
+++ b/src/views/ems/site/sblb/index.vue
@@ -37,12 +37,12 @@
         label="设备名称">
       </el-table-column>
       <el-table-column
-        prop="deviceType"
-        label="设备类型">
+        prop="categoryName"
+        label="设备类别">
       </el-table-column>
       <el-table-column
         prop="communicationStatus"
-        label="通信状态">
+        label="在线状态">
         <template slot-scope="scope">
           <span>{{$store.state.ems.communicationStatusOptions[scope.row.communicationStatus]}}</span>
         </template>
@@ -251,14 +251,19 @@ export default {
     //获取站点列表
     getZdList(){
       this.searchLoading=true
-      getAllSites().then(response => {
+      return getAllSites().then(response => {
         this.siteList = response?.data || []
+        if(this.siteList.length>0) this.siteId = this.siteList[0].siteId
       }).finally(() => {this.searchLoading=false})
     }
   },
   mounted() {
-    this.onReset()
-    this.getZdList()
+    this.loading=true
+    this.siteId=''
+    this.pageNum =1//每次搜索从1开始搜索
+    this.getZdList().then(()=>{
+      this.getData()
+    })
   }
 }
 </script>
diff --git a/src/views/login.vue b/src/views/login.vue
index 6f65055..e3d79fe 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -85,7 +85,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2025 上海电动工具研究所（集团）有限公司.</span>
+      <span>Copyright © 2025 上动新能源 版权所有</span>
     </div>
   </div>
 </template>
@@ -265,6 +265,7 @@ export default {
   }
 }
 .el-login-footer {
+  z-index:2;
   height: 40px;
   line-height: 40px;
   position: fixed;
diff --git a/src/views/register.vue b/src/views/register.vue
index 8e0d3a1..f96446c 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -95,7 +95,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-register-footer">
-      <span>Copyright © 2018-2025 上海电动工具研究所（集团）有限公司.</span>
+      <span>Copyright © 2025 上动新能源 版权所有</span>
     </div>
   </div>
 </template>
@@ -276,6 +276,7 @@ export default {
   }
 }
 .el-register-footer {
+  z-index:2;
   height: 40px;
   line-height: 40px;
   position: fixed;