瀏覽代碼

no message

XAWDJ0277HWXPT2\Administrator 5 年之前
父節點
當前提交
e630a1c75a

文件差異過大導致無法顯示
+ 1 - 1
web/css/chunk-27550a72.99e14beb.css


文件差異過大導致無法顯示
+ 1 - 1
web/index.html


文件差異過大導致無法顯示
+ 0 - 2
web/js/app.092b5a61.js


文件差異過大導致無法顯示
+ 0 - 1
web/js/app.092b5a61.js.map


文件差異過大導致無法顯示
+ 2 - 0
web/js/app.4a60d8b2.js


文件差異過大導致無法顯示
+ 1 - 0
web/js/app.4a60d8b2.js.map


文件差異過大導致無法顯示
+ 2 - 0
web/js/chunk-27550a72.114fbe0d.js


文件差異過大導致無法顯示
+ 1 - 0
web/js/chunk-27550a72.114fbe0d.js.map


文件差異過大導致無法顯示
+ 0 - 2
web/js/chunk-27550a72.7e64d990.js


文件差異過大導致無法顯示
+ 0 - 1
web/js/chunk-27550a72.7e64d990.js.map


文件差異過大導致無法顯示
+ 0 - 2
web/js/chunk-3c3021a1.762e579b.js


文件差異過大導致無法顯示
+ 0 - 1
web/js/chunk-3c3021a1.762e579b.js.map


文件差異過大導致無法顯示
+ 2 - 0
web/js/chunk-3c3021a1.ddf45014.js


文件差異過大導致無法顯示
+ 1 - 0
web/js/chunk-3c3021a1.ddf45014.js.map


+ 1 - 1
webConfig/src/App.vue

@@ -184,7 +184,7 @@
             }
             window.onresize = function(){
                 width = document.body.offsetWidth;
-                console.log(this_.updateRemRatio)
+                // console.log(this_.updateRemRatio)
                 if(width >= 1920){
                     $('html').css({'font-size':'95.01%'})
                     this_.$store.commit('REMRATIOFUN',{

文件差異過大導致無法顯示
+ 447 - 2
webConfig/src/views/dashboard.vue


+ 59 - 2
webConfig/src/views/projectManagement.vue

@@ -1174,8 +1174,15 @@
                 detailsDialog:false,
                 detailsNavSelect:'lamp_info_log',
                 detailsNavList:[{model:'lamp_info_log',label:'路灯'},{model:'lampinfo',label:'配置'},{model:'system_info_log',label:'系统'},{model:'solar_info_log',label:'太阳能板'},{model:'battery_info_log',label:'蓄电池'}],
-                detailsNavListEN:[{model:'lamp_info_log',label:'Lamp'},{model:'lampinfo',label:'Configuration'},{model:'system_info_log',label:'System'},{model:'solar_info_log',label:'Solar panels'},{model:'battery_info_log',label:'Battery'}],
+                detailsNavListEN:[
+                    {model:'lamp_info_log',label:'Lamp'},
+                    {model:'lampinfo',label:'Configuration'},
+                    // {model:'system_info_log',label:'System'},
+                    {model:'solar_info_log',label:'Solar panels'},
+                    {model:'battery_info_log',label:'Battery'}
+                ],
                 detailsFieldList:[],
+                
                 addItemDialog:false,
                 addItemData:{
                     projectName:'',
@@ -3624,7 +3631,7 @@
                         for(var d of this.streetlightDetails){
                             let obj = {};
                             for(let dd of fieldList){
-                                console.log(dd.fields1,d.model)
+                                // console.log(dd.fields1,d.model)
                                 if(dd.fields1 == 'number'){
                                     dd.fields1 = 'lamp_no'
                                 }
@@ -3665,6 +3672,31 @@
                             if(d.model == 'softwareVersion'){
                                 obj.key = 'Version information'
                             }
+
+                            if(d.model == 'lampstatus'){
+                                obj.key = 'Lamp status'
+                            }
+                            if(d.model == 'lamppower'){
+                                obj.key = 'Lamp power'
+                            }
+                            if(d.model == 'temper'){
+                                obj.key = 'Temperature'
+                            }
+                            if(d.model == 'boardpower'){
+                                obj.key = 'Solar panel power'
+                            }
+                            if(d.model == 'electricleft'){
+                                obj.key = 'Remaining battery'
+                            }
+                            if(d.model == 'daychargeah'){
+                                obj.key = 'Charging hours per day'
+                            }
+                            if(d.model == 'daydischarah'){
+                                obj.key = 'Discharge ampere hours day'
+                            }
+                            if(d.model == 'chargestage'){
+                                obj.key = 'Battery charging stage'
+                            }
                             if(d.model == key){
                                 if(d.model != 'devicetype'){
                                     obj.value = data.data[key];
@@ -3730,6 +3762,31 @@
                             if(d.model == 'softwareVersion'){
                                 obj.key = 'Version information'
                             }
+
+                            if(d.model == 'lampstatus'){
+                                obj.key = 'Lamp status'
+                            }
+                            if(d.model == 'lamppower'){
+                                obj.key = 'Lamp power'
+                            }
+                            if(d.model == 'temper'){
+                                obj.key = 'Temperature'
+                            }
+                            if(d.model == 'boardpower'){
+                                obj.key = 'Solar panel power'
+                            }
+                            if(d.model == 'electricleft'){
+                                obj.key = 'Remaining battery'
+                            }
+                            if(d.model == 'daychargeah'){
+                                obj.key = 'Charging hours per day'
+                            }
+                            if(d.model == 'daydischarah'){
+                                obj.key = 'Discharge ampere hours day'
+                            }
+                            if(d.model == 'chargestage'){
+                                obj.key = 'Battery charging stage'
+                            }
                             if(d.model == key){
                                 if(d.model != 'devicetype'){
                                     obj.value = data.data[key];