From f4dec5e5b3a400a6c0fe8cc7fade6b6a01621bfa Mon Sep 17 00:00:00 2001
From: guoshipeng <3194674006@qq.com>
Date: Fri, 18 Aug 2023 10:21:05 +0800
Subject: [PATCH] fix:优化websocket
---
src/views/main/index.vue | 199 +++++++++++++++++++++++++++++++------------------
1 files changed, 126 insertions(+), 73 deletions(-)
diff --git a/src/views/main/index.vue b/src/views/main/index.vue
index 79ae316..c694ae5 100644
--- a/src/views/main/index.vue
+++ b/src/views/main/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="dashboard-container" style="height:100%">
+ <div class="dashboard-container" style="height: 100%">
<el-container style="height: 100%; border: 1px solid #eee">
<el-aside
v-if="this.$store.state.aside"
@@ -7,7 +7,7 @@
style="background-color: rgb(238, 241, 246)"
>
<!-- ��������������������������������������� -->
- <div style="display:flex;margin-bottom:5px">
+ <div style="display: flex; margin-bottom: 5px">
<el-cascader
v-model="newRegion"
placeholder="���������/���/���"
@@ -15,27 +15,45 @@
:props="{ checkStrictly: true }"
clearable
change-on-select
- style="flex:1"
+ style="flex: 1"
/>
- <div style="width: 20%;line-height: 30px;text-align: center;background: #409eff;color: #fff;margin: 5px;border-radius: 5px;cursor: pointer;font-size: 14px;" @click="getRegionApi">������</div>
+ <div
+ style="
+ width: 20%;
+ line-height: 30px;
+ text-align: center;
+ background: #409eff;
+ color: #fff;
+ margin: 5px;
+ border-radius: 5px;
+ cursor: pointer;
+ font-size: 14px;
+ "
+ @click="getRegionApi"
+ >
+ ������
+ </div>
</div>
- <div style="display:flex;margin-bottom:5px">
- <el-input v-model="searchText" placeholder="������������" clearable prefix-icon="el-icon-search" />
+ <div style="display: flex; margin-bottom: 5px">
+ <el-input
+ v-model="searchText"
+ placeholder="������������"
+ clearable
+ prefix-icon="el-icon-search"
+ />
</div>
- <el-menu
- :default-openeds="openeds"
- >
+ <el-menu :default-openeds="openeds" class="elwidth">
<el-submenu
- v-for="(item,index) in defaultData"
+ v-for="(item, index) in defaultData"
:key="index"
- :index="(index+1).toString()"
- style="border-bottom:1px solid #eee;padding-left: 15px;"
+ :index="(index + 1).toString()"
+ style="border-bottom: 1px solid #eee; padding-left: 15px"
class="abc"
>
<template
slot="title"
class="title"
- style="padding-left:20px!important"
+ style="padding-left: 20px !important"
>
<!-- <i
style="vertical-align: -2px;font-size: 20px;margin-right:5px"
@@ -43,32 +61,57 @@
/> -->
<span
- style="height:12px;display: inline-block;"
+ style="height: 12px; display: inline-block"
class="circle"
- :class="{'circle-0':item.state == 0,'circle-1':item.state == 1,'circle-2':item.state == 2,'circle-3':item.state == 3,'circle-4':item.state == 4,'circle-5':item.state == 5,'circle-6':item.state == 6}"
+ :class="{
+ 'circle-0': item.state == 0,
+ 'circle-1': item.state == 1,
+ 'circle-2': item.state == 2,
+ 'circle-3': item.state == 3,
+ 'circle-4': item.state == 4,
+ 'circle-5': item.state == 5,
+ 'circle-6': item.state == 6,
+ }"
/>
<!-- <el-button type="primary" circle /> -->
{{ item.name }}
</template>
<el-menu-item
- v-for="(items,indexitem) in item.devices"
+ v-for="(items, indexitem) in item.devices"
:key="indexitem"
- style="display: flex;justify-content: space-between;align-items: center;padding-right: 0;padding-left:35px"
- :index="(index+1 + '-' + indexitem + 1).toString()"
+ style="
+ display: flex;
+ align-items: center;
+ padding-right: 0;
+ padding-left: 35px;
+ "
+ :index="(index + 1 + '-' + indexitem + 1).toString()"
@click="jump(items)"
>
<!-- <div> -->
<!-- <el-button type="primary" circle /> -->
<span
class="circle"
- :class="{'circle-0':items.state == 0,'circle-1':items.state == 1,'circle-2':items.state == 2,'circle-3':items.state == 3,'circle-4':items.state == 4,'circle-5':items.state == 5,'circle-6':items.state == 6}"
+ :class="{
+ 'circle-0': items.state == 0,
+ 'circle-1': items.state == 1,
+ 'circle-2': items.state == 2,
+ 'circle-3': items.state == 3,
+ 'circle-4': items.state == 4,
+ 'circle-5': items.state == 5,
+ 'circle-6': items.state == 6,
+ }"
/>
<span>{{ items.name }}</span>
<i
- style="vertical-align: -2.5px;font-size: 20px;margin-right:10px;margin-left:auto"
+ style="
+ vertical-align: -2.5px;
+ font-size: 20px;
+ margin-left: 5px;
+ "
class="iconfont iconfaxianzuobiao"
- @click="deviceDetail(items.mac,item,items,indexitem)"
+ @click="deviceDetail(items.mac, item, items, indexitem)"
/>
<!-- </div> -->
</el-menu-item>
@@ -80,7 +123,7 @@
<!-- <Map :mpid="monitorPointId" :rc="regionCode" /> -->
<compoment
:is="this.$store.state.type"
- v-if="weidu&&jingdu"
+ v-if="weidu && jingdu"
ref="child"
:weidu="weidu"
:jingdu="jingdu"
@@ -111,27 +154,27 @@
const lineChartData = {
newVisitis: {
expectedData: [100, 120, 161, 134, 105, 160, 165],
- actualData: [120, 82, 91, 154, 162, 140, 145]
+ actualData: [120, 82, 91, 154, 162, 140, 145],
},
messages: {
expectedData: [200, 192, 120, 144, 160, 130, 140],
- actualData: [180, 160, 151, 106, 145, 150, 130]
+ actualData: [180, 160, 151, 106, 145, 150, 130],
},
purchases: {
expectedData: [80, 100, 121, 104, 105, 90, 100],
- actualData: [120, 90, 100, 138, 142, 130, 130]
+ actualData: [120, 90, 100, 138, 142, 130, 130],
},
shoppings: {
expectedData: [130, 140, 141, 142, 145, 150, 160],
- actualData: [120, 82, 91, 154, 162, 140, 130]
- }
+ actualData: [120, 82, 91, 154, 162, 140, 130],
+ },
}
export default {
components: {
Map,
LineChart,
Charts,
- ReportForm
+ ReportForm,
// vLineChart
},
data() {
@@ -153,13 +196,13 @@
jingdu: 0,
weidu: 0,
options: [],
- newRegion: []
+ newRegion: [],
}
},
computed: {
changeCity() {
return this.$store.state.regionCode
- }
+ },
},
watch: {
searchText(newVal, oldVal) {
@@ -172,8 +215,8 @@
const newDefaultData = [
{
name: '',
- devices: []
- }
+ devices: [],
+ },
]
let ke = 1
this.defaultData.forEach((v, k, a) => {
@@ -226,7 +269,7 @@
// this.newRegion = newVal
this.getRegionApi()
}
- }
+ },
},
beforeCreate() {
// this.$store.state.regionCode = this.$route.params.cName
@@ -249,48 +292,50 @@
},
// ������������������������������������������������������
jump(items) {
+ console.log(items)
this.jumpData = []
// const newLL = this.bd09togcj02(items.longitude, items.latitude)
const newLL = [items.latitude, items.longitude]
this.jumpData.push(newLL[0])
this.jumpData.push(newLL[1])
- // console.log(this.jumpData)
+ console.log(this.jumpData)
this.$refs.child.jumpMap(this.jumpData)
},
// ���������������������
deviceDetail(mac, item, items, indexs) {
+ this.$message.warning('���������������������������������������')
// console.log('������������������������')
// console.log(mac)
// console.log(item)
// console.log(items)
// console.log(indexs)
- this.monitorPointInfo = item
- // console.log(this.monitorPointInfo)
+ // this.monitorPointInfo = item
+ // // console.log(this.monitorPointInfo)
+ // // this.$router.push({
+ // // path: '/deviceDetail/index',
+ // // query: {
+ // // macName: mac
+ // // }
+ // // })
+ // // console.log('items')
+ // // console.log(items)
// this.$router.push({
- // path: '/deviceDetail/index',
+ // name: 'deviceDetail',
+ // params: {
+ // monitorPointInfo: item,
+ // device: items,
+ // macName: mac,
+ // indexs: indexs,
+ // items: [items.latitude, items.longitude],
+ // },
// query: {
- // macName: mac
- // }
+ // monitorPointInfo: JSON.stringify(item),
+ // device: JSON.stringify(items),
+ // macName: mac,
+ // indexs: indexs,
+ // items: [items.latitude, items.longitude],
+ // },
// })
- // console.log('items')
- // console.log(items)
- this.$router.push({
- name: 'deviceDetail',
- params: {
- monitorPointInfo: item,
- device: items,
- macName: mac,
- indexs: indexs,
- items: [items.latitude, items.longitude]
- },
- query: {
- monitorPointInfo: JSON.stringify(item),
- device: items,
- macName: mac,
- indexs: indexs,
- items: [items.latitude, items.longitude]
- }
- })
},
// ������regionCode������������������������������������������������
getRegionApi() {
@@ -301,6 +346,8 @@
this.getData()
this.$refs.child.getRegionApiRequest()
this.jump({ latitude: this.weidu, longitude: this.jingdu })
+ console.log(this.weidu, '������')
+ console.log(this.jingdu, '������')
},
// ������������������������
getData() {
@@ -310,11 +357,11 @@
method: 'get',
params: {
organizationId: this.organizationId,
- regionCode: this.$store.state.regionCode
- }
+ regionCode: this.$store.state.regionCode,
+ },
})
- .then(res => {
- // console.log(res)
+ .then((res) => {
+ console.log(res, '123')
this.monitorPointIds = []
// console.log(this.monitorPointIds)
this.weidu = res.data.monitorPoints[0].devices[0].latitude
@@ -333,7 +380,10 @@
let devisesLength = 0
if (this.defaultData[i].devices) {
for (let j = 0; j < this.defaultData[i].devices.length; j++) {
- if (this.defaultData[i].devices.length > 1 && this.defaultData[i].devices[j].state === '0') {
+ if (
+ this.defaultData[i].devices.length > 1 &&
+ this.defaultData[i].devices[j].state === '0'
+ ) {
devisesLength++
// continue
if (devisesLength === this.defaultData[i].devices.length) {
@@ -354,7 +404,7 @@
this.$store.state.monitorPointName = res.data.monitorPoints[0].name
Bus.$emit('monitorPointIds', this.monitorPointIds) // ������������������������monitorPointIds
})
- .catch(error => {
+ .catch((error) => {
console.log(error)
// console.log('������')
this.defaultData = []
@@ -365,10 +415,10 @@
url: '/organization/getMapPath',
method: 'get',
params: {
- organizationId: this.$store.state.orgId
- }
+ organizationId: this.$store.state.orgId,
+ },
})
- .then(res => {
+ .then((res) => {
// console.log('������������getMapPath������')
// console.log(res.data)
// console.log(res)
@@ -376,30 +426,30 @@
for (let i = 0; i < data.length; i++) {
this.options.push({
value: data[i].provinceCode,
- label: data[i].provinceName
+ label: data[i].provinceName,
})
this.options[i].children = []
for (let j = 0; j < data[i].cities.length; j++) {
this.options[i].children.push({
value: data[i].cities[j].cityCode,
- label: data[i].cities[j].cityName
+ label: data[i].cities[j].cityName,
})
this.options[i].children[j].children = []
for (let k = 0; k < data[i].cities[j].areas.length; k++) {
this.options[i].children[j].children.push({
value: data[i].cities[j].areas[k].areaCode,
- label: data[i].cities[j].areas[k].areaName
+ label: data[i].cities[j].areas[k].areaName,
})
}
}
}
})
- .catch(err => {
+ .catch((err) => {
// console.log('������Region������')
console.log(err)
})
// console.log('������Region������')
- }
+ },
// ������������������
// getMap() {
// axios.get('http://47.99.64.149:8080/screen_api_v2/screen/newMap-page?areaCode=130900&accountId=223')
@@ -411,7 +461,7 @@
// console.log('������')
// })
// }
- }
+ },
}
</script>
@@ -477,4 +527,7 @@
.title {
padding: 0 20px;
}
+.elwidth {
+ width: 400px;
+}
</style>
--
Gitblit v1.8.0