release

src/components/header.vue

@@ -2,7 +2,7 @@
   <div class="head-contener">
       <div class="logo-table">
         <div class="logo-box">
-          <img src="../assets/stor/logo.png">
+          <img style="margin-top: 8px;" src="../assets/stor/logo.png">
         </div>
         <div class="logo-line"></div>
         <div class="logo-text">

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/views/SensorHistory.vue

@@ -258,8 +258,8 @@ export default {
             let param = {
                 SensorNumber: this.selectItem.sensorNum,
                 UNR: this.formItem.hightGraveErr,
-                UC: this.formItem.hightErro,
-                UNC: this.formItem.hightWarning,
+                UC: this.formItem.hightWarning,
+                UNC: this.formItem.hightErro,
                 LNR: this.formItem.lowGraveErr,
                 LC: this.formItem.lowErr,
                 LNC: this.formItem.lowWarning

src/views/SetProctrol.vue

@@ -110,11 +110,11 @@ export default {
 	// 	}
 	// },
 	created() {
-		this.getWanLanInfo();
+
 	},
 	methods: {
 		show(){
-			this.wifiModel = true
+            this.getWanLanInfo();
 		},
 		set(item) {
 			console.log(item)
@@ -124,6 +124,7 @@ export default {
 	            if(res.code == 200) {
 	            	this.formItem = res.data
 	            }
+                this.wifiModel = true
 	      	}).catch((err)=>{
 	        	console.log(err)
 	        	console.log(err.isSuccess)

src/views/UploadProgre.vue

@@ -28,6 +28,7 @@
                     :on-success="success"
                     :on-error="upErrorFn"
                     :on-format-error="onFormatError"
+                    :data="{index: currentIndex}"
                     action="/action/uploadFirmware"
             >
                 <div style="padding: 20px 0">
@@ -277,7 +278,14 @@
                 updateFlashStatusProcess: 0,
             }
         },
-
+        computed: {
+            currName(){
+                return this.$store.state.currentblade.name
+            },
+            currentIndex(){
+                return this.$store.state.currentblade.slot
+            }
+        },
         created() {
         },
         updated() {

src/views/login.vue

@@ -68,7 +68,7 @@ export default {
                   if(res.code == 200) {
                       sessionStorage.setItem('uesrname', this.formInline.username)
                       this.$Message.success('登录成功!');
-                      this.$router.push({path: '/index/dashbord'}).catch((e) => {console.log(e)});
+                      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="timeModel = true"  >
+                    <div class="col-sub"  @click="getRunTime"  >
                         <Icon
                                 type="ios-clock"
                                 color="#1874ff"
@@ -422,7 +422,7 @@
 
                 this.otcArr.push({key, value: vv, label: obj[key]})
             }
-            this.getSysTime()
+
             // this.getRunTime()
         },
 
@@ -519,7 +519,7 @@
                     } else {
                         this.$Message.error("获取时间失败！")
                     }
-
+                    this.timeModel = true
                     console.log(res)
                 }).catch((err) => {
                     console.log(err)