From 54849757852f6ab40eb17afbd03d1d839b60a38d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Nov 2023 17:09:15 +0800
Subject: [PATCH] 重复定时和连续执行
---
src/pages/page-web/projects/tsa.vue | 417 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 291 insertions(+), 126 deletions(-)
diff --git a/src/pages/page-web/projects/tsa.vue b/src/pages/page-web/projects/tsa.vue
index e4fe390..8417112 100644
--- a/src/pages/page-web/projects/tsa.vue
+++ b/src/pages/page-web/projects/tsa.vue
@@ -1,14 +1,15 @@
<template>
- <div class="project-tsa-wrapper ">
+ <div class="project-tsa-wrapper">
<div>
<a-row>
<a-col :span="1"></a-col>
- <a-col :span="11">我的项目呼号</a-col>
- <a-col :span="11" align="right" style="font-weight: 700">{{ username }}</a-col>
+ <a-col :span="11">项目名称</a-col>
+ <a-col :span="11" align="right" style="font-weight: 700">{{ projectName }}</a-col>
<a-col :span="1"></a-col>
</a-row>
</div>
<div class="scrollbar" :style="{ height: scorllHeight + 'px' }">
+ <!--机场-->
<a-collapse :bordered="false" expandIconPosition="right" accordion style="background: #232323;">
<a-collapse-panel :key="EDeviceTypeName.Dock" header="机场" style="border-bottom: 1px solid #4f4f4f;">
<div v-if="onlineDocks.data.length === 0" style="height: 150px; color: white;">
@@ -16,35 +17,58 @@
</div>
<div v-else class="fz12" style="color: white;">
<div v-for="dock in onlineDocks.data" :key="dock.sn"
- style="background: #3c3c3c; height: 90px; margin-bottom: 10px;">
- <div style="border-radius: 2px; height: 100%; width: 100%;"
+ style="background: #3c3c3c; margin-bottom: 10px;">
+ <div class="task_wrapper" v-if="dock.latest_wayline_job">
+ <div class="task_content task_content_way" v-if="deviceInfo[dock.sn] && deviceInfo[dock.sn].mode_code === 5">
+ <div class="task_status">
+ <ContainerOutlined />
+ <span>执行任务中</span>
+ </div>
+ </div>
+ <div class="task_content" v-else>
+ <div class="task_status">
+ <ContainerOutlined />
+ <span>待执行</span>
+ </div>
+ <div class="task_info">{{dock.latest_wayline_job.is_later ? '今天': '明天'}}{{convertTimestampToDate(dock.latest_wayline_job.begin_time, 'hh:mm')}}</div>
+ </div>
+ <div class="task_title">{{dock.latest_wayline_job.name}}</div>
+ </div>
+ <div style="border-radius: 2px; height: 90px; width: 100%;"
class="flex-row flex-justify-between flex-align-center">
<div style="float: left; padding: 0px 5px 8px 8px; width: 88%">
+ <!-- // 机场设备标题 -->
<div style="width: 80%; height: 30px; line-height: 30px; font-size: 16px;">
<a-tooltip :title="`${dock.gateway.callsign} - ${dock.callsign ?? 'No Drone'}`">
- <div class="text-hidden" style="max-width: 200px;">{{ dock.gateway.callsign }} - {{ dock.callsign ??
- 'No Drone' }}</div>
+ <div class="text-hidden" style="max-width: 200px;">{{ dock.gateway.callsign }} - {{
+ dock.callsign ??
+ 'No Drone'
+ }}
+ </div>
</a-tooltip>
</div>
+ <!-- // 机场设备状态 -->
<div class="mt5 flex-align-center flex-row flex-justify-between" style="background: #595959;">
<div class="flex-align-center flex-row">
<span class="ml5 mr5">
<RobotOutlined />
</span>
- 132
<div class="font-bold text-hidden" style="max-width: 80px;"
:style="dockInfo[dock.gateway.sn] && dockInfo[dock.gateway.sn].basic_osd?.mode_code !== EDockModeCode.Disconnected ? 'color: #00ee8b' : 'color: red;'">
- {{ dockInfo[dock.gateway.sn] ? EDockModeCode[dockInfo[dock.gateway.sn].basic_osd?.mode_code] :
- EDockModeCode[EDockModeCode.Disconnected] }}
+ {{
+ dockInfo[dock.gateway.sn] ? EDockModeText[dockInfo[dock.gateway.sn].basic_osd?.mode_code] :
+ EDockModeText[EDockModeCode.Disconnected]
+ }}
</div>
</div>
- <div class="mr5 flex-align-center flex-row" style="width: 85px; margin-right: 0; height: 18px;">
+ <div class="mr5 flex-align-center flex-row" style="width: 125px; margin-right: 0; height: 18px;">
<div v-if="hmsInfo[dock.gateway.sn]" class="flex-align-center flex-row">
<div :class="hmsInfo[dock.gateway.sn][0].level === EHmsLevel.CAUTION ? 'caution-blink' :
hmsInfo[dock.gateway.sn][0].level === EHmsLevel.WARN ? 'warn-blink' : 'notice-blink'"
style="width: 18px; height: 16px; text-align: center;">
<span :style="hmsInfo[dock.gateway.sn].length > 99 ? 'font-size: 11px' : 'font-size: 12px'">{{
- hmsInfo[dock.gateway.sn].length }}</span>
+ hmsInfo[dock.gateway.sn].length
+ }}</span>
<span class="fz10">{{ hmsInfo[dock.gateway.sn].length > 99 ? '+' : '' }}</span>
</div>
<a-popover trigger="click" placement="bottom" color="black"
@@ -53,8 +77,8 @@
:overlayStyle="{ width: '200px', height: '300px' }">
<div :class="hmsInfo[dock.gateway.sn][0].level === EHmsLevel.CAUTION ? 'caution' :
hmsInfo[dock.gateway.sn][0].level === EHmsLevel.WARN ? 'warn' : 'notice'"
- style="margin-left: 3px; width: 62px; height: 16px;">
- <span class="word-loop">{{ hmsInfo[dock.gateway.sn][0].message_en }}</span>
+ style="margin-left: 3px; width: 107px; height: 16px;">
+ <span class="word-loop">{{ hmsInfo[dock.gateway.sn][0].message_zh }}</span>
</div>
<template #content>
<a-collapse style="background: black; height: 300px; overflow-y: auto;" :bordered="false"
@@ -66,7 +90,7 @@
<template #header="{ isActive }">
<div class="flex-row flex-align-center" style="width: 130px;">
<div style="width: 110px;">
- <span class="word-loop">{{ hms.message_en }}</span>
+ <span class="word-loop">{{ hms.message_zh }}</span>
</div>
<div style="width: 20px; height: 15px; font-size: 10px; z-index: 2 "
class="flex-row flex-align-center flex-justify-center"
@@ -84,27 +108,33 @@
</template>
</a-popover>
</div>
- <div v-else class="width-100" style="height: 90%; background: rgba(0, 0, 0, 0.35)"></div>
+ <div v-else class="width-100" style="height: 90%; background: rgba(0, 0, 0, 0.35)">N/A</div>
</div>
</div>
+
+ <!-- // 机场是否启动 -->
<div class="mt5 flex-align-center flex-row flex-justify-between" style="background: #595959;">
<div class="flex-row">
<span class="ml5 mr5">
<RocketOutlined />
</span>
<div class="font-bold text-hidden" style="max-width: 80px"
- :style="deviceInfo[dock.sn] && deviceInfo[dock.sn].mode_code !== EModeCode.Disconnected ? 'color: #00ee8b' : 'color: red;'">
- {{ deviceInfo[dock.sn] ? EModeCode[deviceInfo[dock.sn].mode_code] :
- EModeCode[EModeCode.Disconnected] }}
+ :style="deviceInfo[dock.sn] && deviceInfo[dock.sn].mode_code !== EModeCode.Disconnected || dockInfo[dock.gateway.sn].basic_osd?.drone_in_dock === 1 ? 'color: #00ee8b' : 'color: red;'">
+ {{
+ deviceInfo[dock.sn] ? EModeText[deviceInfo[dock.sn].mode_code] :
+ dockInfo[dock.gateway.sn].basic_osd?.drone_in_dock === 1 ? '舱内关机' :
+ EModeText[EModeCode.Disconnected]
+ }}
</div>
</div>
- <div class="mr5 flex-align-center flex-row" style="width: 85px; margin-right: 0; height: 18px;">
+ <div class="mr5 flex-align-center flex-row" style="width: 125px; margin-right: 0; height: 18px;">
<div v-if="hmsInfo[dock.sn]" class="flex-align-center flex-row">
<div :class="hmsInfo[dock.sn][0].level === EHmsLevel.CAUTION ? 'caution-blink' :
hmsInfo[dock.sn][0].level === EHmsLevel.WARN ? 'warn-blink' : 'notice-blink'"
style="width: 18px; height: 16px; text-align: center;">
<span :style="hmsInfo[dock.sn].length > 99 ? 'font-size: 11px' : 'font-size: 12px'">{{
- hmsInfo[dock.sn].length }}</span>
+ hmsInfo[dock.sn].length
+ }}</span>
<span class="fz10">{{ hmsInfo[dock.sn].length > 99 ? '+' : '' }}</span>
</div>
<a-popover trigger="click" placement="bottom" color="black" v-model:visible="hmsVisible[dock.sn]"
@@ -112,8 +142,8 @@
:overlayStyle="{ width: '200px', height: '300px' }">
<div :class="hmsInfo[dock.sn][0].level === EHmsLevel.CAUTION ? 'caution' :
hmsInfo[dock.sn][0].level === EHmsLevel.WARN ? 'warn' : 'notice'"
- style="margin-left: 3px; width: 62px; height: 16px;">
- <span class="word-loop">{{ hmsInfo[dock.sn][0].message_en }}</span>
+ style="margin-left: 3px; width: 107px; height: 16px;">
+ <span class="word-loop">{{ hmsInfo[dock.sn][0].message_zh }}</span>
</div>
<template #content>
<a-collapse style="background: black; height: 300px; overflow-y: auto;" :bordered="false"
@@ -124,7 +154,7 @@
<template #header="{ isActive }">
<div class="flex-row flex-align-center" style="width: 130px;">
<div style="width: 110px;">
- <span class="word-loop">{{ hms.message_en }}</span>
+ <span class="word-loop">{{ hms.message_zh }}</span>
</div>
<div style="width: 20px; height: 15px; font-size: 10px; z-index: 2 "
class="flex-row flex-align-center flex-justify-center"
@@ -142,14 +172,14 @@
</template>
</a-popover>
</div>
- <div v-else class="width-100" style="height: 90%; background: rgba(0, 0, 0, 0.35)"></div>
+ <div v-else class="width-100" style="height: 90%; background: rgba(0, 0, 0, 0.35)">N/A</div>
</div>
</div>
</div>
<div style="float: right; background: #595959; height: 100%; width: 40px;"
class="flex-row flex-justify-center flex-align-center">
<div class="fz16"
- @click="switchVisible($event, dock, true, dockInfo[dock.gateway.sn] && dockInfo[dock.gateway.sn].basic_osd?.mode_code !== EDockModeCode.Disconnected)">
+ @click="switchVisible($event, dock, true, dockInfo[dock.gateway.sn] && dockInfo[dock.gateway.sn].basic_osd?.mode_code !== EDockModeCode.Disconnected, dock.gateway.sn)">
<a v-if="osdVisible.gateway_sn === dock.gateway.sn && osdVisible.visible">
<EyeOutlined />
</a>
@@ -163,6 +193,8 @@
</div>
</a-collapse-panel>
</a-collapse>
+
+ <!--设备-->
<a-collapse :bordered="false" expandIconPosition="right" accordion style="background: #232323;">
<a-collapse-panel :key="EDeviceTypeName.Aircraft" header="在线设备" style="border-bottom: 1px solid #4f4f4f;">
<div v-if="onlineDevices.data.length === 0" style="height: 150px; color: white;">
@@ -184,9 +216,14 @@
<div style="float: left; padding: 5px 5px 8px 8px; width: 88%">
<div style="width: 100%; height: 100%;">
<a-tooltip>
- <template #title>{{ device.model ? `${device.model} - ${device.callsign}` : 'No Drone' }}</template>
- <span class="text-hidden" style="max-width: 200px; display: block; height: 20px;">{{ device.model ?
- `${device.model} - ${device.callsign}` : 'No Drone' }}</span>
+ <template #title>{{
+ device.model ? `${device.model} - ${device.callsign}` : 'No Drone'
+ }}
+ </template>
+ <span class="text-hidden" style="max-width: 200px; display: block; height: 20px;">{{
+ device.model ?
+ `${device.model} - ${device.callsign}` : 'No Drone'
+ }}</span>
</a-tooltip>
</div>
<div class="mt5" style="background: #595959;">
@@ -195,8 +232,10 @@
</span>
<span class="font-bold"
:style="deviceInfo[device.sn] && deviceInfo[device.sn].mode_code !== EModeCode.Disconnected ? 'color: #00ee8b' : 'color: red;'">
- {{ deviceInfo[device.sn] ? EModeCode[deviceInfo[device.sn].mode_code] :
- EModeCode[EModeCode.Disconnected] }}
+ {{
+ deviceInfo[device.sn] ? EModeCode[deviceInfo[device.sn].mode_code] :
+ EModeCode[EModeCode.Disconnected]
+ }}
</span>
</div>
</div>
@@ -218,9 +257,11 @@
<span class="mr5"><a-image style="margin-left: 2px; margin-top: -2px; height: 20px; width: 20px;"
:src="rc" /></span>
<a-tooltip>
- <template #title>{{ device.gateway.model }} - {{ device.gateway.callsign }} </template>
+ <template #title>{{ device.gateway.model }} - {{ device.gateway.callsign }}</template>
<div class="text-hidden" style="max-width: 200px;">{{ device.gateway.model }} - {{
- device.gateway.callsign }}</div>
+ device.gateway.callsign
+ }}
+ </div>
</a-tooltip>
</div>
</div>
@@ -229,74 +270,54 @@
</a-collapse-panel>
</a-collapse>
</div>
- <Drawer title="项目设置" :styleDrawer="styleDrawer" v-model:show="showDrawer">
- <DockConfig />
- </Drawer>
</div>
</template>
<script lang="ts" setup>
-import { styleDrawer } from './common/common'
-import { useConnectWebSocket } from '/@/hooks/use-connect-websocket'
-import { flyTo } from '/@/hooks/use-center-point'
+import * as Cesium from 'cesium'
import { computed, onMounted, reactive, ref, watch, WritableComputedRef } from 'vue'
import { EDeviceTypeName, ELocalStorageKey } from '/@/types'
-import Drawer from '/@/components/Drawer/Drawer.vue'
-import noData from '/@/assets/icons/no-data.png'
-import { Empty } from 'ant-design-vue'
import rc from '/@/assets/icons/rc.png'
-import { OnlineDevice, EModeCode, OSDVisible, EDockModeCode, DeviceOsd } from '/@/types/device'
+import { OnlineDevice, EModeCode, OSDVisible, EDockModeCode, DeviceOsd, EDockModeText, EModeText } from '/@/types/device'
import { useMyStore } from '/@/store'
-import { getDeviceTopo, getUnreadDeviceHms, updateDeviceHms } from '/@/api/manage'
-import { RocketOutlined, EyeInvisibleOutlined, EyeOutlined, RobotOutlined, DoubleRightOutlined } from '@ant-design/icons-vue'
+import { getDeviceTopo, getUnreadDeviceHms, updateDeviceHms, testBind } from '/@/api/manage'
+import {
+ RocketOutlined,
+ EyeInvisibleOutlined,
+ EyeOutlined,
+ RobotOutlined,
+ DoubleRightOutlined,
+ ContainerOutlined,
+} from '@ant-design/icons-vue'
import { EHmsLevel } from '/@/types/enums'
-import { UranusMqtt } from '/@/mqtt/index'
-import DockConfig from './components/DockConfig.vue'
+import { cesiumOperation } from '/@/hooks/use-cesium-tsa'
+import { convertTimestampToDate, getDateFromTimestamp, isToday, setTodayTime } from '/@/utils/time'
+let droneEntity: any
const { appContext } = getCurrentInstance()
const global = appContext.config.globalProperties
-const route = useRoute()
-const simpleImage = Empty.PRESENTED_IMAGE_SIMPLE
+// const simpleImage = Empty.PRESENTED_IMAGE_SIMPLE
const store = useMyStore()
const username = ref(localStorage.getItem(ELocalStorageKey.Username))
-const workspaceId = ref(localStorage.getItem(ELocalStorageKey.WorkspaceId)!)
+// const workSpaceId = ref(localStorage.getItem(ELocalStorageKey.workSpaceId)!)
const osdVisible = ref({} as OSDVisible)
const hmsVisible = new Map<string, boolean>()
const scorllHeight = ref()
-const showDrawer = ref(false)
const onlineDevices = reactive({
data: [] as OnlineDevice[]
})
-
+// 机场序列号
+const dock = ref('')
+// 无人机序列号
+const device_dock = ref('')
const onlineDocks = reactive({
- data: [
- {
- model: '我是model字段',
- callsign: '我是callsign字段',
- sn: '我是sn字段',
- mode: '我是mode字段',
- gateway: {
- model: 'gateway.model',
- callsign: 'gateway.callsign',
- sn: '我是gateway.sn字段',
- mode: '我是gateway.mode字段',
- },
- payload: [
- {
- index: 1,
- model: '2',
- control_source: 'A',
- payload_sn: 'payload_sn',
- payload_index: 'payload_index',
- payload_name: 'payload_name',
- },
- ]
- },
- ] as unknown as OnlineDevice[]
+ data: [] as OnlineDevice[]
})
-
+const previousPositions = ref([])
const deviceInfo = computed(() => store.state.deviceState.deviceInfo)
const dockInfo = computed(() => store.state.deviceState.dockInfo)
+const projectName = computed(() => store.state.common.projectName)
+const workSpaceId = computed(() => store.state.common.projectId)
const hmsInfo = computed({
get: () => store.state.hmsInfo,
set: (val) => {
@@ -304,53 +325,169 @@
}
})
+watch(
+ () => store.state.osdVisible.visible,
+ (newVal, oldVal) => {
+ osdVisible.value.visible = newVal
+ },
+ {
+ deep: true,
+ })
+
+const getResource = (name: string) => {
+ return new URL(`/src/assets/icons/${name}`, import.meta.url).href
+}
+
+// 获取ws连接过来的sn设备号
+const snCode = ref<string[]>([])
+const cesium = cesiumOperation()
+// 添加机场标注
+watch(() => store.state.deviceState, (data, oldData) => {
+ // cesium.removeAllPoint()
+ if (data.currentType === EDeviceTypeName.Aircraft && data.deviceInfo[data.currentSn]) {
+ // cesium.removeById('drone_fly')
+ if (!droneEntity) {
+ droneEntity = cesium.getEntityById('drone_fly')
+ }
+ if (droneEntity) {
+ const orientation = {
+ heading: data.deviceInfo[data.currentSn].attitude_head,
+ }
+ cesium.updateEntityPosition(data.deviceInfo[data.currentSn].longitude, data.deviceInfo[data.currentSn].latitude, 'drone_fly', orientation)
+ } else {
+ // 无人机图标
+ const setting = {
+ longitude: data.deviceInfo[data.currentSn].longitude,
+ latitude: data.deviceInfo[data.currentSn].latitude,
+ id: 'drone_fly',
+ billboard: {
+ image: getResource('drone.png'),
+ outlineWidth: 0,
+ width: 36,
+ height: 36,
+ scale: 1.0,
+ rotation: 0.0
+ },
+ heading: data.deviceInfo[data.currentSn].attitude_head,
+ }
+ cesium.addPoint(setting)
+ // 无人机路线轨迹
+ const routeTrajectory = {
+ longitude: 115.85666327144976,
+ latitude: 28.62452712442823,
+ id: 'drone_route',
+ polyline: {
+ width: 5,
+ positions: previousPositions.value,
+ material: Cesium.Color.BLUE
+ },
+ }
+ cesium.addPolyline(routeTrajectory)
+ }
+ // eslint-disable-next-line eqeqeq
+ // 3、4、5的时候代表飞行过程 绘制路线
+ console.log(data.deviceInfo[data.currentSn], 'Aircraft')
+ // eslint-disable-next-line eqeqeq
+ if (data.deviceInfo[data.currentSn].mode_code && (data.deviceInfo[data.currentSn].mode_code == 3 || data.deviceInfo[data.currentSn].mode_code == 4 || data.deviceInfo[data.currentSn].mode_code == 5 || data.deviceInfo[data.currentSn].mode_code == 9)) {
+ const newPositions = Cesium.Cartesian3.fromDegreesArray([data.deviceInfo[data.currentSn].longitude, data.deviceInfo[data.currentSn].latitude])
+ previousPositions.value = previousPositions.value.concat(newPositions)
+ // 更新线段的位置
+ const drone_route = cesium.getEntityById('drone_route')
+ drone_route.polyline.positions = previousPositions.value
+ // eslint-disable-next-line eqeqeq
+ } else if (data.deviceInfo[data.currentSn].mode_code == 0 || data.deviceInfo[data.currentSn].mode_code == 14) {
+ const drone_route = cesium.getEntityById('drone_route')
+ previousPositions.value = []
+ drone_route.polyline.positions = previousPositions.value
+ }
+ }
+ if (data.currentType === EDeviceTypeName.Dock && data.dockInfo[data.currentSn]) {
+ if (snCode.value.includes(data.currentSn)) return
+ snCode.value.push(data.currentSn)
+ // 机场图标位置
+ const setting = {
+ longitude: data.dockInfo[data.currentSn].basic_osd?.longitude,
+ latitude: data.dockInfo[data.currentSn].basic_osd?.latitude,
+ billboard: {
+ image: getResource('dock.png'),
+ outlineWidth: 0,
+ width: 36,
+ height: 36,
+ scale: 1.0,
+ }
+ }
+ cesium.addPoint(setting)
+ // cesium.flyTo(setting)
+ }
+}, {
+ deep: true,
+})
+const bind = async (sn: string) => {
+ const res = await testBind(sn)
+ if (res.code === 0) {
+ Promise.resolve(true)
+ } else {
+ Promise.resolve(false)
+ }
+}
+// 判断给定日期是否晚于当前时间
+const isDateLaterThanNow = (dateObj:any) => {
+ const todayTimestamp = setTodayTime(dateObj)
+ return todayTimestamp > Date.now()
+}
+
onMounted(() => {
- // flyTo(global.$viewer, route.params.longitude as unknown as number, route.params.latitude as unknown as number)
- // getOnlineTopo()
- // setTimeout(() => {
- // watch(() => store.state.deviceStatusEvent,
- // data => {
- // getOnlineTopo()
- // if (data.deviceOnline.sn) {
- // getUnreadHms(data.deviceOnline.sn)
- // }
- // },
- // {
- // deep: true
- // }
- // )
- // getOnlineDeviceHms()
- // }, 3000)
+ getOnlineTopo()
+ setTimeout(() => {
+ watch(() => store.state.deviceStatusEvent,
+ data => {
+ getOnlineTopo()
+ if (data.deviceOnline.sn) {
+ getUnreadHms(data.deviceOnline.sn)
+ }
+ },
+ {
+ deep: true
+ }
+ )
+ getOnlineDeviceHms()
+ }, 3000)
const element = document.getElementsByClassName('scrollbar').item(0) as HTMLDivElement
const parent = element?.parentNode as HTMLDivElement
scorllHeight.value = parent?.clientHeight - parent?.firstElementChild?.clientHeight
+ previousPositions.value = []
})
-const messageHandler = async (payload: any) => {
- console.log(payload, 'payload')
- // if (payload.type === 'hms') {
- // const { data
-}
-// 监听ws 消息
-useConnectWebSocket(messageHandler)
+
function getOnlineTopo () {
- getDeviceTopo(workspaceId.value).then((res) => {
+ getDeviceTopo(workSpaceId.value).then((res) => {
if (res.code !== 0) {
return
}
+ const snList: any[] = []
onlineDevices.data = []
onlineDocks.data = []
res.data.forEach((gateway: any) => {
const child = gateway.children
+ if (gateway.latest_wayline_job) {
+ const isLater = isToday(gateway.latest_wayline_job.begin_time)
+ // false 代表任务开始时间大于今天 true为任务开始时间为今天
+ gateway.latest_wayline_job.is_later = isLater
+ }
+
const device: OnlineDevice = {
model: child?.device_name,
callsign: child?.nickname,
sn: child?.device_sn,
mode: EModeCode.Disconnected,
+ latest_wayline_job: gateway.latest_wayline_job,
gateway: {
model: gateway?.device_name,
callsign: gateway?.nickname,
sn: gateway?.device_sn,
- domain: gateway?.domain
+ domain: gateway?.domain,
+ device_domain: child.domain,
+ device_type: child.type,
+ device_sub_type: child.sub_type
},
payload: []
}
@@ -372,38 +509,47 @@
if (gateway.status && EDeviceTypeName.Gateway === gateway.domain) {
onlineDevices.data.push(device)
}
+ snList.push(gateway.device_sn)
+ bind(gateway.device_sn)
})
+ store.commit('SET_SN_LIST', snList)
})
}
-function switchVisible (e: any, device: OnlineDevice, isDock: boolean, isClick: boolean) {
- showDrawer.value = !showDrawer.value
- // if (!isClick) {
- // e.target.style.cursor = 'not-allowed'
- // return
- // }
- // if (device.sn === osdVisible.value.sn) {
- // osdVisible.value.visible = !osdVisible.value.visible
- // } else {
- // osdVisible.value.sn = device.sn
- // osdVisible.value.callsign = device.callsign
- // osdVisible.value.model = device.model
- // osdVisible.value.visible = true
- // osdVisible.value.gateway_sn = device.gateway.sn
- // osdVisible.value.is_dock = isDock
- // osdVisible.value.gateway_callsign = device.gateway.callsign
- // osdVisible.value.payloads = device.payload
- // }
- // store.commit('SET_OSD_VISIBLE_INFO', osdVisible)
+function switchVisible (e: any, device: OnlineDevice, isDock: boolean, isClick: boolean, sn?: any) {
+ dock.value = device.gateway.sn
+ device_dock.value = device.sn
+ // showDrawer.value = !showDr++awer.value
+ if (!isClick) {
+ e.target.style.cursor = 'not-allowed'
+ return
+ }
+ if (device.sn === osdVisible.value.sn) {
+ osdVisible.value.visible = !osdVisible.value.visible
+ } else {
+ osdVisible.value.sn = device.sn
+ osdVisible.value.callsign = device.callsign
+ osdVisible.value.model = device.model
+ osdVisible.value.visible = true
+ osdVisible.value.gateway_sn = device.gateway.sn
+ osdVisible.value.is_dock = isDock
+ osdVisible.value.gateway_callsign = device.gateway.callsign
+ osdVisible.value.payloads = device.payload
+ osdVisible.value.device_domain = device.gateway.device_domain
+ osdVisible.value.device_sub_type = device.gateway.device_sub_type
+ osdVisible.value.device_type = device.gateway.device_type
+ osdVisible.value.latest_wayline_job = device.latest_wayline_job
+ }
+ store.commit('SET_OSD_VISIBLE_INFO', osdVisible.value)
+ store.commit('SET_HMSInfo_DetailSn', sn)
}
function getUnreadHms (sn: string) {
- getUnreadDeviceHms(workspaceId.value, sn).then(res => {
+ getUnreadDeviceHms(workSpaceId.value, sn).then(res => {
if (res.data.length !== 0) {
hmsInfo.value[sn] = res.data
}
})
- console.info(hmsInfo.value)
}
function getOnlineDeviceHms () {
@@ -425,7 +571,7 @@
function readHms (visiable: boolean, sn: string) {
if (!visiable) {
- updateDeviceHms(workspaceId.value, sn).then(res => {
+ updateDeviceHms(workSpaceId.value, sn).then(res => {
if (res.code === 0) {
delete hmsInfo.value[sn]
}
@@ -455,7 +601,7 @@
}
.ant-collapse>.ant-collapse-item>.ant-collapse-header {
- color: white;
+ color: white !important;
border: 0;
padding-left: 14px;
}
@@ -570,4 +716,23 @@
transform: translateX(-100%);
-webkit-transform: translateX(-100%);
}
-}</style>
+}
+</style>
+
+<style lang="scss" scoped>
+.task_wrapper {
+ display: flex;
+ align-items: center;
+ .task_content {
+ background-color: #41bbfa;
+ padding: 2px 4px;
+ }
+ .task_content_way {
+ background-color: #19be6b;
+ }
+ .task_title {
+ margin-left: 5px;
+ font-size: 14px;
+ }
+}
+</style>
--
Gitblit v1.9.3