解决冲突

6ff86fe2 · 高超凡 · ff418995 · c1dc4d83 · 6ff86fe2 · 6ff86fe2
Commit 6ff86fe2 authored May 24, 2021 by 高超凡
53 changed files
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
    "dayjs": "^1.6.7",
    "echarts": "^4.1.0",
    "el-table-infinite-scroll": "^1.0.8",
+    "element-resize-detector": "^1.2.2",
    "element-ui": "^2.12.0",
    "file-saver": "^1.3.3",
    "flex.css": "^1.1.7",

--- a/public/config.js
+++ b/public/config.js
 var CONFIG = {}

 // 页面 title 前缀
-CONFIG.TITLE = 'AI节能管理系统'
+CONFIG.TITLE = '拉林线-山南站AI节能系统'

 // 网络请求公用地址

@@ -11,5 +11,5 @@ CONFIG.TITLE = 'AI节能管理系统'
 CONFIG.requestPath = 'http://59.110.43.122:8046'

 // 文件上传
-// CONFIG.urlPath = 'http://10.20.72.33/'
+// CONFIG.urlPath = 'http://10.20.72.31/'
 CONFIG.urlPath = 'http://59.110.43.122/'
--- a/public/index.html
+++ b/public/index.html
 <!DOCTYPE html>
 <html>
  <head>
-    <meta charset="utf-8">
-    <meta name="renderer" content="webkit"/>
-    <meta name="force-rendering" content="webkit"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta charset="utf-8" />
+    <meta name="renderer" content="webkit" />
+    <meta name="force-rendering" content="webkit" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta http-equiv="Content-Security-Policy" />
+    <!-- <meta name="viewport" content="width=device-width,initial-scale=1.0"> -->
+    <!-- <meta http-equiv="X-UA-Compatible" content="IE=edge"> -->
+    <meta
+      name="viewport"
+      content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,er-scalable=no"
+    />
    <!-- <link rel="icon" href="<%= BASE_URL %>icon.ico"> -->
    <link href="icon.jpg" rel="icon" type="image/x-icon" />
    <!-- <script src = "https://cdn.jsdelivr.net/npm/proxy-polyfill@0.3.0/proxy.min.js"></script> -->

-    <title>铁路车站AI节能管理系统</title>
+    <title>拉林线-山南站AI节能系统</title>
    <script>
      //禁用所有控制台输出
-      // var console={};
-      // console.log=function(){};
-      // console.warn=function(){};
-      // console.error=function(){};
+      var console = {}
+      console.log = function () {}
+      console.warn = function () {}
+      console.error = function () {}
    </script>
    <script src="./config.js"></script>
    <style>
-      html, body, #app {
+      html,
+      body,
+      #app {
        height: 100%;
        margin: 0px;
        padding: 0px;
      }
-      #app{
+      #app {
        /* background: url('./image/bg2x.png') no-repeat fixed center; */
        background-color: #ccc;
      }
@@ -36,11 +44,21 @@
        justify-content: center;
        align-items: center;
        flex-direction: column;
-        background: linear-gradient(to bottom, rgba(255,255,255,0.15) 0%, rgba(0,0,0,0.15) 100%), radial-gradient(at top center, rgba(255,255,255,0.40) 0%, rgba(0,0,0,0.40) 120%) #989898;
-        background-blend-mode: multiply,multiply;
+        background: linear-gradient(
+            to bottom,
+            rgba(255, 255, 255, 0.15) 0%,
+            rgba(0, 0, 0, 0.15) 100%
+          ),
+          radial-gradient(
+              at top center,
+              rgba(255, 255, 255, 0.4) 0%,
+              rgba(0, 0, 0, 0.4) 120%
+            )
+            #989898;
+        background-blend-mode: multiply, multiply;
      }
      .d2-app-loading-title {
-        color: #FFF;
+        color: #fff;
        font-weight: bold;
        font-size: 14px;
        margin-top: 40px;
@@ -48,14 +66,14 @@
        letter-spacing: 0.2em;
      }
      .d2-app-loading-sub-title {
-        color: #FFF;
+        color: #fff;
        font-size: 10px;
        margin-bottom: 10px;
      }
      .d2-app-loading-sub-info {
-        color: #FFF;
+        color: #fff;
        font-size: 10px;
-        opacity: .8;
+        opacity: 0.8;
        margin-bottom: 4px;
      }
      .d2-app-loading-btn {
@@ -73,7 +91,7 @@
        box-sizing: border-box;
        outline: none;
        margin: 0;
-        transition: .1s;
+        transition: 0.1s;
        font-weight: 500;
        -moz-user-select: none;
        -webkit-user-select: none;
@@ -93,68 +111,82 @@
      .d2-app-loading-grid .d2-app-loading {
        width: 10px;
        height: 10px;
-        background-color: #FFF;
+        background-color: #fff;
        float: left;
-        -webkit-animation: d2-app-loading-grid-scale-delay 1.3s infinite ease-in-out;
+        -webkit-animation: d2-app-loading-grid-scale-delay 1.3s infinite
+          ease-in-out;
        animation: d2-app-loading-grid-scale-delay 1.3s infinite ease-in-out;
      }
      .d2-app-loading-grid .d2-app-loading1 {
        border-top-left-radius: 4px;
        -webkit-animation-delay: 0.2s;
-                animation-delay: 0.2s; }
+        animation-delay: 0.2s;
+      }
      .d2-app-loading-grid .d2-app-loading2 {
        -webkit-animation-delay: 0.3s;
-                animation-delay: 0.3s; }
+        animation-delay: 0.3s;
+      }
      .d2-app-loading-grid .d2-app-loading3 {
        border-top-right-radius: 4px;
        -webkit-animation-delay: 0.4s;
-                animation-delay: 0.4s; }
+        animation-delay: 0.4s;
+      }
      .d2-app-loading-grid .d2-app-loading4 {
        -webkit-animation-delay: 0.1s;
-                animation-delay: 0.1s; }
+        animation-delay: 0.1s;
+      }
      .d2-app-loading-grid .d2-app-loading5 {
        -webkit-animation-delay: 0.2s;
-                animation-delay: 0.2s; }
+        animation-delay: 0.2s;
+      }
      .d2-app-loading-grid .d2-app-loading6 {
        -webkit-animation-delay: 0.3s;
-                animation-delay: 0.3s; }
+        animation-delay: 0.3s;
+      }
      .d2-app-loading-grid .d2-app-loading7 {
        border-bottom-left-radius: 4px;
        -webkit-animation-delay: 0s;
-                animation-delay: 0s; }
+        animation-delay: 0s;
+      }
      .d2-app-loading-grid .d2-app-loading8 {
        -webkit-animation-delay: 0.1s;
-                animation-delay: 0.1s; }
+        animation-delay: 0.1s;
+      }
      .d2-app-loading-grid .d2-app-loading9 {
        border-bottom-right-radius: 4px;
        -webkit-animation-delay: 0.2s;
-                animation-delay: 0.2s; }
+        animation-delay: 0.2s;
+      }

      @-webkit-keyframes d2-app-loading-grid-scale-delay {
-        0%, 70%, 100% {
+        0%,
+        70%,
+        100% {
          -webkit-transform: scale3D(1, 1, 1);
          transform: scale3D(1, 1, 1);
-        } 35% {
+        }
+        35% {
          -webkit-transform: scale3D(0, 0, 1);
          transform: scale3D(0, 0, 1);
        }
      }

      @keyframes d2-app-loading-grid-scale-delay {
-        0%, 70%, 100% {
+        0%,
+        70%,
+        100% {
          -webkit-transform: scale3D(1, 1, 1);
          transform: scale3D(1, 1, 1);
-        } 35% {
+        }
+        35% {
          -webkit-transform: scale3D(0, 0, 1);
          transform: scale3D(0, 0, 1);
        }
      }
-      
    </style>
    <!-- ua -->
    <script>
      // let stationId = '40bf04d6f2e2ec3bfbb43aa51a7facc8';
-
    </script>
    <script src="<%= BASE_URL %>script/ua-parser.min.js"></script>
    <script src="<%= BASE_URL %>script/ua.js"></script>
@@ -166,7 +198,10 @@
  </head>
  <body>
    <noscript>
-      <strong>We're sorry but d2-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+      <strong
+        >We're sorry but d2-admin doesn't work properly without JavaScript
+        enabled. Please enable it to continue.</strong
+      >
    </noscript>
    <div id="app">
      <div class="d2-app-loading-group">
@@ -182,8 +217,12 @@
          <div class="d2-app-loading d2-app-loading9"></div>
        </div>
        <div class="d2-app-loading-title">加载中</div>
-        <div class="d2-app-loading-sub-title">欢迎使用铁路车站AI节能管理系统。初次加载较慢，请耐心等待</div>
-        <div class="d2-app-loading-sub-info">如果很久很久都没有加载成功，请清空缓存重新加载页面</div>
+        <div class="d2-app-loading-sub-title">
+          欢迎使用拉林线-山南站AI节能系统。初次加载较慢，请耐心等待
+        </div>
+        <div class="d2-app-loading-sub-info">
+          如果很久很久都没有加载成功，请清空缓存重新加载页面
+        </div>
      </div>
    </div>
    <!-- built files will be auto injected -->

--- a/src/App.vue
+++ b/src/App.vue
@@ -149,7 +149,6 @@ export default {
      isRouterAlive: true,
      queryDetailVisible: false,
      urlPath: window.CONFIG.urlPath,
-      paramsList: [],
      showList: [],
      takeoverInfo: ''
    }
@@ -200,6 +199,7 @@ export default {
      //wsuri.substring(0, wsuri.indexOf(':'))
      if (wsuri != null && wsuri.indexOf(':') <= -1) {
        webpath = 'ws://59.110.43.122:8091/websocket/1001'
+        // webpath = 'ws://10.20.72.31:8091/websocket/1001'
      } else {
        webpath =
          'ws:' +
@@ -257,6 +257,7 @@ export default {
      //wsuri.substring(0, wsuri.indexOf(':'))
      if (wsuri != null && wsuri.indexOf(':') <= -1) {
        webpath = 'ws://59.110.43.122:8091/websocket/1002'
+        // webpath = 'ws://10.20.72.31:8091/websocket/1002'
      } else {
        webpath =
          'ws:' +
@@ -420,13 +421,9 @@ export default {
          params: this.$http.adornParams({})
        }).then((data) => {
          if (data && data.code === 0) {
-            this.paramsList = data.bean
-            sessionStorage.setItem(
-              'paramsList',
-              JSON.stringify(this.paramsList)
-            )
-            console.log('paramsList:', this.paramsList)
-            this.$store.dispatch('d2admin/paramsList/set', this.paramsList)
+            console.log('paramsList:', data.bean)
+            sessionStorage.setItem('paramsList', JSON.stringify(data.bean))
+            this.$store.dispatch('d2admin/paramsList/set', data.bean)
          }
        })
      } else {

--- a/src/assets/iconfont/iconfont.css
+++ b/src/assets/iconfont/iconfont.css
-@font-face {font-family: "iconfont";
-  src: url('iconfont.eot?t=1617869134193'); /* IE9 */
-  src: url('iconfont.eot?t=1617869134193#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
-  url('iconfont.woff?t=1617869134193') format('woff'),
-  url('iconfont.ttf?t=1617869134193') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
-  url('iconfont.svg?t=1617869134193#iconfont') format('svg'); /* iOS 4.1- */
-}
-
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 12px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-feng:before {
-  content: "\e607";
-}
-
-.icon-feng2:before {
-  content: "\e6f7";
-}
-
-.icon-tongji:before {
-  content: "\e67f";
-}
-
-.icon-home:before {
-  content: "\e6ee";
-}
-
-.icon-tuceng:before {
-  content: "\e63b";
-}
-
-.icon-shezhi:before {
-  content: "\e611";
-}
-
-.icon-fenxi:before {
-  content: "\e604";
-}
-
--- a/src/assets/images/imgs/dlsnj.jpg
+++ b/src/assets/images/imgs/dlsnj.jpg
--- a/src/assets/style/iconfont/iconfont.css
+++ b/src/assets/style/iconfont/iconfont.css
+@font-face {
+  font-family: 'iconfont';
+  src: url('iconfont.eot?t=1617869134193'); /* IE9 */
+  src: url('iconfont.eot?t=1617869134193#iefix') format('embedded-opentype'),
+    /* IE6-IE8 */
+      url('data:application/x-font-woff2;charset=utf-8;base64,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')
+      format('woff2'),
+    url('iconfont.woff?t=1617869134193') format('woff'),
+    url('iconfont.ttf?t=1617869134193') format('truetype'),
+    /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+      url('iconfont.svg?t=1617869134193#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
+  font-family: 'iconfont' !important;
+  font-size: 12px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-feng:before {
+  content: '\e607';
+}
+
+.icon-feng2:before {
+  content: '\e6f7';
+}
+
+.icon-tongji:before {
+  content: '\e67f';
+}
+
+.icon-home:before {
+  content: '\e6ee';
+}
+
+.icon-tuceng:before {
+  content: '\e63b';
+}
+
+.icon-shezhi:before {
+  content: '\e611';
+}
+
+.icon-fenxi:before {
+  content: '\e604';
+}
--- a/src/assets/iconfont/iconfont.eot
+++ b/src/assets/iconfont/iconfont.eot
--- a/src/assets/iconfont/iconfont.js
+++ b/src/assets/iconfont/iconfont.js
--- a/src/assets/iconfont/iconfont.json
+++ b/src/assets/iconfont/iconfont.json
--- a/src/assets/iconfont/iconfont.svg
+++ b/src/assets/iconfont/iconfont.svg
--- a/src/assets/iconfont/iconfont.ttf
+++ b/src/assets/iconfont/iconfont.ttf
--- a/src/assets/iconfont/iconfont.woff
+++ b/src/assets/iconfont/iconfont.woff
--- a/src/assets/iconfont/iconfont.woff2
+++ b/src/assets/iconfont/iconfont.woff2
--- a/src/assets/svg-icons/icons/d2-admin.svg
+++ b/src/assets/svg-icons/icons/d2-admin.svg

 <svg viewBox="0 0 60 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <desc>AI节能管理系统</desc>
+    <desc>拉林线-山南站AI节能系统</desc>
    <defs></defs>
    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="logo-no-shadow" transform="translate(-3.000000, -3.000000)">

--- a/src/layout/header-aside/components/components/menu-item/index copy.vue
+++ b/src/layout/header-aside/components/components/menu-item/index copy.vue
+<template>
+  <el-menu-item :index="menu.url || menu.path || uniqueId">
+    <!-- <i v-if="menu.icon" :class="`iconfont icon-${menu.icon}`"></i> -->
+    <i v-if="menu.icon && menu.icon == 'home'" class="base_home">
+      <img src="../../../imgs/home.png" width="16" style="margin-top: -5px" />
+    </i>
+    <d2-icon-svg v-else-if="menu.iconSvg" :name="menu.iconSvg" />
+    <span v-else>&emsp;</span>
+    <span slot="title">{{ menu.title || menu.name || '未命名菜单' }}</span>
+  </el-menu-item>
+</template>
+
+<script>
+import { uniqueId } from 'lodash'
+export default {
+  name: 'd2-layout-header-aside-menu-item',
+  props: {
+    menu: {
+      type: Object,
+      required: false,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      uniqueId: uniqueId('d2-menu-empty-')
+    }
+  }
+}
+</script>
+<style>
+.el-menu-item:hover .base_home img {
+  content: url(../../../imgs/home2.png);
+}
+</style>
--- a/src/layout/header-aside/components/components/menu-item/index.vue
+++ b/src/layout/header-aside/components/components/menu-item/index.vue
 <template>
-  <el-menu-item :index="menu.url||menu.path || uniqueId">
+  <el-menu-item :index="menu.url || menu.path || uniqueId">
    <i v-if="menu.icon" :class="`iconfont icon-${menu.icon}`"></i>
-    <d2-icon-svg v-else-if="menu.iconSvg" :name="menu.iconSvg"/>
-    <span v-else >&emsp;</span>
-    <span slot="title">{{menu.title|| menu.name  || '未命名菜单'}}</span>
+    <!-- <i v-if="menu.icon && menu.icon == 'home'" class="base_home">
+      <img src="../../../imgs/home.png" width="16" style="margin-top: -5px" />
+    </i> -->
+    <d2-icon-svg v-else-if="menu.iconSvg" :name="menu.iconSvg" />
+    <span v-else>&emsp;</span>
+    <span slot="title">{{ menu.title || menu.name || '未命名菜单' }}</span>
  </el-menu-item>
 </template>

@@ -18,10 +21,15 @@ export default {
      default: () => {}
    }
  },
-  data () {
+  data() {
    return {
      uniqueId: uniqueId('d2-menu-empty-')
    }
  }
 }
 </script>
+<style>
+/* .el-menu-item:hover .base_home img {
+  content: url(../../../imgs/home2.png);
+} */
+</style>
--- a/src/layout/header-aside/components/components/menu-sub/index copy.vue
+++ b/src/layout/header-aside/components/components/menu-sub/index copy.vue
+<template>
+  <el-submenu :index="menu.path || menu.id || uniqueId">
+    <template slot="title">
+      <i v-if="menu.icon && menu.icon == 'shebei'" class="base_shebei">
+        <img
+          src="../../../imgs/shebei.png"
+          width="14"
+          style="margin-top: -5px"
+        />
+      </i>
+      <i v-if="menu.icon && menu.icon == 'tongji'" class="base_tongji">
+        <img
+          src="../../../imgs/tongji.png"
+          width="14"
+          style="margin-top: -5px"
+        />
+      </i>
+      <i v-if="menu.icon && menu.icon == 'fenxi'" class="base_fenxi">
+        <img
+          src="../../../imgs/fenxi.png"
+          width="14"
+          style="margin-top: -5px"
+        />
+      </i>
+      <i v-if="menu.icon && menu.icon == 'xitong'" class="base_xitong">
+        <img
+          src="../../../imgs/xitong.png"
+          width="14"
+          style="margin-top: -5px"
+        />
+      </i>
+      <d2-icon-svg v-else-if="menu.iconSvg" :name="menu.iconSvg" />
+      <span v-else>&emsp;</span>
+      <span slot="title">{{ menu.name }}</span>
+    </template>
+
+    <template v-for="(child, childIndex) in menu.list">
+      <d2-layout-header-aside-menu-item
+        v-if="child.list.length == 0"
+        :menu="child"
+        :key="childIndex"
+      />
+      <d2-layout-header-aside-menu-sub
+        v-else
+        :menu="{ ...child }"
+        :key="childIndex"
+      />
+    </template>
+  </el-submenu>
+</template>
+
+<script>
+import { uniqueId } from 'lodash'
+// 组件
+import d2LayoutMainMenuItem from '../menu-item'
+
+export default {
+  name: 'd2-layout-header-aside-menu-sub',
+  components: {
+    'd2-layout-header-aside-menu-item': d2LayoutMainMenuItem
+  },
+  props: {
+    menu: {
+      type: Object,
+      required: false,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      uniqueId: uniqueId('d2-menu-empty-')
+    }
+  }
+}
+</script>
+
+<style>
+.el-submenu:hover .el-submenu__title .base_shebei img {
+  content: url(../../../imgs/shebei2.png);
+}
+.el-submenu:hover .el-submenu__title .base_tongji img {
+  content: url(../../../imgs/tongji2.png);
+}
+.el-submenu:hover .el-submenu__title .base_fenxi img {
+  content: url(../../../imgs/fenxi2.png);
+}
+.el-submenu:hover .el-submenu__title .base_xitong img {
+  content: url(../../../imgs/xitong2.png);
+}
+/* .el-submenu:hover .el-submenu__title img {
+  content: url(../../../imgs/xitong2.png);
+} */
+</style>
--- a/src/layout/header-aside/components/components/menu-sub/index.vue
+++ b/src/layout/header-aside/components/components/menu-sub/index.vue
 <template>
-  <el-submenu :index="menu.path|| menu.id ||uniqueId ">
+  <el-submenu :index="menu.path || menu.id || uniqueId">
    <template slot="title">
      <i v-if="menu.icon" :class="`iconfont icon-${menu.icon}`"></i>
-      <d2-icon-svg v-else-if="menu.iconSvg" :name="menu.iconSvg"/>
-      <span v-else >&emsp;</span>
-      <span slot="title">{{menu.name}}</span>
+      <d2-icon-svg v-else-if="menu.iconSvg" :name="menu.iconSvg" />
+      <span v-else>&emsp;</span>
+      <span slot="title">{{ menu.name }}</span>
    </template>

    <template v-for="(child, childIndex) in menu.list">
-
-      <d2-layout-header-aside-menu-item v-if="child.list.length==0" :menu="child" :key="childIndex"/>
-      <d2-layout-header-aside-menu-sub v-else :menu="{...child}" :key="childIndex"/>
+      <d2-layout-header-aside-menu-item
+        v-if="child.list.length == 0"
+        :menu="child"
+        :key="childIndex"
+      />
+      <d2-layout-header-aside-menu-sub
+        v-else
+        :menu="{ ...child }"
+        :key="childIndex"
+      />
    </template>
  </el-submenu>
 </template>
@@ -32,10 +39,25 @@ export default {
      default: () => {}
    }
  },
-  data () {
+  data() {
    return {
      uniqueId: uniqueId('d2-menu-empty-')
    }
  }
 }
 </script>
+
+<style>
+/* .el-submenu:hover .el-submenu__title .base_shebei img {
+  content: url(../../../imgs/shebei2.png);
+}
+.el-submenu:hover .el-submenu__title .base_tongji img {
+  content: url(../../../imgs/tongji2.png);
+}
+.el-submenu:hover .el-submenu__title .base_fenxi img {
+  content: url(../../../imgs/fenxi2.png);
+}
+.el-submenu:hover .el-submenu__title .base_xitong img {
+  content: url(../../../imgs/xitong2.png);
+} */
+</style>
--- a/src/layout/header-aside/imgs/fenxi.png
+++ b/src/layout/header-aside/imgs/fenxi.png
--- a/src/layout/header-aside/imgs/fenxi2.png
+++ b/src/layout/header-aside/imgs/fenxi2.png
--- a/src/layout/header-aside/imgs/home.png
+++ b/src/layout/header-aside/imgs/home.png
--- a/src/layout/header-aside/imgs/home2.png
+++ b/src/layout/header-aside/imgs/home2.png
--- a/src/layout/header-aside/imgs/logo2.png
+++ b/src/layout/header-aside/imgs/logo2.png
--- a/src/layout/header-aside/imgs/shebei.png
+++ b/src/layout/header-aside/imgs/shebei.png
--- a/src/layout/header-aside/imgs/shebei2.png
+++ b/src/layout/header-aside/imgs/shebei2.png
--- a/src/layout/header-aside/imgs/tongji.png
+++ b/src/layout/header-aside/imgs/tongji.png
--- a/src/layout/header-aside/imgs/tongji2.png
+++ b/src/layout/header-aside/imgs/tongji2.png
--- a/src/layout/header-aside/imgs/xitong.png
+++ b/src/layout/header-aside/imgs/xitong.png
--- a/src/layout/header-aside/imgs/xitong2.png
+++ b/src/layout/header-aside/imgs/xitong2.png
--- a/src/layout/header-aside/layout 1221.vue
+++ b/src/layout/header-aside/layout 1221.vue
--- a/src/layout/header-aside/layout.vue
+++ b/src/layout/header-aside/layout.vue
@@ -10,7 +10,11 @@
 		<div class="d2-layout-header-aside-content" flex="dir:top">
 			<!-- 顶栏 -->
 			<div class="d2-theme-header" flex-box="0" flex>
-        <div class="logo-group" :style="{ width: asideWidth }" flex-box="0">
+				<div
+					class="logo-group"
+					:style="{ width: asideWidth }"
+					flex-box="0"
+				>
 					<img src="./imgs/logo2.png" />
 				</div>
 				<div style="width: 100%">
@@ -18,23 +22,27 @@
 					<!-- 顶栏右侧 -->
 					<div class="d2-header-right">
 						<div class="time-container">
-              <div class="current-time">{{ time | formatDate }}</div>
-              <div class="current-date">{{ time | formatDate2 }}</div>
+							<div class="current-time">
+								{{ time | formatDate }}
+							</div>
+							<div class="current-date">
+								{{ time | formatDate2 }}
+							</div>
 						</div>
 						<div class="weather-container">
 							<div class="user-img">室内</div>
-              <div class="weather-info" v-if='list'>
+							<div class="weather-info" v-if="snqxzBean">
 								<!-- <span :class="station.length < 6 ? 'lineFeed' : ''">{{station }}</span> -->
-                <div>温度 {{list.snqxzList[0].temperature}}℃</div>
-                <div>湿度 {{list.snqxzList[0].humidity}}%</div>
+								<div>温度 {{ snqxzBean.temperature }}℃</div>
+								<div>湿度 {{ snqxzBean.humidity }}%</div>
 							</div>
 						</div>
 						<div class="weather-container">
 							<div class="user-img">室外</div>
-              <div class="weather-info" v-if='list'>
+							<div class="weather-info" v-if="swqxzBean">
 								<!-- <span :class="station.length < 6 ? 'lineFeed' : ''">{{station }}</span> -->
-                <div>温度 {{list.swqxzList[0].temperature}}℃</div>
-                <div>湿度 {{list.swqxzList[0].humidity}}%</div>
+								<div>温度 {{ swqxzBean.temperature }}℃</div>
+								<div>湿度 {{ swqxzBean.humidity }}%</div>
 							</div>
 						</div>
 						<!-- <d2-header-theme /> -->
@@ -59,23 +67,45 @@
 			<div class="d2-theme-container" flex-box="1" flex>
 				<!-- 主体 侧边栏 -->
 				<div
+					v-if="isShow"
 					flex-box="0"
 					ref="aside"
 					class="d2-theme-container-aside"
 					:style="{
 						width: asideWidth,
-            opacity: this.searchActive ? 0.5 : 1
+						opacity: this.searchActive ? 0.5 : 1,
 					}"
 				>
 					<d2-menu-side />
 				</div>
+				<div
+					class="semi-circle"
+					:style="{ left: isShow ? '256px' : '1px' }"
+					@click="isShow = !isShow"
+				>
+					<i
+						:class="[
+							isShow
+								? 'el-icon-caret-left'
+								: 'el-icon-caret-right',
+						]"
+					></i>
+				</div>
+				<!-- <el-button circle size="mini" :style="{left:isShow?'240px':'1px'}" :class="[isShow?'el-icon-caret-left':'el-icon-caret-right' ,'openOrClose']"  @click='isShow=!isShow' ></el-button> -->
+
 				<!-- 主体 -->
 				<div class="d2-theme-container-main" flex-box="1" flex>
 					<!-- 内容 -->
 					<transition name="fade-scale">
-            <div class="d2-theme-container-main-layer" flex="dir:top">
+						<div
+							class="d2-theme-container-main-layer"
+							flex="dir:top"
+						>
 							<!-- 页面 -->
-              <div class="d2-theme-container-main-body" flex-box="1">
+							<div
+								class="d2-theme-container-main-body"
+								flex-box="1"
+							>
 								<!-- <bim></bim> -->
 								<keep-alive :include="keepAlive">
 									<router-view />
@@ -85,9 +115,12 @@
 					</transition>
 				</div>
 			</div>
-      <div style="z-index: 9999 !important; user-select: none" class="mfooter">
-        Copyright (C) 2021-2022. XXXXX信息工程有限公司 蜀ICP备1202XXXX号-1
-        电话：86-028-689XXXX 传真：86-028-6893XXXX
+			<div
+				style="z-index: 9999 !important; user-select: none"
+				class="mfooter"
+			>
+				Copyright (C) 2021-2022. XXXXX信息工程有限公司
+				蜀ICP备1202XXXX号-1 电话：86-028-689XXXX 传真：86-028-6893XXXX
 			</div>
 		</div>
 	</div>
@@ -108,6 +141,8 @@ export default {
 	},
 	data() {
 		return {
+			awidth: '250px',
+			isShow: true,
 			drawer: false,
 			// [侧边栏宽度] 正常状态
 			asideWidth: '256px',
@@ -117,7 +152,9 @@ export default {
 			timer: null,
 			logTimeout: null,
 			countNum: 0,
-      station: ''
+			station: '',
+			snqxzBean: {},
+			swqxzBean: {}
 		}
 	},
 	mounted() {
@@ -126,7 +163,7 @@ export default {
 		this.countNum = this.size
 	},
 	filters: {
-    formatDate: function (value) {
+		formatDate: function(value) {
 			let date = new Date(value)
 			let h = date.getHours()
 			h = h < 10 ? '0' + h : h
@@ -136,7 +173,7 @@ export default {
 			s = s < 10 ? '0' + s : s
 			return ` ${h}:${m}:${s}`
 		},
-    formatDate2: function (value) {
+		formatDate2: function(value) {
 			let date = new Date(value)
 			let y = date.getFullYear()
 			let MM = date.getMonth() + 1
@@ -181,6 +218,14 @@ export default {
 	watch: {
 		size(val) {
 			this.countNum = val
+		},
+		list: {
+			handler(n, o) {
+				if (n) {
+					this.setData()
+				}
+			},
+			deep: true
 		}
 	},
 	methods: {
@@ -224,7 +269,21 @@ export default {
 			if (!this.station || this.station == 'undefined') {
 				setTimeout(this.getStation, 3000)
 			}
+		},
+		setData() {
+			console.log('list:', this.list)
+			if (this.list) {
+				if (this.list.snqxzList.length > 0) {
+					this.snqxzBean = this.list.snqxzList[0]
+				}
+				if (this.list.swqxzList.length > 0) {
+					this.swqxzBean = this.list.swqxzList[0]
+				}
 			}
+			console.log('snqxzBean:', this.snqxzBean)
+			console.log('swqxzBean:', this.swqxzBean)
+		},
+		setSwqxzData() {}
 	}
 }
 </script>
@@ -352,4 +411,22 @@ export default {
 	font-weight: 400;
 	color: rgba(255, 255, 255, 0.75);
 }
+
+.semi-circle {
+	position: absolute;
+	top: 40%;
+	z-index: 9999;
+	width: 10px;
+	height: 20px;
+    line-height: 20px;
+	background-color: #fff;
+    border: 1px solid #d8d4d4;
+	border-radius: 0 50px 50px 0;
+    text-align: left;
+    cursor: pointer;
+    i{
+        color: #1190da;
+        transform: scale(.8)  translateX(-5px);
+    }
+}
 </style>
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -11,7 +11,7 @@ let util = {
 * @param {String} title 标题
 */
 util.title = function (titleText) {
-  const processTitle = 'AI节能管理系统'
+  const processTitle = '拉林线-山南站AI节能系统'
  window.document.title = `${processTitle}${titleText ? ` | ${titleText}` : ''}`
 }

@@ -29,7 +29,7 @@ util.open = function (url) {
  document.body.removeChild(document.getElementById('d2admin-menu-link'))
 }

- /**
+/**
 * @about Tree 数据格式转化
 * @param rows:json数据对象
 * @param idFieldName:表id的字段名
@@ -42,7 +42,9 @@ util.open = function (url) {
 util.ConvertToTreeJson = function (rows, idFieldName, pidFieldName, fileds) {
  function exists(rows, ParentId) {
    for (var i = 0; i < rows.length; i++) {
-            if (rows[i][idFieldName] == ParentId) { return true }
+      if (rows[i][idFieldName] == ParentId) {
+        return true
+      }
    }
    return false
  }
@@ -56,7 +58,9 @@ util.ConvertToTreeJson = function (rows, idFieldName, pidFieldName, fileds) {
      }
      var arrFiled = fileds.split(',')
      for (var j = 0; j < arrFiled.length; j++) {
-                if (arrFiled[j] != idFieldName) { data[arrFiled[j]] = row[arrFiled[j]] }
+        if (arrFiled[j] != idFieldName) {
+          data[arrFiled[j]] = row[arrFiled[j]]
+        }
      }
      nodes.push(data)
    }

--- a/src/main.js
+++ b/src/main.js
@@ -47,7 +47,7 @@ import toastRegistry from './components/toast/index'
 import cardWarp from '@/pages/components/cardWarp.vue'
 import ElementUI from 'element-ui' //element-ui的全部组件

-import './assets/iconfont/iconfont.css'
+import './assets/style/iconfont/iconfont.css'

 Vue.component('cardWarp', cardWarp)
 // import 'element-ui/lib/theme-chalk/index.css'

--- a/src/pages/analysis/fault/pie.vue
+++ b/src/pages/analysis/fault/pie.vue
@@ -3,6 +3,8 @@ div(:id="id", :style="{ width: '100%', height: '90%' }")
 </template>

 <script>
+import elementResizeDetectorMaker from 'element-resize-detector'
+
 export default {
 	props: ['data', 'id'],
 	watch: {
@@ -12,6 +14,16 @@ export default {
 	},
 	mounted() {
 		this.initPie()
+		const erd = elementResizeDetectorMaker()
+		erd.listenTo(document.getElementById(this.id), () => {
+			this.$nextTick(() => {
+				//监听到事件后执行的业务逻辑
+				this.initPie()
+			})
+		})
+	},
+	destroyed() {
+		window.onresize = null
 	},
 	methods: {
 		initPie() {
@@ -55,6 +67,10 @@ export default {
 				]
 			}
 			myCharts.setOption(option)
+			myCharts.resize()
+			window.addEventListener('resize', function() {
+				myCharts.resize()
+			})
 		}
 	}
 }

--- a/src/pages/analysis/fault/pie2.vue
+++ b/src/pages/analysis/fault/pie2.vue
@@ -3,6 +3,8 @@ div(:id="id", :style="{ width: '100%', height: '90%' }")
 </template>

 <script>
+import elementResizeDetectorMaker from 'element-resize-detector'
+
 export default {
 	props: ['data', 'id', 'legendData'],
 	data() {
@@ -18,6 +20,16 @@ export default {

 	mounted() {
 		this.initPie2()
+		const erd = elementResizeDetectorMaker()
+		erd.listenTo(document.getElementById(this.id), () => {
+			this.$nextTick(() => {
+				//监听到事件后执行的业务逻辑
+				this.initPie2()
+			})
+		})
+	},
+	destroyed() {
+		window.onresize = null
 	},
 	methods: {
 		initPie2() {
@@ -75,6 +87,10 @@ export default {
 				]
 			}
 			myCharts.setOption(option)
+			myCharts.resize()
+			window.addEventListener('resize', function() {
+				myCharts.resize()
+			})
 		}
 	}
 }

--- a/src/pages/analysis/indoor/index.vue
+++ b/src/pages/analysis/indoor/index.vue
@@ -164,7 +164,7 @@ export default {
  flex-wrap: wrap;
  height: calc(100vh - 350px);
  > div {
-    width: 48%;
+    width: 47%;
    height: calc(90% / 2);
    margin: 3px;
    padding: 13px;

--- a/src/pages/components/chart.vue
+++ b/src/pages/components/chart.vue
 // 曲线图 ==》 （首页，数据分析）
-<template lang='pug'>
+<template lang="pug">
 div(:id="id", :style="{ width: '100%', height: '90%' }")
 </template>

 <script>
+import elementResizeDetectorMaker from 'element-resize-detector'
+
 export default {
 	props: ['id', 'data', 'title', 'color', 'yAxisName'],
 	watch: {
@@ -17,6 +19,16 @@ export default {
 	},
 	mounted() {
 		this.initChart()
+		const erd = elementResizeDetectorMaker()
+		erd.listenTo(document.getElementById(this.id), () => {
+			this.$nextTick(() => {
+				//监听到事件后执行的业务逻辑
+				this.initChart()
+			})
+		})
+	},
+	destroyed() {
+		window.onresize = null
 	},
 	methods: {
 		initChart() {
@@ -48,7 +60,6 @@ export default {
 					{
 						type: 'value',
 						name: this.yAxisName
-
 					}
 				],
 				series: [
@@ -63,7 +74,12 @@ export default {
 						// },
 						areaStyle: {
 							normal: {
-                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+								color: new this.$echarts.graphic.LinearGradient(
+									0,
+									0,
+									0,
+									1,
+									[
 										{
 											offset: 0,
 											color: this.color // 0% 处的颜色
@@ -72,7 +88,8 @@ export default {
 											offset: 1,
 											color: '#fff' // 100% 处的颜色
 										}
-                ])
+									]
+								)
 							}
 						},
 						lineStyle: {
@@ -91,10 +108,14 @@ export default {
 				]
 			}
 			myCharts.setOption(option, true)
+			myCharts.resize()
+
+			window.addEventListener('resize', function() {
+				myCharts.resize()
+			})
 		}
 	}
 }
 </script>

-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
--- a/src/pages/components/myPies.vue
+++ b/src/pages/components/myPies.vue
@@ -3,6 +3,8 @@
 </template>

 <script>
+import elementResizeDetectorMaker from 'element-resize-detector'
+
 export default {
 	name: 'myPies',
 	data() {
@@ -13,8 +15,14 @@ export default {

 	mounted() {
 		this.initPie()
+		const erd = elementResizeDetectorMaker()
+		erd.listenTo(document.getElementById('myPies'), () => {
+			this.$nextTick(() => {
+				//监听到事件后执行的业务逻辑
+				this.initPie()
+			})
+		})
 	},
-
 	methods: {
 		initPie() {
 			let myPie = document.getElementById('myPies')
@@ -39,7 +47,7 @@ export default {
 					itemGap: 35,
 					icon: 'circle',
 					data: data,
-          formatter: function (name) {
+					formatter: function(name) {
 						var total = 0
 						var target
 						var value
@@ -50,7 +58,12 @@ export default {
 								target = data[i].value
 							}
 						}
-            return name + '     ' + ((target / total) * 100).toFixed(0) + '%'
+						return (
+							name +
+							'     ' +
+							((target / total) * 100).toFixed(0) +
+							'%'
+						)
 					},
 					textStyle: {
 						rich: {
@@ -89,7 +102,7 @@ export default {
 							normal: {
 								show: true,
 								position: 'center',
-                formatter: function () {
+								formatter: function() {
 									return `\r\n20000`
 								},
 								textStyle: {
@@ -113,7 +126,9 @@ export default {
 					}
 				]
 			}
+
 			this.myPies.setOption(option)
+			this.myPies.resize()
 		}
 	}
 }

--- a/src/pages/components/tableList.vue
+++ b/src/pages/components/tableList.vue
@@ -140,5 +140,14 @@ export default {
    color: #32a5ea !important;
    background-color: red !important;
  }
+  .table-row-mode {
+    background: rgb(245, 214, 155);
+  }
+  .table-row-mechanical {
+    background: #71e6e6;
+  }
+  .table-row-natural {
+    background: #b5f096;
+  }
 }
 </style>
--- a/src/pages/eq/hall/page.vue
+++ b/src/pages/eq/hall/page.vue
--- a/src/pages/eq/office/page.vue
+++ b/src/pages/eq/office/page.vue
@@ -12,7 +12,14 @@
          ></el-tab-pane>
        </el-tabs>
        <div style="margin-top: 20px"></div>
-        <table-list :tableColums='tableColums' :tableData='tableData' :showOpr='true' :opNum='3' :showStateColor='true' :currentMode='currentModel'>
+        <table-list
+          :tableColums="tableColums"
+          :tableData="tableData"
+          :showOpr="true"
+          :opNum="3"
+          :showStateColor="true"
+          :currentMode="currentModel"
+        >
          <template v-slot:operation="scope">
            <el-button type="text" @click="statusHandle">开启</el-button>
            <el-button type="text" @click="statusHandle">关闭</el-button>
@@ -53,7 +60,7 @@ export default {
    enTabs,
    enTable,
    tablePagination,
-    tableList,
+    tableList
  },

  data() {
@@ -61,6 +68,7 @@ export default {
      pageIndex: 1,
      pageSize: 10,
      totalSize: 0,
+      curModel: 0,
      activeTab: 'b6af764f2a6e454490a6b1b3c9057e57',
      tableData: [],
      tableColums: tableColumsOne,
@@ -129,12 +137,63 @@ export default {
          this.tableColums = tableColumsTwo
          break
      }
+    },
+    pfjList: {
+      handler(n, o) {
+        if (n) {
+          this.setDataList()
+        }
+      },
+      deep: true
+    },
+    jfktpList: {
+      handler(n, o) {
+        if (n) {
+          this.setDataList()
+        }
+      },
+      deep: true
+    },
+    dlswjList: {
+      handler(n, o) {
+        if (n) {
+          this.setDataList()
+        }
+      },
+      deep: true
+    },
+    dlsnjList: {
+      handler(n, o) {
+        if (n) {
+          this.setDataList()
+        }
+      },
+      deep: true
+    },
+    dlxfsnjList: {
+      handler(n, o) {
+        if (n) {
+          this.setDataList()
+        }
+      },
+      deep: true
    }
+    // currentModel: {
+    //   handler(n, o) {
+    //     if (n) {
+    //       this.setModel()
+    //     }
+    //   },
+    //   deep: true
+    // }
  },
  mounted() {
    this.getDataList()
  },
  methods: {
+    // setModel() {
+    //   this.curModel = this.currentModel
+    // },
    // 获取数据列表
    getDataList(page, size) {
      this.$http({

--- a/src/pages/eq/view/index.vue
+++ b/src/pages/eq/view/index.vue
@@ -61,7 +61,7 @@
          <div v-show="transformationSta==1">
            <el-row style="padding-bottom:15px;height:780px;background:#fff;" :span="24">
              <el-col class="resource-container" :style="obj" ref="drag">
-                <div id="map" class="map" ref='map'  style="width: 100%;height: 720px;position:relative;" @click='closeDetails'></div>
+                <div id="map" class="map" ref='map'  style="width: 100%;height: 720px;position:relative;" ></div>
              </el-col>
            </el-row>
          </div>
@@ -173,7 +173,7 @@ export default {
      lineVectorLayer: [],
      resolutions: [],
      code: '',
-      times: 1,
+      times: 1
    }
  },
  components: {
@@ -191,8 +191,8 @@ export default {
  },
  methods: {
    // 点击空白位置关闭详情框
-    closeDetails(){
-      if(this.queryDetailVisible && this.times > 1){
+    closeDetails() {
+      if (this.queryDetailVisible && this.times > 1) {
        this.queryDetailVisible = false
        this.times = 0
      }
@@ -329,6 +329,8 @@ export default {
              }
            }
          }
+        } else {
+          that.queryDetailVisible = false
        }
      })
    },
@@ -661,10 +663,7 @@ export default {
        }
      })

-      if (
-        this.currentNode.level == 5 ||
-        (this.currentNode.level == 6 && this.currentNode.isDefence)
-      ) {
+      if (this.currentNode.level == 5) {
        this.list = []
        this.currentNode.children.forEach((el) => {
          if (item === null || (item != null && item.id === el.type)) {
@@ -953,11 +952,11 @@ export default {
      })
    },
    //详情
-    queryDetail(id) {
+    queryDetail(item) {
      this.queryDetailVisible = true
      this.noQueryDetailVisible = false
      this.$nextTick(() => {
-        this.$refs.queryDetail.init(id, this.checkedData.sId)
+        this.$refs.queryDetail.init(item, this.checkedData.sId)
      })
    },


--- a/src/pages/eq/view/query-detail.vue
+++ b/src/pages/eq/view/query-detail.vue
@@ -48,7 +48,7 @@
            el-button(type="primary", size="mini", style="margin-left: 10px") 下降
            el-button(type="primary", size="mini", style="margin-left: 10px") 停止

-  .info-state
+  .info-state(v-if="this.params && this.params.length > 0")
    span(style="font-weight: bold") 设备运行状态
    div(v-if="this.params.length && this.params[0].electric_energy")
      span.type 电量(kwh)：
@@ -151,7 +151,6 @@ export default {
      params: [],
      openOrClose: [
        'b6af764f2a6e454490a6b1b3c9057e57', //排风机
-        'b47661ca1d454f9792ba5369f3cb2bc5', //机房空调
        '49f5921a6d7f43cfa222c09f0223ae04', //电动排烟窗
        'b45827c068254695864ee3c1d42573cb', //风冷热泵机组
        '303310efddb34a2e9bf269bdff8a7dc5', //室内机风柜
@@ -174,6 +173,7 @@ export default {
      console.log('---data:', data)
      console.log('当前资源点id', data.id)
      console.log('类型', data.type)
+      this.params = []
      switch (data.type) {
        case '173466a2cf9a42a6a17b2bdfbeae36d5': //多联室内机
          this.params = this.dlsnjList.filter((e) => e.resource_id == data.id)
@@ -387,6 +387,13 @@ export default {
  background: url('../../../assets/images/imgs/dlswj.png') no-repeat center;
  background-size: 100% 100%;
 }
+.el-icon-dlsnj6 {
+  width: 100%;
+  height: 170px;
+  text-align: center;
+  background: url('../../../assets/images/imgs/dlsnj.jpg') no-repeat center;
+  background-size: 100% 100%;
+}
 .el-icon-cgq6 {
  width: 100%;
  height: 170px;

--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
 <template lang="pug">
    div.infopage()
-      font(class='index-title') 欢迎访问山南站AI节能管理系统
+      font(class='index-title') 欢迎访问拉林线-山南站AI节能系统

 </template>

 <script>
-
 export default {
-
  data() {
-    return {
-
-    }
+    return {}
  },
-  methods: {
-
-  }
+  methods: {}
 }
 </script>

 <style lang="scss" scoped>
-@import "~@/assets/style/public.scss";
- .infopage{
-    margin:0 20px 0 24px;
+@import '~@/assets/style/public.scss';
+.infopage {
+  margin: 0 20px 0 24px;
  height: 700px;
  .index-title {
    width: 720px;
@@ -34,5 +28,5 @@ export default {
    display: block;
    margin: 20% auto;
  }
- }
+}
 </style>
--- a/src/pages/kb/indoor/index.vue
+++ b/src/pages/kb/indoor/index.vue
@@ -153,7 +153,7 @@ export default {
  components: {
    tablePagination,
    history,
-    tableList,
+    tableList
  },
  data() {
    return {
@@ -173,7 +173,7 @@ export default {
        { label: '温度(℃)', prop: 'temperature', format: true },
        { label: '湿度(%RH)', prop: 'humidity', format: true },
        { label: 'CO₂(PPM)', prop: 'carbon_dioxide', format: true },
-        { label: '设备状态', prop: 'statusName', format: true },
+        { label: '设备状态', prop: 'statusName', format: true }
      ]
    }
  },

--- a/src/pages/kb/power/page.vue
+++ b/src/pages/kb/power/page.vue
@@ -64,10 +64,19 @@
          </el-form>
        </div>

-        <table-list :tableColums='tableColums' :tableData='tableData' :showOpr='true' :opNum='2'>
+        <table-list
+          :tableColums="tableColums"
+          :tableData="tableData"
+          :showOpr="true"
+          :opNum="2"
+        >
          <template #operation="data">
-            <el-button type="text" @click="openHistoryHandle(data.scope.row)">历史数据</el-button>
-            <el-button type="text" @click="openPicTHandle(data.scope.row)">统计图表</el-button>
+            <el-button type="text" @click="openHistoryHandle(data.scope)"
+              >历史数据</el-button
+            >
+            <el-button type="text" @click="openPicTHandle(data.scope)"
+              >统计图表</el-button
+            >
          </template>
        </table-list>
        <!-- <enTable
@@ -87,8 +96,13 @@
      </div>
    </cardList>
    <el-footer class="box_footer">
-      <tablePagination :pageSize="pageSize" :totalSize="totalSize" @parentMethod="getDataList">
-    </tablePagination></el-footer>
+      <tablePagination
+        :pageSize="pageSize"
+        :totalSize="totalSize"
+        @parentMethod="getDataList"
+      >
+      </tablePagination
+    ></el-footer>

    <history-data-modal
      :historyDataModalVisible="historyDataModalVisible"
@@ -119,7 +133,7 @@ export default {
    historyDataModal,
    statisticPicTableModal,
    tablePagination,
-    tableList,
+    tableList
  },
  data() {
    return {

--- a/src/pages/login/login-img/newlogo@2x.png
+++ b/src/pages/login/login-img/newlogo@2x.png
--- a/src/pages/login/page.vue
+++ b/src/pages/login/page.vue
@@ -137,6 +137,7 @@ export default {
      this.captchaPath = this.$http.adornUrl(
        `/captcha.jpg?uuid=${this.formLogin.uuid}`
      )
+      this.$parent.getDateList()
    },
    /**
     * @description 接收选择一个用户快速登录的事件

--- a/src/pages/sys/commandlog/index.vue
+++ b/src/pages/sys/commandlog/index.vue
@@ -4,7 +4,7 @@
        div(slot='content')
          div.tableCard()
              el-form( :inline="true" :model="dataForm" size="mini" @keyup.enter.native="getDataList()" )
-                  el-form-item( label="关键词:")
+                  el-form-item( label="指令内容:")
                      el-input(  v-model="dataForm.comMark" placeholder="" clearable)
                  el-form-item( label="指令类型:")
                      el-select( v-model="dataForm.comType" placeholder="请选择" clearable)
@@ -22,7 +22,7 @@
              font(v-if='data.scope.comSource == 2') 人工
            template(#comType='data' )
              font(v-if='data.scope.comType == 1') 自动
-              font(v-if='data.scope.comType == 2') 手动
+              font(v-if='data.scope.comType == 2') 人工
            template(#operation="data")
              el-button(type="text"  size="mini" @click="queryHandle(data.scope.id)") 详情
      el-footer.box_footer

--- a/src/pages/sys/commandlog/query-detail.vue
+++ b/src/pages/sys/commandlog/query-detail.vue
@@ -37,7 +37,7 @@
            </el-form-item>
            <el-form-item label='指令类型:' prop='comType'>
              <el-input v-if="dataForm.comType==1" value="自动" size="medium" readonly></el-input>
-              <el-input v-if="dataForm.comType==2" value="手动" size="medium" readonly></el-input>
+              <el-input v-if="dataForm.comType==2" value="人工" size="medium" readonly></el-input>
            </el-form-item>
            <el-form-item label='指令来源:' prop='comSource'>
              <el-input v-if="dataForm.comSource==1" value="算法" size="medium" readonly></el-input>

--- a/src/plugin/axios/index.js
+++ b/src/plugin/axios/index.js
@@ -230,6 +230,7 @@ service.interceptors.response.use(
 					sessionStorage.removeItem('token')
 					sessionStorage.removeItem('uuid')
 					if (this) {
+            this.$parent.getDateList()
 						//清空接管提示框
 						this.$store.dispatch('d2admin/takeover/setTakeover', null)
 					}

--- a/src/store/modules/d2admin/modules/menu.js
+++ b/src/store/modules/d2admin/modules/menu.js
@@ -9,7 +9,7 @@ export default {
    // 侧栏菜单
    aside: [],
    // 侧边栏收缩
-    // asideCollapse: setting.menu.asideCollapse,
+    asideCollapse: setting.menu.asideCollapse,
    // 接口返回的路由数据
    routerList: []
  },