From 50872b80a596415e5e9d60135f4808ef8e31a507 Mon Sep 17 00:00:00 2001 From: quanyawei <401863037@qq.com> Date: Wed, 15 Nov 2023 10:58:09 +0800 Subject: [PATCH] fix:立行立改添加修改责任单位 --- src/views/deviceDetail/index.vue | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/deviceDetail/index.vue b/src/views/deviceDetail/index.vue index 9b4ab1c..f1300fc 100644 --- a/src/views/deviceDetail/index.vue +++ b/src/views/deviceDetail/index.vue @@ -338,6 +338,7 @@ // ���������import������������������from'������������������'; import json from '@/assets/json/sensor.json' +import * as echarts from 'echarts' // import { parse } from 'path-to-regexp' // import LineChart from '@/components/Echarts/LineChart' // import draggable from 'vuedraggable' @@ -446,6 +447,7 @@ watch: { PM2_5Data(val) { // console.log('���������' + val) + this.myChart = null this.drawChart() }, leftaSide(n, o) { @@ -702,6 +704,7 @@ if (this.ws) { this.ws.close() } + var that = this // ������������ // var param = this.accountId + '&' + this.orgId + '&' + this.macName @@ -709,15 +712,16 @@ // ������URL var socketUrl if (this.equipment === 'car') { - socketUrl = 'http://47.99.64.149:8081/api/cruiserWebsocket/' + this.macName + socketUrl = 'https://qx.7drlb.com/api/cruiserWebsocket/' + this.macName // socketUrl = 'http://192.168.0.11:8081/cruiserWebsocket/' + this.macName } else { - socketUrl = 'http://47.99.64.149:8081/api/singleDevice/' + this.macName + socketUrl = 'https://qx.7drlb.com/api/singleDevice/' + this.macName // socketUrl = 'http://192.168.0.11:8081/singleDevice/' + this.macName } // ������http���WS - socketUrl = socketUrl.replace('https', 'ws').replace('http', 'ws') + socketUrl = socketUrl.replace('https', 'wss').replace('http', 'ws') + console.log('socketUrl', socketUrl) this.ws = new WebSocket(socketUrl) this.ws.onopen = function() { @@ -1231,7 +1235,7 @@ const that = this var bar_dv = this.$refs.main if (bar_dv) { - that.myChart = this.$echarts.init(bar_dv) + that.myChart = echarts.init(bar_dv) var option = { title: { left: 'center', -- Gitblit v1.8.0