Selaa lähdekoodia

冗余代码删除

yangxiao 3 vuotta sitten
vanhempi
commit
3a76118d0c
3 muutettua tiedostoa jossa 65 lisäystä ja 33 poistoa
  1. 16 12
      src/App.vue
  2. 46 18
      src/views/Agc/Agc.vue
  3. 3 3
      src/views/LightMatrix2/LightMatrix2.vue

+ 16 - 12
src/App.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main">
     <div class="header-body">
-      <div class="header-title" @click="disconnect">
+      <div class="header-title">
         <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
           width="16.667vh" height="3.704vh" viewBox="0 0 377.437 91.615" enable-background="new 0 0 377.437 91.615"
           xml:space="preserve">
@@ -110,7 +110,9 @@ l16.229-16.229l16.229,16.229l42.867-42.867C115.034,45.228,109.133,42.189,102.956
     <div class="menu-body">
       <Menu />
     </div>
-    <div class="menu-body" @mouseenter="showMenu" @mouseleave="hideMenu"><Menu /></div>
+    <div class="menu-body" @mouseenter="showMenu" @mouseleave="hideMenu">
+      <Menu />
+    </div>
     <div class="main-body" :class="{ 'show-menu': isShowMenu }">
       <router-view />
     </div>
@@ -130,21 +132,19 @@ export default {
   },
   mounted () {
     let that = this;
-    this.$nextTick(() => {
+    that.$nextTick(() => {
       that.API.requestData({
         isMust: false, // 请求是否携带 token ,默认为 true ,可缺省
         method: "POST", // 请求方式,默认为 GET ,可缺省
-        subUrl: "/admin/loginvue", // 请求接口地址,必传项
+        subUrl: "admin/loginvue", // 请求接口地址,必传项
         data: {
           username: "admin",
           password: "admin"
         },
         success (res) {
 
-          that.SET_TOKEN({
-            token: res.data.authToken,
-            username: res.data.user.laborName
-          });
+          localStorage.setItem('authToken', res.data.authToken)
+          localStorage.setItem('username', res.data.user.laborName)
 
           that.API.requestData({
             method: "POST", // 请求方式,默认为 GET ,可缺省
@@ -162,18 +162,22 @@ export default {
       });
     });
   },
+
   methods: {
-    ...mapMutations("user", ["SET_TOKEN"])
-  },data() {
+
+  },
+
+  data () {
     return {
       isShowMenu: false,
     };
   },
+
   methods: {
-    showMenu() {
+    showMenu () {
       this.isShowMenu = true;
     },
-    hideMenu() {
+    hideMenu () {
       this.isShowMenu = false;
     },
   },

+ 46 - 18
src/views/Agc/Agc.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="agc">
     <div class="btn-group-tabs">
-      <BtnGroup2 :btnGroups="btnGroups" :rowIndex="0" :index="1" @select="select"></BtnGroup2>
+      <!-- <BtnGroup2 :btnGroups="btnGroups" :rowIndex="0" :index="1" @select="select"></BtnGroup2> -->
     </div>
     <div class="panel-groups">
       <AgcPanel class="panel-item" v-for="(data, index) of datas" :key="index" :data="data"></AgcPanel>
@@ -12,6 +12,10 @@
 <script>
 import BtnGroup2 from "@com/coms/btn/btn-group-double.vue";
 import AgcPanel from "./components/agc-panel.vue";
+
+import { datainit, webtest } from "@tools/websocket.js";
+import store from "@store/index.js";
+
 export default {
   // 名称
   name: "Agc",
@@ -21,8 +25,11 @@ export default {
     AgcPanel,
   },
   // 数据
-  data() {
+  data () {
     return {
+      loadingFlg: false, // 遮罩开关
+      websocketServe: null, // websocket 服务实例
+      sourceMap: {}, // 核心数据
       datas: [
         {
           title: "某某风电场",
@@ -83,21 +90,28 @@ export default {
   },
   // 函数
   methods: {
-    select: function(item) {
+    select: function (item) {
       console.log(item);
     },
   },
-  // 生命周期钩子
-  beforeCreate() {
-    // 创建前
-  },
-  created() {
-    // 创建后
-  },
-  beforeMount() {
-    // 渲染前
+
+  created () {
+    let that = this;
+    that.loadingFlg = true;
+    that.BASE.showLoading();
+    that.$nextTick(() => {
+      that.websocketServe && that.websocketServe.disconnect();
+      that.API.requestData({
+        method: "POST",
+        subUrl: "admin/websocketdisconnect",
+        success () {
+          that.websocketServe = datainit("/topic/agc");
+        }
+      });
+    });
   },
-  mounted() {
+
+  mounted () {
     // 渲染后
     for (let i = 1; i < 12; i++) {
       this.datas.push(JSON.parse(JSON.stringify(this.datas[0])));
@@ -106,12 +120,26 @@ export default {
       }
     }
   },
-  beforeUpdate() {
-    // 数据更新前
-  },
-  updated() {
-    // 数据更新后
+
+  beforeDestroy () {
+    // 离开页面,销毁 websocket 实例
+    this.websocketServe && this.websocketServe.disconnect();
   },
+
+  watch: {
+    // 监听 websocket 回调并包装数据用于展示
+    '$store.state.windturbineMap': function (res) {
+      this.loadingFlg && this.BASE.closeLoading();
+      this.loadingFlg = false;
+      if (res) {
+        let sourceMap = JSON.parse(res);
+        this.sourceMap = sourceMap;
+      } else {
+        this.sourceMap = {};
+      }
+      console.log(111, this.sourceMap);
+    }
+  }
 };
 </script>
 

+ 3 - 3
src/views/LightMatrix2/LightMatrix2.vue

@@ -203,8 +203,8 @@ export default {
             },
             {
               text: "限电台数",
-              key: "xdts"
               color: "pink",
+              key: "xdts"
             },
             {
               text: "故障台数",
@@ -501,7 +501,7 @@ export default {
 
         &:last-child {
           font-size: @fontsize;
-          font-family: "Bicubik";
+          font-family: 'Bicubik';
         }
       }
     }
@@ -579,7 +579,7 @@ export default {
 
           .sub-count {
             font-size: @fontsize-s;
-            font-family: "Bicubik";
+            font-family: 'Bicubik';
             font-weight: 500;
 
             &.write {