Merge branch 'master' of http://gogs.weclouds.xyz:3000/crazycat/IDCOL

api/application/controllers/Lampcontrol.php

@@ -499,7 +499,7 @@ class Lampcontrol extends Base_Controller {
         $seq = get_seq();
         $seq = '01';
 
-        $sendData = '12'.PROTOCOL_VERSION.$seq.'0000000000';
+        $sendData = '14'.PROTOCOL_VERSION.$seq.'0000000000';
         $sendData .= $lightness > 0 ? '01' : '00';
         $lightness2 = empty($lightness) ? '00' : '00'.base_convert($lightness, 10, 16);
         $sendData .= strlen($lightness2) == 2 ? $lightness2 : substr($lightness2, -2);

webConfig/src/views/projectManagement.vue

@@ -3901,6 +3901,9 @@
                 this.lampId = data.id;
                 this.historicalLampId = data.id;
                 this.lampLoadtype = data.loadtype;
+                let time = new Date();
+                console.log(time.getFullYear().toString()+'-'+(time.getMonth() + 1)+'-'+(time.getDate()-1))
+                this.screenDateLS = [time.getFullYear().toString()+'-'+(time.getMonth() + 1)+'-'+(time.getDate()-1),new Date().format('YY-mm-dd')];
                 this.historicalDialog = true;
                 this.currentPageLS = 1;
                 this.historicalNavSelect = 'lamp_info_log';