0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary

This commit is contained in:
leiqiaochu 2023-10-09 10:01:59 +08:00
parent 83594756ea 8b7e6e2931
commit dbdb044075
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/device/Instance/Detail/Diagnose/Status/index.tsx
View File

@ -63,7 +63,7 @@ const Status = defineComponent({
} }
const jumpAccessConfig = () => { const jumpAccessConfig = () => {
menuStory.jumpPage('device/Product/Detail', { id: unref(device).productId, tab: 'access' }); menuStory.jumpPage('device/Product/Detail', { id: unref(device).productId, tab: 'Device' });
}; };
const jumpDeviceConfig = () => { const jumpDeviceConfig = () => {
@ -1380,7 +1380,7 @@ const Status = defineComponent({
> >
设备接入配置 设备接入配置
</Button> </Button>
中${urlMap.get(unref(device)?.accessProvider) || ''}信息，任意上报一条数据 中{urlMap.get(unref(device)?.accessProvider) || ''}信息，任意上报一条数据
</span> </span>
} }
/>, />,
@ -1391,8 +1391,8 @@ const Status = defineComponent({
status="default" status="default"
text={ text={
<span> <span>
请联系管理员提供${urlMap.get(unref(device)?.accessProvider) || ''} 请联系管理员提供{urlMap.get(unref(device)?.accessProvider) || ''}
信息，并根据URL信息任意上报一条数据 信息，并根据URL信息任意上报一条数据
</span> </span>
} }
/>, />,

2
src/views/device/Instance/Detail/Diagnose/Status/util.ts
View File

@ -259,4 +259,6 @@ urlMap.set('mqtt-client-gateway', 'topic');
urlMap.set('http-server-gateway', 'url'); urlMap.set('http-server-gateway', 'url');
urlMap.set('websocket-server', 'url'); urlMap.set('websocket-server', 'url');
urlMap.set('coap-server-gateway', 'url'); urlMap.set('coap-server-gateway', 'url');
urlMap.set('udp-device-gateway', 'url');
urlMap.set('tcp-server-gateway', 'url');

8
src/views/media/Device/Channel/Live/index.vue
View File

@ -29,18 +29,16 @@
> >
</div> </div>
</div> </div>
<div class="media-live"> <div class="media-live" @mouseenter="visibleChange" @mouseleave="mouseleave">
<div class="media-live-video"> <div class="media-live-video">
<div <div
:class="mediaToolClass" :class="mediaToolClass"
@mouseleave="mouseleave"
@mouseenter="showTool = true" @mouseenter="showTool = true"
> >
<div class="tool-item" v-if="type !== 'share'"> <div class="tool-item" v-if="type !== 'share'">
<template v-if="isRecord === 0"> <template v-if="isRecord === 0">
<j-dropdown <j-dropdown
trigger="click" trigger="click"
@visibleChange="visibleChange"
@click="showToolLock = true" @click="showToolLock = true"
> >
<div>开始录像</div> <div>开始录像</div>
@ -212,8 +210,8 @@ const mouseleave = () => {
} }
}; };
const visibleChange = (v: boolean) => { const visibleChange = () => {
showTool.value = v; showTool.value = true;
}; };
const getPopupContainer = (trigger: HTMLElement) => { const getPopupContainer = (trigger: HTMLElement) => {