Commit 81c42c3cae36bfb9758d3b468ace95cc0a40e09c

Authored by 王通
1 parent 3c49197f

1.报站语音合成代码合并(lggj)

2.设备管理权限控制
3.站点加入公司分公司加权限控制
4.视频播放调整(多sim情况处理)
src/main/resources/static/real_control_v2/fragments/north/nav/dvr.html
@@ -57,12 +57,12 @@ @@ -57,12 +57,12 @@
57 <div class="uk-grid" style="margin-left: 0px; margin-top: 20px; display: none;" id="tuohua"> 57 <div class="uk-grid" style="margin-left: 0px; margin-top: 20px; display: none;" id="tuohua">
58 <div class="uk-width uk-width-dvr"> 58 <div class="uk-width uk-width-dvr">
59 <div class="uk-panel uk-panel-box uk-panel-box-dvr uk-width-dvr-checked"> 59 <div class="uk-panel uk-panel-box uk-panel-box-dvr uk-width-dvr-checked">
60 - <span data-channel="2-1">ADAS</span> 60 + <span data-channel="2-1">DSM</span>
61 </div> 61 </div>
62 </div> 62 </div>
63 <div class="uk-width uk-width-dvr"> 63 <div class="uk-width uk-width-dvr">
64 <div class="uk-panel uk-panel-box uk-panel-box-dvr"> 64 <div class="uk-panel uk-panel-box uk-panel-box-dvr">
65 - <span data-channel="2-2">DSM</span> 65 + <span data-channel="2-2">ADAS</span>
66 </div> 66 </div>
67 </div> 67 </div>
68 <div class="uk-width uk-width-dvr"> 68 <div class="uk-width uk-width-dvr">