no message

webConfig/src/components/sideBar_idcol.vue

@@ -41,7 +41,7 @@
                             <span class="text" :title="obj.projectname"><i class="iconfont icon-celan-fenzhi"></i><span class="span1">{{obj.projectname}}</span><span class="span2">({{obj.lampcount?obj.lampcount:0}})</span></span>
                             <i class="el-icon-arrow-up" :style="{'transform':obj.isOpen?'rotate(180deg)':''}"></i>
                         </p>
-                        <div v-if="obj.isOpen" class="sideBar_project_box">
+                        <div v-if="obj.isOpen&&sectionShow" class="sideBar_project_box">
                             <div v-for="item in obj.sectionList"  :key="item.id" class="sideBar_project">
                                 <div class="sideBar_project_text" :class="{'sideBar_project_select':roadId==item.name&&projectId==obj.id}" @click.stop="click5(obj,item,{})">
                                     <span :title="item.name">
@@ -101,7 +101,7 @@
                 screeningCheckList:[],
                 searchType:'',
                 searchTypeArr:[{id:0,name:'Project'},{id:2,name:'Manufacturer'},{id:3,name:'Supplier'},{id:4,name:'PO'},{id:5,name:'Upazilla'}],
-
+                sectionShow:true,
             }
         },
         computed:{
@@ -110,6 +110,7 @@
                 client_key:'client_key',
                 username:'username',
                 version:'version',
+                routerStr:'routerStr',
             }),
             searchTypeName(){
                 let name;
@@ -128,10 +129,15 @@
                 sideBarCompanyType:0,
             })
             var storage = window.localStorage;
-            let searchType = storage.getItem("searchType");
-            if(searchType){
-                this.searchType = searchType;
+            if(this.routerStr == '/alarmMaintenance'){
+                this.sectionShow = false;
+            }else{
+                let searchType = storage.getItem("searchType");
+                if(searchType){
+                    this.searchType = searchType;
+                }
             }
+            console.log(this.routerStr,this.sectionShow)
             this.sideBarCompanyList(this.keywords,this.searchType,'init');
         },
         methods:{

webConfig/src/views/dashboard.vue

@@ -248,8 +248,8 @@
                                 align="center"
                                 :width="100"
                                 :label="'Operation'">
-                                <template>
-                                    <span class="btn" @click="linkToFun('/alarmMaintenance')" title="See">
+                                <template slot-scope="scope">
+                                    <span class="btn" @click="alarmTz(scope.row)" title="See">
                                         <i class="iconfont icon-weixiu" style="color: rgba(252, 132, 64, 1)"></i>
                                     </span>
                                 </template>
@@ -434,6 +434,10 @@
         methods:{
             linkToFun(val){
                 if(val != this.routerStr){
+                    if(val == '/alarmMaintenance'&&this.alarmList.length>0){
+                        let storage = window.localStorage;
+                        storage.setItem('projectId',this.alarmList[0].projectid);
+                    }
                     this.$router.push({path:val});
                     this.$store.commit('ROUTERSTRFUN',{
                         routerStr:val,
@@ -441,6 +445,15 @@
                     document.title = 'IDCOL-'+val.split('/')[1]
                 }
             },
+            alarmTz(data){
+                var storage = window.localStorage;
+                storage.setItem('projectId',data.projectid);
+                this.$router.push({path:'/alarmMaintenance'});
+                this.$store.commit('ROUTERSTRFUN',{
+                    routerStr:'/alarmMaintenance',
+                })
+                document.title = 'IDCOL-alarmMaintenance'
+            },
             commandHide(val){
                 this.$nextTick(function(){
                     if($('.'+val)&&$('.'+val+' >.select').offset()){
@@ -519,10 +532,10 @@
                     {},
                     data => {
                         this.infoData = data.data;
-                        this.infoData.light_up_count_percent =  this.infoData.total_light_count==0?0:this.infoData.light_up_count/this.infoData.total_light_count
-                        this.infoData.online_count_percent =  this.infoData.total_light_count==0?0:this.infoData.online_count/this.infoData.total_light_count
-                        this.infoData.faulty_count_percent =  this.infoData.total_light_count==0?0:this.infoData.faulty_count/this.infoData.total_light_count
-                        this.infoData.day_new_count_percent =  this.infoData.total_light_count==0?0:this.infoData.day_new_count/this.infoData.total_light_count
+                        this.infoData.light_up_count_percent =  this.infoData.total_light_count==0?0:this.infoData.light_up_count/this.infoData.total_light_count*100
+                        this.infoData.online_count_percent =  this.infoData.total_light_count==0?0:this.infoData.online_count/this.infoData.total_light_count*100
+                        this.infoData.faulty_count_percent =  this.infoData.total_light_count==0?0:this.infoData.faulty_count/this.infoData.total_light_count*100
+                        this.infoData.day_new_count_percent =  this.infoData.total_light_count==0?0:this.infoData.day_new_count/this.infoData.total_light_count*100
                     },
                     this
                 )