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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
XieYongHong 2023-08-28 14:18:23 +08:00
parent e29cba2ff3 9bcda35de4
commit abfb305181
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue
View File

@ -123,7 +123,6 @@
<script lang="ts" setup> <script lang="ts" setup>
import { useInstanceStore } from '@/store/instance'; import { useInstanceStore } from '@/store/instance';
import { import {
getEdgeMap,
saveEdgeMap, saveEdgeMap,
removeEdgeMap, removeEdgeMap,
edgeChannel, edgeChannel,

4
src/views/device/Instance/Detail/ChildDevice/index.vue
View File

@ -89,6 +89,7 @@
:key="i.key" :key="i.key"
> >
<PermissionButton <PermissionButton
v-if="i.key !== 'update' || detail.accessProvider === 'official-edge-gateway'"
:disabled="i.disabled" :disabled="i.disabled"
:popConfirm="i.popConfirm" :popConfirm="i.popConfirm"
:tooltip="{ :tooltip="{
@ -307,6 +308,9 @@ const closeBindDevice = (val: boolean) => {
const closeChildSave = () => { const closeChildSave = () => {
childVisible.value = false; childVisible.value = false;
}; };
onMounted(()=>{
console.log(detail.value.accessProvider)
})
</script> </script>
<style lang="less"> <style lang="less">

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

@ -21,7 +21,7 @@
<j-radio-button value="mp4">MP4</j-radio-button> <j-radio-button value="mp4">MP4</j-radio-button>
<j-radio-button value="flv">FLV</j-radio-button> <j-radio-button value="flv">FLV</j-radio-button>
<j-radio-button value="m3u8">HLS</j-radio-button> <j-radio-button value="m3u8">HLS</j-radio-button>
<j-radio-button value='rtc'>RTC</j-radio-button> <!-- <j-radio-button value='rtc'>RTC</j-radio-button> -->
</j-radio-group> </j-radio-group>
<div class="media-live-share" v-if="type !== 'share'"> <div class="media-live-share" v-if="type !== 'share'">
<j-button type="link" @click="onShare" <j-button type="link" @click="onShare"

1
src/views/media/Device/Channel/Live/shareLive.vue
View File

@ -9,7 +9,6 @@
<j-radio-button value="mp4">MP4</j-radio-button> <j-radio-button value="mp4">MP4</j-radio-button>
<j-radio-button value="flv">FLV</j-radio-button> <j-radio-button value="flv">FLV</j-radio-button>
<j-radio-button value="m3u8">HLS</j-radio-button> <j-radio-button value="m3u8">HLS</j-radio-button>
<j-radio-button value='rtc'>RTC</j-radio-button>
</j-radio-group> </j-radio-group>
<div class="media-live-share" v-if="type !== 'share'"> <div class="media-live-share" v-if="type !== 'share'">
<j-button type="link" @click="onShare" <j-button type="link" @click="onShare"

2
vite.config.ts
View File

@ -96,7 +96,7 @@ export default defineConfig(({ mode}) => {
// target: 'http://192.168.32.244:8881', // target: 'http://192.168.32.244:8881',
// target: 'http://192.168.32.163:8844', //张季本地 // target: 'http://192.168.32.163:8844', //张季本地
// target: 'http://120.77.179.54:8844', // 120测试 // target: 'http://120.77.179.54:8844', // 120测试
target: 'http://192.168.32.5:8844', // 本地开发环境 target: 'http://192.168.33.46:8844', // 本地开发环境
ws: 'ws://192.168.33.46:8844', ws: 'ws://192.168.33.46:8844',
changeOrigin: true, changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, '') rewrite: (path) => path.replace(/^\/api/, '')