Browse Source

修改了安全监控系统的布局

seamew 3 years ago
parent
commit
4ff31d11ab

+ 1 - 1
src/store/index.js

@@ -5,7 +5,7 @@ Vue.use(Vuex)
 
 export default new Vuex.Store({
   state: {
-    websocketIP: "10.170.31.131:8081",
+    websocketIP: "10.170.49.105:8081",
   },
   mutations: {
 

+ 0 - 0
src/views/monitor/zutai.vue → src/views/monitor/configImg/configImg.vue


+ 23 - 24
src/views/monitor/monitor.vue

@@ -9,7 +9,7 @@
         <dataStandard></dataStandard>
       </el-tab-pane>
       <el-tab-pane label="组态图" name="zutai">
-        <zutai></zutai>
+        <configImg></configImg>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -17,31 +17,30 @@
 
 
 <script>
-    import systemData from "./systemData";
-    import dataStandard from "./dataStandard";
-    import zutai from "./zutai";
-    export default {
-        name: "monitor",
-      data() {
-        return {
-          activeName: 'first',
-          checkVisible: 'false'
-        }
-      },
-        methods: {
-          handleClick(tab, event) {
-            console.log(tab, event);
-          }
-        },
-        components: {
-          systemData,
-          dataStandard,
-          zutai
-        }
-    }
+import systemData from "./systemData";
+import dataStandard from "./dataStandard";
+import configImg from '@/views/monitor/configImg/configImg'
+export default {
+  name: "monitor",
+  data() {
+    return {
+      activeName: "first",
+      checkVisible: "false",
+    };
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+  },
+  components: {
+    systemData,
+    dataStandard,
+    configImg,
+  },
+};
 </script>
 
 
 <style scoped>
-
 </style>

+ 3 - 3
src/views/power_supply/dataBoard/leftChart.vue

@@ -200,7 +200,7 @@ export default {
       this.yData = new Array(30).fill("-");
       this.xData = new Array(30).fill("-");
       // 关闭以前的websocket
-      // this.websocket.close();
+      this.websocket.close();
       // 开启一个新的
       this.websocket = new WebSocket(`ws://${this.websocketIP}/hbase/ws/belt/62`);
       this.initWebSocket();
@@ -309,8 +309,8 @@ export default {
     // 先画图
     this.myChart = this.$echarts.init(this.$refs.testLine);
     this.myChart.setOption(this.option);
-    // this.websocket = new WebSocket(`ws://${this.websocketIP}/hbase/ws/belt/35`);
-    // this.initWebSocket();
+    this.websocket = new WebSocket(`ws://${this.websocketIP}/hbase/ws/belt/62`);
+    this.initWebSocket();
   },
 };
 </script>