2021.06.23

src/views/modules/alarm/indoor.vue

@@ -5,7 +5,7 @@
       <el-header>
         <div class="rect rect-form">
           <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
-            <el-form-item style="width: 140px">
+            <!-- <el-form-item style="width: 140px">
               <el-select placeholder="牧场" v-model="form.farmId" :disabled="farmId > 0" @change="farmChange">
                 <el-option
                   v-for="item in farmList"
@@ -14,11 +14,11 @@
                   :value="item.value">
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item style="width: 140px">
-              <el-select placeholder="猪舍" v-model="form.pigstyId" @change="pigstyChange">
+              <el-select placeholder="猪舍" v-model="form.pigstyId">
                 <el-option
-                  v-for="item in pigstySelectedList"
+                  v-for="item in pigstyList"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value">
@@ -77,12 +77,12 @@
               align="center"
               label="当前日期">
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               prop="farmName"
               header-align="center"
               align="center"
               label="牧场">
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               prop="pigstyName"
               header-align="center"
@@ -148,7 +148,7 @@
     data () {
       return {
         form: {
-          farmId: '',
+          // farmId: '',
           pigstyId: '',
           time: [],
           warningType: ''
@@ -158,10 +158,10 @@
         pageSize: 10,
         totalPage: 0,
         dataListLoading: false,
-        farmId: undefined,
-        farmList: [], // 牧场List
+        // farmId: undefined,
+        // farmList: [], // 牧场List
         pigstyList: [], // 猪舍List
-        pigstySelectedList: [], // 根据牧场限制的猪舍SelectedList
+        // pigstySelectedList: [], // 根据牧场限制的猪舍SelectedList
         labelPosition: 'right',
         thresholdTypes: [
           {
@@ -178,10 +178,10 @@
           }
         ],
         verifyVisible: false, // 弹窗是否显示
-        pigsty: {
-          farmId: '',
-          pigstyId: ''
-        }
+        // pigsty: {
+        //   farmId: '',
+        //   pigstyId: ''
+        // }
       }
     },
     activated () {
@@ -193,7 +193,7 @@
     methods: {
       // 获取数据列表
       getDataList () {
-        this.farmId = this.$cookie.get('farmId') === 'null'? undefined: parseInt(this.$cookie.get('farmId'))
+        // this.farmId = this.$cookie.get('farmId') === 'null'? undefined: parseInt(this.$cookie.get('farmId'))
         this.dataListLoading = true
         this.$http({
           url: this.$http.adornUrl('/management/warningInfo/list'),
@@ -201,8 +201,8 @@
           params: this.$http.adornParams({
             'page': this.pageIndex,
             'limit': this.pageSize,
-            'farmId': (this.form.farmId || this.farmId) || undefined,
-            'pigstyId': this.pigstyId || undefined,
+            'farmId': parseInt(this.$cookie.get('formFarmId')),
+            'pigstyId': this.form.pigstyId || undefined,
             'startTime': this.form.time[0] || undefined,
             'endTime': this.form.time[1] || undefined,
             'belongTo': 1,
@@ -218,22 +218,22 @@
             this.totalPage = 0
             this.$message.error(data.msg)
           }
-          // 获取所有牧场
-          this.farmList = []
-          let farmList = []
-          let farmResult = await this.$http({
-            url: this.$http.adornUrl("/management/farm/findAll"),
-            method: "get",
-            params: this.$http.adornParams({})
-          })
-          farmResult.data.all && (farmList = farmResult.data.all)
-          farmList.forEach(farm => {
-            let item = {
-              label: farm.name,
-              value: farm.id
-            }
-            this.farmList.push(item)
-          })
+          // // 获取所有牧场
+          // this.farmList = []
+          // let farmList = []
+          // let farmResult = await this.$http({
+          //   url: this.$http.adornUrl("/management/farm/findAll"),
+          //   method: "get",
+          //   params: this.$http.adornParams({})
+          // })
+          // farmResult.data.all && (farmList = farmResult.data.all)
+          // farmList.forEach(farm => {
+          //   let item = {
+          //     label: farm.name,
+          //     value: farm.id
+          //   }
+          //   this.farmList.push(item)
+          // })
           // 栋舍List
           this.pigstyList = []
           let pigstyList = []
@@ -247,12 +247,12 @@
             let item = {
               value: pigsty.id,
               label: pigsty.number,
-              farmId: pigsty.farmId
+              // farmId: pigsty.farmId
             }
             this.pigstyList.push(item)
           })
-          this.pigstySelectedList = this.pigstyList
-          this.form.farmId = (this.form.farmId || this.farmId) || undefined
+          // this.pigstySelectedList = this.pigstyList
+          // this.form.farmId = (this.form.farmId || this.farmId) || undefined
           this.dataListLoading = false
         })
       },
@@ -261,26 +261,26 @@
         this.abnormalStatus = !this.abnormalStatus
         this.getDataList()
       },
-      // 根据牧场选择限制猪舍
-      farmChange (val) {
-        this.pigstySelectedList = this.pigstyList.filter(item => item.farmId === val)
-        if (this.pigsty.farmId === val) {
-          return
-        }
-        this.form.pigstyId = ''
-      },
-      // 根据猪舍选择确定牧场
-      pigstyChange (val) {
-        for (let pigsty of this.pigstyList) {
-          if (pigsty.value === val) {
-            this.form.farmId = pigsty.farmId
-            this.pigsty.farmId = pigsty.farmId
-            this.pigsty.pigstyId = val
-            break
-          }
-        }
-        this.farmChange(this.form.farmId)
-      },
+      // // 根据牧场选择限制猪舍
+      // farmChange (val) {
+      //   this.pigstySelectedList = this.pigstyList.filter(item => item.farmId === val)
+      //   if (this.pigsty.farmId === val) {
+      //     return
+      //   }
+      //   this.form.pigstyId = ''
+      // },
+      // // 根据猪舍选择确定牧场
+      // pigstyChange (val) {
+      //   for (let pigsty of this.pigstyList) {
+      //     if (pigsty.value === val) {
+      //       this.form.farmId = pigsty.farmId
+      //       this.pigsty.farmId = pigsty.farmId
+      //       this.pigsty.pigstyId = val
+      //       break
+      //     }
+      //   }
+      //   this.farmChange(this.form.farmId)
+      // },
       // 获取起始与结束时间
       timeChange (val) {
         let start = new Date(val[0])
@@ -293,11 +293,11 @@
       },
       // form表单清空，单元SelectedList 和 栏期SelectedList重置
       clearAll () {
-        this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
+        // this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
         this.form.pigstyId = ''
         this.form.time = []
         this.form.warningType = ''
-        this.pigstySelectedList = this.pigstyList
+        // this.pigstySelectedList = this.pigstyList
       },
       // 确认处理
       verifyHandle (id) {

src/views/modules/alarm/meteo.vue

@@ -5,7 +5,7 @@
       <el-header>
         <div class="rect rect-form">
           <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
-            <el-form-item style="width: 140px">
+            <!-- <el-form-item style="width: 140px">
               <el-select placeholder="牧场" v-model="form.farmId" :disabled="farmId > 0">
                 <el-option
                   v-for="item in farmList"
@@ -14,7 +14,7 @@
                   :value="item.value">
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <el-date-picker
                 v-model="form.time"
@@ -67,12 +67,12 @@
               align="center"
               label="当前日期">
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               prop="farmName"
               header-align="center"
               align="center"
               label="牧场">
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               prop="pigstyName"
               header-align="center"
@@ -138,7 +138,7 @@
     data () {
       return {
         form: {
-          farmId: '',
+          // farmId: '',
           time: [],
           warningType: ''
         },
@@ -147,8 +147,8 @@
         pageSize: 10,
         totalPage: 0,
         dataListLoading: false,
-        farmId: undefined,
-        farmList: [], // 牧场List
+        // farmId: undefined,
+        // farmList: [], // 牧场List
         labelPosition: 'right',
         thresholdTypes: [
           {
@@ -176,7 +176,7 @@
     methods: {
       // 获取数据列表
       getDataList () {
-        this.farmId = this.$cookie.get('farmId') === 'null'? undefined: parseInt(this.$cookie.get('farmId'))
+        // this.farmId = this.$cookie.get('farmId') === 'null'? undefined: parseInt(this.$cookie.get('farmId'))
         this.dataListLoading = true
         this.$http({
           url: this.$http.adornUrl('/management/warningInfo/list'),
@@ -184,7 +184,7 @@
           params: this.$http.adornParams({
             'page': this.pageIndex,
             'limit': this.pageSize,
-            'farmId': (this.form.farmId || this.farmId) || undefined,
+            'farmId': parseInt(this.$cookie.get('formFarmId')),
             'startTime': this.form.time[0] || undefined,
             'endTime': this.form.time[1] || undefined,
             'belongTo': 2,
@@ -200,23 +200,23 @@
             this.totalPage = 0
             this.$message.error(data.msg)
           }
-          // 获取所有牧场
-          this.farmList = []
-          let farmList = []
-          let farmResult = await this.$http({
-            url: this.$http.adornUrl("/management/farm/findAll"),
-            method: "get",
-            params: this.$http.adornParams({})
-          })
-          farmResult.data.all && (farmList = farmResult.data.all)
-          farmList.forEach(farm => {
-            let item = {
-              label: farm.name,
-              value: farm.id
-            }
-            this.farmList.push(item)
-          })
-          this.form.farmId = (this.form.farmId || this.farmId) || undefined
+          // // 获取所有牧场
+          // this.farmList = []
+          // let farmList = []
+          // let farmResult = await this.$http({
+          //   url: this.$http.adornUrl("/management/farm/findAll"),
+          //   method: "get",
+          //   params: this.$http.adornParams({})
+          // })
+          // farmResult.data.all && (farmList = farmResult.data.all)
+          // farmList.forEach(farm => {
+          //   let item = {
+          //     label: farm.name,
+          //     value: farm.id
+          //   }
+          //   this.farmList.push(item)
+          // })
+          // this.form.farmId = (this.form.farmId || this.farmId) || undefined
           this.dataListLoading = false
         })
       },
@@ -237,7 +237,7 @@
       },
       // form表单清空，单元SelectedList 和 栏期SelectedList重置
       clearAll () {
-        this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
+        // this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
         this.form.time = []
         this.form.warningType = ''
       },

src/views/modules/alarm/temp.vue

@@ -19,15 +19,25 @@
               </el-select>
             </el-form-item> -->
             <el-form-item style="width: 140px">
-              <el-select placeholder="猪舍" v-model="form.pigstyId" @change="pigstyChange">
+              <el-select placeholder="猪舍" v-model="form.pigstyId">
                 <el-option
-                  v-for="item in pigstySelectedList"
+                  v-for="item in pigstyList"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
+            <el-form-item style="width: 140px">
+              <el-select placeholder="单元" v-model="form.unitId">
+                <el-option
+                  v-for="item in unitList"
+                  :key="item.id"
+                  :label="item.number"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item>
               <el-date-picker
                 v-model="form.time"
@@ -93,6 +103,12 @@
               label="牧场">
             </el-table-column> -->
             <el-table-column
+              prop="unitName"
+              header-align="center"
+              align="center"
+              label="猪舍">
+            </el-table-column>
+            <el-table-column
               prop="pigstyName"
               header-align="center"
               align="center"
@@ -157,7 +173,7 @@
     data () {
       return {
         form: {
-          farmId: '',
+          // farmId: '',
           pigstyId: '',
           time: [],
           warningType: '',
@@ -168,10 +184,11 @@
         pageSize: 10,
         totalPage: 0,
         dataListLoading: false,
-        farmId: undefined,
-        farmList: [], // 牧场List
+        // farmId: undefined,
+        // farmList: [], // 牧场List
         pigstyList: [], // 猪舍List
-        pigstySelectedList: [], // 根据牧场限制的猪舍SelectedList
+        unitList: [], // 单元List
+        // pigstySelectedList: [], // 根据牧场限制的猪舍SelectedList
         labelPosition: 'right',
         thresholdTypes: [
           {
@@ -188,10 +205,10 @@
           }
         ],
         verifyVisible: false, // 弹窗是否显示
-        pigsty: {
-          farmId: '',
-          pigstyId: ''
-        }
+        // pigsty: {
+        //   farmId: '',
+        //   pigstyId: ''
+        // }
       }
     },
     activated () {
@@ -211,8 +228,8 @@
           params: this.$http.adornParams({
             'page': this.pageIndex,
             'limit': this.pageSize,
-            'farmId': (this.form.farmId || this.farmId) || undefined,
-            'pigstyId': this.pigstyId || undefined,
+            'farmId': parseInt(this.$cookie.get('formFarmId')),
+            'pigstyId': this.form.pigstyId,
             'startTime': this.form.time[0] || undefined,
             'endTime': this.form.time[1] || undefined,
             'belongTo': 3,
@@ -229,23 +246,23 @@
             this.totalPage = 0
             this.$message.error(data.msg)
           }
-          // 获取所有牧场
-          this.farmList = []
-          let farmList = []
-          let farmResult = await this.$http({
-            url: this.$http.adornUrl("/management/farm/findAll"),
-            method: "get",
-            params: this.$http.adornParams({})
-          })
-          farmResult.data.all && (farmList = farmResult.data.all)
-          farmList.forEach(farm => {
-            let item = {
-              label: farm.name,
-              value: farm.id
-            }
-            this.farmList.push(item)
-          })
-          // 栋舍List
+          // // 获取所有牧场
+          // this.farmList = []
+          // let farmList = []
+          // let farmResult = await this.$http({
+          //   url: this.$http.adornUrl("/management/farm/findAll"),
+          //   method: "get",
+          //   params: this.$http.adornParams({})
+          // })
+          // farmResult.data.all && (farmList = farmResult.data.all)
+          // farmList.forEach(farm => {
+          //   let item = {
+          //     label: farm.name,
+          //     value: farm.id
+          //   }
+          //   this.farmList.push(item)
+          // })
+          // 猪舍List
           this.pigstyList = []
           let pigstyList = []
           let pigstyR = await this.$http({
@@ -258,12 +275,20 @@
             let item = {
               value: pigsty.id,
               label: pigsty.number,
-              farmId: pigsty.farmId
+              // farmId: pigsty.farmId
             }
             this.pigstyList.push(item)
           })
-          this.pigstySelectedList = this.pigstyList
-          this.form.farmId = (this.form.farmId || this.farmId) || undefined
+          // 单元List
+          this.unitList = []
+          let unitR = await this.$http({
+            url: this.$http.adornUrl("/management/unit/findAll"),
+            method: "get",
+            params: this.$http.adornParams({})
+          })
+          unitR.data.all && (this.unitList = unitR.data.all)
+          // this.pigstySelectedList = this.pigstyList
+          // this.form.farmId = (this.form.farmId || this.farmId) || undefined
           this.dataListLoading = false
         })
       },
@@ -272,26 +297,26 @@
         this.abnormalStatus = !this.abnormalStatus
         this.getDataList()
       },
-      // 根据牧场选择限制猪舍
-      farmChange (val) {
-        this.pigstySelectedList = this.pigstyList.filter(item => item.farmId === val)
-        if (this.pigsty.farmId === val) {
-          return
-        }
-        this.form.pigstyId = ''
-      },
-      // 根据猪舍选择确定牧场
-      pigstyChange (val) {
-        for (let pigsty of this.pigstyList) {
-          if (pigsty.value === val) {
-            this.form.farmId = pigsty.farmId
-            this.pigsty.farmId = pigsty.farmId
-            this.pigsty.pigstyId = val
-            break
-          }
-        }
-        this.farmChange(this.form.farmId)
-      },
+      // // 根据牧场选择限制猪舍
+      // farmChange (val) {
+      //   this.pigstySelectedList = this.pigstyList.filter(item => item.farmId === val)
+      //   if (this.pigsty.farmId === val) {
+      //     return
+      //   }
+      //   this.form.pigstyId = ''
+      // },
+      // // 根据猪舍选择确定牧场
+      // pigstyChange (val) {
+      //   for (let pigsty of this.pigstyList) {
+      //     if (pigsty.value === val) {
+      //       this.form.farmId = pigsty.farmId
+      //       this.pigsty.farmId = pigsty.farmId
+      //       this.pigsty.pigstyId = val
+      //       break
+      //     }
+      //   }
+      //   this.farmChange(this.form.farmId)
+      // },
       // 获取起始与结束时间
       timeChange (val) {
         let start = new Date(val[0])
@@ -304,12 +329,12 @@
       },
       // form表单清空，单元SelectedList 和 栏期SelectedList重置
       clearAll () {
-        this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
+        // this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
         this.form.pigstyId = ''
         this.form.time = []
         this.form.warningType = ''
         this.form.earTag = ''
-        this.pigstySelectedList = this.pigstyList
+        // this.pigstySelectedList = this.pigstyList
       },
       // 确认处理
       verifyHandle (id) {

src/views/modules/alarm/water.vue

@@ -5,7 +5,7 @@
       <el-header>
         <div class="rect rect-form">
           <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
-            <el-form-item style="width: 140px">
+            <!-- <el-form-item style="width: 140px">
               <el-select placeholder="牧场" v-model="form.farmId" :disabled="farmId > 0" @change="farmChange">
                 <el-option
                   v-for="item in farmList"
@@ -14,11 +14,11 @@
                   :value="item.value">
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item style="width: 140px">
-              <el-select placeholder="猪舍" v-model="form.pigstyId" @change="pigstyChange">
+              <el-select placeholder="猪舍" v-model="form.pigstyId">
                 <el-option
-                  v-for="item in pigstySelectedList"
+                  v-for="item in pigstyList"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value">
@@ -77,12 +77,12 @@
               align="center"
               label="当前日期">
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               prop="farmName"
               header-align="center"
               align="center"
               label="牧场">
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               prop="pigstyName"
               header-align="center"
@@ -148,7 +148,7 @@
     data () {
       return {
         form: {
-          farmId: '',
+          // farmId: '',
           pigstyId: '',
           time: [],
           warningType: ''
@@ -158,10 +158,10 @@
         pageSize: 10,
         totalPage: 0,
         dataListLoading: false,
-        farmId: undefined,
-        farmList: [], // 牧场List
+        // farmId: undefined,
+        // farmList: [], // 牧场List
         pigstyList: [], // 猪舍List
-        pigstySelectedList: [], // 根据牧场限制的猪舍SelectedList
+        // pigstySelectedList: [], // 根据牧场限制的猪舍SelectedList
         labelPosition: 'right',
         thresholdTypes: [
           {
@@ -178,10 +178,10 @@
           }
         ],
         verifyVisible: false, // 弹窗是否显示
-        pigsty: {
-          farmId: '',
-          pigstyId: ''
-        }
+        // pigsty: {
+        //   farmId: '',
+        //   pigstyId: ''
+        // }
       }
     },
     activated () {
@@ -193,7 +193,7 @@
     methods: {
       // 获取数据列表
       getDataList () {
-        this.farmId = this.$cookie.get('farmId') === 'null'? undefined: parseInt(this.$cookie.get('farmId'))
+        // this.farmId = this.$cookie.get('farmId') === 'null'? undefined: parseInt(this.$cookie.get('farmId'))
         this.dataListLoading = true
         this.$http({
           url: this.$http.adornUrl('/management/warningInfo/list'),
@@ -201,8 +201,8 @@
           params: this.$http.adornParams({
             'page': this.pageIndex,
             'limit': this.pageSize,
-            'farmId': (this.form.farmId || this.farmId) || undefined,
-            'pigstyId': this.pigstyId || undefined,
+            'farmId': parseInt(this.$cookie.get('formFarmId')),
+            'pigstyId': this.form.pigstyId || undefined,
             'startTime': this.form.time[0] || undefined,
             'endTime': this.form.time[1] || undefined,
             'belongTo': 4,
@@ -218,22 +218,22 @@
             this.totalPage = 0
             this.$message.error(data.msg)
           }
-          // 获取所有牧场
-          this.farmList = []
-          let farmList = []
-          let farmResult = await this.$http({
-            url: this.$http.adornUrl("/management/farm/findAll"),
-            method: "get",
-            params: this.$http.adornParams({})
-          })
-          farmResult.data.all && (farmList = farmResult.data.all)
-          farmList.forEach(farm => {
-            let item = {
-              label: farm.name,
-              value: farm.id
-            }
-            this.farmList.push(item)
-          })
+          // // 获取所有牧场
+          // this.farmList = []
+          // let farmList = []
+          // let farmResult = await this.$http({
+          //   url: this.$http.adornUrl("/management/farm/findAll"),
+          //   method: "get",
+          //   params: this.$http.adornParams({})
+          // })
+          // farmResult.data.all && (farmList = farmResult.data.all)
+          // farmList.forEach(farm => {
+          //   let item = {
+          //     label: farm.name,
+          //     value: farm.id
+          //   }
+          //   this.farmList.push(item)
+          // })
           // 栋舍List
           this.pigstyList = []
           let pigstyList = []
@@ -247,12 +247,12 @@
             let item = {
               value: pigsty.id,
               label: pigsty.number,
-              farmId: pigsty.farmId
+              // farmId: pigsty.farmId
             }
             this.pigstyList.push(item)
           })
-          this.pigstySelectedList = this.pigstyList
-          this.form.farmId = (this.form.farmId || this.farmId) || undefined
+          // this.pigstySelectedList = this.pigstyList
+          // this.form.farmId = (this.form.farmId || this.farmId) || undefined
           this.dataListLoading = false
         })
       },
@@ -261,26 +261,26 @@
         this.abnormalStatus = !this.abnormalStatus
         this.getDataList()
       },
-      // 根据牧场选择限制猪舍
-      farmChange (val) {
-        this.pigstySelectedList = this.pigstyList.filter(item => item.farmId === val)
-        if (this.pigsty.farmId === val) {
-          return
-        }
-        this.form.pigstyId = ''
-      },
-      // 根据猪舍选择确定牧场
-      pigstyChange (val) {
-        for (let pigsty of this.pigstyList) {
-          if (pigsty.value === val) {
-            this.form.farmId = pigsty.farmId
-            this.pigsty.farmId = pigsty.farmId
-            this.pigsty.pigstyId = val
-            break
-          }
-        }
-        this.farmChange(this.form.farmId)
-      },
+      // // 根据牧场选择限制猪舍
+      // farmChange (val) {
+      //   this.pigstySelectedList = this.pigstyList.filter(item => item.farmId === val)
+      //   if (this.pigsty.farmId === val) {
+      //     return
+      //   }
+      //   this.form.pigstyId = ''
+      // },
+      // // 根据猪舍选择确定牧场
+      // pigstyChange (val) {
+      //   for (let pigsty of this.pigstyList) {
+      //     if (pigsty.value === val) {
+      //       this.form.farmId = pigsty.farmId
+      //       this.pigsty.farmId = pigsty.farmId
+      //       this.pigsty.pigstyId = val
+      //       break
+      //     }
+      //   }
+      //   this.farmChange(this.form.farmId)
+      // },
       // 获取起始与结束时间
       timeChange (val) {
         let start = new Date(val[0])
@@ -293,13 +293,13 @@
       },
       // form表单清空，单元SelectedList 和 栏期SelectedList重置
       clearAll () {
-        this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
+        // this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
         this.form.pigstyId = ''
         this.form.time = []
         this.form.warningType = ''
-        this.pigstySelectedList = this.pigstyList
-        console.log(this.$cookie.get('farmId'));
-        console.log(this.form.id);
+        // this.pigstySelectedList = this.pigstyList
+        // console.log(this.$cookie.get('farmId'));
+        // console.log(this.form.id);
       },
       // 确认处理
       verifyHandle (id) {

src/views/modules/breed/btrecord.vue

@@ -0,0 +1,356 @@
+<template>
+  <div class="mod-role">
+    <el-container>
+      <!-- form表单 -->
+      <el-header>
+        <div class="rect rect-form">
+          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+            <el-form-item>
+              <el-input v-model="form.earTag" placeholder="耳标" clearable></el-input>
+            </el-form-item>
+            <el-form-item style="width: 140px">
+              <el-select placeholder="转出猪舍" v-model="form.oldPigstyId" @change="pigstyChange('old')">
+                <el-option
+                  v-for="item in pigstyList"
+                  :key="item.id"
+                  :label="item.number"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item style="width: 140px">
+              <el-select 
+                placeholder="转出单元" 
+                v-model="form.oldUnitId" 
+                @focus="unitFocus('old')"
+                ref="oldUnitId">
+                <el-option
+                  v-for="item in oldUnitSelectedList"
+                  :key="item.id"
+                  :label="item.number"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item style="width: 140px">
+              <el-select placeholder="转入猪舍" v-model="form.newPigstyId" @change="pigstyChange('new')">
+                <el-option
+                  v-for="item in pigstyList"
+                  :key="item.id"
+                  :label="item.number"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item style="width: 140px">
+              <el-select 
+                placeholder="转入单元" 
+                v-model="form.newUnitId" 
+                @focus="unitFocus('new')"
+                ref="newUnitId">
+                <el-option
+                  v-for="item in newUnitSelectedList"
+                  :key="item.id"
+                  :label="item.number"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button 
+                @click="getDataList()" 
+                icon="el-icon-search">
+                查 询
+              </el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-button 
+                icon="el-icon-circle-close"
+                @click="clearAll">
+                清 空
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-header>
+      <!-- role表格 -->
+      <el-main>
+        <div class="rect rect-table">
+          <el-table
+            :data="dataList"
+            border
+            stripe
+            v-loading="dataListLoading"
+            style="width: 100%;"
+            size="mini"
+            height="578"
+            :header-cell-style="{background:'rgb(245,245,245)',color:'#000',height: '45px',fontSize: '13px',fontWeight: 'normal',borderBottom: '1px solid #ccc'}" 
+            :cell-style="{color: '#888',fontSize: '13px'}">
+            <el-table-column
+              prop="earTag"
+              header-align="center"
+              align="center"
+              label="耳标">
+            </el-table-column>
+            <el-table-column
+              prop="newPeriodName"
+              header-align="center"
+              align="center"
+              label="转入栏期">
+            </el-table-column>
+            <el-table-column
+              prop="newUnitName"
+              header-align="center"
+              align="center"
+              label="转入单元">
+            </el-table-column>
+            <el-table-column
+              prop="newPigstyName"
+              header-align="center"
+              align="center"
+              label="转入猪舍">
+            </el-table-column>
+            <el-table-column
+              prop="oldPeriodName"
+              header-align="center"
+              align="center"
+              label="转出栏期">
+            </el-table-column>
+            <el-table-column
+              prop="oldUnitName"
+              header-align="center"
+              align="center"
+              label="转出单元">
+            </el-table-column>
+            <el-table-column
+              prop="oldPigstyName"
+              header-align="center"
+              align="center"
+              label="转出猪舍">
+            </el-table-column>
+            <el-table-column
+              prop="operatorUsername"
+              header-align="center"
+              align="center"
+              label="操作人员">
+            </el-table-column>
+          </el-table>
+          <el-pagination
+            @size-change="sizeChangeHandle"
+            @current-change="currentChangeHandle"
+            :current-page="pageIndex"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="pageSize"
+            :total="totalPage"
+            layout="total, sizes, prev, pager, next, jumper">
+          </el-pagination>
+        </div>
+      </el-main>
+    </el-container>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        form: {
+          earTag: '',
+          oldPigstyId: '',
+          newPigstyId: '',
+          oldUnitId: '',
+          newUnitId: ''
+        },
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false,
+        pigstyList: [], // 猪舍List
+        unitList: [], // 单元List
+        oldUnitSelectedList: [], // 猪舍选择后的单元List
+        newUnitSelectedList: [], // 猪舍选择后的单元List
+        labelPosition: 'right',
+        abnormalStatus: false,
+        pigsty: {
+          farmId: '',
+          pigstyId: ''
+        }
+      }
+    },
+    activated () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/management/transferPeriodLog/list'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'page': this.pageIndex,
+            'limit': this.pageSize,
+            'earTag': this.form.earTag || undefined,
+            'oldPigstyId': this.form.oldPigstyId || undefined,
+            'newstyId': this.form.newPigstyId || undefined,
+            'oldUnitId': this.form.oldUnitId || undefined,
+            'newUnitId': this.form.newUnitId || undefined
+          })
+        }).then(async({data}) => {
+          if (data && data.code === 0) {
+            this.dataList = data.page.list
+            this.totalPage = data.page.totalCount
+          } else {
+            this.dataList = []
+            this.totalPage = 0
+            this.$message.error(data.msg)
+          }
+          // 猪舍List
+          this.pigstyList = []
+          let pigstyR = await this.$http({
+            url: this.$http.adornUrl("/management/pigsty/findAll"),
+            method: "get",
+            params: this.$http.adornParams({})
+          })
+          pigstyR.data.all && (this.pigstyList = pigstyR.data.all)
+          // 单元List
+          this.unitList = []
+          let unitR = await this.$http({
+            url: this.$http.adornUrl("/management/unit/findAll"),
+            method: "get",
+            params: this.$http.adornParams()
+          })
+          if (unitR.data.all) {
+            this.unitList = unitR.data.all
+          }
+          this.form.oldPigstyId? this.oldUnitSelectedList = this.unitList.filter(item => item.pigstyId === this.form.oldPigstyId): this.oldUnitSelectedList = this.unitList
+          this.form.newPigstyId? this.newUnitSelectedList = this.unitList.filter(item => item.pigstyId === this.form.newPigstyId): this.newUnitSelectedList = this.unitList
+          // 加载完毕
+          this.dataListLoading = false
+        })
+      },
+      // pigsty的选择
+      pigstyChange (val) {
+        let unit = val + 'UnitSelectedList'
+        this[unit] = this.unitList.filter(item => item.pigstyId === this.form[val + 'PigstyId'])
+      },
+      // unit的选择
+      unitFocus (val) {
+        let pigsty = val + 'PigstyId'
+        let unit = val + 'UnitId'
+        const message = {
+          old: '请先选择转出猪舍',
+          new: '请先选择转入猪舍'
+        }
+        console.log(pigsty);
+        console.log(this.form[pigsty]);
+        if (!this.form[pigsty]) {
+          this.$message.error(message[val])
+          this.form[unit] = ''
+          setTimeout(() => {
+            this.$refs[unit].blur()
+          }, 10)
+        }
+      },
+      // 获取起始与结束时间
+      timeChange (val) {
+        let start = new Date(val[0])
+        let end = new Date(val[1])
+        let now = new Date()
+        if (start > now || end > now) {
+          this.form.time = []
+          this.$message.error('请勿选择超出现在的时刻')
+        }
+      },
+      // form表单清空，单元SelectedList 和 栏期SelectedList重置
+      clearAll () {
+        for (let key in this.form) {
+          this.form[key] = ''
+        }
+        this.oldUnitSelectedList = this.unitList
+        this.newUnitSelectedList = this.unitList
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      }
+    },
+    watch: {
+      'form.oldPigstyId': {
+        handler (newValue, oldValue) {
+          if (oldValue) {
+            this.form.oldUnitId = ''
+          }
+        }
+      },
+      'form.newPigstyId': {
+        handler (newValue, oldValue) {
+          if (oldValue) {
+            this.form.newUnitId = ''
+          }
+        }
+      }
+    }
+  }
+</script>
+<style scoped>
+.rect {
+  background-color: #fff;
+  padding: 30px 15px;
+  border-radius: 5px;
+  border: 1px solid #e8e8e8;
+}
+.rect-form {
+  padding-bottom: 10px;
+}
+.rect-table {
+  margin-top: 20px;
+}
+.demo-table-expand {
+  font-size: 0;
+  margin-left: 40px;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 80%;
+}
+.el-table .height {
+  background: rgba(254, 254, 254, 0.5);
+}
+/deep/ .el-table--mini td, .el-table--mini th {
+  padding: 3px 0 !important;
+  height: 20px !important;
+}
+/deep/ .el-checkbox__input.is-checked+.el-checkbox__label {
+  color: rgb(24,144,255);
+  background-color: rgb(24,144,255);
+  border-color: rgb(24,144,255);
+}
+/deep/.el-table .el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: rgb(24,144,255);
+  border-color: rgb(24,144,255);
+}
+/deep/.el-table .el-checkbox__inner:hover {
+  border-color: rgb(24,144,255);
+}
+/deep/.el-table .el-checkbox__input.is-focus .el-checkbox__inner {
+  border-color: rgb(24,144,255);
+}
+/deep/.el-table #select .cell .el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: rgb(24,144,255);
+  border-color: rgb(24,144,255);
+}
+</style>

src/views/modules/envir/ealarm-add-or-update.vue

@@ -12,7 +12,7 @@
       label-width="80px" 
       size="mini"
       style="margin-left: 20px;width: 500px">
-      <el-form-item label="牧场名称" prop="farmId">
+      <!-- <el-form-item label="牧场名称" prop="farmId">
         <el-select v-model="dataForm.farmId" :disabled="farmId > 0" style="width: 100%">
           <el-option
             v-for="item in farmList"
@@ -21,7 +21,7 @@
             :value="item.value">
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="参数名称" prop="thresholdType">
         <!-- <el-input v-model.number="dataForm.thresholdType" placeholder="请输入数字"></el-input> -->
         <el-select v-model="dataForm.thresholdType" style="width: 100%">
@@ -49,27 +49,27 @@
   export default {
     props: ["thresholdTypes"],
     data () {
-      var validateEmail = (rule, value, callback) => {
-        // if (!isEmail(value)) {
-        //   callback(new Error('邮箱格式错误'))
-        // } else {
-        //   callback()
-        // }
-        if (value === '') {
-          callback()
-        } else if (!isEmail(value)) {
-          callback(new Error('邮箱格式错误'))
-        } else {
-          callback()
-        }
-      }
-      var validateMobile = (rule, value, callback) => {
-        if (!isMobile(value)) {
-          callback(new Error('手机号格式错误'))
-        } else {
-          callback()
-        }
-      }
+      // var validateEmail = (rule, value, callback) => {
+      //   // if (!isEmail(value)) {
+      //   //   callback(new Error('邮箱格式错误'))
+      //   // } else {
+      //   //   callback()
+      //   // }
+      //   if (value === '') {
+      //     callback()
+      //   } else if (!isEmail(value)) {
+      //     callback(new Error('邮箱格式错误'))
+      //   } else {
+      //     callback()
+      //   }
+      // }
+      // var validateMobile = (rule, value, callback) => {
+      //   if (!isMobile(value)) {
+      //     callback(new Error('手机号格式错误'))
+      //   } else {
+      //     callback()
+      //   }
+      // }
       return {
         visible: false,
         dataForm: {
@@ -77,12 +77,12 @@
           thresholdName: '',
           thresholdType: '',
           thresholdValue: '',
-          farmId: ''
+          // farmId: ''
         },
         dataRule: {
-          farmId: [
-            { required: true, message: '牧场名称不能为空', trigger: 'blur' }
-          ],
+          // farmId: [
+          //   { required: true, message: '牧场名称不能为空', trigger: 'blur' }
+          // ],
           thresholdType: [
             { required: true, message: '参数名称不能为空', trigger: 'blur' }
           ],
@@ -90,53 +90,52 @@
             { required: true, message: '参数阈值不能为空', trigger: 'blur' }
           ]
         },
-        farmList: [], // 牧场List
-        farmId: undefined
+        // farmList: [], // 牧场List
+        // farmId: undefined
       }
     },
     methods: {
       // 在ealarm.vue调用该方法
       init (id) {
-        this.farmId = this.$cookie.get('farmId') === 'null'? undefined: parseInt(this.$cookie.get('farmId'))
+        // this.farmId = this.$cookie.get('farmId') === 'null'? undefined: parseInt(this.$cookie.get('farmId'))
         this.visible = true
         this.$nextTick(() => {
           this.$refs['dataForm'].resetFields()
-          this.dataForm.farmId = (this.dataForm.farmId || this.farmId) || undefined
+          // this.dataForm.farmId = (this.dataForm.farmId || this.farmId) || undefined
         })
         this.dataForm.id = id || undefined
         if (this.dataForm.id) {
-          console.log(this.dataForm.id);
           this.$http({
             url: this.$http.adornUrl(`/management/thresholdManagement/info/${this.dataForm.id}`),
             method: 'get',
             params: this.$http.adornParams()
           }).then(({data}) => {
             if (data && data.code === 0) {
-              console.log(data)
+              // console.log(data)
               this.dataForm.thresholdType = data.thresholdManagement.thresholdType
               this.dataForm.thresholdValue = data.thresholdManagement.thresholdValue
-              this.dataForm.farmId = data.thresholdManagement.farmId
+              // this.dataForm.farmId = data.thresholdManagement.farmId
             }
           })
         }
-        // 获取所有牧场
-        this.farmList = []
-        let farmList = []
-        this.$http({
-          url: this.$http.adornUrl("/management/farm/findAll"),
-          method: "post",
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            farmList = data.all
-            farmList.forEach(farm => {
-              let item = {
-                label: farm.name,
-                value: farm.id
-              }
-              this.farmList.push(item)
-            })
-          }
-        })
+        // // 获取所有牧场
+        // this.farmList = []
+        // let farmList = []
+        // this.$http({
+        //   url: this.$http.adornUrl("/management/farm/findAll"),
+        //   method: "post",
+        // }).then(({data}) => {
+        //   if (data && data.code === 0) {
+        //     farmList = data.all
+        //     farmList.forEach(farm => {
+        //       let item = {
+        //         label: farm.name,
+        //         value: farm.id
+        //       }
+        //       this.farmList.push(item)
+        //     })
+        //   }
+        // })
       },
       // 表单提交
       dataFormSubmit () {
@@ -161,7 +160,7 @@
                 'id': this.dataForm.id || undefined,
                 'thresholdType': this.dataForm.thresholdType,
                 'thresholdValue': this.dataForm.thresholdValue,
-                'farmId': this.dataForm.farmId,
+                'farmId': parseInt(this.$cookie.get('formFarmId')),
                 'belongTo': belong[this.dataForm.thresholdType.toString()]
               })
             }).then(({data}) => {

src/views/modules/envir/ealarm.vue

@@ -5,7 +5,7 @@
       <el-header>
         <div class="rect rect-form">
           <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
-            <el-form-item style="width: 140px">
+            <!-- <el-form-item style="width: 140px">
               <el-select placeholder="牧场" v-model="form.farmId" :disabled="farmId > 0">
                 <el-option
                   v-for="item in farmList"
@@ -14,9 +14,9 @@
                   :value="item.value">
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item style="width: 140px">
-              <el-select placeholder="参数名称" v-model="form.thresholdType" :disabled="farmId > 0">
+              <el-select placeholder="参数名称" v-model="form.thresholdType">
                 <el-option
                   v-for="item in thresholdTypes"
                   :key="item.value"
@@ -148,7 +148,7 @@
       return {
         form: {
           thresholdType: '',
-          farmId: ''
+          // farmId: ''
         },
         dataList: [],
         pageIndex: 1,
@@ -157,8 +157,8 @@
         dataListLoading: false,
         dataListSelections: [],
         addOrUpdateVisible: false,
-        farmId: undefined,
-        farmList: [], // 牧场List
+        // farmId: undefined,
+        // farmList: [], // 牧场List
         labelPosition: 'right',
         thresholdTypes: [
           {
@@ -213,7 +213,7 @@
     methods: {
       // 获取数据列表
       getDataList () {
-        this.farmId = this.$cookie.get('farmId') === 'null'? undefined: parseInt(this.$cookie.get('farmId'))
+        // this.farmId = this.$cookie.get('farmId') === 'null'? undefined: parseInt(this.$cookie.get('farmId'))
         this.dataListLoading = true
         this.$http({
           url: this.$http.adornUrl('/management/thresholdManagement/list'),
@@ -222,25 +222,25 @@
             'page': this.pageIndex,
             'limit': this.pageSize,
             'thresholdType': this.form.thresholdType,
-            'farmId': (this.form.farmId || this.farmId) || undefined
+            'farmId': parseInt(this.$cookie.get('formFarmId'))
           })
         }).then(async({data}) => {
           // 获取所有牧场
-          this.farmList = []
-          let farmList = []
-          let farmResult = await this.$http({
-            url: this.$http.adornUrl("/management/farm/findAll"),
-            method: "get",
-            params: this.$http.adornParams({})
-          })
-          farmResult.data.all && (farmList = farmResult.data.all)
-          farmList.forEach(farm => {
-            let item = {
-              label: farm.name,
-              value: farm.id
-            }
-            this.farmList.push(item)
-          })
+          // this.farmList = []
+          // let farmList = []
+          // let farmResult = await this.$http({
+          //   url: this.$http.adornUrl("/management/farm/findAll"),
+          //   method: "get",
+          //   params: this.$http.adornParams({})
+          // })
+          // farmResult.data.all && (farmList = farmResult.data.all)
+          // farmList.forEach(farm => {
+          //   let item = {
+          //     label: farm.name,
+          //     value: farm.id
+          //   }
+          //   this.farmList.push(item)
+          // })
           // 获取报警List
           if (data && data.code === 0) {
             this.dataList = data.page.list
@@ -250,16 +250,13 @@
             this.totalPage = 0
             this.$message.error(data.msg)
           }
-          this.form.farmId = (this.form.farmId || this.farmId) || undefined
+          // this.form.farmId = (this.form.farmId || this.farmId) || undefined
           this.dataListLoading = false
         })
       },
       // form表单清空，单元SelectedList 和 栏期SelectedList重置
       clearAll () {
-        this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
-        if (!this.farmId) {
-          this.form.farmId = ''
-        }
+        this.form.thresholdType = ''
       },
       // 每页数
       sizeChangeHandle (val) {

src/views/modules/envir/eindoor.vue

@@ -124,7 +124,7 @@
     data () {
       return {
         form: {
-          farmId: '',
+          // farmId: '',
           pigstyId: '',
           time: []
         },
@@ -133,14 +133,14 @@
         pageSize: 10,
         totalPage: 0,
         dataListLoading: false,
-        farmId: undefined,
+        // farmId: undefined,
         pigstyList: [], // 猪舍List
         labelPosition: 'right',
         abnormalStatus: false,
-        pigsty: {
-          farmId: '',
-          pigstyId: ''
-        }
+        // pigsty: {
+        //   farmId: '',
+        //   pigstyId: ''
+        // }
       }
     },
     activated () {
@@ -149,9 +149,10 @@
     methods: {
       // 获取数据列表
       getDataList () {
+        // TODO: 真的没有做啊
         // FIXME: 对猪舍没有查询
-        this.farmId = parseInt(this.$cookie.get('formFarmId'))
-        this.form.farmId = parseInt(this.$cookie.get('formFarmId'))
+        // this.farmId = parseInt(this.$cookie.get('formFarmId'))
+        // this.form.farmId = parseInt(this.$cookie.get('formFarmId'))
         this.dataListLoading = true
         this.$http({
           url: this.$http.adornUrl('/management/indoorEnvironment/list'),
@@ -160,7 +161,8 @@
             'page': this.pageIndex,
             'limit': this.pageSize,
             'abnormalStatus': this.abnormalStatus,
-            'farmId': (this.form.farmId || this.farmId) || undefined,
+            'pigstyId': this.form.pigstyId || undefined,
+            'farmId': parseInt(this.$cookie.get('formFarmId')),
             'startTime': this.form.time[0] || undefined,
             'endTime': this.form.time[1] || undefined
           })
@@ -190,7 +192,6 @@
             }
             this.pigstyList.push(item)
           })
-          console.log(this.pigstyList);
           this.dataListLoading = false
         })
       },
@@ -211,10 +212,10 @@
       },
       // form表单清空，单元SelectedList 和 栏期SelectedList重置
       clearAll () {
-        this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
+        // this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
         this.form.pigstyId = ''
         this.form.time = []
-        this.pigstySelectedList = this.pigstyList
+        // this.pigstySelectedList = this.pigstyList
       },
       // 每页数
       sizeChangeHandle (val) {

src/views/modules/envir/emeteo.vue

@@ -11,7 +11,7 @@
             <el-form-item style="width: 100px">
               <el-button type="warning" :disabled="abnormalStatus===true" @click="changeClick">异常</el-button>
             </el-form-item>
-            <el-form-item style="width: 140px">
+            <!-- <el-form-item style="width: 140px">
               <el-select placeholder="牧场" v-model="form.farmId" :disabled="farmId > 0">
                 <el-option
                   v-for="item in farmList"
@@ -20,7 +20,7 @@
                   :value="item.value">
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <el-date-picker
                 v-model="form.time"
@@ -63,12 +63,12 @@
               align="center"
               label="当前日期">
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               prop="farmName"
               header-align="center"
               align="center"
               label="牧场">
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               header-align="center"
               align="center"
@@ -118,7 +118,7 @@
     data () {
       return {
         form: {
-          farmId: '',
+          // farmId: '',
           time: []
         },
         dataList: [],
@@ -126,7 +126,7 @@
         pageSize: 10,
         totalPage: 0,
         dataListLoading: false,
-        farmId: undefined,
+        // farmId: undefined,
         farmList: [], // 牧场List
         labelPosition: 'right',
         abnormalStatus: false
@@ -138,7 +138,7 @@
     methods: {
       // 获取数据列表
       getDataList () {
-        this.farmId = this.$cookie.get('farmId') === 'null'? undefined: parseInt(this.$cookie.get('farmId'))
+        // this.farmId = this.$cookie.get('farmId') === 'null'? undefined: parseInt(this.$cookie.get('farmId'))
         this.dataListLoading = true
         this.$http({
           url: this.$http.adornUrl('/management/outdoorEnvironment/list'),
@@ -147,7 +147,7 @@
             'page': this.pageIndex,
             'limit': this.pageSize,
             'abnormalStatus': this.abnormalStatus,
-            'farmId': (this.form.farmId || this.farmId) || undefined,
+            // 'farmId': (this.form.farmId || this.farmId) || undefined,
             'startTime': this.form.time[0] || undefined,
             'endTime': this.form.time[1] || undefined
           })
@@ -160,23 +160,23 @@
             this.totalPage = 0
             this.$message.error(data.msg)
           }
-          // 获取所有牧场
-          this.farmList = []
-          let farmList = []
-          let farmResult = await this.$http({
-            url: this.$http.adornUrl("/management/farm/findAll"),
-            method: "get",
-            params: this.$http.adornParams({})
-          })
-          farmResult.data.all && (farmList = farmResult.data.all)
-          farmList.forEach(farm => {
-            let item = {
-              label: farm.name,
-              value: farm.id
-            }
-            this.farmList.push(item)
-          })
-          this.form.farmId = (this.form.farmId || this.farmId) || undefined
+          // // 获取所有牧场
+          // this.farmList = []
+          // let farmList = []
+          // let farmResult = await this.$http({
+          //   url: this.$http.adornUrl("/management/farm/findAll"),
+          //   method: "get",
+          //   params: this.$http.adornParams({})
+          // })
+          // farmResult.data.all && (farmList = farmResult.data.all)
+          // farmList.forEach(farm => {
+          //   let item = {
+          //     label: farm.name,
+          //     value: farm.id
+          //   }
+          //   this.farmList.push(item)
+          // })
+          // this.form.farmId = (this.form.farmId || this.farmId) || undefined
           this.dataListLoading = false
         })
       },
@@ -197,7 +197,7 @@
       },
       // form表单清空，单元SelectedList 和 栏期SelectedList重置
       clearAll () {
-        this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
+        // this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
         this.form.time = []
       },
       // 每页数

src/views/modules/envir/ewater.vue

@@ -11,7 +11,7 @@
             <el-form-item style="width: 100px">
               <el-button type="warning" :disabled="abnormalStatus===true" @click="changeClick">异常</el-button>
             </el-form-item>
-            <el-form-item style="width: 140px">
+            <!-- <el-form-item style="width: 140px">
               <el-select placeholder="牧场" v-model="form.farmId" :disabled="farmId > 0" @change="farmChange">
                 <el-option
                   v-for="item in farmList"
@@ -20,11 +20,11 @@
                   :value="item.value">
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item style="width: 140px">
-              <el-select placeholder="猪舍" v-model="form.pigstyId" @change="pigstyChange">
+              <el-select placeholder="猪舍" v-model="form.pigstyId">
                 <el-option
-                  v-for="item in pigstySelectedList"
+                  v-for="item in pigstyList"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value">
@@ -73,12 +73,12 @@
               align="center"
               label="当前日期">
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               prop="farmName"
               header-align="center"
               align="center"
               label="牧场">
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               prop="pigstyName"
               header-align="center"
@@ -118,7 +118,7 @@
     data () {
       return {
         form: {
-          farmId: '',
+          // farmId: '',
           pigstyId: '',
           time: []
         },
@@ -127,16 +127,16 @@
         pageSize: 10,
         totalPage: 0,
         dataListLoading: false,
-        farmId: undefined,
-        farmList: [], // 牧场List
+        // farmId: undefined,
+        // farmList: [], // 牧场List
         pigstyList: [], // 猪舍List
-        pigstySelectedList: [], // 根据牧场限制的猪舍SelectedList
+        // pigstySelectedList: [], // 根据牧场限制的猪舍SelectedList
         labelPosition: 'right',
         abnormalStatus: false,
-        pigsty: {
-          farmId: '',
-          pigstyId: ''
-        }
+        // pigsty: {
+        //   farmId: '',
+        //   pigstyId: ''
+        // }
       }
     },
     activated () {
@@ -145,7 +145,7 @@
     methods: {
       // 获取数据列表
       getDataList () {
-        this.farmId = this.$cookie.get('farmId') === 'null'? undefined: parseInt(this.$cookie.get('farmId'))
+        // this.farmId = this.$cookie.get('farmId') === 'null'? undefined: parseInt(this.$cookie.get('farmId'))
         this.dataListLoading = true
         this.$http({
           url: this.$http.adornUrl('/management/drinkingWater/list'),
@@ -154,7 +154,8 @@
             'page': this.pageIndex,
             'limit': this.pageSize,
             'abnormalStatus': this.abnormalStatus,
-            'farmId': (this.form.farmId || this.farmId) || undefined,
+            'farmId': parseInt(this.$cookie.get('formFarmId')),
+            'pigstyId': this.form.pigstyId || undefined,
             'startTime': this.form.time[0] || undefined,
             'endTime': this.form.time[1] || undefined
           })
@@ -197,12 +198,12 @@
             let item = {
               value: pigsty.id,
               label: pigsty.number,
-              farmId: pigsty.farmId
+              // farmId: pigsty.farmId
             }
             this.pigstyList.push(item)
           })
-          this.pigstySelectedList = this.pigstyList
-          this.form.farmId = (this.form.farmId || this.farmId) || undefined
+          // this.pigstySelectedList = this.pigstyList
+          // this.form.farmId = (this.form.farmId || this.farmId) || undefined
           this.dataListLoading = false
         })
       },
@@ -212,25 +213,25 @@
         this.getDataList()
       },
       // 根据牧场选择限制猪舍
-      farmChange (val) {
-        this.pigstySelectedList = this.pigstyList.filter(item => item.farmId === val)
-        if (this.pigsty.farmId === val) {
-          return
-        }
-        this.form.pigstyId = ''
-      },
+      // farmChange (val) {
+      //   this.pigstySelectedList = this.pigstyList.filter(item => item.farmId === val)
+      //   if (this.pigsty.farmId === val) {
+      //     return
+      //   }
+      //   this.form.pigstyId = ''
+      // },
       // 根据猪舍选择确定牧场
-      pigstyChange (val) {
-        for (let pigsty of this.pigstyList) {
-          if (pigsty.value === val) {
-            this.form.farmId = pigsty.farmId
-            this.pigsty.farmId = pigsty.farmId
-            this.pigsty.pigstyId = val
-            break
-          }
-        }
-        this.farmChange(this.form.farmId)
-      },
+      // pigstyChange (val) {
+      //   for (let pigsty of this.pigstyList) {
+      //     if (pigsty.value === val) {
+      //       this.form.farmId = pigsty.farmId
+      //       this.pigsty.farmId = pigsty.farmId
+      //       this.pigsty.pigstyId = val
+      //       break
+      //     }
+      //   }
+      //   this.farmChange(this.form.farmId)
+      // },
       // 获取起始与结束时间
       timeChange (val) {
         let start = new Date(val[0])
@@ -243,10 +244,10 @@
       },
       // form表单清空，单元SelectedList 和 栏期SelectedList重置
       clearAll () {
-        this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
+        // this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
         this.form.pigstyId = ''
         this.form.time = []
-        this.pigstySelectedList = this.pigstyList
+        // this.pigstySelectedList = this.pigstyList
       },
       // 每页数
       sizeChangeHandle (val) {

src/views/modules/health/hdisease.vue

@@ -7,31 +7,31 @@
               :inline="true"
               :model="searchForm"
               size="mini">
-            <el-form-item style="width: 200px">
-              <el-input placeholder="耳标" style="width: 200px" v-model="searchForm.earTag"></el-input>
+            <el-form-item>
+              <el-input placeholder="耳标" v-model="searchForm.earTag"></el-input>
             </el-form-item>
-            <el-form-item label="症 状">
-              <el-select v-model="searchForm.sympotomName">
+            <el-form-item style="width: 140px">
+              <el-select v-model="searchForm.sympotomName" placeholder="症状">
                 <el-option v-for="item in symptomList" :key="item.id" :label="item.sympotomName" :value="item.sympotomName"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="病 因">
-              <el-select v-model="searchForm.causeName">
+            <el-form-item style="width: 140px">
+              <el-select v-model="searchForm.causeName" placeholder="病因">
                 <el-option v-for="item in causeList" :key="item.id" :label="item.causeName" :value="item.causeName"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="疾病名称">
-              <el-select v-model="searchForm.diseaseName">
+            <el-form-item style="width: 140px">
+              <el-select v-model="searchForm.diseaseName" placeholder="疾病名称">
                 <el-option v-for="item in illnesList" :key="item.id" :label="item.idseaseName" :value="item.idseaseName"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="医生姓名">
-              <el-select v-model="searchForm.doctor">
+            <el-form-item style="width: 140px">
+              <el-select v-model="searchForm.doctor" placeholder="医生">
                 <el-option v-for="item in manList" :key="item.id" :label="item.name" :value="item.name"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="治疗方案">
-              <el-select v-model="searchForm.treatmentPlan">
+            <el-form-item style="width: 140px">
+              <el-select v-model="searchForm.treatmentPlan" placeholder="治疗方案">
                 <el-option v-for="item in tmentplanList" :key="item.id" :label="item.medicantName" :value="item.medicantName"></el-option>
               </el-select>
             </el-form-item>
@@ -80,18 +80,21 @@
                 prop="pigId"
                 header-align="center"
                 align="center"
+                width="100"
                 label="猪只耳标">
             </el-table-column>
             <el-table-column
                 prop="diseaseName"
                 header-align="center"
                 align="center"
+                width="140"
                 label="疾病名称">
             </el-table-column>
             <el-table-column
                 prop="diseaseTime"
                 header-align="center"
                 align="center"
+                width="160"
                 label="发病时间">
             </el-table-column>
             <el-table-column
@@ -110,12 +113,14 @@
                 prop="diagnosisTime"
                 header-align="center"
                 align="center"
+                width="140"
                 label="诊断时间">
             </el-table-column>
             <el-table-column
                 prop="doctor"
                 header-align="center"
                 align="center"
+                width="140"
                 label="兽医姓名">
             </el-table-column>
             <el-table-column
@@ -135,107 +140,111 @@
 <!--              </template>-->
 <!--            </el-table-column>-->
             <el-table-column
-                fixed="right"
-                header-align="center"
-                align="center"
-                label="操作">
+              fixed="right"
+              header-align="center"
+              align="center"
+              label="操作"
+              width="140">
               <template slot-scope="scope">
                 <el-button
-                    v-if="isAuth('sys:user:update')"
-                    type="text"
-                    size="medium"
-                    @click="addOrUpdateHandle(scope.row)"
-                    style="color: rgb(24,144,255)">
+                  v-if="isAuth('sys:user:update')"
+                  type="text"
+                  size="medium"
+                  @click="addOrUpdateHandle(scope.row)"
+                  style="color: rgb(24,144,255)">
                   修改
                 </el-button>
                 <el-button
-                    v-if="isAuth('sys:user:delete')"
-                    type="text"
-                    size="medium"
-                    @click="deleteHandle(scope.row.id)"
-                    style="color: rgb(24,144,255)">
+                  v-if="isAuth('sys:user:delete')"
+                  type="text"
+                  size="medium"
+                  @click="deleteHandle(scope.row.id)"
+                  style="color: rgb(24,144,255)">
                   删除
                 </el-button>
               </template>
             </el-table-column>
           </el-table>
-          <div class="block">
-            <table-footer
-                :totals="total"
-                :size="limit"
-                @sizeChange="sizeChange"
-                @pageChange="pageChange"></table-footer>
-          </div>
+          <el-pagination
+            @size-change="sizeChange"
+            @current-change="pageChange"
+            :current-page="page"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="limit"
+            :total="total"
+            layout="total, sizes, prev, pager, next, jumper">
+          </el-pagination>
         </div>
         <!--  弹框      -->
         <el-dialog
-            :title="!dataForm.id ? '新增' : '修改'"
-            :close-on-click-modal="false"
-            :visible.sync="visible"
-            width="600px">
+          :title="!dataForm.id ? '新增' : '修改'"
+          :close-on-click-modal="false"
+          :visible.sync="visible"
+          width="600px">
           <el-form
-              :model="dataForm"
-              :rules="dataRule"
-              ref="dataForm"
-              @keyup.enter.native="dataFormSubmit()"
-              label-width="80px"
-              size="mini"
-              style="margin-left: 20px;width: 500px">
+            :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="pigId">
               <el-input
-                  type="text"
-                  placeholder="请输入耳标号"
-                  v-model="dataForm.pigId"
-                  :disabled="dataForm.id? true: false">
+                type="text"
+                placeholder="请输入耳标号"
+                v-model="dataForm.pigId"
+                :disabled="dataForm.id? true: false">
               </el-input>
             </el-form-item>
             <el-form-item label="疾病名称" prop="diseaseName">
-              <el-select v-model="dataForm.diseaseName">
+              <el-select v-model="dataForm.diseaseName" style="width: 100%">
                 <el-option v-for="item in illnesList" :key="item.id" :value="item.idseaseName" :label="item.idseaseName"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="发病时间" prop="diseaseName">
               <el-date-picker
-                  v-model="dataForm.diseaseTime"
-                  type="datetime"
-                  placeholder="选择日期时间"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  >
+                v-model="dataForm.diseaseTime"
+                type="datetime"
+                placeholder="选择日期时间"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                style="width: 100%">
               </el-date-picker>
             </el-form-item>
             <el-form-item label="症 状">
-              <el-select v-model="dataForm.sympotomName">
+              <el-select v-model="dataForm.sympotomName" style="width: 100%">
                 <el-option v-for="item in symptomList" :key="item.id" :label="item.sympotomName" :value="item.sympotomName"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="病 因" prop="causeName">
-              <el-select v-model="dataForm.causeName">
+            <el-form-item label="病 因" prop="causeName" style="width: 100%">
+              <el-select v-model="dataForm.causeName" style="width: 100%">
                 <el-option v-for="item in causeList" :key="item.id" :value="item.causeName" :label="item.causeName"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="兽医姓名" prop="doctorId">
               <el-select
-                  @change="onChangeMan($event)"
-                  v-model="dataForm.doctorId">
+                @change="onChangeMan($event)"
+                v-model="dataForm.doctorId"
+                style="width: 100%">
                 <el-option
                     v-for="item in manList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="诊断时间">
               <el-date-picker
-                  v-model="dataForm.diagnosisTime"
-                  type="date"
-                  placeholder="选择日期时间"
-                  value-format="yyyy-MM-dd"
-              >
+                v-model="dataForm.diagnosisTime"
+                type="date"
+                placeholder="选择日期时间"
+                value-format="yyyy-MM-dd"
+                style="width: 100%">
               </el-date-picker>
             </el-form-item>
             <el-form-item label="治疗方案">
-              <el-select v-model="dataForm.treatmentPlan">
+              <el-select v-model="dataForm.treatmentPlan" style="width: 100%">
                 <el-option v-for="item in tmentplanList" :key="item.id" :label="item.medicantName" :value="item.medicantName"></el-option>
               </el-select>
             </el-form-item>
@@ -271,7 +280,7 @@
 
 <script>
 import {mapState, mapActions} from 'vuex'
-import TableFooter from '../../../components/TableFooter'
+// import TableFooter from '../../../components/TableFooter'
 export default {
   name: 'hdisease',
   data () {
@@ -332,9 +341,9 @@ export default {
       dataRule: {}
     }
   },
-  components: {
-    TableFooter
-  },
+  // components: {
+  //   TableFooter
+  // },
   computed: {
     ...mapState(['manList', 'causeList', 'illnesList', 'symptomList', 'tmentplanList'])
   },

src/views/modules/health/hisolate.vue

@@ -99,13 +99,15 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="block">
-            <table-footer
-                :totals="total"
-                :size="limit"
-                @sizeChange="sizeChange"
-                @pageChange="pageChange"></table-footer>
-          </div>
+          <el-pagination
+            @size-change="sizeChange"
+            @current-change="pageChange"
+            :current-page="page"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="limit"
+            :total="total"
+            layout="total, sizes, prev, pager, next, jumper">
+          </el-pagination>
         </div>
       </el-main>
       <el-dialog

src/views/modules/health/hrecord.vue

@@ -10,28 +10,28 @@
             <el-form-item style="width: 200px">
               <el-input placeholder="耳标" style="width: 200px" v-model="searchForm.earTag"></el-input>
             </el-form-item>
-            <el-form-item label="症 状">
-              <el-select v-model="searchForm.sympotomName">
+            <el-form-item style="width: 140px">
+              <el-select v-model="searchForm.sympotomName" placeholder="症状">
                 <el-option v-for="item in symptomList" :key="item.id" :label="item.sympotomName" :value="item.sympotomName"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="病 因">
-              <el-select v-model="searchForm.causeName">
+            <el-form-item style="width: 140px">
+              <el-select v-model="searchForm.causeName" placeholder="病因">
                 <el-option v-for="item in causeList" :key="item.id" :label="item.causeName" :value="item.causeName"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="疾病名称">
-              <el-select v-model="searchForm.diseaseName">
+            <el-form-item style="width: 140px">
+              <el-select v-model="searchForm.diseaseName" placeholder="疾病名称">
                 <el-option v-for="item in illnesList" :key="item.id" :label="item.idseaseName" :value="item.idseaseName"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="医生姓名">
-              <el-select v-model="searchForm.doctor">
+            <el-form-item style="width: 140px">
+              <el-select v-model="searchForm.doctor" placeholder="医生">
                 <el-option v-for="item in manList" :key="item.id" :label="item.name" :value="item.name"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="治疗方案">
-              <el-select v-model="searchForm.treatmentPlan">
+            <el-form-item style="width: 140px">
+              <el-select v-model="searchForm.treatmentPlan" placeholder="治疗方案">
                 <el-option v-for="item in tmentplanList" :key="item.id" :label="item.medicantName" :value="item.medicantName"></el-option>
               </el-select>
             </el-form-item>
@@ -44,33 +44,36 @@
       <el-main>
         <div class="rect" style="margin-top: 20px">
           <el-table
-              id="select"
-              height="530"
-              :data="tableData"
-              v-loading="dataListLoading"
-              style="width: 100%"
-              ref="table"
-              stripe
-              border
-              :header-cell-style="{background:'rgb(245,245,245)',color:'#000',height: '45px',fontSize: '13px',fontWeight: 'normal',borderBottom: '1px solid #ccc'}"
-              :cell-style="{color: '#888',fontSize: '13px'}"
-              size="mini">
+            id="select"
+            height="530"
+            :data="tableData"
+            v-loading="dataListLoading"
+            style="width: 100%"
+            ref="table"
+            stripe
+            border
+            :header-cell-style="{background:'rgb(245,245,245)',color:'#000',height: '45px',fontSize: '13px',fontWeight: 'normal',borderBottom: '1px solid #ccc'}"
+            :cell-style="{color: '#888',fontSize: '13px'}"
+            size="mini">
             <el-table-column
-                prop="pigId"
-                header-align="center"
-                align="center"
-                label="猪只耳标">
+              prop="pigId"
+              header-align="center"
+              align="center"
+              label="猪只耳标"
+              width="100">
             </el-table-column>
             <el-table-column
                 prop="diseaseName"
                 header-align="center"
                 align="center"
+                width="140"
                 label="疾病名称">
             </el-table-column>
             <el-table-column
                 prop="diseaseTime"
                 header-align="center"
                 align="center"
+                width="160"
                 label="发病时间">
             </el-table-column>
             <el-table-column
@@ -89,12 +92,14 @@
                 prop="diagnosisTime"
                 header-align="center"
                 align="center"
+                width="140"
                 label="诊断时间">
             </el-table-column>
             <el-table-column
                 prop="doctor"
                 header-align="center"
                 align="center"
+                width="140"
                 label="兽医姓名">
             </el-table-column>
             <el-table-column
@@ -106,7 +111,8 @@
             <el-table-column
                 header-align="center"
                 align="center"
-                label="治疗结果">
+                label="治疗结果"
+                width="100">
               <template slot-scope="scope">
                 <span v-if="scope.row.result === 1">康 复</span>
                 <span v-else-if="scope.row.result === 2">死 亡</span>
@@ -128,7 +134,7 @@
                 align="center"
                 label="出栏时间">
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作" width="140">
               <template slot-scope="scope">
                 <el-button
                     type="text"
@@ -140,13 +146,15 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="block">
-            <table-footer
-                :totals="total"
-                :size="limit"
-                @sizeChange="sizeChange"
-                @pageChange="pageChange"></table-footer>
-          </div>
+          <el-pagination
+            @size-change="sizeChange"
+            @current-change="pageChange"
+            :current-page="page"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="limit"
+            :total="total"
+            layout="total, sizes, prev, pager, next, jumper">
+          </el-pagination>
         </div>
       </el-main>
       <el-dialog

src/views/modules/health/htreat.vue

@@ -10,32 +10,32 @@
             <el-form-item style="width: 200px">
               <el-input placeholder="耳标" style="width: 200px" v-model="searchForm.earTag"></el-input>
             </el-form-item>
-            <el-form-item label="症 状">
-              <el-select v-model="searchForm.sympotomName">
+            <el-form-item style="width: 140px">
+              <el-select v-model="searchForm.sympotomName" placeholder="症状">
                 <el-option v-for="item in symptomList" :key="item.id" :label="item.sympotomName" :value="item.sympotomName"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="病 因">
-              <el-select v-model="searchForm.causeName">
+            <el-form-item style="width: 140px">
+              <el-select v-model="searchForm.causeName" placeholder="病因">
                 <el-option v-for="item in causeList" :key="item.id" :label="item.causeName" :value="item.causeName"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="疾病名称">
-              <el-select v-model="searchForm.diseaseName">
+            <el-form-item style="width: 140px">
+              <el-select v-model="searchForm.diseaseName" placeholder="疾病名称">
                 <el-option v-for="item in illnesList" :key="item.id" :label="item.idseaseName" :value="item.idseaseName"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="医生姓名">
-              <el-select v-model="searchForm.doctor">
+            <el-form-item style="width: 140px">
+              <el-select v-model="searchForm.doctor" placeholder="医生">
                 <el-option v-for="item in manList" :key="item.id" :label="item.name" :value="item.name"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="治疗方案">
-              <el-select v-model="searchForm.treatmentPlan">
+            <el-form-item style="width: 140px">
+              <el-select v-model="searchForm.treatmentPlan" placeholder="治疗方案">
                 <el-option v-for="item in tmentplanList" :key="item.id" :label="item.medicantName" :value="item.medicantName"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item>
+            <el-form-item style="width: 140px">
               <el-button icon="el-icon-search" @click="search">查 询</el-button>
             </el-form-item>
           </el-form>
@@ -58,76 +58,76 @@
             </el-form-item>
           </el-form>
           <el-table
-              id="select"
-              height="530"
-              :data="tableData"
-              @selection-change="selectionChangeHandle"
-              v-loading="dataListLoading"
-              style="width: 100%"
-              ref="table"
-              stripe
-              border
-              :header-cell-style="{background:'rgb(245,245,245)',color:'#000',height: '45px',fontSize: '13px',fontWeight: 'normal',borderBottom: '1px solid #ccc'}"
-              :cell-style="{color: '#888',fontSize: '13px'}"
-              size="mini">
+            id="select"
+            height="530"
+            :data="tableData"
+            @selection-change="selectionChangeHandle"
+            v-loading="dataListLoading"
+            style="width: 100%"
+            ref="table"
+            stripe
+            border
+            :header-cell-style="{background:'rgb(245,245,245)',color:'#000',height: '45px',fontSize: '13px',fontWeight: 'normal',borderBottom: '1px solid #ccc'}"
+            :cell-style="{color: '#888',fontSize: '13px'}"
+            size="mini">
             <el-table-column
-                type="selection"
-                header-align="center"
-                align="center"
-                width="50">
+              type="selection"
+              header-align="center"
+              align="center"
+              width="50">
             </el-table-column>
             <el-table-column
-                prop="pigId"
-                header-align="center"
-                align="center"
-                label="猪只耳标">
+              prop="pigId"
+              header-align="center"
+              align="center"
+              label="猪只耳标">
             </el-table-column>
             <el-table-column
-                prop="diseaseName"
-                header-align="center"
-                align="center"
-                label="疾病名称">
+              prop="diseaseName"
+              header-align="center"
+              align="center"
+              label="疾病名称">
             </el-table-column>
             <el-table-column
-                prop="diseaseTime"
-                header-align="center"
-                align="center"
-                label="发病时间">
+              prop="diseaseTime"
+              header-align="center"
+              align="center"
+              label="发病时间">
             </el-table-column>
             <el-table-column
-                prop="symptomName"
-                header-align="center"
-                align="center"
-                label="症 状">
+              prop="symptomName"
+              header-align="center"
+              align="center"
+              label="症 状">
             </el-table-column>
             <el-table-column
-                prop="causeName"
-                header-align="center"
-                align="center"
-                label="病 因">
+              prop="causeName"
+              header-align="center"
+              align="center"
+              label="病 因">
             </el-table-column>
             <el-table-column
-                prop="diagnosisTime"
-                header-align="center"
-                align="center"
-                label="诊断时间">
+              prop="diagnosisTime"
+              header-align="center"
+              align="center"
+              label="诊断时间">
             </el-table-column>
             <el-table-column
-                prop="doctor"
-                header-align="center"
-                align="center"
-                label="兽医姓名">
+              prop="doctor"
+              header-align="center"
+              align="center"
+              label="兽医姓名">
             </el-table-column>
             <el-table-column
-                prop="treatmentPlan"
-                header-align="center"
-                align="center"
-                label="治疗方案">
+              prop="treatmentPlan"
+              header-align="center"
+              align="center"
+              label="治疗方案">
             </el-table-column>
             <el-table-column
-                header-align="center"
-                align="center"
-                label="治疗结果">
+              header-align="center"
+              align="center"
+              label="治疗结果">
               <template slot-scope="scope">
                 <span v-if="scope.row.result === 1">康 复</span>
                 <span v-else-if="scope.row.result === 2">死 亡</span>
@@ -150,37 +150,39 @@
 <!--                label="出栏时间">-->
 <!--            </el-table-column>-->
             <el-table-column
-                fixed="right"
-                header-align="center"
-                align="center"
-                label="操作">
+              fixed="right"
+              header-align="center"
+              align="center"
+              label="操作">
               <template slot-scope="scope">
                 <el-button
-                    v-if="isAuth('sys:user:update')"
-                    type="text"
-                    size="medium"
-                    @click="addOrUpdateHandle(scope.row)"
-                    style="color: rgb(24,144,255)">
+                  v-if="isAuth('sys:user:update')"
+                  type="text"
+                  size="medium"
+                  @click="addOrUpdateHandle(scope.row)"
+                  style="color: rgb(24,144,255)">
                   修改
                 </el-button>
                 <el-button
-                    v-if="isAuth('sys:user:delete')"
-                    type="text"
-                    size="medium"
-                    @click="deleteHandle(scope.row.id)"
-                    style="color: rgb(24,144,255)">
+                  v-if="isAuth('sys:user:delete')"
+                  type="text"
+                  size="medium"
+                  @click="deleteHandle(scope.row.id)"
+                  style="color: rgb(24,144,255)">
                   删除
                 </el-button>
               </template>
             </el-table-column>
           </el-table>
-          <div class="block">
-            <table-footer
-                :totals="total"
-                :size="limit"
-                @sizeChange="sizeChange"
-                @pageChange="pageChange"></table-footer>
-          </div>
+          <el-pagination
+            @size-change="sizeChange"
+            @current-change="pageChange"
+            :current-page="page"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="limit"
+            :total="total"
+            layout="total, sizes, prev, pager, next, jumper">
+          </el-pagination>
         </div>
         <!--  弹框      -->
         <el-dialog

src/views/modules/health/hvaccine.vue

@@ -111,13 +111,15 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="block">
-            <table-footer
-                :totals="total"
-                :size="limit"
-                @sizeChange="sizeChange"
-                @pageChange="pageChange"></table-footer>
-          </div>
+          <el-pagination
+            @size-change="sizeChange"
+            @current-change="pageChange"
+            :current-page="page"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="limit"
+            :total="total"
+            layout="total, sizes, prev, pager, next, jumper">
+          </el-pagination>
         </div>
         <!--  弹框      -->
         <el-dialog

src/views/modules/pigbasic/pbadopt-charts/in-and-out.vue

@@ -49,201 +49,12 @@
     //   // this.initChartScatter()
     // },
     mounted () {
-      // 由于给echart添加了resize事件, 在组件激活时需要重新resize绘画一次, 否则出现空白bug
-      // if (this.chartLine) {
-      //   this.chartLine.resize()
-      // }
-      // if (this.chartBar) {
-      //   this.chartBar.resize()
-      // }
-      // if (this.chartPie) {
-      //   this.$nextTick(() => {
-      //     this.chartPie.resize()
-      //   })
-        
-      // }
-      // this.$nextTick(() => {
       this.initChartPie()
-      // })
-      // if (this.chartScatter) {
-      //   this.chartScatter.resize()
-      // }
+    },
+    activated () {
+      this.initChartPie()
     },
     methods: {
-      con() {
-        console.log(this.proportion)
-      },
-      // // 折线图
-      // initChartLine () {
-      //   var option = {
-      //     'title': {
-      //       'text': '折线图堆叠'
-      //     },
-      //     'tooltip': {
-      //       'trigger': 'axis'
-      //     },
-      //     'legend': {
-      //       'data': [ '邮件营销', '联盟广告', '视频广告', '直接访问', '搜索引擎' ]
-      //     },
-      //     'grid': {
-      //       'left': '3%',
-      //       'right': '4%',
-      //       'bottom': '3%',
-      //       'containLabel': true
-      //     },
-      //     'toolbox': {
-      //       'feature': {
-      //         'saveAsImage': { }
-      //       }
-      //     },
-      //     'xAxis': {
-      //       'type': 'category',
-      //       'boundaryGap': false,
-      //       'data': [ '周一', '周二', '周三', '周四', '周五', '周六', '周日' ]
-      //     },
-      //     'yAxis': {
-      //       'type': 'value'
-      //     },
-      //     'series': [
-      //       {
-      //         'name': '邮件营销',
-      //         'type': 'line',
-      //         'stack': '总量',
-      //         'data': [ 120, 132, 101, 134, 90, 230, 210 ]
-      //       },
-      //       {
-      //         'name': '联盟广告',
-      //         'type': 'line',
-      //         'stack': '总量',
-      //         'data': [ 220, 182, 191, 234, 290, 330, 310 ]
-      //       },
-      //       {
-      //         'name': '视频广告',
-      //         'type': 'line',
-      //         'stack': '总量',
-      //         'data': [ 150, 232, 201, 154, 190, 330, 410 ]
-      //       },
-      //       {
-      //         'name': '直接访问',
-      //         'type': 'line',
-      //         'stack': '总量',
-      //         'data': [ 320, 332, 301, 334, 390, 330, 320 ]
-      //       },
-      //       {
-      //         'name': '搜索引擎',
-      //         'type': 'line',
-      //         'stack': '总量',
-      //         'data': [ 820, 932, 901, 934, 1290, 1330, 1320 ]
-      //       }
-      //     ]
-      //   }
-      //   this.chartLine = echarts.init(document.getElementById('J_chartLineBox'))
-      //   this.chartLine.setOption(option)
-      //   window.addEventListener('resize', () => {
-      //     this.chartLine.resize()
-      //   })
-      // },
-      // // 柱状图
-      // initChartBar () {
-      //   var option = {
-      //     tooltip: {
-      //       trigger: 'axis',
-      //       axisPointer: {
-      //         type: 'shadow'
-      //       }
-      //     },
-      //     legend: {
-      //       data: ['直接访问', '邮件营销', '联盟广告', '视频广告', '搜索引擎', '百度', '谷歌', '必应', '其他']
-      //     },
-      //     grid: {
-      //       left: '3%',
-      //       right: '4%',
-      //       bottom: '3%',
-      //       containLabel: true
-      //     },
-      //     xAxis: [
-      //       {
-      //         type: 'category',
-      //         data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
-      //       }
-      //     ],
-      //     yAxis: [
-      //       {
-      //         type: 'value'
-      //       }
-      //     ],
-      //     series: [
-      //       {
-      //         name: '直接访问',
-      //         type: 'bar',
-      //         data: [320, 332, 301, 334, 390, 330, 320]
-      //       },
-      //       {
-      //         name: '邮件营销',
-      //         type: 'bar',
-      //         stack: '广告',
-      //         data: [120, 132, 101, 134, 90, 230, 210]
-      //       },
-      //       {
-      //         name: '联盟广告',
-      //         type: 'bar',
-      //         stack: '广告',
-      //         data: [220, 182, 191, 234, 290, 330, 310]
-      //       },
-      //       {
-      //         name: '视频广告',
-      //         type: 'bar',
-      //         stack: '广告',
-      //         data: [150, 232, 201, 154, 190, 330, 410]
-      //       },
-      //       {
-      //         name: '搜索引擎',
-      //         type: 'bar',
-      //         data: [862, 1018, 964, 1026, 1679, 1600, 1570],
-      //         markLine: {
-      //           lineStyle: {
-      //             normal: {
-      //               type: 'dashed'
-      //             }
-      //           },
-      //           data: [
-      //             [{ type: 'min' }, { type: 'max' }]
-      //           ]
-      //         }
-      //       },
-      //       {
-      //         name: '百度',
-      //         type: 'bar',
-      //         barWidth: 5,
-      //         stack: '搜索引擎',
-      //         data: [620, 732, 701, 734, 1090, 1130, 1120]
-      //       },
-      //       {
-      //         name: '谷歌',
-      //         type: 'bar',
-      //         stack: '搜索引擎',
-      //         data: [120, 132, 101, 134, 290, 230, 220]
-      //       },
-      //       {
-      //         name: '必应',
-      //         type: 'bar',
-      //         stack: '搜索引擎',
-      //         data: [60, 72, 71, 74, 190, 130, 110]
-      //       },
-      //       {
-      //         name: '其他',
-      //         type: 'bar',
-      //         stack: '搜索引擎',
-      //         data: [62, 82, 91, 84, 109, 110, 120]
-      //       }
-      //     ]
-      //   }
-      //   this.chartBar = echarts.init(document.getElementById('J_chartBarBox'))
-      //   this.chartBar.setOption(option)
-      //   window.addEventListener('resize', () => {
-      //     this.chartBar.resize()
-      //   })
-      // },
       // 饼状图
       initChartPie () {
         // this.dataListLoading = true;

src/views/modules/pigbasic/pbadopt-charts/statistics.vue

@@ -5,6 +5,29 @@
     <!-- <el-row :gutter="20"> -->
       <!-- <el-col :span="24"> -->
         <el-card>
+          <el-form inline size="mini">
+            <el-form-item>
+              <el-button type="danger" :disabled="ifMonth" @click="clickChange">月</el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="danger" :disabled="!ifMonth" @click="clickChange">日</el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-date-picker
+                v-model="form.time"
+                type="datetimerange"
+                align="right"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                :default-time="['08:00:00', '16:00:00']"
+                @change="initChartLine"
+                value-format="yyyy-MM-dd HH:mm:ss">
+              </el-date-picker>
+            </el-form-item>
+            <!-- <el-form-item>
+              <el-button @click="get" icon="el-icon-search">查 询</el-button>
+            </el-form-item> -->
+          </el-form>
           <div id="J_chartLineBox" class="chart-box"></div>
         </el-card>
       <!-- </el-col> -->
@@ -33,56 +56,33 @@
     data () {
       return {
         chartLine: null,
-        // chartBar: null,
-        // chartPie: null,
-        // chartScatter: null,
         statistics: null,
         date: [],
-        total: []
+        total: [],
+        ifMonth: true,
+        form: {
+          time: []
+        }
       }
     },
-    // props: ['proportion'],
-    // mounted () {
-    //   // this.initChartLine()
-    //   // this.initChartBar()
-    //   this.$nextTick(() => {
-    //     this.initChartPie()
-    //   })
-    //   // this.initChartScatter()
-    // },
     mounted () {
-      // 由于给echart添加了resize事件, 在组件激活时需要重新resize绘画一次, 否则出现空白bug
-      // if (this.chartLine) {
-      //   this.chartLine.resize()
-      // }
-      // if (this.chartBar) {
-      //   this.chartBar.resize()
-      // }
-      // if (this.chartPie) {
-      //   this.$nextTick(() => {
-      //     this.chartPie.resize()
-      //   })
-        
-      // }
-      // this.$nextTick(() => {
       this.initChartLine()
-      // })
-      // if (this.chartScatter) {
-      //   this.chartScatter.resize()
-      // }
+    },
+    activated () {
+      this.initChartLine()
     },
     methods: {
-      con() {
-        console.log(this.proportion)
-      },
       // // 折线图
       initChartLine () {
         this.date = []
         this.total = []
         this.$http({
-          url: this.$http.adornUrl("/management/yearpigbase/suchStatisticsMonth"),
+          url: this.$http.adornUrl(`/management/yearpigbase/suchStatistics${this.ifMonth? 'Month': 'Day'}`),
           method: "get",
-          params: this.$http.adornParams()
+          params: this.$http.adornParams({
+            'startTime': this.form.time[0],
+            'endTime': this.form.time[1]
+          })
         }).then( ({ data }) => {
           console.log(data.data);
           if (data && data.code === 0) {
@@ -91,14 +91,17 @@
               this.total.push(item.total)
             })
             var option = {
+              // backgroundColor: '#2c343c',
               'title': {
-                'text': '出栏统计折线图'
+                'text': '出栏统计折线图',
+                'x': 'center'
               },
               'tooltip': {
                 'trigger': 'axis'
               },
               'legend': {
-                'data': [ '出栏猪只数量']
+                'data': [ '出栏猪只数量'],
+                'y': '30px'
               },
               'grid': {
                 'left': '3%',
@@ -139,331 +142,20 @@
         })
         
       },
-      // // 柱状图
-      // initChartBar () {
-      //   var option = {
-      //     tooltip: {
-      //       trigger: 'axis',
-      //       axisPointer: {
-      //         type: 'shadow'
-      //       }
-      //     },
-      //     legend: {
-      //       data: ['直接访问', '邮件营销', '联盟广告', '视频广告', '搜索引擎', '百度', '谷歌', '必应', '其他']
-      //     },
-      //     grid: {
-      //       left: '3%',
-      //       right: '4%',
-      //       bottom: '3%',
-      //       containLabel: true
-      //     },
-      //     xAxis: [
-      //       {
-      //         type: 'category',
-      //         data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
-      //       }
-      //     ],
-      //     yAxis: [
-      //       {
-      //         type: 'value'
-      //       }
-      //     ],
-      //     series: [
-      //       {
-      //         name: '直接访问',
-      //         type: 'bar',
-      //         data: [320, 332, 301, 334, 390, 330, 320]
-      //       },
-      //       {
-      //         name: '邮件营销',
-      //         type: 'bar',
-      //         stack: '广告',
-      //         data: [120, 132, 101, 134, 90, 230, 210]
-      //       },
-      //       {
-      //         name: '联盟广告',
-      //         type: 'bar',
-      //         stack: '广告',
-      //         data: [220, 182, 191, 234, 290, 330, 310]
-      //       },
-      //       {
-      //         name: '视频广告',
-      //         type: 'bar',
-      //         stack: '广告',
-      //         data: [150, 232, 201, 154, 190, 330, 410]
-      //       },
-      //       {
-      //         name: '搜索引擎',
-      //         type: 'bar',
-      //         data: [862, 1018, 964, 1026, 1679, 1600, 1570],
-      //         markLine: {
-      //           lineStyle: {
-      //             normal: {
-      //               type: 'dashed'
-      //             }
-      //           },
-      //           data: [
-      //             [{ type: 'min' }, { type: 'max' }]
-      //           ]
-      //         }
-      //       },
-      //       {
-      //         name: '百度',
-      //         type: 'bar',
-      //         barWidth: 5,
-      //         stack: '搜索引擎',
-      //         data: [620, 732, 701, 734, 1090, 1130, 1120]
-      //       },
-      //       {
-      //         name: '谷歌',
-      //         type: 'bar',
-      //         stack: '搜索引擎',
-      //         data: [120, 132, 101, 134, 290, 230, 220]
-      //       },
-      //       {
-      //         name: '必应',
-      //         type: 'bar',
-      //         stack: '搜索引擎',
-      //         data: [60, 72, 71, 74, 190, 130, 110]
-      //       },
-      //       {
-      //         name: '其他',
-      //         type: 'bar',
-      //         stack: '搜索引擎',
-      //         data: [62, 82, 91, 84, 109, 110, 120]
-      //       }
-      //     ]
-      //   }
-      //   this.chartBar = echarts.init(document.getElementById('J_chartBarBox'))
-      //   this.chartBar.setOption(option)
-      //   window.addEventListener('resize', () => {
-      //     this.chartBar.resize()
-      //   })
-      // },
-      // // 饼状图
-      // initChartPie () {
-      //   // this.dataListLoading = true;
-      //   this.$http({
-      //     url: this.$http.adornUrl("/management/yearpigbase/outAndInProportion"),
-      //     method: "get",
-      //     params: this.$http.adornParams()
-      //   }).then( ({ data }) => {
-      //     console.log(data.data);
-      //     if (data && data.code === 0) {
-      //       this.proportion = data.data
-      //       var option = {
-      //         backgroundColor: '#2c343c',
-      //         title: {
-      //           text: '育肥出栏比例饼状图',
-      //           left: 'center',
-      //           top: 20,
-      //           textStyle: {
-      //             color: '#fff'
-      //           }
-      //         },
-      //         tooltip: {
-      //           trigger: 'item',
-      //           formatter: '{a} <br/>{b} : {c} ({d}%)'
-      //         },
-      //         visualMap: {
-      //           show: false,
-      //           min: 80,
-      //           max: 600,
-      //           inRange: {
-      //             colorLightness: [0, 1]
-      //           }
-      //         },
-      //         series: [
-      //           {
-      //             name: '访问来源',
-      //             type: 'pie',
-      //             radius: '65%',
-      //             center: ['50%', '55%'],
-      //             data: [
-      //               { value: this.proportion['inFenct'], name: '育肥' },
-      //               { value: this.proportion['outFenct'], name: '出栏' },
-      //               // { value: 274, name: '联盟广告' },
-      //               // { value: 235, name: '视频广告' },
-      //               // { value: 400, name: '搜索引擎' }
-      //             ].sort(function (a, b) { return a.value - b.value }),
-      //             roseType: 'radius',
-      //             label: {
-      //               normal: {
-      //                 textStyle: {
-      //                   color: 'rgba(255, 255, 255, 0.8)'
-      //                 }
-      //               }
-      //             },
-      //             labelLine: {
-      //               normal: {
-      //                 lineStyle: {
-      //                   color: 'rgba(255, 255, 255, 0.8)'
-      //                 },
-      //                 smooth: 0.2,
-      //                 length: 10,
-      //                 length2: 20
-      //               }
-      //             },
-      //             itemStyle: {
-      //               normal: {
-      //                 color: '#c23531',
-      //                 shadowBlur: 200,
-      //                 shadowColor: 'rgba(0, 0, 0, 0.5)'
-      //               }
-      //             },
-      //             animationType: 'scale',
-      //             animationEasing: 'elasticOut',
-      //             animationDelay: function (idx) {
-      //               return Math.random() * 200
-      //             }
-      //           }
-      //         ]
-      //       }
-      //       this.chartPie = echarts.init(document.getElementById('J_chartPieBox'))
-      //       this.chartPie.setOption(option)
-      //       window.addEventListener('resize', () => {
-      //         this.chartPie.resize()
-      //       })
-      //     } else {
-      //       this.proportion = null
-      //     }
-      //   })
-        
-      // },
-      // // 散点图
-      // initChartScatter () {
-      //   var option = {
-      //     backgroundColor: new echarts.graphic.RadialGradient(0.3, 0.3, 0.8, [
-      //       { offset: 0, color: '#f7f8fa' },
-      //       { offset: 1, color: '#cdd0d5' }
-      //     ]),
-      //     title: {
-      //       text: '1990 与 2015 年各国家人均寿命与 GDP'
-      //     },
-      //     legend: {
-      //       right: 10,
-      //       data: ['1990', '2015']
-      //     },
-      //     xAxis: {
-      //       splitLine: {
-      //         lineStyle: {
-      //           type: 'dashed'
-      //         }
-      //       }
-      //     },
-      //     yAxis: {
-      //       splitLine: {
-      //         lineStyle: {
-      //           type: 'dashed'
-      //         }
-      //       },
-      //       scale: true
-      //     },
-      //     series: [
-      //       {
-      //         name: '1990',
-      //         data: [
-      //           [28604, 77, 17096869, 'Australia', 1990],
-      //           [31163, 77.4, 27662440, 'Canada', 1990],
-      //           [1516, 68, 1154605773, 'China', 1990],
-      //           [13670, 74.7, 10582082, 'Cuba', 1990],
-      //           [28599, 75, 4986705, 'Finland', 1990],
-      //           [29476, 77.1, 56943299, 'France', 1990],
-      //           [31476, 75.4, 78958237, 'Germany', 1990],
-      //           [28666, 78.1, 254830, 'Iceland', 1990],
-      //           [1777, 57.7, 870601776, 'India', 1990],
-      //           [29550, 79.1, 122249285, 'Japan', 1990],
-      //           [2076, 67.9, 20194354, 'North Korea', 1990],
-      //           [12087, 72, 42972254, 'South Korea', 1990],
-      //           [24021, 75.4, 3397534, 'New Zealand', 1990],
-      //           [43296, 76.8, 4240375, 'Norway', 1990],
-      //           [10088, 70.8, 38195258, 'Poland', 1990],
-      //           [19349, 69.6, 147568552, 'Russia', 1990],
-      //           [10670, 67.3, 53994605, 'Turkey', 1990],
-      //           [26424, 75.7, 57110117, 'United Kingdom', 1990],
-      //           [37062, 75.4, 252847810, 'United States', 1990]
-      //         ],
-      //         type: 'scatter',
-      //         symbolSize: function (data) {
-      //           return Math.sqrt(data[2]) / 5e2
-      //         },
-      //         label: {
-      //           emphasis: {
-      //             show: true,
-      //             formatter: function (param) {
-      //               return param.data[3]
-      //             },
-      //             position: 'top'
-      //           }
-      //         },
-      //         itemStyle: {
-      //           normal: {
-      //             shadowBlur: 10,
-      //             shadowColor: 'rgba(120, 36, 50, 0.5)',
-      //             shadowOffsetY: 5,
-      //             color: new echarts.graphic.RadialGradient(0.4, 0.3, 1, [
-      //               { offset: 0, color: 'rgb(251, 118, 123)' },
-      //               { offset: 1, color: 'rgb(204, 46, 72)' }
-      //             ])
-      //           }
-      //         }
-      //       },
-      //       {
-      //         name: '2015',
-      //         data: [
-      //           [44056, 81.8, 23968973, 'Australia', 2015],
-      //           [43294, 81.7, 35939927, 'Canada', 2015],
-      //           [13334, 76.9, 1376048943, 'China', 2015],
-      //           [21291, 78.5, 11389562, 'Cuba', 2015],
-      //           [38923, 80.8, 5503457, 'Finland', 2015],
-      //           [37599, 81.9, 64395345, 'France', 2015],
-      //           [44053, 81.1, 80688545, 'Germany', 2015],
-      //           [42182, 82.8, 329425, 'Iceland', 2015],
-      //           [5903, 66.8, 1311050527, 'India', 2015],
-      //           [36162, 83.5, 126573481, 'Japan', 2015],
-      //           [1390, 71.4, 25155317, 'North Korea', 2015],
-      //           [34644, 80.7, 50293439, 'South Korea', 2015],
-      //           [34186, 80.6, 4528526, 'New Zealand', 2015],
-      //           [64304, 81.6, 5210967, 'Norway', 2015],
-      //           [24787, 77.3, 38611794, 'Poland', 2015],
-      //           [23038, 73.13, 143456918, 'Russia', 2015],
-      //           [19360, 76.5, 78665830, 'Turkey', 2015],
-      //           [38225, 81.4, 64715810, 'United Kingdom', 2015],
-      //           [53354, 79.1, 321773631, 'United States', 2015]
-      //         ],
-      //         type: 'scatter',
-      //         symbolSize: function (data) {
-      //           return Math.sqrt(data[2]) / 5e2
-      //         },
-      //         label: {
-      //           emphasis: {
-      //             show: true,
-      //             formatter: function (param) {
-      //               return param.data[3]
-      //             },
-      //             position: 'top'
-      //           }
-      //         },
-      //         itemStyle: {
-      //           normal: {
-      //             shadowBlur: 10,
-      //             shadowColor: 'rgba(25, 100, 150, 0.5)',
-      //             shadowOffsetY: 5,
-      //             color: new echarts.graphic.RadialGradient(0.4, 0.3, 1, [
-      //               { offset: 0, color: 'rgb(129, 227, 238)' },
-      //               { offset: 1, color: 'rgb(25, 183, 207)' }
-      //             ])
-      //           }
-      //         }
-      //       }
-      //     ]
-      //   }
-      //   this.chartPie = echarts.init(document.getElementById('J_chartScatterBox'))
-      //   this.chartPie.setOption(option)
-      //   window.addEventListener('resize', () => {
-      //     this.chartPie.resize()
-      //   })
-      // }
+      // 获取起始与结束时间
+      timeChange (val) {
+        let start = new Date(val[0])
+        let end = new Date(val[1])
+        let now = new Date()
+        if (start > now || end > now) {
+          this.form.time = []
+          this.$message.error('请勿选择超出现在的时刻')
+        }
+      },
+      clickChange () {
+        this.ifMonth = !this.ifMonth
+        this.initChartLine()
+      }
     }
   }
 </script>
@@ -482,7 +174,7 @@
     //   }
     // }
     .chart-box {
-      min-height: 640px;
+      min-height: 600px;
     }
   }
 </style>

src/views/modules/pigbasic/pbadopt.vue

@@ -21,8 +21,10 @@
         </el-form-item>
       </el-form>
       <!-- 入栏 / 出栏 饼状图 -->
-      <in-and-out v-if="inOut"></in-and-out>
-      <statistics v-else></statistics>
+      <transition name="echartDiv" mode="out-in">
+        <in-and-out v-if="inOut"></in-and-out>
+        <statistics v-else></statistics>
+      </transition>
     </div>
   </div>
 </template>
@@ -116,4 +118,11 @@ export default {
   background-color: rgb(24,144,255);
   border-color: rgb(24,144,255);
 }
+/* 离开/进入动画 */
+.echartDiv-enter-from, .echartDiv-leave-to {
+  opacity: 0;
+}
+.echartDiv-enter-active, .echartDiv-leave-active {
+  transition: opacity 1.5s ease;
+}
 </style>