diff --git a/src/assets/imgs/m0.png b/src/assets/imgs/m0.png
new file mode 100644
index 00000000..329ff524
Binary files /dev/null and b/src/assets/imgs/m0.png differ
diff --git a/src/assets/imgs/m1.png b/src/assets/imgs/m1.png
new file mode 100644
index 00000000..b999cbcf
Binary files /dev/null and b/src/assets/imgs/m1.png differ
diff --git a/src/assets/imgs/m2.png b/src/assets/imgs/m2.png
new file mode 100644
index 00000000..9f30b309
Binary files /dev/null and b/src/assets/imgs/m2.png differ
diff --git a/src/assets/imgs/m3.png b/src/assets/imgs/m3.png
new file mode 100644
index 00000000..0d3f8263
Binary files /dev/null and b/src/assets/imgs/m3.png differ
diff --git a/src/assets/imgs/m4.png b/src/assets/imgs/m4.png
new file mode 100644
index 00000000..61387d2a
Binary files /dev/null and b/src/assets/imgs/m4.png differ
diff --git a/src/utils/mqtt.ts b/src/utils/mqtt.ts
index 66d48a0d..2685801b 100644
--- a/src/utils/mqtt.ts
+++ b/src/utils/mqtt.ts
@@ -27,8 +27,8 @@ class MQTT {
clean: true,
connectTimeout: 30 * 1000,
clientId: `mqttjs_${Math.random().toString(16).substr(2, 8)}`,
- username: 't_user',
- password: 'njcnpqs',
+ username: '',
+ password: '',
reconnectPeriod: 1000, // 默认1秒重试一次
maxReconnectTimes: 3 // 默认最大重连5次
}
diff --git a/src/utils/webSocketClient.ts b/src/utils/webSocketClient.ts
index b5a305fe..6c4e4e5f 100644
--- a/src/utils/webSocketClient.ts
+++ b/src/utils/webSocketClient.ts
@@ -56,7 +56,6 @@ export default class SocketService {
this.ws.onmessage = event => this.handleMessage(event)
}, 0)
}
-
// 处理连接成功事件
private handleOpen(): void {
ElMessage.success('webSocket连接服务端成功了')
diff --git a/src/views/pqs/auditManage/auditList/index.vue b/src/views/pqs/auditManage/auditList/index.vue
index fbadad74..92cbfd93 100644
--- a/src/views/pqs/auditManage/auditList/index.vue
+++ b/src/views/pqs/auditManage/auditList/index.vue
@@ -90,7 +90,6 @@ const loading = ref(false)
const statistics = ref()
const flg = ref(true)
-const showMqtt = ref(false)
const zoom = ref('') //图表焦点校验
const resultList = ref([
diff --git a/src/views/pqs/voltageSags/Region/transientList/index.vue b/src/views/pqs/voltageSags/Region/transientList/index.vue
index 4ac45bba..58cacc86 100644
--- a/src/views/pqs/voltageSags/Region/transientList/index.vue
+++ b/src/views/pqs/voltageSags/Region/transientList/index.vue
@@ -10,81 +10,39 @@
-
+
-
-
+
+
-
-
+
+
-
+
< 时间数 <
-
+
-
+
< 严重度 <
-
+
-
-
+
+
-
-
+
+
-
+
@@ -272,10 +201,10 @@ const tableStore = new TableStore({
},
{
- title: '操作',fixed: 'right',
+ title: '操作', fixed: 'right',
width: '150',
render: 'buttons',
-
+
buttons: [
{
name: 'edit',
@@ -330,7 +259,7 @@ const tableStore = new TableStore({
}
],
- loadCallback: () => {}
+ loadCallback: () => { }
})
const options = ref([])
const defaultProps = {
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue b/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue
index d096300b..1fa3c259 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue
@@ -68,7 +68,7 @@
>
-
+
([])
const siteList = ref([])
const polyline = ref([])
const lineId = ref('')
+const imageUrl = new URL('@/assets/imgs/m0.png', import.meta.url).href
+const imageUrl1 = new URL('@/assets/imgs/m1.png', import.meta.url).href
+const imageUrl2 = new URL('@/assets/imgs/m3.png', import.meta.url).href
+const imageUrl3 = new URL('@/assets/imgs/m4.png', import.meta.url).href
+const styles = [
+ {
+ url: imageUrl,
+ size: {
+ width: 53,
+ height: 52
+ },
+ opt_textSize: 10
+ },
+ {
+ url: imageUrl1,
+ size: {
+ width: 56,
+ height: 55
+ },
+ opt_textSize: 12
+ },
+ {
+ url: imageUrl2,
+ size: {
+ width: 78,
+ height: 77
+ },
+ opt_textSize: 14
+ },
+ {
+ url: imageUrl3,
+ size: {
+ width: 90,
+ height: 89
+ },
+ opt_textSize: 14
+ },
+]
const handler = async ({ BMap, map }: any) => {
let data = props.mapList
let r = 0.0035
diff --git a/src/views/pqs/voltageSags/overview/index.vue b/src/views/pqs/voltageSags/overview/index.vue
index a05261b4..e78edc9b 100644
--- a/src/views/pqs/voltageSags/overview/index.vue
+++ b/src/views/pqs/voltageSags/overview/index.vue
@@ -82,7 +82,7 @@
>
-
+
([])
const siteList = ref([])
const polyline = ref([])
const lineId = ref('')
+const imageUrl = new URL('@/assets/imgs/m0.png', import.meta.url).href
+const imageUrl1 = new URL('@/assets/imgs/m1.png', import.meta.url).href
+const imageUrl2 = new URL('@/assets/imgs/m3.png', import.meta.url).href
+const imageUrl3 = new URL('@/assets/imgs/m4.png', import.meta.url).href
+const styles = [
+ {
+ url: imageUrl,
+ size: {
+ width: 53,
+ height: 52
+ },
+ opt_textSize: 10
+ },
+ {
+ url: imageUrl1,
+ size: {
+ width: 56,
+ height: 55
+ },
+ opt_textSize: 12
+ },
+ {
+ url: imageUrl2,
+ size: {
+ width: 78,
+ height: 77
+ },
+ opt_textSize: 14
+ },
+ {
+ url: imageUrl3,
+ size: {
+ width: 90,
+ height: 89
+ },
+ opt_textSize: 14
+ },
+]
const handler = async ({ BMap, map }: any) => {
params.value.deptIndex = adminInfo.$state.deptId
params.value.searchBeginTime = datePickerRef.value.timeValue[0]