生物安防

src/views/BioSafety/BioSafety.vue

@@ -21,7 +21,7 @@
             </div>
           </div>
           <div class="bio-out-center">
-            <div class="out-img"></div>
+            <div class="out-img1"></div>
             <div style="color: white; font-size: 16px">
               <p>七日抓取次数</p>
               <p style="font-size: 22px; font-weight: 600">{{pig.SevenDayGate}}</p>
@@ -459,8 +459,8 @@ export default {
         openType: 61,
         pageNum:1,
         pageSize: 21,
-        startSwingTime: timeDate(new Date().getTime()) + '00:00:00',
-        endSwingTime: timeDate(new Date().getTime()) + '23:59:59',
+        startSwingTime: timeDate(new Date().getTime()) + ' 00:00:00',
+        endSwingTime: timeDate(new Date().getTime()) + ' 23:59:59',
       }
       getPersonList(params1).then(async res => {
           let result = JSON.parse(res.result);
@@ -637,12 +637,12 @@ export default {
   .bio-flex-left {
     width: 770px;
     height: 100%;
-    border: 1px solid rgb(121, 121, 121);
+    /*border: 1px solid rgb(121, 121, 121);*/
   }
   .bio-flex-center {
     width: 465px;
     height: 100%;
-    border: 1px solid rgb(121, 121, 121);
+    /*border: 1px solid rgb(121, 121, 121);*/
   }
   .bio-title {
     width: 100%;
@@ -681,7 +681,13 @@ export default {
   .out-img {
     width: 54px;
     height: 54px;
-    background: url("../../assets/BioSafety/u2500.svg") no-repeat;
+    background: url("../../assets/BioSafety/day.svg") no-repeat;
+    background-size: 100% 100%;
+  }
+  .out-img1 {
+    width: 54px;
+    height: 54px;
+    background: url("../../assets/BioSafety/servenday.svg") no-repeat;
     background-size: 100% 100%;
   }
   .bio-title-left {

src/views/Home/Home.vue

@@ -99,11 +99,11 @@
           <div class="case-title">猪舍温度</div>
           <div class="case-content">
             <div class="case-one">
-              <span style=" padding-left: 20px;padding-right: 50px">最高</span>
+              <span style=" padding-left: 20px;padding-right: 40px">最高</span>
               <span><strong class="sign">{{env.maxTem}}</strong>℃</span>
             </div>
             <div class="case-one">
-              <span style=" padding-left: 20px; padding-right: 50px">最低</span>
+              <span style=" padding-left: 20px; padding-right: 40px">最低</span>
               <span><strong class="sign">{{env.minTem}}</strong>℃</span>
             </div>
           </div>

src/views/Login/Login.vue

@@ -43,8 +43,8 @@
 </template>
 
 <script>
-import { Login} from '../../utils/api';
-import { mapState, } from 'vuex'
+import { Login, getFarmId} from '../../utils/api';
+import { mapState, mapActions} from 'vuex'
 export default {
   name: "Login",
   data() {
@@ -58,6 +58,7 @@ export default {
     ...mapState(['ip'])
   },
   methods: {
+    ...mapActions(['setFarmIdAsync']),
     onSubmit() {
       let params = {
         accountName: this.userName,
@@ -70,12 +71,18 @@ export default {
           localStorage.setItem('UserName', res.data.accountName);
           localStorage.setItem('UserId', res.data.id);
           this.$message.success('登录成功');
-          let url = this.$route.query.redirect;
-          if(url) {
-            this.$router.replace(url);
-          } else {
-            this.$router.replace('/');
-          }
+          getFarmId().then(res => {
+            if(res.code === 10000) {
+              this.setFarmIdAsync(res.data);
+              localStorage.setItem('lastFarmId', res.data);
+              let url = this.$route.query.redirect;
+              if(url) {
+                this.$router.replace(url);
+              } else {
+                this.$router.replace('/');
+              }
+            }
+          })
         } else {
           this.$message.error(res.message);
           this.refset();