111

src/utils/httpRequest.js

@@ -8,7 +8,7 @@ import { clearLoginInfo } from '@/utils'
 // var cookies = document.cookie.split(' ')
 // var cookie = cookies[1].split('=')
 // var farmId = cookie[1]
-let farmId = localStorage.getItem('farmId') === 'null'? undefined: parseInt(localStorage.getItem('farmId'))
+let farmId = localStorage.getItem('farmId') == null ? undefined : parseInt(localStorage.getItem('farmId'))
 // let formFarmId = Vue.cookie.get('formFarmId') === null? undefined: parseInt(Vue.cookie.get('formFarmId'));
 // console.log(Vue.cookie.get('formFarmId'));
 

src/views/common/login.vue

@@ -85,6 +85,7 @@
                 if (data.farmId) {
                   this.$cookie.set('formFarmId', data.farmId)
                 }
+                console.log(data);
                 localStorage.setItem('farmId', data.farmId)
                 this.$router.replace({ name: 'home' })
               } else {

src/views/main-navbar.vue

@@ -22,10 +22,10 @@
             <span>{{farmName}}</span>
           </template>
           <template slot="title" v-else>
-            <el-select 
-              placeholder="牧场" 
-              v-model="formFarmId" 
-              :disabled="farmId > 0" 
+            <el-select
+              placeholder="牧场"
+              v-model="formFarmId"
+              :disabled="farmId > 0"
               @change="farmChange"
               size="mini"
               style="width: 120px">
@@ -76,18 +76,18 @@
       :visible="dialogVisible"
       width="30%"
       :modal-append-to-body="false">
-      <el-form 
-        :model="dataForm" 
-        :rules="dataRule" 
-        ref="dataForm" 
-        @keyup.enter.native="dataFormSubmit()" 
-        label-width="80px" 
+      <el-form
+        :model="dataForm"
+        :rules="dataRule"
+        ref="dataForm"
+        @keyup.enter.native="dataFormSubmit()"
+        label-width="80px"
         size="mini"
         style="margin-left: 20px;width: 500px">
         <el-form-item label="牧场名称" prop="farmId">
-          <el-select 
-            placeholder="牧场" 
-            v-model="dataForm.farmId" 
+          <el-select
+            placeholder="牧场"
+            v-model="dataForm.farmId"
             :disabled="farmId > 0">
             <el-option
               v-for="item in farmList"
@@ -104,7 +104,7 @@
     </el-dialog>
     <!-- 弹窗, 修改密码 -->
     <update-password v-if="updatePassowrdVisible" ref="updatePassowrd"></update-password>
-    
+
   </nav>
 </template>
 
@@ -188,10 +188,10 @@
             this.$message.error(data.msg)
           }
         })
-        
+
         // this.farmId = this.$cookie.get('farmId') === 'null'? undefined: parseInt(this.$cookie.get('farmId'))
         // if (this.formFarmId) {
-          
+
         //   return
         // }
       },
@@ -200,6 +200,7 @@
           if (valid) {
             this.formFarmId = this.dataForm.farmId
             this.$cookie.set('formFarmId', this.formFarmId)
+            localStorage.setItem('formId', this.formFarmId);
             this.dialogVisible = false
           }
         })

src/views/modules/health/hvaccine.vue

@@ -143,7 +143,7 @@
                   :disabled="dataForm.id? true: false">
               </el-input>
             </el-form-item>
-            <el-form-item label="疫苗名称" prop="vaccine">
+            <el-form-item label="疫苗名称" prop="vaccineName">
               <el-input v-model="dataForm.vaccineName" placeholder="请输入疫苗名称"></el-input>
             </el-form-item>
             <el-form-item label="操作人" prop="manId">
@@ -203,7 +203,7 @@ export default {
         pigId: [
           {required: true, message: '猪只耳标不能为空', trigger: 'blur'}
         ],
-        vaccine: [
+        vaccineName: [
           {required: true, message: '疫苗名称不能为空', trigger: 'blur'}
         ],
         manId: [