no message

webConfig/src/views/GISMap.vue

@@ -341,7 +341,7 @@
                             :row-class-name="rodaTableDataRowName"
                             @row-dblclick="rodaTableDblclick"
                             style="width: 100%">
-                            <el-table-column v-for="item in rodaTableList" :key="item.prop" :label="item.label" :prop="item.prop" :min-width="item.width" align="center">
+                            <el-table-column v-for="item in rodaTableListEN" :key="item.prop" :label="item.label" :prop="item.prop" :min-width="item.width" align="center">
                                 <template slot-scope="scope">
                                     <i class="border_i" v-if="item.prop=='number'"></i>
                                     <span v-if="item.prop!='netStatus'" :class="{'red':scope.row.isfaulted == 1}">{{scope.row[item.prop]}}</span>
@@ -1279,36 +1279,6 @@
                     }
                 }
             }
-            var url = window.location.hash.split("?")[1]; //获取url中"?"符后的字串
-            var theRequest = new Object();
-            if (url) {
-                let arr = url.split("&");
-                for (var i = 0; i < arr.length; i++) {
-                    theRequest[arr[i].split("=")[0]] = decodeURIComponent(arr[i].split("=")[1]);
-                }
-                this.lampIdChangeType = 'map';
-                this.lampId = theRequest.id;
-                if(this.browserLanguage == 'bd'){
-                    this.mapGet('lamp',[theRequest.longitude,theRequest.latitude],false,true);
-                }else{
-                    setTimeout(function(){
-                        this_.mapEnIsTrue = true;
-                        this_.mapGet_en('lamp',[theRequest.longitude,theRequest.latitude],false,true);
-                    },1000)
-                }
-                
-                // this.getProjectCompany
-            }else{
-                if(this.browserLanguage == 'bd'){
-                    this.mapGet(false,false,false,true);
-                }else{
-                    setTimeout(function(){
-                        this_.mapEnIsTrue = true;
-                        this_.mapGet_en(false,false,false,true);
-                    },1000)
-                }
-                // this.projectInfo(0);
-            }
             AMap.mapSwitch=function(){                  
             };
             AMap.mapSwitch.prototype = {  
@@ -2533,6 +2503,34 @@
                         this.projectNav = data.data;
                         this.dateNav();
                         this.lampListGet(1);
+                        var url = window.location.hash.split("?")[1]; //获取url中"?"符后的字串
+                        var theRequest = new Object();
+                        if (url) {
+                            let arr = url.split("&");
+                            for (var i = 0; i < arr.length; i++) {
+                                theRequest[arr[i].split("=")[0]] = decodeURIComponent(arr[i].split("=")[1]);
+                            }
+                            this.lampIdChangeType = 'map';
+                            this.lampId = theRequest.id;
+                            if(this.browserLanguage == 'bd'){
+                                this.mapGet('lamp',[theRequest.longitude,theRequest.latitude],false,true);
+                            }else{
+                                setTimeout(function(){
+                                    this_.mapEnIsTrue = true;
+                                    this_.mapGet_en('lamp',[theRequest.longitude,theRequest.latitude],false,true);
+                                },1000)
+                            }
+                            
+                        }else{
+                            if(this.browserLanguage == 'bd'){
+                                this.mapGet(false,false,false,true);
+                            }else{
+                                setTimeout(function(){
+                                    this_.mapEnIsTrue = true;
+                                    this_.mapGet_en(false,false,false,true);
+                                },1000)
+                            }
+                        }
                     },
                 this)
             },
@@ -4252,26 +4250,26 @@
 
                                 this_.markers.push(new AMap.Marker({
                                     position:[d.longitude,d.latitude],
-                                    content: `<div style="text-align:center;border:11px solid ${borderColor};border-radius:50%;" class="lamp lamp_${d.id} ${lampType} lamp_${this_.mapTCtype}">
+                                    content: `<div style="text-align:center;border:11px solid ${borderColor};border-radius:50%;cursor: pointer;" class="lamp lamp_${d.id} ${lampType} lamp_${this_.mapTCtype}">
                                             ${lamp_icon}
                                             <div class="map_lamp_info map_lamp_info_${d.id}">
                                             <div class="map_lamp_info_bg">
                                                 <div class="top">
-                                                    <span>${'路灯'+d.number}</span>
+                                                    <span>${'Lamp'+d.number}</span>
                                                     <img src="${require('../img/GIS/wifi_'+d.netStatus+'.png')}" />
-                                                    <sapn class="right lamp_info_click ${d.id}" >${'更多'}</span>
+                                                    <sapn class="right lamp_info_click ${d.id}" >${'More'}</span>
                                                 </div>
                                                 <div class="ul">
                                                     <div class="li">
-                                                        <span class="span1">${'亮度：'}</span>
+                                                        <span class="span1">Brightness</span>
                                                         <span class="span2">${d.light}%</span>
                                                     </div>
                                                     <div class="li">
-                                                        <span class="span1">${'电压：'}</span>
+                                                        <span class="span1">${'Voltage:'}</span>
                                                         <span class="span2">${d.lampvoltage}V</span>
                                                     </div>
                                                     <div class="li">
-                                                        <span class="span1">${'功率：'}</span>
+                                                        <span class="span1">${'Power:'}</span>
                                                         <span class="span2">${d.lamppower}W</span>
                                                     </div>
                                                     <div class="li">
@@ -4279,18 +4277,57 @@
                                                         <span class="span2">${d.address}</span>
                                                     </div>
                                                     <div class="li">
-                                                        <span class="span1">${'充电：'}</span>
-                                                        <span class="span2">${this_.chargestageData[d.chargestage]}</span>
+                                                        <span class="span1">${'Charge:'}</span>
+                                                        <span class="span2">${this_.chargestageDataEN[d.chargestage]}</span>
                                                     </div>
                                                 </div>
                                                 <div class="bottom">
-                                                    <span class="span1">${'更新时间：'}</span>
+                                                    <span class="span1">${'Update time:'}</span>
                                                     <span class="span2">${d.updatetime}</span>
                                                 </div>
                                                 <div class="icon"></div>
                                             </div>
                                         </div>
-                                        </div>`,
+                                    </div>`,
+                                    // content: `<div style="text-align:center;border:11px solid ${borderColor};border-radius:50%;" class="lamp lamp_${d.id} ${lampType} lamp_${this_.mapTCtype}">
+                                    //         ${lamp_icon}
+                                    //         <div class="map_lamp_info map_lamp_info_${d.id}">
+                                    //         <div class="map_lamp_info_bg">
+                                    //             <div class="top">
+                                    //                 <span>${'路灯'+d.number}</span>
+                                    //                 <img src="${require('../img/GIS/wifi_'+d.netStatus+'.png')}" />
+                                    //                 <sapn class="right lamp_info_click ${d.id}" >${'更多'}</span>
+                                    //             </div>
+                                    //             <div class="ul">
+                                    //                 <div class="li">
+                                    //                     <span class="span1">${'亮度：'}</span>
+                                    //                     <span class="span2">${d.light}%</span>
+                                    //                 </div>
+                                    //                 <div class="li">
+                                    //                     <span class="span1">${'电压：'}</span>
+                                    //                     <span class="span2">${d.lampvoltage}V</span>
+                                    //                 </div>
+                                    //                 <div class="li">
+                                    //                     <span class="span1">${'功率：'}</span>
+                                    //                     <span class="span2">${d.lamppower}W</span>
+                                    //                 </div>
+                                    //                 <div class="li">
+                                    //                     <span class="span1">${'SN：'}</span>
+                                    //                     <span class="span2">${d.address}</span>
+                                    //                 </div>
+                                    //                 <div class="li">
+                                    //                     <span class="span1">${'充电：'}</span>
+                                    //                     <span class="span2">${this_.chargestageDataEN[d.chargestage]}</span>
+                                    //                 </div>
+                                    //             </div>
+                                    //             <div class="bottom">
+                                    //                 <span class="span1">${'更新时间：'}</span>
+                                    //                 <span class="span2">${d.updatetime}</span>
+                                    //             </div>
+                                    //             <div class="icon"></div>
+                                    //         </div>
+                                    //     </div>
+                                    //     </div>`,
                                     offset: new AMap.Pixel(-19,-19),
                                     extData:d.id+d.number,
                                 }))
@@ -5210,7 +5247,7 @@
                     }
                     .select{
                         color: #fff;
-                        height:32px;
+                        // height:32px;
                         background:linear-gradient(270deg,rgba(54,130,251,1) 0%,rgba(56,161,246,1) 100%);
                         border-radius:100px;
                     }

webConfig/src/views/dashboard.vue

@@ -135,7 +135,7 @@
                             <div class="nav_box">
                                 <div class="li" :class="{'select':chartType == '0'}" @click="chartTypeFun(0)"><span>Total</span></div>
                                 <div class="li" :class="{'select':chartType == '1'}" @click="chartTypeFun(1)"><span>Online</span></div>
-                                <div class="li" :class="{'select':chartType == '2'}" @click="chartTypeFun(2)"><span>Offline</span></div>
+                                <div class="li" :class="{'select':chartType == '2'}" @click="chartTypeFun(2)"><span>lightCount</span></div>
                                 <div class="li" :class="{'select':chartType == '3'}" @click="chartTypeFun(3)"><span>Fault</span></div>
                             </div>
                             <div class="nav_box">
@@ -476,7 +476,7 @@
                 {prop:'name',label:'Company',align:'left',minWidth:this.remRatio*10,type:1},
                 {prop:'total',label:'Total',minWidth:this.remRatio*4,type:1},
                 {prop:'onlineCount',label:'On-line',minWidth:this.remRatio*3},
-                {prop:'offlineCount',label:'Off-line',minWidth:this.remRatio*3},
+                {prop:'lightCount',label:'Light up',minWidth:this.remRatio*3},
                 {prop:'faultCount',label:'Fault',minWidth:this.remRatio*3},
             ];
 
@@ -549,7 +549,7 @@
                             {prop:'name',label:'Company',align:'left',minWidth:this.remRatio*10,type:1},
                             {prop:'total',label:'Total',minWidth:this.remRatio*3,type:1},
                             {prop:'onlineCount',label:'On-line',minWidth:this.remRatio*3},
-                            {prop:'offlineCount',label:'Off-line',minWidth:this.remRatio*3},
+                            {prop:'lightCount',label:'Light up',minWidth:this.remRatio*3},
                             {prop:'faultCount',label:'Fault',minWidth:this.remRatio*3},
                         ];
                     }else{
@@ -557,7 +557,7 @@
                             {prop:'name',label:'Upazila',align:'left',minWidth:this.remRatio*10,type:1},
                             {prop:'total',label:'Total',minWidth:this.remRatio*3,type:1},
                             {prop:'onlineCount',label:'On-line',minWidth:this.remRatio*3},
-                            {prop:'offlineCount',label:'Off-line',minWidth:this.remRatio*3},
+                            {prop:'lightCount',label:'Light up',minWidth:this.remRatio*3},
                             {prop:'faultCount',label:'Fault',minWidth:this.remRatio*3},
                         ];
                     }
@@ -1162,7 +1162,7 @@
                                 seriesData.push({name: d.name,value: d.onlineCount,itemStyle:{color:colorArr[i]}})
                             }
                             if(type == 2){
-                                seriesData.push({name: d.name,value: d.offlineCount,itemStyle:{color:colorArr[i]}})
+                                seriesData.push({name: d.name,value: d.lightCount,itemStyle:{color:colorArr[i]}})
                             }
                             if(type == 3){
                                 seriesData.push({name: d.name,value: d.faultCount,itemStyle:{color:colorArr[i]}})

webConfig/src/views/projectManagement.vue

@@ -7378,7 +7378,6 @@
                         }
                         .select{
                             color: #fff;
-                            // height:2.5rem;
                             background:linear-gradient(270deg,rgba(54,130,251,1) 0%,rgba(56,161,246,1) 100%);
                             border-radius:10rem;
                         }