Browse Source

华电部署最后一版

liujiejie 2 tuần trước cách đây
mục cha
commit
d613bba264

+ 2 - 2
src/components/map/index.vue

@@ -259,9 +259,9 @@ export default {
           source: new XYZ({
             // url: "http://106.120.102.238:18000/tiles/{z}/{x}/{y}.png", //外网
             // url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
-            url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
+            // url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
             // url: "http://10.96.137.5:9080/tiles/{z}/{x}/{y}.png", //大~#@唐
-            // url: "http://192.168.0.1/tiles/{z}/{x}/{y}.png", //华电
+            url: "http://192.168.0.1/tiles/{z}/{x}/{y}.png", //华电
             // url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //中广核
           }),
         }),

+ 2 - 2
src/router/index.js

@@ -28,8 +28,8 @@ const createRouter = () =>
             iconName: "gps",
             component: () =>
               import(
-                /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/Index.vue"
-                // /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/HD.vue" //华电选择这个
+                // /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/Index.vue"
+                /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/HD.vue" //华电选择这个
               ),
           },
           {

+ 3 - 3
src/store/themes.js

@@ -3,7 +3,7 @@ import { theme } from "tailwindcss/stubs/defaultConfig.stub";
 /*
  * @Author: your name
  * @Date: 2024-05-27 15:09:27
- * @LastEditTime: 2025-07-04 17:17:59
+ * @LastEditTime: 2025-07-07 10:49:54
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/store/themes.js
@@ -12,8 +12,8 @@ import { colorSchemes } from "@/views/overview/js/colors";
 export default {
   namespaced: true,
   state: {
-    theme: localStorage.getItem("theme") || "green",
-    // theme: localStorage.getItem("theme") || "blue", //华电默认主题色
+    // theme: localStorage.getItem("theme") || "green",
+    theme: localStorage.getItem("theme") || "blue", //华电默认主题色
     themeColor: [...colorSchemes[0].colors],
   },
   mutations: {

+ 16 - 8
src/views/health/vibration.vue

@@ -14,10 +14,10 @@
           <img src="@/assets/analyse/01.png" alt="" />
           <p>包络谱图</p>
         </div>
-        <div @click="tendency" class="picture">
+        <!-- <div @click="tendency" class="picture">
           <img src="@/assets/analyse/02.png" alt="" />
           <p>趋势图</p>
-        </div>
+        </div> -->
       </div>
       <div class="headright">
         <img src="@/assets/analyse/07.png" alt="全部缩小" @click="suoxiao" />
@@ -403,11 +403,10 @@ export default {
       return point ? point?.detectionPointCn : null; // 如果没有找到对应项,返回 null
     },
 
-     NewgetDetectionPointCn(key) {
-      return this.pointNameMap[key] || key
+    NewgetDetectionPointCn(key) {
+      return this.pointNameMap[key] || key;
     },
-  
-  
+
     getCompanyLabel(companyCode) {
       const selectedOption = this.parentOpt?.find(
         (option) => option.codeNumber === companyCode
@@ -763,10 +762,19 @@ export default {
       axios
         .post("/AnalysisMulti/analysis/trend", params)
         .then((res) => {
-          this.qsList = JSON.parse(res.data);
+          let jsonStr = res.data;
+          // ① 仅字符串才处理
+          if (typeof jsonStr === "string") {
+            // ② 将 "NaN" 或裸 NaN 替换为 null(更安全的方式)
+            jsonStr = jsonStr.replace(/\bNaN\b/g, "null"); // 替换裸 NaN
+          }
+          // ③ 再解析为对象
+          this.qsList = JSON.parse(jsonStr);
           this.fourList.push(newItem);
         })
-        .catch((error) => {});
+        .catch((error) => {
+          console.error("趋势图接口报错:", error);
+        });
     },
 
     conditions() {

+ 1 - 1
src/views/home/Index.vue

@@ -52,7 +52,7 @@ export default {
   data() {
     return {
       loading: false,
-      isShowHd: false, //true 则展示华电的菜单样式,false 则展示默认的左侧边栏菜单
+      isShowHd: true, //true 则展示华电的菜单样式,false 则展示默认的左侧边栏菜单
     };
   },
   methods: {

+ 2 - 2
src/views/home/components/MenuHD.vue

@@ -377,7 +377,7 @@ export default {
 </style>
 
 <!-- /* 华电时的菜单打开这个 */ -->
-<!-- <style lang="scss">
+<style lang="scss">
 .el-menu--popup {
   width: 100% !important;
   min-width: 120px !important;
@@ -388,4 +388,4 @@ export default {
     padding: 0 5px !important;
   }
 }
-</style> -->
+</style>

+ 2 - 2
src/views/login/Index.vue

@@ -2,9 +2,9 @@
   <div class="background-image" v-loading="loadingView">
     <div class="border">
       <div class="leftLogin">
-        <h1>机组功率曲线异常检测数据分析系统</h1>
+        <!-- <h1>机组功率曲线异常检测数据分析系统</h1> -->
         <!-- 华电 -->
-        <!-- <h1>风电机组健康诊断平台</h1> -->
+        <h1>风电机组健康诊断平台</h1>
         <el-divider></el-divider>
         <div class="loginText">
           <el-form