admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-06-12 10:00:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

绣花修改因员工功能

Browse Source
This commit is contained in:
java110 2021-11-11 10:35:51 +08:00
parent e8d2ddab77
commit 09fc6706aa
3 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
public/components/dev/editApp/editApp.html
View File

@ -1,4 +1,5 @@
<div id = "editAppModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" > <div id="editAppModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
aria-hidden="true">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-lg">
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"> <div class="modal-body">
@ -11,34 +12,37 @@
<div class="col-sm-10"> <div class="col-sm-10">
<input v-model="editAppInfo.name" type="text" placeholder="必填，请填写应用名称" class="form-control"> <input v-model="editAppInfo.name" type="text" placeholder="必填，请填写应用名称" class="form-control">
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-2 col-form-label">秘钥</label> <label class="col-sm-2 col-form-label">秘钥</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input v-model="editAppInfo.securityCode" type="text" placeholder="选填，请填写秘钥" class="form-control"> <input v-model="editAppInfo.securityCode" type="text" placeholder="选填，请填写秘钥" class="form-control">
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-2 col-form-label">白名单</label> <label class="col-sm-2 col-form-label">白名单</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input v-model="editAppInfo.whileListIp" type="text" placeholder="选填，请填写白名单" class="form-control"> <input v-model="editAppInfo.whileListIp" type="text" placeholder="选填，请填写白名单" class="form-control">
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-2 col-form-label">黑名单</label> <label class="col-sm-2 col-form-label">黑名单</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input v-model="editAppInfo.blackListIp" type="text" placeholder="选填，请填写黑名单" class="form-control"> <input v-model="editAppInfo.blackListIp" type="text" placeholder="选填，请填写黑名单" class="form-control">
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-2 col-form-label">备注</label> <label class="col-sm-2 col-form-label">备注</label>
<div class="col-sm-10"> <div class="col-sm-10">
<textarea placeholder="选填，请填写备注" class="form-control" v-model="editAppInfo.remark"></textarea> </div> <textarea placeholder="选填，请填写备注" class="form-control" v-model="editAppInfo.remark"></textarea>
</div> </div>
</div>
<div class="ibox-content"> <div class="ibox-content">
<button class="btn btn-primary float-right" type="button" v-on:click="editApp()" ><i class="fa fa-check"></i>&nbsp;保存</button> <button class="btn btn-primary float-right" type="button" v-on:click="editApp()"><i
<button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button> class="fa fa-check"></i>&nbsp;保存</button>
<button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
data-dismiss="modal">取消</button>
</div> </div>
</div> </div>
</div> </div>

2
public/components/dev/editApp/editApp.js
View File

@ -19,7 +19,7 @@
vc.on('editApp', 'openEditAppModal', function (_params) { vc.on('editApp', 'openEditAppModal', function (_params) {
vc.component.refreshEditAppInfo(); vc.component.refreshEditAppInfo();
$('#editAppModel').modal('show'); $('#editAppModel').modal('show');
vc.component.editAppInfo = _params; vc.copyObject(_params,vc.component.editAppInfo);
//vc.component.editAppInfo.communityId = vc.getCurrentCommunity().communityId; //vc.component.editAppInfo.communityId = vc.getCurrentCommunity().communityId;
}); });
}, },

2
public/components/property/cameraControlVideo/cameraControlVideo.js
View File

@ -60,7 +60,7 @@
); );
}, },
_initMachineVideo:function(_machines){ _initMachineVideo:function(_machines){
$that._playVideo('rtc_media_player1','webrtc://112.124.21.207/live/34020000001320000001@34020000001320000010'); $that._playVideo('rtc_media_player1','webrtc://112.124.21.207/live/34020000002000000010@34020000001320000010');
$that._playVideo('rtc_media_player2','webrtc://112.124.21.207/live/34020000001320000002@34020000001320000010'); $that._playVideo('rtc_media_player2','webrtc://112.124.21.207/live/34020000001320000002@34020000001320000010');
$that._playVideo('rtc_media_player3','webrtc://112.124.21.207/live/34020000001320000001@34020000001320000010'); $that._playVideo('rtc_media_player3','webrtc://112.124.21.207/live/34020000001320000001@34020000001320000010');
$that._playVideo('rtc_media_player4','webrtc://112.124.21.207/live/34020000001320000002@34020000001320000010'); $that._playVideo('rtc_media_player4','webrtc://112.124.21.207/live/34020000001320000002@34020000001320000010');