Commit 77a36d20 by 李宁

1

1 parent b070a7d7
...@@ -959,6 +959,7 @@ html,body{ ...@@ -959,6 +959,7 @@ html,body{
margin: auto; margin: auto;
margin-top: .24rem; margin-top: .24rem;
display: none; display: none;
position: relative;
} }
div{ div{
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>江苏移动</title> <title>江苏移动</title>
<link rel="stylesheet" href="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/css/vant.css"/> <link rel="stylesheet" href="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/css/vant.css"/>
<link rel="stylesheet" href="css/demo.css?6763276"> <link rel="stylesheet" href="css/demo.css?676333276">
</head> </head>
<body> <body>
...@@ -338,8 +338,8 @@ ...@@ -338,8 +338,8 @@
<div class="alertCon"> <div class="alertCon">
<div class="info">检测到主光猫置于箱(柜)内,根据内部施工规范与验收要求,建议您将设备移至箱(柜)外并预留≥5 cm散热空间。</div> <div class="info">检测到主光猫置于箱(柜)内,根据内部施工规范与验收要求,建议您将设备移至箱(柜)外并预留≥5 cm散热空间。</div>
<div class="butt" id="gmBoxButt"> <div class="butt" id="gmBoxButt">
<div class="left" key="move">立即移出</div> <div class="left" key="remove">立即移出</div>
<div class="right" key="agree">用户已同意</div> <div class="right" key="userAgree">用户已同意</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -353,9 +353,9 @@ ...@@ -353,9 +353,9 @@
<div class="til">环境异常警告</div> <div class="til">环境异常警告</div>
<div class="des">为保障服务质量与数据真实性,质检过程需在标准装维场景下进行。系统识别到当前环境不符合规范,已 <span><em id="cheatNum">1</em>次“疑似作弊”</span></div> <div class="des">为保障服务质量与数据真实性,质检过程需在标准装维场景下进行。系统识别到当前环境不符合规范,已 <span><em id="cheatNum">1</em>次“疑似作弊”</span></div>
<div class="des dess" id="allowProcess">若再出现类似违规操作,该工单将自动标记为<span>“作弊工单”</span>,同时暂停<span>暂停质检并通报考核</span></div> <div class="des dess" id="allowProcess">若再出现类似违规操作,该工单将自动标记为<span>“作弊工单”</span>,同时暂停<span>暂停质检并通报考核</span></div>
<div class="des dess" id="forbidProcess">该工单已标记为<span>“作弊工单”</span><span>无法继续质检</span>,如存在误判情况可及时 <span>联系管理员或平台运营人员</span> 解除异常。</div> <div class="des dess" id="forbidProcess">该工单已自动标记为<span>“作弊工单”</span><span>无法继续质检</span>,如存在误判情况可及时 <span>联系管理员或平台运营人员</span> 解除异常。</div>
<div class="quit" id="cheatQuitBut">退出质检</div> <div class="quit pageClose" id="cheatQuitBut">退出质检</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
<script src="js/util.js?1212"></script> <script src="js/util.js?1212"></script>
<script src="js/vue.min.js"></script> <script src="js/vue.min.js"></script>
<script src="js/vant.min.js"></script> <script src="js/vant.min.js"></script>
<script src="js/demo.js?676"></script> <script src="js/demo.js?2333333"></script>
</body> </body>
</html> </html>
\ No newline at end of file \ No newline at end of file
...@@ -187,6 +187,8 @@ function getProcess(){ ...@@ -187,6 +187,8 @@ function getProcess(){
if(res.findCheat == 2){ if(res.findCheat == 2){
$('#cheatQuitBut').show() $('#cheatQuitBut').show()
$('#forbidProcess').show() $('#forbidProcess').show()
$('#cheatClose').hide()
$('#allowProcess').hide()
}else{ }else{
$('#allowProcess').show() $('#allowProcess').show()
} }
...@@ -621,9 +623,9 @@ $("#videoSwitch").click(async function(e){ ...@@ -621,9 +623,9 @@ $("#videoSwitch").click(async function(e){
}else{ }else{
if(rtcType == 1){ if(rtcType == 1){
await localTracks.videoTrack.setDevice(cams[0].camsId); await localTracks.videoTrack.setDevice(cams[0].deviceId);
}else{ }else{
await room.switchActiveDevice('videoinput', cams[0].camsId); await room.switchActiveDevice('videoinput', cams[0].deviceId);
} }
camsId = '' camsId = ''
} }
...@@ -720,9 +722,6 @@ $('.snAgain').click((e)=>{ ...@@ -720,9 +722,6 @@ $('.snAgain').click((e)=>{
ifClickHide = false ifClickHide = false
},2000) },2000)
}) })
$('.quit').click(()=>{
window.location.replace('index.html?time='+new Date().getTime())
})
let clickButtFlag = false let clickButtFlag = false
$('.clickButt').click(async (e)=>{ $('.clickButt').click(async (e)=>{
...@@ -1116,18 +1115,6 @@ async function init(){ ...@@ -1116,18 +1115,6 @@ async function init(){
setTimeout(()=>{ setTimeout(()=>{
$('#livekit-dummy-audio-el').remove(); $('#livekit-dummy-audio-el').remove();
},1000) },1000)
setTimeout(async ()=>{
const {mics,spks} = await getAudioDevices();
renderSelect($('#micSelect'), mics, 'mic');
renderSelect($('#spkSelect'), spks, 'spk');
// 事件绑定
$('#micSelect').on('change', e=> changeMic(e.target.value) );
$('#spkSelect').on('change', e=> changeSpk(e.target.value) );
$('#refreshBtn').on('click', init);
},2000)
} }
function handleLocalTrackPublished(publication, participant) { function handleLocalTrackPublished(publication, participant) {
...@@ -1280,8 +1267,11 @@ var vm = new Vue({ ...@@ -1280,8 +1267,11 @@ var vm = new Vue({
this.reasonPickData.index = index this.reasonPickData.index = index
camsId = cams[index].deviceId camsId = cams[index].deviceId
//localTracks.videoTrack.setDevice(camsId); if(rtcType == 1){
room.switchActiveDevice('videoinput', camsId); localTracks.videoTrack.setDevice(camsId);
}else{
room.switchActiveDevice('videoinput', camsId);
}
this.reasonCancel() this.reasonCancel()
}, },
...@@ -1491,7 +1481,6 @@ async function queryImgUrl() { ...@@ -1491,7 +1481,6 @@ async function queryImgUrl() {
} }
let r1 = await clientOss.put(fn(), fileBlob); let r1 = await clientOss.put(fn(), fileBlob);
console.log('oss图片地址:', r1.url);
return r1.url return r1.url
} catch (e) { } catch (e) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!