release

src/components/menu.vue

@@ -83,11 +83,17 @@
                 ]
             }
         },
+        created() {
+            if(!!!this.currentIndex) {
+                this.$router.push("/login")
+            }
+        },
         computed:{
             currName(){
                 return this.$store.state.currentblade.name
             },
             currentIndex(){
+
                 return this.$store.state.currentblade.slot
             },
             status(){

src/router/index.js

@@ -100,24 +100,24 @@ const router = new Router({
 router.beforeEach(async (to, from, next) => {
 
 
-    // let title = to.name ? to.name : '领存BMC'
-    // console.log("/login" == to.path)
-    // if("/login" == to.path) {
-    //     next()
-    //     return
-    // }
-    // let res = await api.Get('/action/checkLoginStatus',{})
-    // if(res.code == 200 && res.data.loginStatus == 'ok'){
-    //     next()
-    //     return
-    // }
-    // next({
-    //     path:'/login',
-    //     query:{
-    //         redirect: to.path
-    //     }
-    // })
-    next();
+    let title = to.name ? to.name : '领存BMC'
+    console.log("/login" == to.path)
+    if("/login" == to.path) {
+        next()
+        return
+    }
+    let res = await api.Get('/action/checkLoginStatus',{})
+    if(res.code == 200 && res.data.loginStatus == 'ok'){
+        next()
+        return
+    }
+    next({
+        path:'/login',
+        query:{
+            redirect: to.path
+        }
+    })
+    // next();
 })
 // // 跳转后返回顶部
 // router.afterEach((to, from, next) => {

src/store/index.js

@@ -8,11 +8,11 @@ Vue.use(Vuex);
 const store = new Vuex.Store({
     state: {
         // 状态
-        currentblade: JSON.parse(sessionStorage.getItem('currentblade')) || { status: null, slot: null, power: null, name: "", isChMC: null  }
+        currentblade: ""
     },
     mutations: {
         currentblade(state, item){
-            sessionStorage.setItem('currentblade', JSON.stringify(item))
+            // sessionStorage.setItem('currentblade', JSON.stringify(item))
             state.currentblade = item
         }
     },

src/views/EventLogs.vue

@@ -5,6 +5,7 @@
       desc=""
     />
     <div class="subObject">
+
       <Spin
         v-if="spinShow"
         fix
@@ -34,7 +35,7 @@
             >
               <p style="color:#333">
                   <template v-if="item.hasOwnProperty('RecordID')">
-                      ID:{{ item.RecordID }} {{ getTimeStamp(item.TimeStamp).substring(6,10) == "1970" ? 'Pre-init Timestamp':getTimeStamp(item.TimeStamp) }} 名称：{{ item.SensorName }}  类型：{{ item.sensortype }} 描述：{{ item.eventdesc }}
+                      ID:{{ item.RecordID }} {{ getTimeStamp(item.TimeStamp).substring(6,10) == "1970" ? 'Pre-init Timestamp':getTimeStamp(item.TimeStamp) }} 名称：{{ item.SensorName }}类型：{{ item.sensortype }}&nbsp;描述：{{ item.eventdesc }}
                   </template>
                   <template v-else>
                         没有数据， 请稍后再试
@@ -98,7 +99,6 @@ export default {
 				lowGraveErr: 0,
 				filterBy: 0
 			},
-
 			year: date.getFullYear(),
 			month: date.getMonth() + 1,
 			day: date.getDate(),
@@ -219,140 +219,220 @@ export default {
         filterSencond(item){
 			console.log(item)
         },
+        filterEventBySelf(item){
+            let Eventdata1 = item.EventData1
+            let Eventdata2 = item.EventData2
+            let Eventdata3 = item.EventData3
+            let Eventdata4 = item.EventData4
+            if (Eventdata1 == 1 && Eventdata2 == 1 && Eventdata3 == 1 ) {
+                item.eventdesc = 'User login BMC Web'
+            } else if (Eventdata1 == 1 && Eventdata2 == 1 && Eventdata3 == 2 ) {
+                item.eventdesc = 'User logout BMC Web'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 1 && Eventdata4 ==	1) {
+                item.eventdesc = 'Chassis power on by system command'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 1 && Eventdata4 ==	2) {
+                item.eventdesc = 'Chassis power on by BMC command'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 1 && Eventdata4 ==	3) {
+                item.eventdesc = 'Chassis power on by watchdog'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 1 && Eventdata4 ==	4) {
+                item.eventdesc = 'Chassis power on by button'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 1 && Eventdata4 != 1 && Eventdata4 != 2 && Eventdata4 != 3 && Eventdata4 != 4 ) {
+                item.eventdesc = 'Chassis power on by unknown cause'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 2 && Eventdata4 ==	1) {
+                item.eventdesc = 'Chassis power off by system command'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 2 && Eventdata4 ==	2) {
+                item.eventdesc = 'Chassis power off by BMC command'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 2 && Eventdata4 ==	3) {
+                item.eventdesc = 'Chassis power off by watchdog'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 2 && Eventdata4 ==	4) {
+                item.eventdesc = 'Chassis power off by button'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 2 && Eventdata4 != 1 && Eventdata4 != 2 && Eventdata4 != 3&& Eventdata4 != 4		) {
+                item.eventdesc = 'Chassis power off by unknown cause'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 3 && Eventdata4 ==	1) {
+                item.eventdesc = 'Chassis power reset by system command'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 3 && Eventdata4 ==	2) {
+                item.eventdesc = 'Chassis power reset by BMC command'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 3 && Eventdata4 ==	3) {
+                item.eventdesc = 'Chassis power reset by watchdog'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 3 && Eventdata4 ==	4) {
+                item.eventdesc = 'Chassis power reset by button'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 3 && Eventdata4 != 1 && Eventdata4 != 2 && Eventdata4 != 3&& Eventdata4 != 4	) {
+                item.eventdesc = 'Chassis power reset by unknown cause'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 4 && Eventdata4 ==	1) {
+                item.eventdesc = 'Chassis power cycle by system command'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 4 && Eventdata4 ==	2) {
+                item.eventdesc = 'Chassis power cycle by BMC command'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 4 && Eventdata4 ==	3) {
+                item.eventdesc = 'Chassis power cycle by watchdog'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 4 && Eventdata4 ==	4) {
+                item.eventdesc = 'Chassis power cycle by button'
+            } else if (Eventdata1 == 1 && Eventdata2 == 2 && Eventdata3 == 4 && Eventdata4 != 1 && Eventdata4 != 2 && Eventdata4 != 3&& Eventdata4 != 4 ) {
+                item.eventdesc = 'Chassis power cycle by unknown cause'
+            } else if (Eventdata1 == 1 && Eventdata2 == 3 && Eventdata3 == 1		) {
+                item.eventdesc = 'BMC reset by cold reset command'
+            } else if (Eventdata1 == 1 && Eventdata2 == 3 && Eventdata3 == 2) {
+                item.eventdesc = 'BMC reset by warm reset command'
+            } else if (Eventdata1 == 1 && Eventdata2 == 3 && Eventdata3 == 3) {
+                item.eventdesc = 'BMC reset by watchdog command'
+            } else if (Eventdata1 == 1 && Eventdata2 == 3 &&  Eventdata3 != 1 && Eventdata3 != 2 && Eventdata3 != 3&& Eventdata3 != 4		) {
+                item.eventdesc = '	BMC reset by unknown cause'
+            } else if (Eventdata1 == 2 && Eventdata2 == 1 && Eventdata3 == 0 ) {
+                item.eventdesc = 'Power status going down'
+            } else if (Eventdata1 == 2 && Eventdata2 == 1 && Eventdata3 == 1 ) {
+                item.eventdesc = 'Power status going up'
+            }
+
+        },
         filterByData(data){
         	let eventtype = 0;
-			 data.forEach(item =>{
+            data.forEach(item =>{
                  item.RecordID     = item.D1
                  item.RecordType   = item.D2
                  item.TimeStamp= item.D3
-                 item.GenID1   = item.D4
-                 item.GenID2   = item.D5
-                 item.EvmRev   = item.D6
-                 item.SensorType   = item.D7
-                 item.EventDirType = item.D8
-                 item.EventData1   = item.D9
-                 item.EventData2   = item.D10
-                 item.EventData3   = item.D11
-                 item.SensorName   = item.D12
-				if(this.formItem.lowGraveErr != 0){
-				    if (item.RecordType >= 0x0 &&
-						item.RecordType <= 0xBF) {
-						eventtype = 0;
-						if (this.formItem.lowGraveErr != 1) {
-							if (this.getbits(item.GenID1, 0, 0) == 1) {
-								if ((this.getbitsval(item.GenID1, 7, 1) >= 0x0) && 
-									(this.getbitsval(item.GenID1, 7, 1) <= 0x0F)) {
-									eventtype = 3;
-								} else if ((this.getbitsval(item.GenID1, 7, 1) >= 0x10) && 
-									(this.getbitsval(item.GenID1, 7, 1) <= 0x1F)) {
-									eventtype = 4;
-								} else if ((this.getbitsval(item.GenID1, 7, 1) >= 0x20) && 
-									(this.getbitsval(item.GenID1, 7, 1) <= 0x2F)) {
-									eventtype = 5;
-								} else if ((this.getbitsval(item.GenID1, 7, 1) >= 0x30) && 
-									(this.getbitsval(item.GenID1, 7, 1) <= 0x3F)) {
-									eventtype = 6;
-								} else if ((this.getbitsval(item.GenID1, 7, 1) >= 0x40) && 
-									(this.getbitsval(item.GenID1, 7, 1) <= 0x46)) {
-									eventtype = 7;
-								} else if (this.getbitsval(item.GenID1, 7, 1) == 0x47) {
-									eventtype = 8;
-								}
-								eventdesc = eLang.getString("common", "STR_SOFTWARE_ID") + 
-									"-" + eLang.getString("common", "STR_EVENT_LOG_TYPE" +
-									eventtype);
-							}
-						}
-					} else if ((item.RecordType >= 0xC0) &&
-						(item.RecordType <= 0xFF)){
-					//C0h-DFh = OEM timestamped
-					//E0h-FFh = OEM non-timestamped
-						eventtype = 2;
-					}
-					// if (this.formItem.lowGraveErr != eventtype) {
-					// //if not matches skips the record
-					// 	return true
-					// }
-				}
 
-            	this.sensorNameSet.add(item.SensorName);
-            	if(item.RecordType >= 0 && item.RecordType <= 191) {
-            		
-					let type = this.getbits(item.EventDirType, 6, 0);
+                 if(item.RecordType == 0xc0){
 
-					if (type == 0x0) {
-						//Event/Reading Type unspecified
-					} else if (type == 0x6F) {
-						//Sensor-specific Discrete
-						//If event type is 0x6F then read from sensor-specific table
-						offset = this.getbits(item.EventData1, 3, 0);
-						if(this.m_Max_allowed_SensorSpecific_offset[item.SensorType]
-							>= offset) {
-							eventdesc = eLang.getString("sensor_specific_event", item.SensorType, offset);
-						} else {
-							eventdesc = eLang.getString("common", "INVALID_OFFSET");
-						}
-					} else if ((type >= 0x01) && (type <= 0x0C)) {
-						//0x01-Threshold based, 0x02-0x0C Generic Discrete
-						offset = this.getbits(item.EventData1, 3, 0);
-						if (this.m_Max_allowed_offset[type] >= offset) {
-							eventdesc = eLang.getString("event", type, offset);
-						} else {
-							eventdesc = eLang.getString("common", "INVALID_OFFSET");
-						}
-					} else {
-						/* 0x70-0x7F,OEM Discrete */
-						eventdesc = eLang.getString("event", "OEM_DISCRETE");
-					}
-					item.eventdesc = eventdesc
-					// item.EventDirType = 1
-            	}
+                     item.SensorName = "-  "
+                     item.sensortype = "-  "
+                     item.EventData1   = item.D4
+                     item.EventData2   = item.D5
+                     item.EventData3   = item.D6
+                     item.EventData4   = item.D7
 
-            	if ((item.GenID1 >= 1) &&
-					(item.GenID1 <= 31) &&
-					(item.SensorType == 15)) {
-					/* look up bios_post_String using offset and evtdata2
-					we are clean event data 2 should be seen only if this bits 
-					indicate evtdata2 has something */
+                     this.filterEventBySelf(item)
 
-					//Only 0 and 1 table are in Bios_post_event_str.js
-					if ((this.getbits(item.EventData1,7,6) == 192) &&
-						((offset >= 0) && (offset <= 2))) {
-						/* Since SensorType 0xf ,Offset 1 and 2 use the same table Entry */
-						if(2 == offset) {
-							offset =1;
-						}
-						eventdesc += "-" + eLang.getString("bios_post_event", 
-							offset, this.getbits(item.EventData2, 3, 0));
-					} else {
-						eventdesc += "-" + eLang.getString("common", "STR_UNKNOWN");
-					}
-				}
+                 } else if(item.RecordType == 0x02) {
+                     item.GenID1   = item.D4
+                     item.GenID2   = item.D5
+                     item.EvmRev   = item.D6
+                     item.SensorType   = item.D7
+                     item.EventDirType = item.D8
+                     item.EventData1   = item.D9
+                     item.EventData2   = item.D10
+                     item.EventData3   = item.D11
+                     item.SensorName   = item.D12
+                     if(this.formItem.lowGraveErr != 0){
+                         if (item.RecordType >= 0x0 &&
+                             item.RecordType <= 0xBF) {
+                             eventtype = 0;
+                             if (this.formItem.lowGraveErr != 1) {
+                                 if (this.getbits(item.GenID1, 0, 0) == 1) {
+                                     if ((this.getbitsval(item.GenID1, 7, 1) >= 0x0) &&
+                                         (this.getbitsval(item.GenID1, 7, 1) <= 0x0F)) {
+                                         eventtype = 3;
+                                     } else if ((this.getbitsval(item.GenID1, 7, 1) >= 0x10) &&
+                                         (this.getbitsval(item.GenID1, 7, 1) <= 0x1F)) {
+                                         eventtype = 4;
+                                     } else if ((this.getbitsval(item.GenID1, 7, 1) >= 0x20) &&
+                                         (this.getbitsval(item.GenID1, 7, 1) <= 0x2F)) {
+                                         eventtype = 5;
+                                     } else if ((this.getbitsval(item.GenID1, 7, 1) >= 0x30) &&
+                                         (this.getbitsval(item.GenID1, 7, 1) <= 0x3F)) {
+                                         eventtype = 6;
+                                     } else if ((this.getbitsval(item.GenID1, 7, 1) >= 0x40) &&
+                                         (this.getbitsval(item.GenID1, 7, 1) <= 0x46)) {
+                                         eventtype = 7;
+                                     } else if (this.getbitsval(item.GenID1, 7, 1) == 0x47) {
+                                         eventtype = 8;
+                                     }
+                                     eventdesc = eLang.getString("common", "STR_SOFTWARE_ID") +
+                                         "-" + eLang.getString("common", "STR_EVENT_LOG_TYPE" +
+                                             eventtype);
+                                 }
+                             }
+                         } else if ((item.RecordType >= 0xC0) &&
+                             (item.RecordType <= 0xFF)){
+                             //C0h-DFh = OEM timestamped
+                             //E0h-FFh = OEM non-timestamped
+                             eventtype = 2;
+                         }
+                         // if (this.formItem.lowGraveErr != eventtype) {
+                         // //if not matches skips the record
+                         // 	return true
+                         // }
+                     }
+
+                     this.sensorNameSet.add(item.SensorName);
+                     if(item.RecordType >= 0 && item.RecordType <= 191) {
+
+                         let type = this.getbits(item.EventDirType, 6, 0);
+
+                         if (type == 0x0) {
+                             //Event/Reading Type unspecified
+                         } else if (type == 0x6F) {
+                             //Sensor-specific Discrete
+                             //If event type is 0x6F then read from sensor-specific table
+                             offset = this.getbits(item.EventData1, 3, 0);
+                             if(this.m_Max_allowed_SensorSpecific_offset[item.SensorType]
+                                 >= offset) {
+                                 eventdesc = eLang.getString("sensor_specific_event", item.SensorType, offset);
+                             } else {
+                                 eventdesc = eLang.getString("common", "INVALID_OFFSET");
+                             }
+                         } else if ((type >= 0x01) && (type <= 0x0C)) {
+                             //0x01-Threshold based, 0x02-0x0C Generic Discrete
+                             offset = this.getbits(item.EventData1, 3, 0);
+                             if (this.m_Max_allowed_offset[type] >= offset) {
+                                 eventdesc = eLang.getString("event", type, offset);
+                             } else {
+                                 eventdesc = eLang.getString("common", "INVALID_OFFSET");
+                             }
+                         } else {
+                             /* 0x70-0x7F,OEM Discrete */
+                             eventdesc = eLang.getString("event", "OEM_DISCRETE");
+                         }
+                         item.eventdesc = eventdesc
+                         // item.EventDirType = 1
+                     }
+
+                     if ((item.GenID1 >= 1) &&
+                         (item.GenID1 <= 31) &&
+                         (item.SensorType == 15)) {
+                         /* look up bios_post_String using offset and evtdata2
+                         we are clean event data 2 should be seen only if this bits
+                         indicate evtdata2 has something */
+
+                         //Only 0 and 1 table are in Bios_post_event_str.js
+                         if ((this.getbits(item.EventData1,7,6) == 192) &&
+                             ((offset >= 0) && (offset <= 2))) {
+                             /* Since SensorType 0xf ,Offset 1 and 2 use the same table Entry */
+                             if(2 == offset) {
+                                 offset =1;
+                             }
+                             eventdesc += "-" + eLang.getString("bios_post_event",
+                                 offset, this.getbits(item.EventData2, 3, 0));
+                         } else {
+                             eventdesc += "-" + eLang.getString("common", "STR_UNKNOWN");
+                         }
+                     }
+
+                     if (this.getbits(item.EventDirType,7,7) == 0) {
+                         if(typeof(eventdesc) != "undefined") {
+                             // to avoid eventdesc with multiple Asserted like "undefined - Asserted - Asserted"
+                             if(eventdesc.indexOf(eLang.getString("common", "STR_EVENT_LOG_ASSERT")) == -1) {
+                                 eventdesc += " - "+eLang.getString("common", "STR_EVENT_LOG_ASSERT");
+                             }
+                         } else
+                             eventdesc += " - "+eLang.getString("common", "STR_EVENT_LOG_ASSERT");
+                     } else {
+                         if(typeof(eventdesc) != "undefined") {
+                             // to avoid eventdesc with multiple Asserted like "undefined - Deasserted - Deasserted"
+                             if(eventdesc.indexOf(eLang.getString("common", "STR_EVENT_LOG_DEASSERT")) == -1) {
+                                 eventdesc += " - "+eLang.getString("common", "STR_EVENT_LOG_DEASSERT");
+                             }
+                         } else
+                             eventdesc += " - "+eLang.getString("common", "STR_EVENT_LOG_DEASSERT");
+                     }
+                     sensortype = eLang.getString("sensortype", item.SensorType);
+                     item.sensortype = sensortype
+                 }
 
-				if (this.getbits(item.EventDirType,7,7) == 0) {
-					if(typeof(eventdesc) != "undefined") {
-						// to avoid eventdesc with multiple Asserted like "undefined - Asserted - Asserted"
-						if(eventdesc.indexOf(eLang.getString("common", "STR_EVENT_LOG_ASSERT")) == -1) {
-							eventdesc += " - "+eLang.getString("common", "STR_EVENT_LOG_ASSERT");
-						}
-					} else 
-						eventdesc += " - "+eLang.getString("common", "STR_EVENT_LOG_ASSERT");
-				} else {
-					if(typeof(eventdesc) != "undefined") {
-						// to avoid eventdesc with multiple Asserted like "undefined - Deasserted - Deasserted"
-						if(eventdesc.indexOf(eLang.getString("common", "STR_EVENT_LOG_DEASSERT")) == -1) {
-							eventdesc += " - "+eLang.getString("common", "STR_EVENT_LOG_DEASSERT");
-						}
-					} else 
-						eventdesc += " - "+eLang.getString("common", "STR_EVENT_LOG_DEASSERT");
-				}
-				sensortype = eLang.getString("sensortype", item.SensorType);
-				item.sensortype = sensortype
 
             })
 			this.data = data
         },
         getData(){
+            this.spinShow = true
         	api.Get("/action/GetAllSELEntriesSorted", {}).then((res)=>{
                 // this.data = res.data
                 this.filterByData(res.data)

src/views/SensorHistory.vue

@@ -119,10 +119,10 @@
                         </div>
                     </div>
                 </div>
-               <!-- <div  class="sensors-history-graph">
+                <div  class="sensors-history-graph">
                     <div  class="ivu-tabs ivu-tabs-card">
                         <div class="ivu-tabs-bar">
-                            &lt;!&ndash;&ndash;&gt;
+                            <!---->
                             <div tabindex="0" class="ivu-tabs-nav-container">
                                 <div class="ivu-tabs-nav-wrap" style="position: relative;">
 							<span class="ivu-tabs-nav-prev ivu-tabs-nav-scroll-disabled">
@@ -138,9 +138,7 @@
                                             <div class="ivu-tabs-ink-bar ivu-tabs-ink-bar-animated" style="visibility: hidden; width: 90px; transform: translate3d(0px, 0px, 0px);">
                                             </div>
                                             <div class="ivu-tabs-tab ivu-tabs-tab-active ivu-tabs-tab-focused">
-                                                &lt;!&ndash;&ndash;&gt;
-                                                图形视图
-                                                &lt;!&ndash;&ndash;&gt;
+                                                历史记录
                                             </div>
                                         </div>
                                     </div>
@@ -163,7 +161,7 @@
                             </div>
                         </div>
                     </div>
-                </div>-->
+                </div>
             </div>
         </div>
 
@@ -288,7 +286,7 @@ export default {
                 hightWarning: t.highnc,
                 hightErro: t.highct
             }
-                // this.getPie()//TODO
+                this.getPie()//TODO
         },
         set(t) {},
         getSensorList() {
@@ -390,15 +388,15 @@ export default {
                     for (var r = t.history.split(","), n = r.map(Number), a = 0; a < n.length; a++) e[a] = n[a];
                     u.setOption(c)
                 }));
-                // this.timer = window.setInterval((() =>{
-                //
-                //     api.Get("/action/webGetSensorHistory", {
-                //         SensorNumber: this.selectItem.sensorNum
-                //     }).then((function(t) {
-                //         for (var r = t.history.split(","), n = r.map(Number), a = 0; a < n.length; a++) e[a] = n[a];
-                //         u.setOption(c)
-                //     }))
-                // }), 1000 * 180)
+                this.timer = window.setInterval((() =>{
+
+                    api.Get("/action/webGetSensorHistory", {
+                        SensorNumber: this.selectItem.sensorNum
+                    }).then((function(t) {
+                        for (var r = t.history.split(","), n = r.map(Number), a = 0; a < n.length; a++) e[a] = n[a];
+                        u.setOption(c)
+                    }))
+                }), 1000 * 180)
         },
         randomfn(t, e) {
             var r = Math.floor(Math.random() * (t - e) + e);

src/views/UploadProgre.vue

@@ -321,7 +321,6 @@
                 this.status = '擦除固件'
                 this.eraseing = 1
                 api.Get("/action/getEraseStatus", {}).then((res) => {
-                    console.log(res, ">>>>>>>>>>>>>>>>>")
                     if (res.Erase) {
                         this.eraseing = 2
                         this.getUpdateProgress()//擦除后更新固件

src/views/login.vue

@@ -60,6 +60,23 @@ export default {
       sessionStorage.clear()
   },
   methods: {
+      async getAllBladeInfo() {
+          var t = this;
+          await api.Get("/action/getAllBladeInfo", {}).then(res => {
+              if(200 == res.code){
+                  let i;
+                  for(i = 0; i < res.data.length; i ++ ){
+                      res.data[i].currentIndex = i
+                      if(res.data[i].isChMC) {
+                          this.$store.commit('currentblade', res.data[i])
+                      }
+                  }
+              } else {
+                  this.$Message.error(res.msg)
+              }
+
+          })
+      },
        handleSubmit (name) {
            console.log(name)
           this.$refs[name].validate(async(valid) => {
@@ -68,6 +85,7 @@ export default {
                   if(res.code == 200) {
                       sessionStorage.setItem('uesrname', this.formInline.username)
                       this.$Message.success('登录成功!');
+                      await this.getAllBladeInfo()
                       this.$router.push({path: '/index/dashbord'});
                   } else {
                       this.$Message.error('账号或密码错误!');

src/views/setting.vue

@@ -11,7 +11,7 @@
                     </div>
                 </Col>
                 <Col span="6">
-                    <div class="col-sub"  @click="getRunTime"  >
+                    <div class="col-sub"  @click="getSysTime"  >
                         <Icon
                                 type="ios-clock"
                                 color="#1874ff"
@@ -79,20 +79,22 @@
                     </div>
                 </Col>
                 <Col span="6">
-<!--                    <div class="col-sub"  @click="resetLast" >-->
-                    <div class="col-sub"  style="cursor: not-allowed;">
+                    <div class="col-sub"  @click="resetLast" >
+<!--                    <div class="col-sub"  style="cursor: not-allowed;">-->
                         <Icon
                                 type="md-git-pull-request"
+                                color="#1874ff"
                                 size="36"
                         />
                         <span>恢复上次设置</span>
                     </div>
                 </Col>
                 <Col span="6">
-<!--                    <div class="col-sub" @click="saveParam" >-->
-                    <div class="col-sub" style="cursor: not-allowed;">
+                    <div class="col-sub" @click="saveParam" >
+<!--                    <div class="col-sub" style="cursor: not-allowed;">-->
                         <Icon
                                 type="ios-construct"
+                                color="#1874ff"
                                 size="36"
                         />
                         <span>保存设置</span>
@@ -104,9 +106,9 @@
             </Row>
             <Row style="margin-top:30px" :gutter="20">
                 <Col span="6">
-<!--                    <div class="col-sub" @click="reloadModal = true" >-->
-                    <div class="col-sub"  style="cursor: not-allowed;">
-                        <Icon    type="md-at" size="36"  />
+                    <div class="col-sub" @click="reloadModal = true" >
+<!--                    <div class="col-sub"  style="cursor: not-allowed;">-->
+                        <Icon    type="md-at" size="36"  color="#1874ff" />
                         <span>模块识别</span>
                     </div>
                 </Col>
@@ -449,7 +451,7 @@
             start(){
                 this.starting = true
                 let num = this.sTime[this.distinguishTime]
-                api.Get("/action/web_SetModIdentifyOff", {}).then((res) => {
+                api.Get("/action/web_SetModIdentifyOn", {}).then((res) => {
                     if (res.code == 200) {
                         if(this.distinguishTime != 4){
                             this.timer = window.setInterval((() =>{
@@ -473,7 +475,7 @@
             stop(){
 
                 this.stoping = true
-                api.Get("/action/web_SetModIdentifyOn", {}).then((res) => {
+                api.Get("/action/web_SetModIdentifyOff", {}).then((res) => {
                     if (res.code == 200) {
 
                     }
@@ -496,6 +498,7 @@
                 }
             },
             getSysTime() {
+
                 api.Get("/action/GetTime", {}).then((res) => {
                     if (res.code == 200) {
                         this.formItem.curTime = this.getTimeStamp(res.data.time)
@@ -505,6 +508,7 @@
                         this.formItem.curUtc = temp.label
                         this.formItem.UTCOffset = temp.value
                     }
+                    this.timeModel = true
                     console.log(res)
                 }).catch((err) => {
                     console.log(err)
@@ -519,7 +523,7 @@
                     } else {
                         this.$Message.error("获取时间失败！")
                     }
-                    this.timeModel = true
+
                     console.log(res)
                 }).catch((err) => {
                     console.log(err)
@@ -570,7 +574,7 @@
             saveParam(){
                 this.$Modal.confirm({
                     title: '警告',
-                    content: '当前的用户配置信息将被恢复到上次保存的节点。确认执行吗？',
+                    content: '当前的用户配置信息将被保存到Flash中，可以通过“恢复设置”按钮将用户配置恢复到本节点。确认执行吗？',
                     onOk: () => {
                         api.Get("/action/web_SaveConfig", {}).then((res) => {
                             if (res.code == 200) {
@@ -588,7 +592,7 @@
             resetLast(){
                 this.$Modal.confirm({
                     title: '警告',
-                    content: '当前的用户配置信息将被保存到Flash中，可以通过“恢复设置”按钮将用户配置恢复到本节点。确认执行吗？',
+                    content: '当前的用户配置信息将被恢复到上次保存的节点。确认执行吗？',
                     onOk: () => {
                         api.Get("/action/web_RestoreConfig", {}).then((res) => {
                             if (res.code == 200) {