系统监测采用大屏显示版本

.env.development

@@ -7,9 +7,9 @@ ENV = 'development'
 # 开发环境
 # VUE_APP_BASE_API = '/dev-api'
 # 后台
-VUE_APP_BASE_API = 'http://192.168.1.222:8080'
+# VUE_APP_BASE_API = 'http://192.168.1.222:8080'
 # 云端
-# VUE_APP_BASE_API = 'http://106.55.173.225:8090'
+VUE_APP_BASE_API = 'http://106.55.173.225:8090'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/api/alarm/alarmRecord.js

@@ -16,3 +16,11 @@ export function getAlarmRecord(ardId) {
     method: "get",
   });
 }
+// 修改报警记录状态
+export function updateAlarmRecord(data) {
+  return request({
+    url: "/alarm/ard",
+    method: "put",
+    data: data,
+  });
+}

src/api/centerairC/sysMonitor.js

@@ -65,3 +65,19 @@ export function systemMode(query) {
     params: query,
   });
 }
+// 查询主机参数
+export function hostDetailsData(query) {
+  return request({
+    url: "/chillers/list",
+    method: "get",
+    params: query,
+  });
+}
+// 主机冷冻冷却进出水温度
+export function hostTemData(data) {
+  return request({
+    url: "/chillers/lineList",
+    method: "post",
+    data
+  });
+}

src/assets/icons/svg/arrow.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1745981751444" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4350" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M978.46285085 519.68535919l-611.60394228 0L366.85890857 463.05536438 978.46285085 463.05536438l-2e-8 56.62999481z" fill="" p-id="4351"></path><path d="M360.30189532 689.14672739L30.97795841 495.73425621l329.32393691-198.63983493 0 392.05230611z" fill="" p-id="4352"></path></svg>

src/assets/styles/element-ui.scss

@@ -1137,7 +1137,7 @@
   display: flex;
   flex-direction: column;
   align-items: center;
-  padding:10px !important;
+  padding: 10px !important;
 }
 
 /* 修改消息文本颜色 */
@@ -1362,13 +1362,14 @@
   border: 1px solid #ff4949;
   background: #ff4949;
 }
-.el-table__body tr.current-row > td.el-table__cell, .el-table__body tr.selection-row > td.el-table__cell{
+.el-table__body tr.current-row > td.el-table__cell,
+.el-table__body tr.selection-row > td.el-table__cell {
   background-color: rgba(0, 71, 125, 0.4) !important;
 }
-.el-loading-mask{
+.el-loading-mask {
   min-height: 800px;
 }
-.el-loading-spinner{
+.el-loading-spinner {
   min-height: 800px;
   display: flex;
   top: 0 !important;
@@ -1396,10 +1397,17 @@
 .popup-result {
   border: 1px solid #0e5191 !important;
 }
+<<<<<<< HEAD
 .popup-result table span{
   border: 1px solid #0e5191 !important;
 }
 .popup-result .title{
+=======
+.popup-result table span {
+  border: 1px solid #0e5191 !important;
+}
+.popup-result .title {
+>>>>>>> dev
   background: #405e7e !important;
 }
 .el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
@@ -1407,9 +1415,42 @@
   border-right-color: transparent;
   border-left-color: transparent;
 }
+<<<<<<< HEAD
 .el-tabs--border-card > .el-tabs__header .el-tabs__item{
   color: #c3cbd4;
 }
 .drawing-item:hover > .el-form-item, .drawing-row-item:hover > .el-form-item {
   background: #b6b6b6 !important;
+=======
+.el-tabs--border-card > .el-tabs__header .el-tabs__item {
+  color: #c3cbd4;
+}
+.drawing-item:hover > .el-form-item,
+.drawing-row-item:hover > .el-form-item {
+  background: #b6b6b6 !important;
+}
+.el-cascader__suggestion-list {
+  color: #a4b2af;
+}
+.el-cascader__suggestion-item:hover,
+.el-cascader__suggestion-item:focus {
+  background-color: #00b4ff;
+  color: #ffffff;
+}
+.el-cascader__search-input {
+  background: transparent !important;
+  color: #a4b2af;
+  margin-left: 10px !important;
+  min-width: 50px !important;
+  z-index: 0;
+}
+.el-input__suffix{
+  z-index: 10;
+}
+.el-cascader__tags {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  flex-wrap: nowrap;
+>>>>>>> dev
 }

src/components/Crontab/index.vue

@@ -104,6 +104,7 @@
       <CrontabResult :ex="crontabValueString"></CrontabResult>
 
       <div class="pop_btn">
+<<<<<<< HEAD
         <div class="primary-btn">
           <el-button size="small" type="primary" @click="submitFill"
             >确定</el-button
@@ -119,6 +120,11 @@
             >取消</el-button
           >
         </div>
+=======
+        <div class="primary-btn"><el-button size="small" type="primary" @click="submitFill">确定</el-button></div>
+        <div class="warning-btn"><el-button size="small" type="warning" @click="clearCron">重置</el-button></div>
+        <div class="cancel-btn"><el-button size="small" type="cancel" @click="hidePopup">取消</el-button></div>
+>>>>>>> dev
       </div>
     </div>
   </div>

src/layout/components/Navbar.vue

@@ -16,6 +16,14 @@
 
     <div class="right-menu">
       <template v-if="device !== 'mobile'">
+        <img
+          v-if="isShowWarning"
+          class="warning"
+          src="../../assets/images/warning.png"
+          title="报警记录"
+          @click="goWarning"
+          alt=""
+        />
         <search id="header-search" class="right-menu-item" />
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
       </template>
@@ -51,7 +59,8 @@ import TopNav from "@/components/TopNav";
 import Hamburger from "@/components/Hamburger";
 import Screenfull from "@/components/Screenfull";
 import Search from "@/components/HeaderSearch";
-
+import { alarmRecordList } from "@/api/alarm/alarmRecord";
+import { getDay } from "@/utils/datetime";
 export default {
   components: {
     Breadcrumb,
@@ -79,6 +88,14 @@ export default {
       },
     },
   },
+  data() {
+    return {
+      isShowWarning: false,
+    };
+  },
+  mounted() {
+    this.getAlarnStatus();
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch("app/toggleSideBar");
@@ -96,6 +113,27 @@ export default {
         })
         .catch(() => {});
     },
+    // 报警列表
+    getAlarnStatus() {
+      let data = {
+        pageNum: 1,
+        pageSize: 10,
+        status: "0",
+      };
+      let timeArr = [getDay(0), getDay(0)];
+      alarmRecordList(this.addDateRange(data, timeArr)).then((res) => {
+        console.log("请求了报警列表·············");
+        if (res.code == 200 && res.rows.length > 0) {
+          this.isShowWarning = true;
+        } else {
+          this.isShowWarning = false;
+        }
+      });
+    },
+    goWarning() {
+      // this.exitFullscreen();
+      this.$router.push("/alarm/alarmRecord");
+    },
   },
 };
 </script>
@@ -126,6 +164,23 @@ export default {
       background: rgba(0, 0, 0, 0.025);
     }
   }
+  .warning {
+    width: 30px;
+    height: 30px;
+    margin: 0 10px;
+    z-index: 10;
+    cursor: pointer;
+    /* 添加闪烁动画 */
+    animation: blink 1s infinite;
+  }
+  @keyframes blink {
+    100% {
+      opacity: 1;
+    }
+    50% {
+      opacity: 0;
+    }
+  }
 
   .breadcrumb-container {
     float: left;
@@ -206,7 +261,11 @@ export default {
   .hamburger-container {
     line-height: 0.46rem !important;
   }
-
+  .warning {
+    width: 0.3rem !important;
+    height: 0.3rem !important;
+    margin: 0 0.1rem !important;
+  }
   .topmenu-container {
     left: 0.5rem !important;
   }
@@ -225,7 +284,7 @@ export default {
         margin-top: 0.05rem !important;
 
         .user-avatar {
-          width:0.4rem !important;
+          width: 0.4rem !important;
           height: 0.4rem !important;
           border-radius: 0.1rem !important;
         }

src/router/index.js

@@ -90,7 +90,8 @@ export const constantRoutes = [
   },
     // 综合大屏
     {
-      path: "/bigScreen",
+      path: "/Screen",
+      name:"Screen",
       hidden: true,
       component: () => import("@/views/bigScreen/bigScreen"),
       meta: { title: "大屏总览", icon: "screen" },

src/store/modules/permission.js

@@ -1,9 +1,9 @@
-import auth from '@/plugins/auth'
+import auth from "@/plugins/auth";
-import router, { constantRoutes, dynamicRoutes } from '@/router'
+import router, { constantRoutes, dynamicRoutes } from "@/router";
-import { getRouters } from '@/api/menu'
+import { getRouters } from "@/api/menu";
-import Layout from '@/layout/index'
+import Layout from "@/layout/index";
-import ParentView from '@/components/ParentView'
+import ParentView from "@/components/ParentView";
-import InnerLink from '@/layout/components/InnerLink'
+import InnerLink from "@/layout/components/InnerLink";
 
 const permission = {
   state: {
@@ -11,127 +11,216 @@ const permission = {
     addRoutes: [],
     defaultRoutes: [],
     topbarRouters: [],
-    sidebarRouters: []
+    sidebarRouters: [],
   },
   mutations: {
     SET_ROUTES: (state, routes) => {
-      state.addRoutes = routes
+      state.addRoutes = routes;
-      state.routes = constantRoutes.concat(routes)
+      state.routes = constantRoutes.concat(routes);
     },
     SET_DEFAULT_ROUTES: (state, routes) => {
-      state.defaultRoutes = constantRoutes.concat(routes)
+      state.defaultRoutes = constantRoutes.concat(routes);
     },
     SET_TOPBAR_ROUTES: (state, routes) => {
-      state.topbarRouters = routes
+      state.topbarRouters = routes;
     },
     SET_SIDEBAR_ROUTERS: (state, routes) => {
-      state.sidebarRouters = routes
+      state.sidebarRouters = routes;
     },
   },
   actions: {
     // 生成路由
     GenerateRoutes({ commit }) {
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         // 向后端请求路由数据
-        getRouters().then(res => {
+        getRouters().then((res) => {
-          const sdata = JSON.parse(JSON.stringify(res.data))
+          const sdata = JSON.parse(JSON.stringify(res.data));
-          const rdata = JSON.parse(JSON.stringify(res.data))
+          const rdata = JSON.parse(JSON.stringify(res.data));
-          const sidebarRoutes = filterAsyncRouter(sdata)
+          const sidebarRoutes = filterAsyncRouter(sdata);
-          const rewriteRoutes = filterAsyncRouter(rdata, false, true)
+          const rewriteRoutes = filterAsyncRouter(rdata, false, true);
           const asyncRoutes = filterDynamicRoutes(dynamicRoutes);
-          rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
+          rewriteRoutes.push({ path: "*", redirect: "/404", hidden: true });
+          // 如果动态的路由有中央空调-系统监控-系统监测页面，那就添加一个hidden为true非Layout的大屏页面
+          const result = checkRouteArray(
+            sidebarRoutes,
+            "centerairC",
+            "monitorControl",
+            "sysMonitor"
+          );
           router.addRoutes(asyncRoutes);
-          commit('SET_ROUTES', rewriteRoutes)
+          if (result) {
-          commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes))
+            // console.log(
-          commit('SET_DEFAULT_ROUTES', sidebarRoutes)
+            //   "满足条件,添加中央空调-系统监控-系统监测相关的大屏页面路由"
-          commit('SET_TOPBAR_ROUTES', sidebarRoutes)
+            // );
-          resolve(rewriteRoutes)
+            // 定义要添加的多个路由对象数组
-        })
+            const additionalRoutes = [
-      })
+              {
+                path: "/monitorCenter",
+                name: "monitorCenter",
+                hidden: true,
+                component: () =>
+                  import("@/views/centerairC/sysMonitor/monitorCenter"),
+                meta: { title: "系统监测", icon: "screen" },
+              },
+              {
+                path: "/hostDetails",
+                name: "hostDetails",
+                hidden: true,
+                component: () =>
+                  import("@/views/centerairC/sysMonitor/hostDetails"),
+                meta: { title: "主机性能", icon: "new2" },
+              },
+              {
+                path: "/performance",
+                name: "performance",
+                hidden: true,
+                component: () =>
+                  import("@/views/centerairC/sysMonitor/performance"),
+                meta: { title: "冷机性能性能", icon: "new2" },
+              },
+              // 可以继续添加更多路由对象
+            ];
+            // 循环添加额外的路由对象到各路由数组
+            additionalRoutes.forEach((route) => {
+              sidebarRoutes.push(route);
+              rewriteRoutes.push(route);
+              asyncRoutes.push(route);
+            });
+          } else {
+            // console.log("不满足条件");
+          }
+
+          commit("SET_ROUTES", rewriteRoutes);
+          commit("SET_SIDEBAR_ROUTERS", constantRoutes.concat(sidebarRoutes));
+          commit("SET_DEFAULT_ROUTES", sidebarRoutes);
+          commit("SET_TOPBAR_ROUTES", sidebarRoutes);
+          console.log("返回的动态路由", sidebarRoutes);
+          console.log("静态的动态路由", constantRoutes);
+          resolve(rewriteRoutes);
+        });
+      });
+    },
+  },
+};
+//判断是否返回特定的菜单，再添加大屏路由的动态菜单
+function checkRouteArray(routes, ...paths) {
+  // 检查传入路径参数的数量，用于确定要检查的层级
+  const level = paths.length;
+  function checkLevel(route, currentLevel) {
+    // 如果当前层级的路径参数存在且当前路由的 path 包含该路径
+    if (
+      paths[currentLevel] &&
+      route.path &&
+      route.path.includes(paths[currentLevel])
+    ) {
+      // 如果已经到达指定的最后一层级，返回 true
+      if (currentLevel === level - 1) {
+        return true;
+      }
+      // 如果还有下一层级且当前路由有 children 属性
+      if (route.children) {
+        for (let i = 0; i < route.children.length; i++) {
+          const childRoute = route.children[i];
+          // 递归检查下一层级
+          if (checkLevel(childRoute, currentLevel + 1)) {
+            return true;
+          }
+        }
+      }
     }
+    return false;
   }
+
+  // 遍历路由数组，对每个一级路由调用 checkLevel 函数开始检查
+  for (let i = 0; i < routes.length; i++) {
+    const route = routes[i];
+    if (checkLevel(route, 0)) {
+      return true;
+    }
+  }
+  return false;
 }
 
 // 遍历后台传来的路由字符串，转换为组件对象
 function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
-  return asyncRouterMap.filter(route => {
+  return asyncRouterMap.filter((route) => {
     if (type && route.children) {
-      route.children = filterChildren(route.children)
+      route.children = filterChildren(route.children);
     }
     if (route.component) {
       // Layout ParentView 组件特殊处理
-      if (route.component === 'Layout') {
+      if (route.component === "Layout") {
-        route.component = Layout
+        route.component = Layout;
-      } else if (route.component === 'ParentView') {
+      } else if (route.component === "ParentView") {
-        route.component = ParentView
+        route.component = ParentView;
-      } else if (route.component === 'InnerLink') {
+      } else if (route.component === "InnerLink") {
-        route.component = InnerLink
+        route.component = InnerLink;
       } else {
-        route.component = loadView(route.component)
+        route.component = loadView(route.component);
       }
     }
     if (route.children != null && route.children && route.children.length) {
-      route.children = filterAsyncRouter(route.children, route, type)
+      route.children = filterAsyncRouter(route.children, route, type);
     } else {
-      delete route['children']
+      delete route["children"];
-      delete route['redirect']
+      delete route["redirect"];
     }
-    return true
+    return true;
-  })
+  });
 }
 
 function filterChildren(childrenMap, lastRouter = false) {
-  var children = []
+  var children = [];
   childrenMap.forEach((el, index) => {
     if (el.children && el.children.length) {
-      if (el.component === 'ParentView' && !lastRouter) {
+      if (el.component === "ParentView" && !lastRouter) {
-        el.children.forEach(c => {
+        el.children.forEach((c) => {
-          c.path = el.path + '/' + c.path
+          c.path = el.path + "/" + c.path;
           if (c.children && c.children.length) {
-            children = children.concat(filterChildren(c.children, c))
+            children = children.concat(filterChildren(c.children, c));
-            return
+            return;
           }
-          children.push(c)
+          children.push(c);
-        })
+        });
-        return
+        return;
       }
     }
     if (lastRouter) {
-      el.path = lastRouter.path + '/' + el.path
+      el.path = lastRouter.path + "/" + el.path;
       if (el.children && el.children.length) {
-        children = children.concat(filterChildren(el.children, el))
+        children = children.concat(filterChildren(el.children, el));
-        return
+        return;
       }
     }
-    children = children.concat(el)
+    children = children.concat(el);
-  })
+  });
-  return children
+  return children;
 }
 
 // 动态路由遍历，验证是否具备权限
 export function filterDynamicRoutes(routes) {
-  const res = []
+  const res = [];
-  routes.forEach(route => {
+  routes.forEach((route) => {
     if (route.permissions) {
       if (auth.hasPermiOr(route.permissions)) {
-        res.push(route)
+        res.push(route);
       }
     } else if (route.roles) {
       if (auth.hasRoleOr(route.roles)) {
-        res.push(route)
+        res.push(route);
       }
     }
-  })
+  });
-  return res
+  return res;
 }
 
 export const loadView = (view) => {
-  if (process.env.NODE_ENV === 'development') {
+  if (process.env.NODE_ENV === "development") {
-    return (resolve) => require([`@/views/${view}`], resolve)
+    return (resolve) => require([`@/views/${view}`], resolve);
   } else {
     // 使用 import 实现生产环境的路由懒加载
-    return () => import(`@/views/${view}`)
+    return () => import(`@/views/${view}`);
   }
-}
+};
 
-export default permission
+export default permission;

src/views/alarm/alarmCode/index.vue

@@ -83,7 +83,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <div class="primary-btn" v-hasPermi="['system:post:add']">
+        <div class="primary-btn" v-hasPermi="['alarm:ac:add']">
           <el-button
             type="primary"
             icon="el-icon-plus"
@@ -94,7 +94,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="success-btn" v-hasPermi="['system:post:edit']">
+        <div class="success-btn" v-hasPermi="['alarm:ac:edit']">
           <el-button
             type="success"
             icon="el-icon-edit"
@@ -106,7 +106,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="delete-btn" v-hasPermi="['system:post:remove']">
+        <div class="delete-btn" v-hasPermi="['alarm:ac:remove']">
           <el-button
             type="delete"
             icon="el-icon-delete"
@@ -117,7 +117,7 @@
           >
         </div>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <div class="warning-btn" v-hasPermi="['system:post:export']">
           <el-button
             type="warning"
@@ -127,7 +127,7 @@
             >导出</el-button
           >
         </div>
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -189,7 +189,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:post:edit']"
+            v-hasPermi="['alarm:ac:edit']"
             >修改</el-button
           >
           <el-button
@@ -197,7 +197,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:post:remove']"
+            v-hasPermi="['alarm:ac:remove']"
             >删除</el-button
           >
         </template>

src/views/alarm/alarmRecord/index.vue

@@ -67,6 +67,30 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item label="处理状态" prop="status">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="选择处理状态"
+              clearable
+            >
+              <el-option label="未处理" value="0" />
+              <el-option label="已处理" value="1" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="日期范围" prop="timeArr">
+            <el-date-picker
+              style="width: 220px"
+              v-model="timeArr"
+              type="daterange"
+              unlink-panels
+              range-separator="~"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+              @change="dateChange"
+            >
+            </el-date-picker>
+          </el-form-item>
         </el-form>
         <div class="primary-btn">
           <el-button
@@ -86,7 +110,7 @@
             >重置</el-button
           >
         </div>
-        <div class="warning-btn" v-hasPermi="['system:post:export']">
+        <!-- <div class="warning-btn" v-hasPermi="['system:post:export']">
           <el-button
             type="warning"
             icon="el-icon-download"
@@ -94,7 +118,7 @@
             @click="handleExport"
             >导出</el-button
           >
-        </div>
+        </div> -->
       </div>
     </div>
     <el-table v-loading="loading" :data="postList" stripe>
@@ -125,16 +149,25 @@
         </template>
       </el-table-column>
       <el-table-column label="报警内容" align="center" prop="content" />
-      <!-- <el-table-column
+      <el-table-column label="报警时间" align="center" prop="createTime">
-          label="更新时间"
+        <template slot-scope="scope">
-          align="center"
+          <span>{{ parseTime(scope.row.createTime) }}</span>
-          prop="updateTime"
+        </template>
-          width="180"
+      </el-table-column>
-        >
+      <el-table-column label="处理状态" align="center" prop="status">
-          <template slot-scope="scope">
+        <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.updateTime) }}</span>
+          <span
-          </template>
+            :class="getStatusClass(scope.row.status)"
-        </el-table-column> -->
+            v-if="scope.row.status === 0"
+            >未处理</span
+          >
+          <span
+            :class="getStatusClass(scope.row.status)"
+            v-if="scope.row.status === 1"
+            >已处理</span
+          >
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         align="center"
@@ -144,9 +177,17 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-tickets"
+            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:post:edit']"
+            v-hasPermi="['alarm:ard:edit']"
+            >处理</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-tickets"
+            @click="handleLook(scope.row)"
+            v-hasPermi="['alarm:ard:query']"
             >详情</el-button
           >
         </template>
@@ -226,19 +267,19 @@
         <el-row type="flex" justify="center">
           <el-col :span="12">
             <el-form-item label="仪表名称" prop="cpmName">
-              <el-input v-model="form.cpmName"  readonly />
+              <el-input v-model="form.cpmName" readonly />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="报警时间" prop="createTime">
-              <el-input v-model="form.createTime"  readonly />
+              <el-input v-model="form.createTime" readonly />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row type="flex" justify="center">
           <el-col :span="24">
             <el-form-item label="报警内容" prop="content">
-              <el-input v-model="form.content" type="textarea"  readonly />
+              <el-input v-model="form.content" type="textarea" readonly />
             </el-form-item>
           </el-col>
         </el-row>
@@ -251,13 +292,18 @@
 </template>
 
 <script>
-import { alarmRecordList, getAlarmRecord } from "@/api/alarm/alarmRecord";
+import {
+  alarmRecordList,
+  getAlarmRecord,
+  updateAlarmRecord,
+} from "@/api/alarm/alarmRecord";
 
 export default {
   name: "alarmRecord",
   dicts: ["alarm_type", , "alarm_type", "alarm_event_type", "alarm_level"],
   data() {
     return {
+      timeArr: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -285,6 +331,9 @@ export default {
         eventType: "",
         alarmLevel: "",
         content: "",
+        status: "",
+        beginTime: "",
+        endTime: "",
       },
       // 表单参数
       form: {},
@@ -296,14 +345,36 @@ export default {
     this.getList();
   },
   methods: {
+    // 表格动态类名
+    getStatusClass(status) {
+      switch (status) {
+        case 0:
+          return "status-green";
+        case 1:
+          return "status-red";
+        default:
+          return "";
+      }
+    },
+    // 选中日期事件
+    dateChange() {
+      // console.log("打印时间", this.timeArr);
+      if (!this.timeArr) {
+        this.$nextTick(() => {
+          this.timeArr = [];
+        });
+      }
+    },
     /** 查询报警编码列表 */
     getList() {
       this.loading = true;
-      alarmRecordList(this.queryParams).then((response) => {
+      alarmRecordList(this.addDateRange(this.queryParams, this.timeArr)).then(
-        this.postList = response.rows;
+        (response) => {
-        this.total = response.total;
+          this.postList = response.rows;
-        this.loading = false;
+          this.total = response.total;
-      });
+          this.loading = false;
+        }
+      );
     },
     // 取消按钮
     cancel() {
@@ -333,8 +404,8 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    /** 修改按钮操作 */
+    /** 详情 */
-    handleUpdate(row) {
+    handleLook(row) {
       this.reset();
       this.form.id = "";
       const acId = row.id || this.ids;
@@ -364,6 +435,31 @@ export default {
         this.title = "报警记录详情";
       });
     },
+    /** 处理 */
+    handleUpdate(row) {
+      if (row.status === 0) {
+        this.$confirm(`是否要处理该条报警记录?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            let data = {
+              id: row.id,
+              status: 1,
+            };
+            updateAlarmRecord(data).then((res) => {
+              if (res.code == 200) {
+                this.$modal.msgSuccess("处理成功！");
+                this.getList();
+              }
+            });
+          })
+          .catch(() => {});
+      } else if (row.status === 1) {
+        this.$modal.msgWarning("该报警记录已被处理!");
+      }
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download(
@@ -377,3 +473,11 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.status-green {
+  color: red;
+}
+.status-red {
+  color: rgb(7, 214, 110);
+}
+</style>

src/views/alarm/alarmRule/index.vue

@@ -75,7 +75,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <div class="primary-btn" v-hasPermi="['system:post:add']">
+        <div class="primary-btn" v-hasPermi="['alarm:ar:add']">
           <el-button
             type="primary"
             icon="el-icon-plus"
@@ -86,7 +86,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="success-btn" v-hasPermi="['system:post:edit']">
+        <div class="success-btn" v-hasPermi="['alarm:ar:edit']">
           <el-button
             type="success"
             icon="el-icon-edit"
@@ -98,7 +98,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="delete-btn" v-hasPermi="['system:post:remove']">
+        <div class="delete-btn" v-hasPermi="['alarm:ar:remove']">
           <el-button
             type="delete"
             icon="el-icon-delete"
@@ -109,7 +109,7 @@
           >
         </div>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <div class="warning-btn" v-hasPermi="['system:post:export']">
           <el-button
             type="warning"
@@ -119,7 +119,7 @@
             >导出</el-button
           >
         </div>
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -219,7 +219,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:post:edit']"
+            v-hasPermi="['alarm:ar:edit']"
             >修改</el-button
           >
           <el-button
@@ -227,7 +227,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:post:remove']"
+            v-hasPermi="['alarm:ar:remove']"
             >删除</el-button
           >
         </template>
@@ -669,6 +669,8 @@ export default {
         // 请求采集位点
         this.getCpmIdList(this.form.ledgerId);
       }
+      //清除采集位点
+      this.form.cpmId = ""
     },
     //采集参数列表
     getCpmIdList(id) {

src/views/bigScreen/index.vue

@@ -11,7 +11,7 @@ export default {
     toPage() {
       console.log("需要跳转的")
       // 跳转到高校导航大屏展示
-      this.$router.push("/bigScreen")
+      this.$router.push("/Screen")
     },
   },
 };

src/views/centerairC/sysMonitor/components/hostChart.vue

@@ -0,0 +1,415 @@
+<template>
+  <div>
+    <div class="historyCharts" ref="chart_ref"></div>
+  </div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+export default {
+  props: {
+    temArray: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      chartInstance: null,
+      option: {},
+      chartData1: [],
+      chartData2: [],
+      chartData3: [],
+      chartData4: [],
+      bottomData: [],
+    };
+  },
+  watch: {
+    temArray: {
+      immediate: true, // 页面加载时立即触发一次监听
+      handler(newVal, oldVal) {
+        if (newVal) {
+          this.chartData1 = []; // 清空 chartData1
+          this.chartData2 = []; // 清空 chartData2
+          this.bottomData = []; // 清空 bottomData
+          console.log("charts传值", newVal);
+          let data = newVal;
+          if (data.length > 0) {
+            // 获取 title 和 titleStr 数组
+            const title = data.data[0].title;
+            const titleStr = data.data[1].titleStr;
+            // 获取 dataList 数组
+            const dataList = data.data[3].dataList;
+
+            // 遍历 dataList 数组
+            dataList.forEach((item) => {
+              // 查找 name 在 title 数组中的索引
+              const index = title.indexOf(item.name);
+              if (index !== -1) {
+                // 若找到匹配项，则将 name 替换为 titleStr 中对应位置的值
+                item.name = titleStr[index];
+              }
+            });
+            console.log("处理后的data", data);
+            data.forEach((item) => {
+              if (item.timeStr) {
+                this.bottomData = item.timeStr;
+              }
+              if (item.dataList) {
+                let name1 = "";
+                let name2 = "";
+                let name3 = "";
+                let name4 = "";
+                item.dataList.forEach((val, index) => {
+                  if (val.name) {
+                    switch (index) {
+                      case 0:
+                        this.chartData1 = val.value;
+                        name1 = val.name;
+                        break;
+                      case 1:
+                        this.chartData2 = val.value;
+                        name2 = val.name;
+                        break;
+                      case 2:
+                        this.chartData3 = val.value;
+                        name3 = val.name;
+                        break;
+                      case 3:
+                        this.chartData4 = val.value;
+                        name4 = val.name;
+                        break;
+                      default:
+                        break;
+                    }
+                  }
+                });
+              }
+            });
+            this.$nextTick(() => {
+              const adapterOption = {
+                xAxis: {
+                  data: this.bottomData,
+                },
+                series: [
+                  {
+                    yAxisIndex: 0,
+                    name:name1,
+                    data: this.chartData1,
+                  },
+                  {
+                    yAxisIndex: 0,
+                    name:name2,
+                    data: this.chartData2,
+                  },
+                  {
+                    yAxisIndex: 0,
+                    name:name3,
+                    data: this.chartData3,
+                  },
+                  {
+                    yAxisIndex: 0,
+                    name:name4,
+                    data: this.chartData4,
+                  },
+                ],
+              };
+              this.chartInstance.setOption(adapterOption);
+              //手动的调用图标对象的resize才能产生效果
+              this.chartInstance.resize();
+            });
+          } else {
+            this.$nextTick(() => {
+              const adapterOption = {
+                xAxis: {
+                  data: [],
+                },
+                series: [
+                  {
+                    yAxisIndex: 0,
+                    data: [],
+                  },
+                  {
+                    yAxisIndex: 0,
+                    data: [],
+                  },
+                  {
+                    yAxisIndex: 0,
+                    data: [],
+                  },
+                  {
+                    yAxisIndex: 0,
+                    data: [],
+                  },
+                ],
+              };
+              this.chartInstance.setOption(adapterOption);
+              //手动的调用图标对象的resize才能产生效果
+              this.chartInstance.resize();
+              this.screenAdapter();
+            });
+          }
+        }
+      },
+    },
+  },
+  mounted() {
+    this.initChart();
+    this.screenAdapter();
+  },
+  destroyed() {
+    //取消监听器
+    window.removeEventListener("resize", this.screenAdapter);
+  },
+  methods: {
+    // 折线图自适应+ 根据按钮切换图例仅限一条且不可点击+ 折线图数据
+    screenAdapter() {
+      //自己定义的比较合适的适配大小,2.6  mes_ref是图表盒子
+      const titleFontSize = this.$refs.chart_ref.offsetWidth / 130;
+      //因为option可以多次配置的，所以这里的option只需要写 需要配置大小的相关数据
+      const adapterOption = {};
+      //记得重新给配置项给实例对象。只要实例对象.chartInstance不变，option就可以多次配置不同的条件。也可以配置一个dataoption只写需要从后台请求的数据相关
+      this.chartInstance.setOption(adapterOption);
+      //手动的调用图标对象的resize才能产生效果
+      this.chartInstance.resize();
+    },
+    //初始化chartInstance对象
+    initChart() {
+      const chartRef = this.$refs.chart_ref;
+      if (chartRef) {
+        // 初始化图表的代码
+        this.chartInstance = echarts.init(this.$refs.chart_ref);
+        this.option = {
+          tooltip: {
+            trigger: "axis",
+          },
+          legend: {
+            show: true,
+            top: 0,
+            textStyle: {
+              color: "white",
+            },
+          },
+          grid: {
+            top: "10%",
+            left: "4%",
+            right: "6%",
+            bottom: "3%",
+            containLabel: true,
+          },
+          xAxis: {
+            type: "category",
+            //设置为true代表离零刻度间隔一段距离
+            boundaryGap: true,
+            // 修饰刻度标签的颜色即x坐标数据
+            axisLabel: {
+              // interval: 0, //强制显示所有x轴数据
+              // rotate: 30, //x轴坐标字体倾斜30度
+              color: "rgba(255, 255, 255, 1)",
+            },
+            axisTick: {
+              show: false, // 不显示坐标轴刻度线
+            },
+            // x坐标轴的颜色
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: "#365576",
+              },
+            },
+            splitLine: {
+              lineStyle: {
+                color: "#e2e6f0",
+              },
+            }, //x轴分割线
+            data: this.bottomData,
+          },
+          yAxis: {
+            min: 0,
+            // max:20,
+            // // // min:'dataMin',
+            // // // max:'dataMax',
+            // name: "kwh", // 第一个 y 轴的单位描述
+            // 设置 name 的样式
+            nameTextStyle: {
+              color: "rgba(255, 255, 255, 1)",
+              fontSize: 12,
+            },
+            miniInterval: 5,
+            type: "value",
+            // 修饰刻度标签的颜色即y坐标数据
+            axisLabel: {
+              color: "rgba(255, 255, 255, 1)",
+            },
+            // 显示y坐标轴
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: "#365576", // 设置 y 轴线的颜色
+              },
+            },
+            //y轴分割线段数
+            // splitNumber: 10,
+            // 修改y轴分割线的颜色
+            splitLine: {
+              lineStyle: {
+                color: "#1a3d62", // 设置分割线的颜色
+                type: "dashed", // 设置分割线为虚线
+              },
+            },
+          },
+          series: [
+            {
+              type: "line",
+              // 拐点大小
+              symbolSize: 8,
+              data: this.chartData1,
+              //折线颜色
+              itemStyle: {
+                color: "#1a69f1", //折线点的颜色
+              },
+              lineStyle: {
+                color: "#1a69f1", //折线点的颜色
+              },
+              smooth: false,
+              // 不显示折线点
+              showSymbol: false,
+              // 区域填充样式，添加渐变背景
+              areaStyle: {
+                color: {
+                  type: "linear",
+                  x: 0,
+                  y: 0,
+                  x2: 0,
+                  y2: 1,
+                  colorStops: [
+                    {
+                      offset: 0,
+                      color: "rgba(26, 105, 241, 0.5)", // 渐变起始颜色
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(26, 105, 241, 0)", // 渐变结束颜色
+                    },
+                  ],
+                  global: false, // 缺省为 false
+                },
+              },
+            },
+            {
+              type: "line",
+              // 拐点大小
+              symbolSize: 8,
+              data: this.chartData2,
+              //折线颜色
+              itemStyle: {
+                color: "#00CED1", //折线的颜色
+              },
+              smooth: false,
+              // 不显示折线点
+              showSymbol: false,
+              areaStyle: {
+                color: {
+                  type: "linear",
+                  x: 0,
+                  y: 0,
+                  x2: 0,
+                  y2: 1,
+                  colorStops: [
+                    {
+                      offset: 0,
+                      color: "rgba(0, 206, 209, 0.5)", // 渐变起始颜色
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(0, 206, 209, 0)", // 渐变结束颜色
+                    },
+                  ],
+                  global: false, // 缺省为 false
+                },
+              },
+            },
+            {
+              type: "line",
+              // 拐点大小
+              symbolSize: 8,
+              data: this.chartData3,
+              //折线颜色
+              itemStyle: {
+                color: "#00CED1", //折线的颜色
+              },
+              smooth: false,
+              // 不显示折线点
+              showSymbol: false,
+              areaStyle: {
+                color: {
+                  type: "linear",
+                  x: 0,
+                  y: 0,
+                  x2: 0,
+                  y2: 1,
+                  colorStops: [
+                    {
+                      offset: 0,
+                      color: "rgba(0, 206, 209, 0.5)", // 渐变起始颜色
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(0, 206, 209, 0)", // 渐变结束颜色
+                    },
+                  ],
+                  global: false, // 缺省为 false
+                },
+              },
+            },
+            {
+              type: "line",
+              // 拐点大小
+              symbolSize: 8,
+              data: this.chartData4,
+              //折线颜色
+              itemStyle: {
+                color: "#00CED1", //折线的颜色
+              },
+              smooth: false,
+              // 不显示折线点
+              showSymbol: false,
+              areaStyle: {
+                color: {
+                  type: "linear",
+                  x: 0,
+                  y: 0,
+                  x2: 0,
+                  y2: 1,
+                  colorStops: [
+                    {
+                      offset: 0,
+                      color: "rgba(0, 206, 209, 0.5)", // 渐变起始颜色
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(0, 206, 209, 0)", // 渐变结束颜色
+                    },
+                  ],
+                  global: false, // 缺省为 false
+                },
+              },
+            },
+          ],
+        };
+        //把配置项给实例对象
+        this.chartInstance.setOption(this.option, true);
+      } else {
+        console.error("未找到有效的 DOM 元素");
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.historyCharts {
+  width: 100%;
+  height: 4rem;
+}
+</style>

src/views/centerairC/sysMonitor/components/lineSquare.vue

@@ -0,0 +1,67 @@
+<template>
+    <div class="crossed-lines-container">
+      <!-- 上边线 -->
+      <div
+        class="line horizontal-line"
+        :style="{ width: (horizontalLength / 100) + 'rem', left: `calc(50% - ${horizontalLength / 200}rem)`, top: `calc(50% - ${(verticalLength / 200) - (overlap / 100)}rem)` }"
+      ></div>
+      <!-- 右边线 -->
+      <div
+        class="line vertical-line"
+        :style="{ height: (verticalLength / 100) + 'rem', top: `calc(50% - ${verticalLength / 200}rem)`, left: `calc(50% + ${(horizontalLength / 200) - (overlap / 100)}rem)` }"
+      ></div>
+      <!-- 下边线 -->
+      <div
+        class="line horizontal-line"
+        :style="{ width: (horizontalLength / 100) + 'rem', left: `calc(50% - ${horizontalLength / 200}rem)`, top: `calc(50% + ${(verticalLength / 200) - (overlap / 100)}rem)` }"
+      ></div>
+      <!-- 左边线 -->
+      <div
+        class="line vertical-line"
+        :style="{ height: (verticalLength / 100) + 'rem', top: `calc(50% - ${verticalLength / 200}rem)`, left: `calc(50% - ${(horizontalLength / 200) - (overlap / 100)}rem)` }"
+      ></div>
+    </div>
+  </template>
+  
+  <script>
+  export default {
+    props: {
+      // 水平方向（上下边）的直线长度
+      horizontalLength: {
+        type: Number,
+        default: 100
+      },
+      // 垂直方向（左右边）的直线长度
+      verticalLength: {
+        type: Number,
+        default: 100
+      },
+      // 直线交叉时超出的长度
+      overlap: {
+        type: Number,
+        default: 10
+      }
+    }
+  };
+  </script>
+  
+  <style scoped>
+  .crossed-lines-container {
+    position: relative;
+    width: 100%;
+    height: 100%;
+  }
+  
+  .line {
+    position: absolute;
+    background-color: rgb(45, 121, 236,0.7);
+  }
+  
+  .horizontal-line {
+    height: 0.01rem;
+  }
+  
+  .vertical-line {
+    width: 0.01rem;
+  }
+  </style>

src/views/centerairC/sysMonitor/components/loadData.vue

@@ -0,0 +1,452 @@
+<template>
+  <div>
+    <div class="sys_charts" ref="sys_charts"></div>
+  </div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import { eventBus } from "@/utils/evenBus";
+import { overView } from "@/api/bigScreen";
+import { getDay, getMonth, getYear } from "@/utils/datetime";
+export default {
+  props: {
+    hostData: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      chartInstance: null,
+      option: {},
+      loadPercent: "",
+    };
+  },
+  watch: {
+    hostData: {
+      immediate: true, // 页面加载时立即触发一次监听
+      handler(newVal, oldVal) {
+        if (newVal) {
+          console.log("charts传值", newVal);
+          let data = newVal;
+          if (data.length > 0) {
+            data.forEach((item) => {
+              if (item.paramType === "28") {
+                this.loadPercent = item.curValue;
+              }
+            });
+            this.$nextTick(() => {
+              // 销毁现有的 ECharts 实例
+              if (this.chartInstance) {
+                this.chartInstance.dispose();
+              }
+              // 重新初始化图表
+              this.initChart();
+            });
+          } else {
+          }
+        }
+      },
+    },
+  },
+  mounted() {
+    this.initChart();
+    this.screenAdapter();
+    window.addEventListener("resize", this.screenAdapter);
+  },
+  destroyed() {
+    //与mounted中的监听对应，在组件销毁的时候，需要将监听器取消掉
+    window.removeEventListener("resize", this.screenAdapter);
+  },
+  methods: {
+    // 计算颜色设置的函数
+    getAxisLineColor(useData, maxData) {
+      // 计算阈值
+      // 真实值大于最大值的0.75才使用颜色渐变
+      const threshold = maxData * 0.75;
+
+      // 判断实际值是否超过阈值
+      if (useData > threshold) {
+        return [
+          [
+            useData / maxData,
+            new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+              { offset: 0, color: "rgba(0,127,208,1)" },
+              { offset: 0.6, color: "rgba(0,127,208,1)" },
+              { offset: 1, color: "rgba(69, 235, 167,0.5)" },
+            ]),
+          ],
+          [1, "rgba(28,128,245,.0)"],
+        ];
+      } else {
+        return [
+          [
+            useData / maxData,
+            new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+              { offset: 0, color: "rgba(0,127,208,1)" },
+              { offset: 0.5, color: "rgba(0,127,208,1)" },
+              { offset: 1, color: "rgba(0,127,208,1)" },
+            ]),
+          ],
+          [1, "rgba(28,128,245,.0)"],
+        ];
+      }
+    },
+    //初始化chartInstance2对象 折线图
+    initChart() {
+      var value = 80;
+      // 初始化数据
+      const dataArr = this.loadPercent; //负载数据
+      const dataX = 100;
+      this.chartInstance = echarts.init(this.$refs.sys_charts);
+      this.option = {
+        backgroundStyle: {
+          borderWidth: 1,
+          color: "transparent",
+        },
+        title: [
+          {
+            text: `${dataArr} %`,
+            bottom: "8%",
+            left: "center",
+            textStyle: {
+              fontSize: "16", //标记
+              color: "#ffff",
+              fontWeight: 800,
+            },
+            triggerEvent: true,
+          },
+        ],
+
+        legend: {
+          show: false,
+        },
+        series: [
+          {
+            name: "最外部进度条",
+            type: "gauge",
+            radius: "99%",
+            splitNumber: 10,
+            axisLine: {
+              lineStyle: {
+                color: [
+                  [
+                    dataArr / dataX,
+                    {
+                      type: "linear",
+                      x: 0,
+                      y: 1,
+                      x2: 0.5,
+                      y2: 0.5,
+                      colorStops: [
+                        {
+                          offset: 0,
+                          color: "rgba(0,0,0,0)", // 0% 处的颜色
+                        },
+                        {
+                          offset: 0.8,
+                          color: "#195b9d", // 100% 处的颜色
+                        },
+                        {
+                          offset: 1,
+                          color: "#0a2256", // 100% 处的颜色
+                        },
+                      ],
+                      global: false, // 缺省为 false
+                    },
+                  ],
+                  [1, "#083158"],
+                ],
+                width: 5, //标记
+              },
+            },
+            axisLabel: {
+              show: false,
+            },
+            axisTick: {
+              show: false,
+            },
+            splitLine: {
+              show: false,
+            },
+            itemStyle: {
+              show: false,
+            },
+            detail: {
+              show: false,
+            },
+            title: {
+              // 标题
+              show: false,
+            },
+            data: [
+              {
+                name: "title",
+                value: dataArr,
+              },
+            ],
+            pointer: {
+              show: false,
+            },
+            animationDuration: 4000,
+          },
+          {
+            name: "刻度尺",
+            type: "gauge",
+            radius: "88%",
+            splitNumber: 10, // 刻度数量
+            min: 0, // 最小刻度
+            max: dataX, // 最大刻度
+            // 分隔线
+            splitLine: {
+              show: true,
+              length: 12,
+              lineStyle: {
+                width: 3,
+                color: "#12E5FE",
+              },
+            },
+            // 刻度线
+            axisTick: {
+              show: true,
+              splitNumber: 10,
+              length: 5,
+              lineStyle: {
+                color: "#12E5FE",
+                width: 2,
+              },
+            },
+            // 刻度标签
+            axisLabel: {
+              distance: -8, //刻度数字离轴线的距离
+              color: "#CEF3FE",
+              fontSize: "6",
+              fontWeight: 600,
+            },
+            detail: {
+              show: false,
+            },
+            axisLine: {
+              lineStyle: {
+                width: -10, //刻度离轴线的距离
+                color: [
+                  [
+                    1,
+                    {
+                      type: "radial",
+                      x: 0.5,
+                      y: 0.6,
+                      r: 0.6,
+                      colorStops: [
+                        {
+                          offset: 0.85,
+                          color: "#031F46", // 0% 处的颜色
+                        },
+                        {
+                          offset: 0.93,
+                          color: "#060d25", // 100% 处的颜色
+                        },
+                        {
+                          offset: 1,
+                          color: "#12D7EF", // 100% 处的颜色
+                        },
+                      ],
+                    },
+                  ],
+                ],
+              },
+            },
+          },
+          {
+            name: "外部指针",
+            type: "gauge",
+            radius: "90%",
+            axisLine: {
+              lineStyle: {
+                color: [
+                  [dataArr / dataX - 0.001, "rgba(0,0,0,0)"],
+                  [dataArr / dataX + 0.003, "#e43c59"],
+                  [1, "rgba(0,0,0,0)"],
+                ],
+                width: 33,
+              },
+            },
+            axisLabel: {
+              show: false,
+            },
+            axisTick: {
+              show: false,
+            },
+            splitLine: {
+              show: false,
+            },
+            itemStyle: {
+              show: false,
+            },
+            detail: {
+              show: false,
+            },
+            title: {
+              // 标题
+              show: false,
+            },
+            data: [
+              {
+                name: "title",
+                value: dataArr,
+              },
+            ],
+            pointer: {
+              show: false,
+            },
+          },
+          {
+            name: "内层带指针",
+            type: "gauge",
+            radius: "60%",
+            splitNumber: 10, // 刻度数量
+            min: 0, // 最小刻度
+            max: dataX, // 最大刻度
+            // 仪表盘轴线相关配置
+            axisLine: {
+              lineStyle: {
+                color: [
+                  [
+                    1,
+                    {
+                      type: "radial",
+                      x: 0.5,
+                      y: 0.59,
+                      r: 0.6,
+                      colorStops: [
+                        {
+                          offset: 0.72,
+                          color: "#032046",
+                        },
+                        {
+                          offset: 0.94,
+                          color: "#086989",
+                        },
+                        {
+                          offset: 0.98,
+                          color: "#0FAFCB",
+                        },
+                        {
+                          offset: 1,
+                          color: "#0EA4C1",
+                        },
+                      ],
+                    },
+                  ],
+                ],
+                width: 1000,
+              },
+            },
+            // 分隔线
+            splitLine: {
+              show: false,
+            },
+            // 刻度线
+            axisTick: {
+              show: false,
+            },
+            // 刻度标签
+            axisLabel: {
+              show: false,
+            },
+            // 仪表盘指针
+            pointer: {
+              show: true,
+              length: "95%",
+              width: 5, // 指针粗细
+            },
+            // 仪表盘指针样式
+            itemStyle: {
+              color: "#01eaf8",
+            },
+            data: [
+              {
+                value: dataArr,
+              },
+            ],
+            detail: {
+              show: false,
+            },
+          },
+
+          // 中间半圆装饰
+          {
+            type: "gauge",
+            radius: "110%", // 大小
+            center: ["50%", "127%"],
+            axisLine: {
+              show: true,
+              lineStyle: {
+                // 轴线样式
+                width: 4, // 宽度
+                color: [
+                  [
+                    1,
+                    {
+                      type: "radial",
+                      x: 0.5,
+                      y: 0,
+                      r: 0.6,
+                      colorStops: [
+                        {
+                          offset: 0,
+                          color: "#00f3f9", // 0% 处的颜色
+                        },
+                        {
+                          offset: 1,
+                          color: "#000", // 100% 处的颜色
+                        },
+                      ],
+                    },
+                  ],
+                ],
+              },
+            },
+            axisTick: {
+              // 刻度
+              show: false,
+            },
+            splitLine: {
+              // 分割线
+              show: false,
+            },
+            axisLabel: {
+              // 刻度标签
+              show: false,
+            },
+            pointer: {
+              // 仪表盘指针
+              show: false,
+            },
+            detail: {
+              // 仪表盘详情
+              show: false,
+            },
+          },
+        ],
+      };
+      //把配置项给实例对象
+      this.chartInstance.setOption(this.option, true);
+    },
+    screenAdapter() {
+      const titleFontSize = this.$refs.sys_charts.offsetWidth / 18;
+      const adapterOption = {};
+      this.chartInstance.setOption(adapterOption);
+      this.chartInstance.resize();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.sys_charts {
+  width: 2rem;
+  height: 2rem;
+}
+</style>

src/views/centerairC/sysMonitor/components/performanceChart.vue

@@ -0,0 +1,416 @@
+<template>
+    <div>
+      <div class="historyCharts" ref="chart_ref"></div>
+    </div>
+  </template>
+  
+  <script>
+  import * as echarts from "echarts";
+  export default {
+    props: {
+      temArray: {
+        type: Array,
+        default: () => [],
+      },
+    },
+    data() {
+      return {
+        chartInstance: null,
+        option: {},
+        chartData1: [],
+        chartData2: [],
+        chartData3: [],
+        chartData4: [],
+        bottomData: [],
+      };
+    },
+    watch: {
+      temArray: {
+        immediate: true, // 页面加载时立即触发一次监听
+        handler(newVal, oldVal) {
+          if (newVal) {
+            this.chartData1 = []; // 清空 chartData1
+            this.chartData2 = []; // 清空 chartData2
+            this.bottomData = []; // 清空 bottomData
+            console.log("charts传值", newVal);
+            let data = newVal;
+            if (data.length > 0) {
+              // 获取 title 和 titleStr 数组
+              const title = data.data[0].title;
+              const titleStr = data.data[1].titleStr;
+              // 获取 dataList 数组
+              const dataList = data.data[3].dataList;
+  
+              // 遍历 dataList 数组
+              dataList.forEach((item) => {
+                // 查找 name 在 title 数组中的索引
+                const index = title.indexOf(item.name);
+                if (index !== -1) {
+                  // 若找到匹配项，则将 name 替换为 titleStr 中对应位置的值
+                  item.name = titleStr[index];
+                }
+              });
+              console.log("处理后的data", data);
+              data.forEach((item) => {
+                if (item.timeStr) {
+                  this.bottomData = item.timeStr;
+                }
+                if (item.dataList) {
+                  let name1 = "";
+                  let name2 = "";
+                  let name3 = "";
+                  let name4 = "";
+                  item.dataList.forEach((val, index) => {
+                    if (val.name) {
+                      switch (index) {
+                        case 0:
+                          this.chartData1 = val.value;
+                          name1 = val.name;
+                          break;
+                        case 1:
+                          this.chartData2 = val.value;
+                          name2 = val.name;
+                          break;
+                        case 2:
+                          this.chartData3 = val.value;
+                          name3 = val.name;
+                          break;
+                        case 3:
+                          this.chartData4 = val.value;
+                          name4 = val.name;
+                          break;
+                        default:
+                          break;
+                      }
+                    }
+                  });
+                }
+              });
+              this.$nextTick(() => {
+                const adapterOption = {
+                  xAxis: {
+                    data: this.bottomData,
+                  },
+                  series: [
+                    {
+                      yAxisIndex: 0,
+                      name:name1,
+                      data: this.chartData1,
+                    },
+                    {
+                      yAxisIndex: 0,
+                      name:name2,
+                      data: this.chartData2,
+                    },
+                    {
+                      yAxisIndex: 0,
+                      name:name3,
+                      data: this.chartData3,
+                    },
+                    {
+                      yAxisIndex: 0,
+                      name:name4,
+                      data: this.chartData4,
+                    },
+                  ],
+                };
+                this.chartInstance.setOption(adapterOption);
+                //手动的调用图标对象的resize才能产生效果
+                this.chartInstance.resize();
+              });
+            } else {
+              this.$nextTick(() => {
+                const adapterOption = {
+                  xAxis: {
+                    data: [],
+                  },
+                  series: [
+                    {
+                      yAxisIndex: 0,
+                      data: [],
+                    },
+                    {
+                      yAxisIndex: 0,
+                      data: [],
+                    },
+                    {
+                      yAxisIndex: 0,
+                      data: [],
+                    },
+                    {
+                      yAxisIndex: 0,
+                      data: [],
+                    },
+                  ],
+                };
+                this.chartInstance.setOption(adapterOption);
+                //手动的调用图标对象的resize才能产生效果
+                this.chartInstance.resize();
+                this.screenAdapter();
+              });
+            }
+          }
+        },
+      },
+    },
+    mounted() {
+      this.initChart();
+      this.screenAdapter();
+    },
+    destroyed() {
+      //取消监听器
+      window.removeEventListener("resize", this.screenAdapter);
+    },
+    methods: {
+      // 折线图自适应+ 根据按钮切换图例仅限一条且不可点击+ 折线图数据
+      screenAdapter() {
+        //自己定义的比较合适的适配大小,2.6  mes_ref是图表盒子
+        const titleFontSize = this.$refs.chart_ref.offsetWidth / 130;
+        //因为option可以多次配置的，所以这里的option只需要写 需要配置大小的相关数据
+        const adapterOption = {};
+        //记得重新给配置项给实例对象。只要实例对象.chartInstance不变，option就可以多次配置不同的条件。也可以配置一个dataoption只写需要从后台请求的数据相关
+        this.chartInstance.setOption(adapterOption);
+        //手动的调用图标对象的resize才能产生效果
+        this.chartInstance.resize();
+      },
+      //初始化chartInstance对象
+      initChart() {
+        const chartRef = this.$refs.chart_ref;
+        if (chartRef) {
+          // 初始化图表的代码
+          this.chartInstance = echarts.init(this.$refs.chart_ref);
+          this.option = {
+            tooltip: {
+              trigger: "axis",
+            },
+            legend: {
+              show: true,
+              top: 0,
+              textStyle: {
+                color: "white",
+              },
+            },
+            grid: {
+              top: "10%",
+              left: "4%",
+              right: "6%",
+              bottom: "3%",
+              containLabel: true,
+            },
+            xAxis: {
+              type: "category",
+              //设置为true代表离零刻度间隔一段距离
+              boundaryGap: true,
+              // 修饰刻度标签的颜色即x坐标数据
+              axisLabel: {
+                // interval: 0, //强制显示所有x轴数据
+                // rotate: 30, //x轴坐标字体倾斜30度
+                color: "rgba(255, 255, 255, 1)",
+              },
+              axisTick: {
+                show: false, // 不显示坐标轴刻度线
+              },
+              // x坐标轴的颜色
+              axisLine: {
+                show: true,
+                lineStyle: {
+                  color: "#365576",
+                },
+              },
+              splitLine: {
+                lineStyle: {
+                  color: "#e2e6f0",
+                },
+              }, //x轴分割线
+              data: this.bottomData,
+            },
+            yAxis: {
+              min: 0,
+              // max:20,
+              // // // min:'dataMin',
+              // // // max:'dataMax',
+              // name: "kwh", // 第一个 y 轴的单位描述
+              // 设置 name 的样式
+              nameTextStyle: {
+                color: "rgba(255, 255, 255, 1)",
+                fontSize: 12,
+              },
+              miniInterval: 5,
+              type: "value",
+              // 修饰刻度标签的颜色即y坐标数据
+              axisLabel: {
+                color: "rgba(255, 255, 255, 1)",
+              },
+              // 显示y坐标轴
+              axisLine: {
+                show: true,
+                lineStyle: {
+                  color: "#365576", // 设置 y 轴线的颜色
+                },
+              },
+              //y轴分割线段数
+              // splitNumber: 10,
+              // 修改y轴分割线的颜色
+              splitLine: {
+                lineStyle: {
+                  color: "#1a3d62", // 设置分割线的颜色
+                  type: "dashed", // 设置分割线为虚线
+                },
+              },
+            },
+            series: [
+              {
+                type: "line",
+                // 拐点大小
+                symbolSize: 8,
+                data: this.chartData1,
+                //折线颜色
+                itemStyle: {
+                  color: "#1a69f1", //折线点的颜色
+                },
+                lineStyle: {
+                  color: "#1a69f1", //折线点的颜色
+                },
+                smooth: false,
+                // 不显示折线点
+                showSymbol: false,
+                // 区域填充样式，添加渐变背景
+                areaStyle: {
+                  color: {
+                    type: "linear",
+                    x: 0,
+                    y: 0,
+                    x2: 0,
+                    y2: 1,
+                    colorStops: [
+                      {
+                        offset: 0,
+                        color: "rgba(26, 105, 241, 0.5)", // 渐变起始颜色
+                      },
+                      {
+                        offset: 1,
+                        color: "rgba(26, 105, 241, 0)", // 渐变结束颜色
+                      },
+                    ],
+                    global: false, // 缺省为 false
+                  },
+                },
+              },
+              {
+                type: "line",
+                // 拐点大小
+                symbolSize: 8,
+                data: this.chartData2,
+                //折线颜色
+                itemStyle: {
+                  color: "#00CED1", //折线的颜色
+                },
+                smooth: false,
+                // 不显示折线点
+                showSymbol: false,
+                areaStyle: {
+                  color: {
+                    type: "linear",
+                    x: 0,
+                    y: 0,
+                    x2: 0,
+                    y2: 1,
+                    colorStops: [
+                      {
+                        offset: 0,
+                        color: "rgba(0, 206, 209, 0.5)", // 渐变起始颜色
+                      },
+                      {
+                        offset: 1,
+                        color: "rgba(0, 206, 209, 0)", // 渐变结束颜色
+                      },
+                    ],
+                    global: false, // 缺省为 false
+                  },
+                },
+              },
+              {
+                type: "line",
+                // 拐点大小
+                symbolSize: 8,
+                data: this.chartData3,
+                //折线颜色
+                itemStyle: {
+                  color: "#00CED1", //折线的颜色
+                },
+                smooth: false,
+                // 不显示折线点
+                showSymbol: false,
+                areaStyle: {
+                  color: {
+                    type: "linear",
+                    x: 0,
+                    y: 0,
+                    x2: 0,
+                    y2: 1,
+                    colorStops: [
+                      {
+                        offset: 0,
+                        color: "rgba(0, 206, 209, 0.5)", // 渐变起始颜色
+                      },
+                      {
+                        offset: 1,
+                        color: "rgba(0, 206, 209, 0)", // 渐变结束颜色
+                      },
+                    ],
+                    global: false, // 缺省为 false
+                  },
+                },
+              },
+              {
+                type: "line",
+                // 拐点大小
+                symbolSize: 8,
+                data: this.chartData4,
+                //折线颜色
+                itemStyle: {
+                  color: "#00CED1", //折线的颜色
+                },
+                smooth: false,
+                // 不显示折线点
+                showSymbol: false,
+                areaStyle: {
+                  color: {
+                    type: "linear",
+                    x: 0,
+                    y: 0,
+                    x2: 0,
+                    y2: 1,
+                    colorStops: [
+                      {
+                        offset: 0,
+                        color: "rgba(0, 206, 209, 0.5)", // 渐变起始颜色
+                      },
+                      {
+                        offset: 1,
+                        color: "rgba(0, 206, 209, 0)", // 渐变结束颜色
+                      },
+                    ],
+                    global: false, // 缺省为 false
+                  },
+                },
+              },
+            ],
+          };
+          //把配置项给实例对象
+          this.chartInstance.setOption(this.option, true);
+        } else {
+          console.error("未找到有效的 DOM 元素");
+        }
+      },
+    },
+  };
+  </script>
+  
+  <style lang="scss" scoped>
+  .historyCharts {
+    width: 100%;
+    height:3rem;
+  }
+  </style>
+  

src/views/centerairC/sysMonitor/components/titleImg.vue

@@ -0,0 +1,15 @@
+<template>
+  <div class="title-img">
+    <img src="../../../../assets/images/big.png" class="img1" alt="" />
+  </div>
+</template>
+<style lang="scss" scoped>
+.title-img {
+  position: relative;
+}
+.img1 {
+  width: 0.8rem;
+  height: 0.5rem;
+  z-index: 10;
+}
+</style>

src/views/centerairC/sysMonitor/index.vue

@@ -1,4 +1,5 @@
 <template>
+<<<<<<< HEAD
   <div class="monitor" v-loading="loading">
     <div class="monitor-content">
       <!-- logo -->
@@ -644,19 +645,14 @@
       </el-table>
     </el-dialog>
   </div>
+=======
+  <div></div>
+>>>>>>> dev
 </template>
 
 <script>
-import {
-  weatherData,
-  sysPerformance,
-  oneKeyButton,
-  monitorList,
-  operationConrol,
-  systemMode,
-} from "@/api/centerairC/sysMonitor";
-import LineChildren from "./lineChildren.vue";
 export default {
+<<<<<<< HEAD
   name: "sysControl",
   components: { LineChildren },
   data() {
@@ -1520,6 +1516,16 @@ export default {
         }
       });
       return true;
+=======
+  created() {
+    this.toPage();
+  },
+  methods: {
+    toPage() {
+      console.log("需要跳转的")
+      // 跳转到高校导航大屏展示
+      this.$router.push("/monitorCenter")
+>>>>>>> dev
     },
     // 裙楼-客房进出水阀启停状态
     hostAndCoolingControlClass(item) {
@@ -1556,6 +1562,7 @@ export default {
 };
 </script>
 
+<<<<<<< HEAD
 <style lang="scss" scoped>
 .monitor {
   width: 100%;
@@ -2690,3 +2697,6 @@ export default {
   margin-top: 15% !important;
 }
 </style>
+=======
+<style></style>
+>>>>>>> dev

src/views/centerairC/sysMonitor/performance.vue

@@ -0,0 +1,881 @@
+<template>
+  <div class="monitor" v-loading="loading">
+    <div class="monitor-top">
+      <img
+        class="title-left"
+        src="../../../assets/images/title-left.png"
+        alt=""
+      />
+      <img
+        class="title-center"
+        src="../../../assets/images/title-center.png"
+        alt=""
+      />
+      <img
+        class="title-right"
+        src="../../../assets/images/title-right.png"
+        alt=""
+      />
+      <div class="sys-title">铭汉高效冷源站管理系统</div>
+      <!-- logo -->
+      <img src="../../../assets/images/logo-3.png" class="sys-logo" alt="" />
+      <div class="nowTime">{{ formattedDate }}</div>
+      <div class="monitor-time">已监测时长:{{ dayData }}天</div>
+      <img
+        class="icon_warning"
+        src="../../../assets/images/warning.png"
+        title="报警记录"
+        @click="goWarning"
+        v-if="isShowWarning"
+        alt=""
+      />
+      <img
+        class="icon_home"
+        src="../../../assets/images/icon_home.png"
+        title="首页"
+        @click="goSys"
+        alt=""
+      />
+      <img
+        class="back-icon"
+        src="../../../assets/images/back-icon.png"
+        title="返回"
+        @click="goBack"
+        alt=""
+      />
+    </div>
+    <div class="host-detail">
+      <div class="detail-top">
+        <div class="detail-top-left">
+          <div class="host-li">
+            <img
+              class="host-img"
+              src="../../../assets/images/host-img4.png"
+              alt=""
+            />
+            <div class="host-name">1号螺旋机</div>
+            <div class="detail-data hostparams">
+              <div class="detail-data-top">
+                <title-img></title-img>
+                <div class="details-title">冷机性能</div>
+                <title-img></title-img>
+              </div>
+              <div class="detail-data-bottom">
+                <div class="detail-data-li">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>实时EER:</span>
+                      <span class="dotData">10.365</span>
+                      <span class="dotUnit">kw/kw</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="detail-data-li">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>实时功率:</span>
+                      <span class="dotData">126</span>
+                      <span class="dotUnit">kw</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="detail-data-li">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>实时冷量:</span>
+                      <span class="dotData">1306</span>
+                      <span class="dotUnit">kw</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="detail-data-li year-data">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>全年EER:</span>
+                      <span class="dotData">0.000</span>
+                      <span class="dotUnit">kw/kw</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="detail-data-li">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>全年用电:</span>
+                      <span class="dotData">64098</span>
+                      <span class="dotUnit">kw/H</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="detail-data-li">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>全年供电:</span>
+                      <span class="dotData">101365</span>
+                      <span class="dotUnit">kw</span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="host-li">
+            <img
+              class="host-img"
+              src="../../../assets/images/host-img4.png"
+              alt=""
+            />
+            <div class="host-name">2号螺旋机</div>
+            <div class="detail-data hostparams">
+              <div class="detail-data-top">
+                <title-img></title-img>
+                <div class="details-title">冷机性能</div>
+                <title-img></title-img>
+              </div>
+              <div class="detail-data-bottom">
+                <div class="detail-data-li">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>实时EER:</span>
+                      <span class="dotData">10.365</span>
+                      <span class="dotUnit">kw/kw</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="detail-data-li">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>实时功率:</span>
+                      <span class="dotData">126</span>
+                      <span class="dotUnit">kw</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="detail-data-li">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>实时冷量:</span>
+                      <span class="dotData">1306</span>
+                      <span class="dotUnit">kw</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="detail-data-li year-data">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>全年EER:</span>
+                      <span class="dotData">0.000</span>
+                      <span class="dotUnit">kw/kw</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="detail-data-li">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>全年用电:</span>
+                      <span class="dotData">64098</span>
+                      <span class="dotUnit">kw/H</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="detail-data-li">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>全年供电:</span>
+                      <span class="dotData">101365</span>
+                      <span class="dotUnit">kw</span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="host-li">
+            <img
+              class="host-img"
+              src="../../../assets/images/host-img3.png"
+              alt=""
+            />
+            <div class="host-name">3号磁悬浮机</div>
+            <div class="detail-data hostparams">
+              <div class="detail-data-top">
+                <title-img></title-img>
+                <div class="details-title">冷机性能</div>
+                <title-img></title-img>
+              </div>
+              <div class="detail-data-bottom">
+                <div class="detail-data-li">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>实时EER:</span>
+                      <span class="dotData">10.365</span>
+                      <span class="dotUnit">kw/kw</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="detail-data-li">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>实时功率:</span>
+                      <span class="dotData">126</span>
+                      <span class="dotUnit">kw</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="detail-data-li">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>实时冷量:</span>
+                      <span class="dotData">1306</span>
+                      <span class="dotUnit">kw</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="detail-data-li year-data">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>全年EER:</span>
+                      <span class="dotData">0.000</span>
+                      <span class="dotUnit">kw/kw</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="detail-data-li">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>全年用电:</span>
+                      <span class="dotData">64098</span>
+                      <span class="dotUnit">kw/H</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="detail-data-li">
+                  <div class="rightDot">
+                    <div class="leftDot">
+                      <span>全年供电:</span>
+                      <span class="dotData">101365</span>
+                      <span class="dotUnit">kw</span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="detail-top-right">
+          <div class="detail-data hostparams">
+            <div class="detail-data-top">
+              <title-img></title-img>
+              <div class="details-title">系统性能</div>
+              <title-img></title-img>
+            </div>
+            <div class="detail-data-bottom">
+              <div class="detail-data-li">
+                <div class="rightDot">
+                  <div class="leftDot">
+                    <span>今日EER:</span>
+                    <span class="dotData">6.531</span>
+                    <span class="dotUnit">kw/kw</span>
+                  </div>
+                </div>
+              </div>
+              <div class="detail-data-li">
+                <div class="rightDot">
+                  <div class="leftDot">
+                    <span>今日用电:</span>
+                    <span class="dotData">367</span>
+                    <span class="dotUnit">kw/H</span>
+                  </div>
+                </div>
+              </div>
+              <div class="detail-data-li">
+                <div class="rightDot">
+                  <div class="leftDot">
+                    <span>今日供冷:</span>
+                    <span class="dotData">2397</span>
+                    <span class="dotUnit">kw</span>
+                  </div>
+                </div>
+              </div>
+              <div class="detail-data-li year-data">
+                <div class="rightDot">
+                  <div class="leftDot">
+                    <span>当月EER:</span>
+                    <span class="dotData">6.131</span>
+                    <span class="dotUnit">kw/kw</span>
+                  </div>
+                </div>
+              </div>
+              <div class="detail-data-li">
+                <div class="rightDot">
+                  <div class="leftDot">
+                    <span>今月用电:</span>
+                    <span class="dotData">27840</span>
+                    <span class="dotUnit">kw/H</span>
+                  </div>
+                </div>
+              </div>
+              <div class="detail-data-li">
+                <div class="rightDot">
+                  <div class="leftDot">
+                    <span>当月供冷:</span>
+                    <span class="dotData">172069</span>
+                    <span class="dotUnit">kw</span>
+                  </div>
+                </div>
+              </div>
+              <div class="detail-data-li year-data">
+                <div class="rightDot">
+                  <div class="leftDot">
+                    <span>当年EER:</span>
+                    <span class="dotData">6.531</span>
+                    <span class="dotUnit">kw/kw</span>
+                  </div>
+                </div>
+              </div>
+              <div class="detail-data-li">
+                <div class="rightDot">
+                  <div class="leftDot">
+                    <span>当年用电:</span>
+                    <span class="dotData">105771</span>
+                    <span class="dotUnit">kw/H</span>
+                  </div>
+                </div>
+              </div>
+              <div class="detail-data-li">
+                <div class="rightDot">
+                  <div class="leftDot">
+                    <span>当年供冷:</span>
+                    <span class="dotData">744519</span>
+                    <span class="dotUnit">kw</span>
+                  </div>
+                </div>
+              </div>
+              <div class="detail-data-li year-data">
+                <div class="rightDot">
+                  <div class="leftDot">
+                    <span class="dotTitle">累计EER:</span>
+                    <span class="dotData">5.531</span>
+                    <span class="dotUnit">kw/kw</span>
+                  </div>
+                </div>
+              </div>
+              <div class="detail-data-li">
+                <div class="rightDot">
+                  <div class="leftDot">
+                    <span class="dotTitle">累计用电:</span>
+                    <span class="dotData">1096628</span>
+                    <span class="dotUnit">kw/H</span>
+                  </div>
+                </div>
+              </div>
+              <div class="detail-data-li">
+                <div class="rightDot">
+                  <div class="leftDot">
+                    <span class="dotTitle">累计供冷:</span>
+                    <span class="dotData">6107983</span>
+                    <span class="dotUnit">kw</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="detail-bottom">
+        <performance-chart :temArray="temArray"></performance-chart>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  hostDetailsData,
+  hostTemData,
+  runTime,
+} from "@/api/centerairC/sysMonitor";
+import { alarmRecordList } from "@/api/alarm/alarmRecord";
+import titleImg from "./components/titleImg.vue";
+import { format } from "@/utils/datetime";
+import PerformanceChart from './components/performanceChart.vue';
+export default {
+  name: "sysControl",
+  components: { titleImg, PerformanceChart },
+  data() {
+    return {
+      loading: false,
+
+      currentDate: new Date(),
+      nowTimer: null,
+      deviceName: "", //主机名称
+      hostData: [], //冷机性能
+      rightHostData: [], //右
+      automaticObj: {}, //手自动状态
+      localObj: {}, //本地远程状态
+      badObj: {}, //故障状态
+      timeObj: {}, //累计运行时间
+      compressorData: [], //压缩机参数
+      temArray: [], //冷冻冷却水温度
+      isMagnetic: false,
+      isShowWarning: false, //是否有报警
+      dayData: "", //监测天数
+    };
+  },
+  computed: {
+    formattedDate() {
+      const year = this.currentDate.getFullYear();
+      const month = String(this.currentDate.getMonth() + 1).padStart(2, "0");
+      const day = String(this.currentDate.getDate()).padStart(2, "0");
+      const hours = String(this.currentDate.getHours()).padStart(2, "0");
+      const minutes = String(this.currentDate.getMinutes()).padStart(2, "0");
+      const seconds = String(this.currentDate.getSeconds()).padStart(2, "0");
+      const weekDays = [
+        "星期日",
+        "星期一",
+        "星期二",
+        "星期三",
+        "星期四",
+        "星期五",
+        "星期六",
+      ];
+      const weekDay = weekDays[this.currentDate.getDay()];
+      return `${year}年${month}月${day}日 ${hours}:${minutes}:${seconds} ${weekDay}`;
+    },
+  },
+  created() {},
+  mounted() {
+    this.getHostDetailsData();
+    this.getDayData();
+    // 在组件挂载后尝试进入全屏
+    setTimeout(() => {
+      this.requestFullscreen();
+    }, 100); // 延迟 100 毫秒执行全屏操作
+  },
+  beforeDestroy() {
+    // 组件销毁前清除定时器
+    if (this.nowTimer) {
+      clearInterval(this.nowTimer);
+    }
+  },
+  methods: {
+    // 全屏操作
+    requestFullscreen() {
+      const element = document.documentElement;
+      console.log("全屏了吗");
+      if (element.requestFullscreen) {
+        element.requestFullscreen();
+      } else if (element.mozRequestFullScreen) {
+        // Firefox
+        element.mozRequestFullScreen();
+      } else if (element.webkitRequestFullscreen) {
+        // Chrome, Safari and Opera
+        element.webkitRequestFullscreen();
+      } else if (element.msRequestFullscreen) {
+        // IE/Edge
+        element.msRequestFullscreen();
+      }
+    },
+    // 退出全屏
+    exitFullscreen() {
+      if (document.exitFullscreen) {
+        document.exitFullscreen();
+      } else if (document.mozCancelFullScreen) {
+        // Firefox
+        document.mozCancelFullScreen();
+      } else if (document.webkitExitFullscreen) {
+        // Chrome, Safari and Opera
+        document.webkitExitFullscreen();
+      } else if (document.msExitFullscreen) {
+        // IE/Edge
+        document.msExitFullscreen();
+      }
+    },
+    // 进入系统首页
+    goSys() {
+      this.exitFullscreen();
+      this.$router.push("/");
+    },
+    // 返回上一页
+    goBack() {
+      this.$router.back();
+    },
+    getHostDetailsData() {
+      // 请求数据
+      // this.getHostParams(deviceLedgerId);
+    },
+    // 监测天数
+    getDayData() {
+      runTime().then((res) => {
+        if (res.code == 200) {
+          this.dayData = res.data.runTime;
+        }
+      });
+    },
+    // 报警列表
+    getAlarnStatus() {
+      let data = {
+        pageNum: 1,
+        pageSize: 10,
+        status: "0",
+      };
+      let timeArr = [getDay(0), getDay(0)];
+      alarmRecordList(this.addDateRange(data, timeArr)).then((res) => {
+        if (res.code == 200 && res.rows.length > 0) {
+          this.isShowWarning = true;
+        } else {
+          this.isShowWarning = false;
+        }
+      });
+    },
+    goWarning() {
+      this.exitFullscreen();
+      this.$router.push("/alarm/alarmRecord");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.monitor {
+  width: 100%;
+  min-height: 100vh;
+  height: auto;
+  background-color: black;
+  color: #fff;
+  .monitor-top {
+    width: 100%;
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    justify-content: space-between;
+    flex-wrap: nowrap;
+    padding: 0.1rem 0.2rem;
+    position: relative;
+    .title-left {
+      width: 3.41rem;
+      height: 0.8rem;
+    }
+    .title-center {
+      width: 9.46rem;
+      height: 0.69rem;
+    }
+    .title-right {
+      width: 5.04rem;
+      height: 0.61rem;
+    }
+    .sys-title {
+      position: absolute;
+      top: 40%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      font-size: 0.28rem;
+      color: #ffffff;
+      font-weight: bold;
+      z-index: 100;
+    }
+    .nowTime {
+      position: absolute;
+      top: 0.3rem;
+      right: 0.6rem;
+      font-size: 0.18rem;
+      color: #ffffff;
+      font-weight: bold;
+      z-index: 100;
+    }
+    .sys-logo {
+      width: 1.8rem;
+      height: 0.5rem;
+      position: absolute;
+      top: 0.26rem;
+      left: 0.8rem;
+      z-index: 10;
+    }
+    .monitor-time {
+      position: absolute;
+      top: 0.44rem;
+      left: 4.2rem;
+      z-index: 10;
+      font-size: 0.18rem;
+      color: #ffffff;
+      font-weight: bold;
+    }
+    .icon_warning {
+      position: absolute;
+      top: 0.33rem;
+      right: 4.4rem;
+      z-index: 10;
+      width: 0.3rem;
+      height: 0.27rem;
+      margin: 0 0.25rem 0 0.27rem;
+      cursor: pointer;
+      /* 添加闪烁动画 */
+      animation: blink 1s infinite;
+    }
+    @keyframes blink {
+      100% {
+        opacity: 1;
+      }
+      50% {
+        opacity: 0;
+      }
+    }
+    .icon_home {
+      position: absolute;
+      top: 0.33rem;
+      right: 4rem;
+      z-index: 10;
+      width: 0.3rem;
+      height: 0.27rem;
+      margin: 0 0.2rem 0 0.27rem;
+      cursor: pointer;
+    }
+    .back-icon {
+      position: absolute;
+      top: 0.33rem;
+      right: 3.7rem;
+      z-index: 10;
+      width: 0.3rem;
+      height: 0.27rem;
+      cursor: pointer;
+    }
+  }
+  .host-detail {
+    padding: 0.2rem;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    .detail-top {
+      width: 100%;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: space-between;
+      .detail-top-left {
+        width: 14rem;
+        // background-color: aquamarine;
+        position: relative;
+        display: flex;
+        flex-direction: row;
+        align-items: flex-start;
+        .host-li {
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          margin-left: 0.3rem;
+          position: relative;
+          .host-img {
+            width: 3.5rem;
+            height: 2.6rem;
+            margin-bottom: 0.1rem;
+          }
+          .host-name{
+            position: absolute;
+            top: 0.8rem;
+            left: 1.6rem;
+            color: #3520f8;
+            font-size: 0.18rem;
+            font-weight: bold;
+          }
+        }
+      }
+      .detail-top-right {
+        width: calc(100% - 14rem);
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+      }
+      .detail-data {
+        display: flex;
+        flex-direction: column;
+        width: 4.5rem;
+        position: relative;
+        .detail-data-top {
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: center;
+          color: #c0dffc;
+          font-weight: bold;
+          font-size: 0.18rem;
+          width: 100%;
+          text-align: center;
+          z-index: 10;
+          .details-title {
+            margin: 0 0.15rem;
+          }
+        }
+        .detail-data-bottom {
+          width: 100%;
+          padding: 0rem 0.3rem;
+          z-index: 0;
+          display: flex;
+          flex-direction: row;
+          flex-wrap: wrap;
+          align-items: flex-start;
+          justify-content: center;
+          .detail-data-li {
+            width: 80%;
+            margin-right: 0.1rem;
+            position: relative;
+            color: #89acc4;
+            font-family: Arial, sans-serif;
+            letter-spacing: 0.02rem;
+            font-size: 0.18rem;
+            position: relative;
+            margin-bottom: 0.08rem;
+            border-left: 0.01rem solid #217df5;
+            border-right: 0.01rem solid #217df5;
+            background-image: radial-gradient(
+                circle at left top,
+                #217df5 0.01rem,
+                transparent 0.01rem
+              ),
+              radial-gradient(
+                circle at right top,
+                #217df5 0.01rem,
+                transparent 0.01rem
+              ),
+              radial-gradient(
+                circle at left bottom,
+                #217df5 0.01rem,
+                transparent 0.01rem
+              ),
+              radial-gradient(
+                circle at right bottom,
+                #217df5 0.01rem,
+                transparent 0.01rem
+              );
+            background-repeat: no-repeat;
+            background-position: left top, right top, left bottom, right bottom;
+          }
+          .detail-data-li::before,
+          .detail-data-li::after {
+            content: "";
+            position: absolute;
+            left: 0;
+            right: 0;
+            height: 0.01rem;
+            background-image: linear-gradient(
+              to right,
+              #217df5 0%,
+              rgba(41, 128, 185, 0) 50%,
+              #217df5 100%
+            ) !important;
+          }
+          .year-data {
+            margin-top: 0.1rem;
+          }
+          .rightDot {
+            position: relative;
+            width: 100%;
+            height: 100%;
+            z-index: 999;
+          }
+          .leftDot {
+            position: relative;
+            width: 100%;
+            height: 100%;
+            padding: 0.04rem 0.1rem;
+            display: flex;
+            flex-direction: row;
+            justify-content: space-between;
+            .dotData {
+              font-weight: bold;
+              margin: 0 0.06rem;
+              color: #3b80ff;
+              display: flex;
+              align-items: center;
+            }
+            .dotUnit{
+              width: 0.55rem;
+              text-align: left;
+              display: flex;
+              align-items: center;
+            }
+          }
+
+          .rightDot::before {
+            content: "";
+            position: absolute;
+            top: -0.03rem;
+            right: -0.03rem;
+            width: 0.06rem;
+            height: 0.06rem;
+            background-color: #217df5;
+            box-shadow: 0 0 0.1rem 0.02rem rgba(33, 125, 245, 0.9);
+            background-image: radial-gradient(
+              circle at 30% 30%,
+              rgba(255, 255, 255, 0.8) 0%,
+              rgba(255, 255, 255, 0) 70%
+            );
+            border-radius: 50%;
+          }
+
+          .rightDot::after {
+            content: "";
+            position: absolute;
+            bottom: -0.03rem;
+            right: -0.03rem;
+            width: 0.06rem;
+            height: 0.06rem;
+            background-color: #217df5;
+            box-shadow: 0 0 0.1rem 0.02rem rgba(33, 125, 245, 0.9);
+            background-image: radial-gradient(
+              circle at 30% 30%,
+              rgba(255, 255, 255, 0.8) 0%,
+              rgba(255, 255, 255, 0) 70%
+            );
+            border-radius: 50%;
+          }
+          .leftDot::before {
+            content: "";
+            position: absolute;
+            top: -0.03rem;
+            left: -0.03rem;
+            width: 0.06rem;
+            height: 0.06rem;
+            background-color: #217df5;
+            border-radius: 50%;
+            box-shadow: 0 0 0.1rem 0.02rem rgba(33, 125, 245, 0.9);
+            background-image: radial-gradient(
+              circle at 30% 30%,
+              rgba(255, 255, 255, 0.8) 0%,
+              rgba(255, 255, 255, 0) 70%
+            );
+          }
+
+          .leftDot::after {
+            content: "";
+            position: absolute;
+            bottom: -0.03rem;
+            left: -0.03rem;
+            width: 0.06rem;
+            height: 0.06rem;
+            background-color: #217df5;
+            box-shadow: 0 0 0.1rem 0.02rem rgba(33, 125, 245, 0.9);
+            background-image: radial-gradient(
+              circle at 30% 30%,
+              rgba(255, 255, 255, 0.8) 0%,
+              rgba(255, 255, 255, 0) 70%
+            );
+            border-radius: 50%;
+          }
+        }
+        .line1 {
+          position: absolute;
+          top: 0.53rem;
+        }
+      }
+    }
+    .detail-bottom {
+      // margin: 0.3rem 0.5rem 0 0.5rem;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      height:3rem;
+      // background-color: #217df5;
+    }
+  }
+}
+</style>

src/views/device/comm/index.vue

@@ -47,7 +47,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <div class="primary-btn" v-hasPermi="['system:post:add']">
+        <div class="primary-btn" v-hasPermi="['device:cmp:add']">
           <el-button
             type="primary"
             icon="el-icon-plus"
@@ -58,7 +58,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="success-btn" v-hasPermi="['system:post:edit']">
+        <div class="success-btn" v-hasPermi="['device:cmp:edit']">
           <el-button
             type="success"
             icon="el-icon-edit"
@@ -70,7 +70,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="delete-btn" v-hasPermi="['system:post:remove']">
+        <div class="delete-btn" v-hasPermi="['device:cmp:remove']">
           <el-button
             type="delete"
             icon="el-icon-delete"
@@ -81,7 +81,7 @@
           >
         </div>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <div class="warning-btn" v-hasPermi="['system:post:export']">
           <el-button
             type="warning"
@@ -91,7 +91,7 @@
             >导出</el-button
           >
         </div>
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -144,7 +144,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:post:edit']"
+            v-hasPermi="['device:cmp:edit']"
             >修改</el-button
           >
           <el-button
@@ -152,7 +152,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:post:remove']"
+            v-hasPermi="['device:cmp:remove']"
             >删除</el-button
           >
         </template>

src/views/device/gateway/index.vue

@@ -55,7 +55,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <div class="primary-btn" v-hasPermi="['system:post:add']">
+        <div class="primary-btn" v-hasPermi="['device:gw:add']">
           <el-button
             type="primary"
             icon="el-icon-plus"
@@ -66,7 +66,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="success-btn" v-hasPermi="['system:post:edit']">
+        <div class="success-btn" v-hasPermi="['device:gw:edit']">
           <el-button
             type="success"
             icon="el-icon-edit"
@@ -78,7 +78,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="delete-btn" v-hasPermi="['system:post:remove']">
+        <div class="delete-btn" v-hasPermi="['device:gw:remove']">
           <el-button
             type="delete"
             icon="el-icon-delete"
@@ -89,7 +89,7 @@
           >
         </div>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <div class="warning-btn" v-hasPermi="['system:post:export']">
           <el-button
             type="warning"
@@ -99,7 +99,7 @@
             >导出</el-button
           >
         </div>
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -170,7 +170,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:post:edit']"
+            v-hasPermi="['device:gw:edit']"
             >修改</el-button
           >
           <el-button
@@ -178,7 +178,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:post:remove']"
+            v-hasPermi="['device:gw:remove']"
             >删除</el-button
           >
         </template>

src/views/device/gather/index.vue

@@ -92,7 +92,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <div class="primary-btn" v-hasPermi="['system:post:add']">
+        <div class="primary-btn" v-hasPermi="['device:cpm:add']">
           <el-button
             type="primary"
             icon="el-icon-plus"
@@ -103,7 +103,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="success-btn" v-hasPermi="['system:post:edit']">
+        <div class="success-btn" v-hasPermi="['device:cpm:edit']">
           <el-button
             type="success"
             icon="el-icon-edit"
@@ -115,7 +115,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="delete-btn" v-hasPermi="['system:post:remove']">
+        <div class="delete-btn" v-hasPermi="['device:cpm:remove']">
           <el-button
             type="delete"
             icon="el-icon-delete"
@@ -126,7 +126,7 @@
           >
         </div>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <div class="warning-btn" v-hasPermi="['system:post:export']">
           <el-button
             type="warning"
@@ -136,7 +136,7 @@
             >导出</el-button
           >
         </div>
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -281,7 +281,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:post:edit']"
+            v-hasPermi="['device:cpm:edit']"
             >修改</el-button
           >
           <el-button
@@ -289,7 +289,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:post:remove']"
+            v-hasPermi="['device:cpm:remove']"
             >删除</el-button
           >
         </template>

src/views/device/ledger/index.vue

@@ -77,7 +77,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <div class="primary-btn" v-hasPermi="['system:post:add']">
+        <div class="primary-btn" v-hasPermi="['device:ledger:add']">
           <el-button
             type="primary"
             icon="el-icon-plus"
@@ -88,7 +88,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="success-btn" v-hasPermi="['system:post:edit']">
+        <div class="success-btn" v-hasPermi="['device:ledger:edit']">
           <el-button
             type="success"
             icon="el-icon-edit"
@@ -100,7 +100,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="delete-btn" v-hasPermi="['system:post:remove']">
+        <div class="delete-btn" v-hasPermi="['device:ledger:remove']">
           <el-button
             type="delete"
             icon="el-icon-delete"
@@ -111,7 +111,7 @@
           >
         </div>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <div class="warning-btn" v-hasPermi="['system:post:export']">
           <el-button
             type="warning"
@@ -121,7 +121,7 @@
             >导出</el-button
           >
         </div>
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -192,7 +192,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:post:edit']"
+            v-hasPermi="['device:ledger:edit']"
             >修改</el-button
           >
           <el-button
@@ -200,7 +200,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:post:remove']"
+            v-hasPermi="['device:ledger:remove']"
             >删除</el-button
           >
         </template>

src/views/device/maintenance/index.vue

@@ -153,7 +153,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <div class="primary-btn" v-hasPermi="['system:post:add']">
+        <div class="primary-btn" v-hasPermi="['device:maintain:add']">
           <el-button
             type="primary"
             icon="el-icon-plus"
@@ -164,7 +164,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="success-btn" v-hasPermi="['system:post:edit']">
+        <div class="success-btn" v-hasPermi="['device:maintain:edit']">
           <el-button
             type="success"
             icon="el-icon-edit"
@@ -176,7 +176,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="delete-btn" v-hasPermi="['system:post:remove']">
+        <div class="delete-btn" v-hasPermi="['device:maintain:remove']">
           <el-button
             type="delete"
             icon="el-icon-delete"
@@ -187,7 +187,7 @@
           >
         </div>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <div class="warning-btn" v-hasPermi="['system:post:export']">
           <el-button
             type="warning"
@@ -197,7 +197,7 @@
             >导出</el-button
           >
         </div>
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -263,7 +263,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:post:edit']"
+            v-hasPermi="['device:maintain:edit']"
             >修改</el-button
           >
           <el-button
@@ -271,7 +271,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:post:remove']"
+            v-hasPermi="['device:maintain:remove']"
             >删除</el-button
           >
         </template>

src/views/device/qrCode/index.vue

@@ -47,7 +47,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <div class="primary-btn" v-hasPermi="['system:post:add']">
+        <div class="primary-btn" v-hasPermi="['device:qr:create']">
           <el-button
             type="primary"
             icon="el-icon-folder-add"
@@ -58,7 +58,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="success-btn" v-hasPermi="['system:post:edit']">
+        <div class="success-btn" v-hasPermi="['device:qr:edit']">
           <el-button
             type="success"
             icon="el-icon-edit"
@@ -70,7 +70,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="delete-btn" v-hasPermi="['system:post:remove']">
+        <div class="delete-btn" v-hasPermi="['device:qr:remove']">
           <el-button
             type="delete"
             icon="el-icon-delete"
@@ -81,7 +81,7 @@
           >
         </div>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <div class="warning-btn" v-hasPermi="['system:post:export']">
           <el-button
             type="warning"
@@ -91,7 +91,7 @@
             >导出</el-button
           >
         </div>
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -171,7 +171,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:post:edit']"
+            v-hasPermi="['device:qr:edit']"
             >修改</el-button
           >
           <el-button
@@ -179,7 +179,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:post:remove']"
+            v-hasPermi="['device:qr:remove']"
             >删除</el-button
           >
         </template>

src/views/device/spare/index.vue

@@ -63,7 +63,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <div class="primary-btn" v-hasPermi="['system:post:add']">
+        <div class="primary-btn" v-hasPermi="['device:spare:add']">
           <el-button
             type="primary"
             icon="el-icon-plus"
@@ -74,7 +74,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="success-btn" v-hasPermi="['system:post:edit']">
+        <div class="success-btn" v-hasPermi="['device:spare:edit']">
           <el-button
             type="success"
             icon="el-icon-edit"
@@ -86,7 +86,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="delete-btn" v-hasPermi="['system:post:remove']">
+        <div class="delete-btn" v-hasPermi="['device:spare:remove']">
           <el-button
             type="delete"
             icon="el-icon-delete"
@@ -97,7 +97,7 @@
           >
         </div>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <div class="warning-btn" v-hasPermi="['system:post:export']">
           <el-button
             type="warning"
@@ -107,7 +107,7 @@
             >导出</el-button
           >
         </div>
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -154,7 +154,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:post:edit']"
+            v-hasPermi="['device:spare:edit']"
             >修改</el-button
           >
           <el-button
@@ -162,7 +162,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:post:remove']"
+            v-hasPermi="['device:spare:remove']"
             >删除</el-button
           >
         </template>

src/views/device/spareInOut/index.vue

@@ -77,7 +77,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <div class="primary-btn" v-hasPermi="['system:post:add']">
+        <div class="primary-btn" v-hasPermi="['device:spareInOut:add']">
           <el-button type="primary" size="mini" @click="handleOut"
             ><svg-icon
               icon-class="Outbound"
@@ -87,7 +87,7 @@
         </div>
       </el-col>
       <el-col :span="1.5">
-        <div class="primary-btn" v-hasPermi="['system:post:add']">
+        <div class="primary-btn" v-hasPermi="['device:spareInOut:add']">
           <el-button type="primary" size="mini" @click="handleIn"
             ><svg-icon
               icon-class="Inbound"
@@ -96,7 +96,7 @@
           >
         </div>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <div class="warning-btn" v-hasPermi="['system:post:export']">
           <el-button
             type="warning"
@@ -106,7 +106,7 @@
             >导出</el-button
           >
         </div>
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"

src/views/monitor/job/index.vue

@@ -285,7 +285,11 @@
           <el-col :span="24">
             <el-form-item label="cron表达式" prop="cronExpression">
               <el-input
+<<<<<<< HEAD
                 style="width: 76%"
+=======
+              style="width: 76%;"
+>>>>>>> dev
                 v-model="form.cronExpression"
                 placeholder="请输入cron执行表达式"
               >
@@ -428,7 +432,7 @@ import Crontab from "@/components/Crontab";
 
 export default {
   components: { Crontab },
-  name: "Job",
+  // name: "Job",
   dicts: ["sys_job_group", "sys_job_status"],
   data() {
     return {

src/views/region/index.vue

@@ -178,7 +178,6 @@
               type="text"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
-              v-hasPermi="['system:post:edit']"
               >修改</el-button
             >
             <el-button
@@ -186,7 +185,6 @@
               type="text"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
-              v-hasPermi="['system:post:remove']"
               >删除</el-button
             >
           </template>

src/views/temSys/temHistory/index.vue

@@ -18,6 +18,7 @@
               clearable
               v-model="selectedValue"
               @change="handleCascaderChange"
+              filterable
             ></el-cascader>
           </el-form-item>
           <el-form-item label="时间范围" prop="gwName">
@@ -251,7 +252,7 @@ export default {
 
 <style lang="scss" scoped>
 .elCascader {
-  width: 290px;
+  width: 350px;
 }
 .history {
   width: 100%;
@@ -306,3 +307,8 @@ export default {
   }
 }
 </style>
+<style scoped>
+.elCascader >>>.el-input__inner::placeholder {
+  color: transparent !important;
+}
+</style>

src/views/tool/build/index.vue

@@ -599,7 +599,11 @@ $lighterBlue: #409eff;
   height: calc(100vh - 42px);
   overflow: hidden;
   border-left: 1px solid #0e5191;
+<<<<<<< HEAD
   border-left: 1px solid #0e5191;
+=======
+  border-right: 1px solid #0e5191 ;
+>>>>>>> dev
   box-sizing: border-box;
 }
 .center-board {
@@ -623,8 +627,13 @@ $lighterBlue: #409eff;
   height: 42px;
   text-align: right;
   padding: 0 15px;
+<<<<<<< HEAD
   box-sizing: border-box;
   border: 1px solid #0e5191;
+=======
+  box-sizing: border-box;;
+  border: 1px solid  #0e5191 ;
+>>>>>>> dev
   border-top: none;
   border-left: none;
   .delete-btn {