|
|
@@ -1,18 +1,8 @@
|
|
|
/* 许钟文修改的 标记 xzw
|
|
|
另外 所有"matter"字样已被我删除 原因：删除matterport信息
|
|
|
*/
|
|
|
- var dom = {//许钟文add
|
|
|
- getOffset: function(type, element, parent) {
|
|
|
- left = (type == "left") ? element.offsetLeft : element.offsetTop;
|
|
|
- if (!parent) parent = $("body")[0];
|
|
|
- while (element = element.offsetParent) {
|
|
|
- if (element == parent) break;
|
|
|
- left += (type == "left") ? element.offsetLeft : element.offsetTop;
|
|
|
- }
|
|
|
- return left;
|
|
|
- }
|
|
|
-};
|
|
|
|
|
|
+hardwareTypes = null
|
|
|
hardwareHotList = {}
|
|
|
|
|
|
|
|
|
@@ -24,12 +14,12 @@ $("#hotPannel .close").on('click',()=>{
|
|
|
|
|
|
})
|
|
|
|
|
|
-$("#hotPannel input.mui-switch").on('change',(e)=>{
|
|
|
+$("#hotPannel input.mui-switch").on('change',(e)=>{//灯
|
|
|
var ifOn = $('#hotPannel input.mui-switch').is(':checked');
|
|
|
- window.changeDeviceStatus(window.hotNeedUpdatePannel, ifOn)
|
|
|
+ window.changeDeviceStatus(window.hotNeedUpdatePannel, '02', ifOn?'1':'0')
|
|
|
})
|
|
|
|
|
|
-hardwareTypes = null
|
|
|
+
|
|
|
|
|
|
$.ajax({//设备类型列表
|
|
|
method: "GET",
|
|
|
@@ -48,7 +38,30 @@ $.ajax({//设备类型列表
|
|
|
}
|
|
|
})
|
|
|
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+//----------------------------------
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+var dom = {//许钟文add
|
|
|
+ getOffset: function(type, element, parent) {
|
|
|
+ left = (type == "left") ? element.offsetLeft : element.offsetTop;
|
|
|
+ if (!parent) parent = $("body")[0];
|
|
|
+ while (element = element.offsetParent) {
|
|
|
+ if (element == parent) break;
|
|
|
+ left += (type == "left") ? element.offsetLeft : element.offsetTop;
|
|
|
+ }
|
|
|
+ return left;
|
|
|
+ }
|
|
|
+};
|
|
|
|
|
|
!function() {
|
|
|
"use strict";
|
|
|
@@ -15568,30 +15581,171 @@ window.Modernizr = function(n, e, t) {
|
|
|
success: (data)=> {
|
|
|
console.log(data)
|
|
|
if (data.code === 0) {
|
|
|
- var info = data.data.find(device=>device.id==hardware.id)
|
|
|
+ data = data.data;
|
|
|
var devType = hardwareTypes.find(type=>type.id == hardware.devTypeId).name
|
|
|
$("#hotPannel>div").addClass("hide")
|
|
|
if(devType == "灯控"){
|
|
|
$("#hotPannel>div[name='light']").removeClass("hide")
|
|
|
- $("#hotPannel>input").prop('checked', true);
|
|
|
+
|
|
|
+ var ifOn = data.find(e=>e.paramCode == '02').paramValue == '1'
|
|
|
+ $("#hotPannel>input").prop('checked', ifOn);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}else if(devType == "温湿度"){
|
|
|
$("#hotPannel>#temperature").removeClass("hide")
|
|
|
+
|
|
|
+
|
|
|
loadTemperature({
|
|
|
id:"temperature",//dom Id
|
|
|
val:70 //度数
|
|
|
})
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}else if(devType == "摄像头"){
|
|
|
$("#hotPannel>.m-con").removeClass("hide")
|
|
|
- loadMonitor({
|
|
|
- id:"monitor",
|
|
|
- url:'http://14.215.216.123:18080/rtp/00A153DF/hls.m3u8'
|
|
|
- })
|
|
|
+
|
|
|
+
|
|
|
+ /* "result": [
|
|
|
+ {
|
|
|
+ "id": "97347887d0dbad459bca30118fe9fae2",
|
|
|
+ "devtypeId": "ab073575c1628d2b42e2e915f1bee384",
|
|
|
+ "deviceCode": "34020000001320010058",
|
|
|
+ "paramCode": "12",
|
|
|
+ "paramValue": "0",
|
|
|
+ "createBy": "admin",
|
|
|
+ "createTime": "2021-03-19",
|
|
|
+ "updateBy": null,
|
|
|
+ "updateTime": "2021-03-19",
|
|
|
+ "paramName": null,
|
|
|
+ "devTypeParam": null
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "id": "c8cc2ea0ad2a86c4fa267325caf69c1c",
|
|
|
+ "devtypeId": "ab073575c1628d2b42e2e915f1bee384",
|
|
|
+ "deviceCode": "34020000001320010058",
|
|
|
+ "paramCode": "11",
|
|
|
+ "paramValue": "1",
|
|
|
+ "createBy": "admin",
|
|
|
+ "createTime": "2021-03-19",
|
|
|
+ "updateBy": null,
|
|
|
+ "updateTime": "2021-03-19",
|
|
|
+ "paramName": null,
|
|
|
+ "devTypeParam": null
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "id": "e6bc35c5c9ce26509091ca34e21bf237",
|
|
|
+ "devtypeId": "ab073575c1628d2b42e2e915f1bee384",
|
|
|
+ "deviceCode": "34020000001320010058",
|
|
|
+ "paramCode": "10",
|
|
|
+ "paramValue": "2",
|
|
|
+ "createBy": "admin",
|
|
|
+ "createTime": "2021-03-19",
|
|
|
+ "updateBy": null,
|
|
|
+ "updateTime": "2021-03-19",
|
|
|
+ "paramName": null,
|
|
|
+ "devTypeParam": null
|
|
|
+ }
|
|
|
+
|
|
|
+ {
|
|
|
+ "paramCode": "12",
|
|
|
+ "name": "类型",
|
|
|
+ "paramValue": "{\"0\":\"枪机\",\"1\":\"球机\"}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "paramCode": "01",
|
|
|
+ "name": "通道号",
|
|
|
+ "paramValue": "34020000001320010058"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "paramCode": "10",
|
|
|
+ "name": "云台控制",
|
|
|
+ "paramValue": "{\"1\":\"支持\",\"2\":\"不支持\"}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "paramCode": "11",
|
|
|
+ "name": "方向",
|
|
|
+ "paramValue": "{\"1\":\"左\",\"2\":\"右\",\"3\":\"上\",\"4\":\"下\"}"
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ "msg": "操作成功"
|
|
|
+
|
|
|
+
|
|
|
+ */
|
|
|
+
|
|
|
+
|
|
|
+ /* "code": 0,
|
|
|
+ "data": {
|
|
|
+ "external": {
|
|
|
+ "rtmp": "rtmp://14.215.216.123:18080/rtp/00A1537C",
|
|
|
+ "flv": "http://14.215.216.123:18080/rtp/00A1537C.flv",
|
|
|
+ "wsFlv": "ws://14.215.216.123:18080/rtp/00A1537C.flv",
|
|
|
+ "rtsp": "rtsp://14.215.216.123:18080/rtp/00A1537C",
|
|
|
+ "hls": "http://14.215.216.123:18080/rtp/00A1537C/hls.m3u8"
|
|
|
+ },
|
|
|
+ "id": "34020000001320010058",
|
|
|
+ "interiorIp": "192.168.6.11",
|
|
|
+ "interior": {
|
|
|
+ "rtmp": "rtmp://192.168.6.11:18080/rtp/00A1537C",
|
|
|
+ "flv": "http://192.168.6.11:18080/rtp/00A1537C.flv",
|
|
|
+ "wsFlv": "ws://192.168.6.11:18080/rtp/00A1537C.flv",
|
|
|
+ "rtsp": "rtsp://192.168.6.11:18080/rtp/00A1537C",
|
|
|
+ "hls": "http://192.168.6.11:18080/rtp/00A1537C/hls.m3u8"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "msg": "操作成功" */
|
|
|
+
|
|
|
+ $.ajax({
|
|
|
+ method: "GET",
|
|
|
+ headers: {
|
|
|
+ "Content-Type": "application/json",
|
|
|
+ },
|
|
|
+ dataType: "json",
|
|
|
+ contentType: "application/json",
|
|
|
+ url: `/api/device/getLive/${hardware.code}`,
|
|
|
+ success: (data2)=> {
|
|
|
+ if(data2.code == 0){
|
|
|
+ loadMonitor({
|
|
|
+ id:"monitor",
|
|
|
+ url: data2.data.external.wsFlv //'http://14.215.216.123:18080/rtp/00A153DF/hls.m3u8'
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }}
|
|
|
+ )
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}else if(devType == "空调"){
|
|
|
- $("#hotPannel>.ac-con").removeClass("hide")
|
|
|
+ $("#hotPannel>.ac-con").removeClass("hide")
|
|
|
+
|
|
|
+
|
|
|
+/* 摆叶位置 06 可读写 下拉框 {"1":"上","2":"下","3":"左","4":"右"} - 编辑删除
|
|
|
+ 3 温度 05 可读写 文本框 - 编辑删除
|
|
|
+ 4 开关机 02 可读写 下拉框 {"0":"关","1":"开"} - 编辑删除
|
|
|
+ 5 风速 04 可读写 下拉框 {"1":"低风","2":"中风","3":"高风"} - 编辑删除
|
|
|
+ 6 摆叶状态 07 可读写 下拉框 {"0":"关","1":"开"} - 编辑删除
|
|
|
+ 7 模式 03 可读写 下拉框 {"0":"自动","1":"除湿","2":"冷风","3":"送风","4":"暖风"} -
|
|
|
+ */
|
|
|
+
|
|
|
+
|
|
|
+ var ifOn = data.find(e=>e.paramCode == '02').paramValue == '1'
|
|
|
+ var mode = data.find(e=>e.paramCode == '03').paramValue
|
|
|
+ var windSpeed = data.find(e=>e.paramCode == '04').paramValue
|
|
|
+ var temperature = data.find(e=>e.paramCode == '05').paramValue
|
|
|
+ var fanPos = data.find(e=>e.paramCode == '06').paramValue
|
|
|
+ var fanState = data.find(e=>e.paramCode == '07').paramValue == '1'
|
|
|
+
|
|
|
loadAirConditioner({
|
|
|
id:"air-conditioner",
|
|
|
- val:50,
|
|
|
- type:'冷风'
|
|
|
+ val:parseInt(temperature),
|
|
|
+ type: mode == 0 ? '自动': mode == 1 ? '除湿': mode == 2 ? '冷风': mode == 3 ? '送风' : '暖风',//模式
|
|
|
+ ifOn,//开关机
|
|
|
+ windSpeed : windSpeed == 1 ? "低风" : windSpeed == 2 ? "中风" : "高风",//风速
|
|
|
+ fanPos : fanPos == 1 ? "上" : fanPos == 2 ? "下" : fanPos == 3 ? "左" : "右",//摆叶位置
|
|
|
+ fanState //摆叶状态
|
|
|
})
|
|
|
}
|
|
|
$("#hotPannel>div").css("display","block");
|
|
|
@@ -15613,21 +15767,21 @@ window.Modernizr = function(n, e, t) {
|
|
|
});
|
|
|
|
|
|
|
|
|
- $.ajax({//获取设备状态
|
|
|
+ /* $.ajax({//获取设备参数
|
|
|
method: "GET",
|
|
|
headers: {
|
|
|
"Content-Type": "application/json",
|
|
|
},
|
|
|
dataType: "json",
|
|
|
contentType: "application/json",
|
|
|
- url: `/api/device/getParam/${hardware.id}/${hardware.code}`,
|
|
|
+ url: `/api/device/getParam/${hardware.devTypeId}/${hardware.code}`,
|
|
|
success: (data)=> {
|
|
|
console.log(data)
|
|
|
if (data.code === 0) {
|
|
|
var info = data.data.find(device=>device.id==hardware.id)
|
|
|
}
|
|
|
}
|
|
|
- })
|
|
|
+ }) */
|
|
|
|
|
|
|
|
|
|
xzw