XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/wvp-28181-2.0' into map

Browse Source 
# Conflicts:
#	web_src/src/components/UiHeader.vue
#	web_src/src/components/devicePosition.vue
#	web_src/src/components/live.vue
#	web_src/src/router/index.js
This commit is contained in:
648540858
2022-04-21 13:01:02 +08:00
parent d7bfd9bfa7 3501046ebe
commit 190fc62b72
17 changed files with 2344 additions and 2156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web_src/src/components/live.vue
View File

@@ -45,8 +45,8 @@
</template>
<script>
import uiHeader from "./UiHeader.vue";
import player from './common/jessibuca.vue'
import uiHeader from "../layout/UiHeader.vue";
import player from './dialog/jessibuca.vue'
import ChannelTree from './channelTree.vue'
export default {