111

src/views/main-navbar.vue

@@ -18,14 +18,13 @@
         class="site-navbar__menu site-navbar__menu--right"
         mode="horizontal">
         <el-menu-item>
-          <template slot="title" v-if="farmId > 0">
-            <span>{{farmName}}</span>
-          </template>
-          <template slot="title" v-else>
+<!--          <template slot="title" v-if="farmId > 0">-->
+<!--            <span>{{farmName}}</span>-->
+<!--          </template>-->
+          <template slot="title">
             <el-select
               placeholder="牧场"
               v-model="formFarmId"
-              :disabled="farmId > 0"
               @change="farmChange"
               size="mini"
               style="width: 120px">
@@ -118,7 +117,7 @@
         farmId: '',
         farmName: '',
         farmList: [], // 牧场List
-        formFarmId: '',
+        formFarmId: Number(localStorage.getItem('farmId')),
         dialogVisible: false,
         dataForm: {
           farmId: ''
@@ -222,6 +221,7 @@
       farmChange (val) {
         // 管理员选择牧场
         this.$cookie.set('formFarmId', val)
+        localStorage.setItem('farmId', val)
         this.$http({
           url: this.$http.adornUrl('/sys/user/saveChooseFarm'),
           methods: 'get',

src/views/modules/monitor/camera.vue

@@ -320,14 +320,18 @@ export default {
       this.dataListLoading = true
       let params = {
         page: this.page,
-        limit: this.limit,
-        keyword: this.form.keyword,
-        areaId: this.form.areaId
+        limit: this.limit
+      }
+      if (this.form.keyword !== '') {
+        params.keyword = this.form.keyword
+      }
+      if (this.form.areaId !== '') {
+        params.areaId = this.form.areaId
       }
       this.$http({
         url: this.$http.adornUrl('/management/camerainfo/list'),
-        method: 'post',
-        data: this.$http.adornParams(params)
+        method: 'get',
+        params: this.$http.adornParams(params, true)
       })
           .then(res => {
             if (res.data.code === 0) {