|
|
@@ -60,16 +60,16 @@ deviceBtnBind($('#hotPannel .ac-con .air-con [name="onoff"] .ac-btn').eq(0), '
|
|
|
deviceBtnBind($('#hotPannel .ac-con .air-con [name="onoff"] .ac-btn').eq(1), '07', '0')//fanState
|
|
|
|
|
|
|
|
|
-var getAjax = function(url, data, success, errorString){
|
|
|
+var getAjax = function(url, data, success, errorString, method){
|
|
|
$(".waiting").addClass('showloading')
|
|
|
$.ajax({//获取设备状态
|
|
|
- method: "GET",
|
|
|
- headers: {
|
|
|
+ method: method || "GET",
|
|
|
+ data : data && JSON.stringify(data),
|
|
|
+ headers: {
|
|
|
"Content-Type": "application/json",
|
|
|
- },
|
|
|
- data : data,
|
|
|
- dataType: "json",
|
|
|
- contentType: "application/json",
|
|
|
+ },
|
|
|
+ /*dataType: "json",
|
|
|
+ contentType: "application/json", */
|
|
|
url: url,
|
|
|
success: (data)=> {
|
|
|
success(data)
|
|
|
@@ -15818,10 +15818,9 @@ window.Modernizr = function(n, e, t) {
|
|
|
} ,
|
|
|
(data2)=>{
|
|
|
if (data2.code == 0) { // [{date: "1", status: "2"}, {date: "2", status: "2"},
|
|
|
- data2.result
|
|
|
-
|
|
|
- var hasMonitorDays = data2.result.filter(e=>e.status == '1');
|
|
|
- hasMonitorDays = hasMonitorDays.map(e=>{return {startDate:year + month + e.date, id:e.date}})//有监控的日期
|
|
|
+ console.log(data2.data)
|
|
|
+ var hasMonitorDays = data2.data.filter(e=>e.status == '1');
|
|
|
+ hasMonitorDays = hasMonitorDays.map(e=>{return {startDate:year + '-' + month + '-' + e.date, id:e.date}})//有监控的日期
|
|
|
|
|
|
loadCalendar({
|
|
|
data: hasMonitorDays,
|
|
|
@@ -15842,6 +15841,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
},
|
|
|
(data3)=>{
|
|
|
if(data3.code == 0){
|
|
|
+ console.log(data3.data)
|
|
|
/* address: null
|
|
|
creationTime: null
|
|
|
deviceId: null
|
|
|
@@ -15854,7 +15854,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
startTime: "2021-05-13 11:00:08"
|
|
|
sumNum: null
|
|
|
type: null */
|
|
|
- var timeList = data3.result;
|
|
|
+ var timeList = data3.data;
|
|
|
|
|
|
|
|
|
/* channelId: "34020000001320010059"
|
|
|
@@ -15875,7 +15875,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
|
|
|
|
|
|
|
|
|
- }, '获取视频日历day失败'
|
|
|
+ }, '获取视频日历day失败', 'POST'
|
|
|
)
|
|
|
|
|
|
|
|
|
@@ -15890,11 +15890,10 @@ window.Modernizr = function(n, e, t) {
|
|
|
|
|
|
})
|
|
|
}
|
|
|
- }
|
|
|
- , "获取视频日历month失败")
|
|
|
+ }, "获取视频日历month失败", 'POST')
|
|
|
}
|
|
|
var date = new Date();
|
|
|
- getCalendar(date.getFullYear(), date.getMonth())
|
|
|
+ getCalendar(date.getFullYear(), date.getMonth()+1)
|
|
|
|
|
|
|
|
|
|
tremble