杭州-活动告警、历史告警-时间帅选条件优化

@@ -124,8 +124,6 @@ layui.define(['table', 'form', 'sessions', 'common'], function (exports) {
 
 
         //刷新表格
         //刷新表格
         function reloadTypeSubscribeTable() {
         function reloadTypeSubscribeTable() {
-            debugger
-            var a=  accessToken;
             typeSubscribeListable.reload({
             typeSubscribeListable.reload({
                 where: {
                 where: {
                     keyword: $("#type_subscribe_list_keyword").val(),
                     keyword: $("#type_subscribe_list_keyword").val(),

@@ -48,30 +48,40 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
         form.render("select");
         form.render("select");
 
 
         function initDate() {
         function initDate() {
+            let startMin = {};
+            let endMax = {};
             //开始时间
             //开始时间
             var start = laydate.render({
             var start = laydate.render({
                 elem: '#activewarningStartdate'
                 elem: '#activewarningStartdate'
                 , trigger: 'click'
                 , trigger: 'click'
+                ,ready: function(date){
+                    startMin=start.config.min;
+                }
                 , done: function (value, date) {
                 , done: function (value, date) {
                     date.month--;
                     date.month--;
                     end.config.min = date;
                     end.config.min = date;
-                    var endDate = $("#activewarningEnddate").val();
-                    if (endDate != null && endDate != "") {
-                        reloadTable();
+                    if(value === ''){//点击清空
+                        end.config.min = startMin;
                     }
                     }
+                    form.render();
+                    reloadTable()
                 }
                 }
             });
             });
             //结束时间
             //结束时间
             var end = laydate.render({
             var end = laydate.render({
                 elem: '#activewarningEnddate'
                 elem: '#activewarningEnddate'
                 , trigger: 'click'
                 , trigger: 'click'
+                ,ready: function(date){
+                    endMax=end.config.max;
+                }
                 , done: function (value, date) {
                 , done: function (value, date) {
                     date.month--;
                     date.month--;
                     start.config.max = date;
                     start.config.max = date;
-                    var benginDate = $("#activewarningStartdate").val();
-                    if (benginDate != null && benginDate != "") {
-                        reloadTable();
+                    if(value === ''){//点击清空
+                        start.config.max = endMax;
                     }
                     }
+                    form.render();
+                    reloadTable();
                 }
                 }
             });
             });
             //绑定业务下拉选择数据
             //绑定业务下拉选择数据

@@ -27,29 +27,39 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
         }
         }
 
 
         function initDate() {
         function initDate() {
+            let startMin = {};
+            let endMax = {};
             var start = laydate.render({
             var start = laydate.render({
                 elem: '#historywarningStartdate'
                 elem: '#historywarningStartdate'
                 , trigger: 'click'
                 , trigger: 'click'
+                ,ready: function(date){
+                    startMin=start.config.min;
+                }
                 , done: function (value, date) {
                 , done: function (value, date) {
                     date.month--;
                     date.month--;
                     end.config.min = date;
                     end.config.min = date;
-                    var endDate = $("#historywarningEnddate").val();
-                    if (endDate != null && endDate != "") {
-                        reloadTable();
+                    if(value === ''){//点击清空
+                        end.config.min = startMin;
                     }
                     }
+                    form.render();
+                    reloadTable();
                 }
                 }
             });
             });
 
 
             var end = laydate.render({
             var end = laydate.render({
                 elem: '#historywarningEnddate'
                 elem: '#historywarningEnddate'
                 , trigger: 'click'
                 , trigger: 'click'
+                ,ready: function(date){
+                    endMax=end.config.max;
+                }
                 , done: function (value, date) {
                 , done: function (value, date) {
                     date.month--;
                     date.month--;
                     start.config.max = date;
                     start.config.max = date;
-                    var benginDate = $("#historywarningStartdate").val();
-                    if (benginDate != null && benginDate != "") {
-                        reloadTable();
+                    if(value === ''){//点击清空
+                        start.config.max = endMax;
                     }
                     }
+                    form.render();
+                    reloadTable();
                 }
                 }
             });
             });
 
 

@@ -58,8 +58,6 @@ export default {
 
 
         let showMachineRoomDialog = (flg) => {
         let showMachineRoomDialog = (flg) => {
             dialogFlg.value = flg;
             dialogFlg.value = flg;
-debugger
-console.log(props.optionData);
         }
         }
 
 
         return {
         return {