|
|
@@ -15674,14 +15674,12 @@ window.Modernizr = function(n, e, t) {
|
|
|
hot.prototype.showPannel = function(o={}) {
|
|
|
var hardware = this.infoAttribute.hardware
|
|
|
|
|
|
- if (hardware && hardware.id != void 0) {
|
|
|
- //获取设备状态
|
|
|
+ if (hardware && hardware.id != void 0) { //获取设备状态
|
|
|
$(".waiting").addClass('showloading')
|
|
|
getDeviceInfo(hardware.id, (data)=>{
|
|
|
this.setDeviceStatus(data[0].status == 2)
|
|
|
|
|
|
- if (this.deviceStatus) {
|
|
|
- //在线
|
|
|
+ if (this.deviceStatus) { //在线
|
|
|
|
|
|
getAjax(`/api/device/getStatus/${hardware.code}`, null, (data)=>{
|
|
|
console.log(data)
|
|
|
@@ -15701,101 +15699,13 @@ window.Modernizr = function(n, e, t) {
|
|
|
this.temperature = parseInt(temperature)
|
|
|
|
|
|
loadTemperature({
|
|
|
- id: "temperature",
|
|
|
- //dom Id
|
|
|
+ id: "temperature", //dom Id
|
|
|
val: 70//度数
|
|
|
})
|
|
|
|
|
|
} else if (devType == "摄像头") {
|
|
|
$("#hotPannel>.m-con").removeClass("hide")
|
|
|
-
|
|
|
- /* "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": "操作成功" */
|
|
|
+
|
|
|
getAjax(`/api/device/getLive/${hardware.code}`, null, (data2)=>{
|
|
|
if (data2.code == 0) {
|
|
|
loadMonitor({
|
|
|
@@ -15820,8 +15730,8 @@ window.Modernizr = function(n, e, t) {
|
|
|
"type": "month"
|
|
|
} ,
|
|
|
(data2)=>{
|
|
|
- if (data2.code == 0) { // [{date: "1", status: "2"}, {date: "2", status: "2"},
|
|
|
- console.log(data2.data)
|
|
|
+ if (data2.code == 0) {
|
|
|
+ console.log(data2.data) // [{date: "1", status: "2"}, {date: "2", status: "2"},
|
|
|
var hasMonitorDays = data2.data.filter(e=>e.status == '1');
|
|
|
hasMonitorDays = hasMonitorDays.map(e=>{
|
|
|
var day = e.date
|
|
|
@@ -15877,7 +15787,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
}, '获取视频日历day失败', 'POST'
|
|
|
)
|
|
|
|
|
|
- }else{
|
|
|
+ }else{//clear
|
|
|
window.loadHistoryList()
|
|
|
loadMonitor({id: "monitor", url:null })
|
|
|
}
|
|
|
@@ -15894,8 +15804,8 @@ window.Modernizr = function(n, e, t) {
|
|
|
getCalendar(yearText, month)
|
|
|
},
|
|
|
})
|
|
|
- }
|
|
|
- }, "获取视频日历month失败", 'POST')
|
|
|
+ }
|
|
|
+ }, "获取视频日历month失败", 'POST')
|
|
|
}
|
|
|
var date = new Date();
|
|
|
getCalendar(date.getFullYear(), date.getMonth()+1)
|
xzw