测试更新

src/views/dashboard/index.vue

@@ -10,8 +10,8 @@
                 <el-option v-for="item in accuracy.cattleTpyeList" :key="item.value" :label="item.label"
                   :value="item.value"> </el-option>
               </el-select>
-              <el-select v-model="accuracy.value2" clearable style="width:100px;margin-right: 5px;" class="filter-item" @change="changeformula('1')">
-                <el-option v-for="item in accuracy.formulaList" :key="item.id" :label="item.name" :value="item.id">
+              <el-select v-model="accuracy.value2" style="width:100px;margin-right: 5px;" class="filter-item" @change="changeformula('1')">
+                <el-option v-for="item in accuracy.formulaList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
               <el-date-picker v-model="accuracy.inputDatetime" :clearable="false" class="inputDatetime filter-item"
@@ -82,13 +82,13 @@
                 <el-option v-for="item in time.cattleTpyeList" :key="item.value" :label="item.label"
                   :value="item.value"> </el-option>
               </el-select>
-              <el-select v-model="time.value2" clearable style="width:100px;margin-right: 5px;" class="filter-item" @change="changeformula('2')">
-                <el-option v-for="item in time.formulaList" :key="item.id" :label="item.name" :value="item.id">
+              <el-select v-model="time.value2" style="width:100px;margin-right: 5px;" class="filter-item" @change="changeformula('2')">
+                <el-option v-for="item in time.formulaList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
               <el-date-picker v-model="time.inputDatetime" :clearable="false" class="inputDatetime filter-item"
                 type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-                style="width: 250px;" @change="changeDate('2')"/>
+                style="width: 250px;" :picker-options="pickerOptions" @change="changeDate('2')"/>
             </div>
             <div class="time_t_r">
               <div class="exportTable button" @click="handleChart('time')">切换图表</div>
@@ -148,8 +148,8 @@
                   <span class="el-icon-question"></span>
                 </el-tooltip>
               </h4>
-              <el-select v-model="abnormal.value2" clearable style="width:100px;margin-right: 5px;" class="filter-item" @change="changeformula('3')">
-                <el-option v-for="item in abnormal.formulaList" :key="item.id" :label="item.name" :value="item.id">
+              <el-select v-model="abnormal.value2" style="width:100px;margin-right: 5px;" class="filter-item" @change="changeformula('3')">
+                <el-option v-for="item in abnormal.formulaList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
               <el-date-picker v-model="abnormal.inputDatetime" :clearable="false" class="inputDatetime filter-item"
@@ -275,7 +275,7 @@
           value2: '',
           inputDatetime: [new Date(), new Date()],
           cattleTpyeList: JSON.parse(sessionStorage.downlist).cattle_parent_category,
-          formulaList: [],
+          formulaList: JSON.parse(sessionStorage.downlist).formula_list,
           activeName: 'first',
           chart1: {
             isChart: true,
@@ -306,7 +306,7 @@
           value2: '',
           inputDatetime: [new Date(), new Date()],
           cattleTpyeList: JSON.parse(sessionStorage.downlist).cattle_parent_category,
-          formulaList: [],
+          formulaList: JSON.parse(sessionStorage.downlist).formula_list,
           chart1: {
             isChart: true,
             listLoading: false,
@@ -320,7 +320,7 @@
           value2: '',
           inputDatetime: [new Date(), new Date()],
           cattleTpyeList: JSON.parse(sessionStorage.downlist).cattle_parent_category,
-          formulaList: [],
+          formulaList: JSON.parse(sessionStorage.downlist).formula_list,
           chart1: {
             isChart: true,
             listLoading: false,
@@ -348,17 +348,29 @@
       // accuracy.inputDatetime
       this.getTimeFn()
     },
-    mounted() {
+    mounted() {
+      this.accuracy.value1 = this.accuracy.cattleTpyeList[0].value
+      this.time.value1 = this.time.cattleTpyeList[0].value
+      this.abnormal.value1 = this.abnormal.cattleTpyeList[0].value
+      this.accuracy.value2 = this.accuracy.formulaList[0].value
+      this.time.value2 = this.time.formulaList[0].value
+      this.abnormal.value2 = this.abnormal.formulaList[0].value
     },
     methods: {
       getTimeFn() {
         const that = this
-        const start = new Date()
-        const end = new Date()
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 1)
-        end.setTime(end.getTime() - 3600 * 1000 * 24 * 1)
-        that.accuracy.inputDatetime = [start, end]
-        that.getFormulaList()
+        const start1 = new Date()
+        const end1 = new Date()
+        start1.setTime(start1.getTime() - 3600 * 1000 * 24 * 1)
+        end1.setTime(end1.getTime() - 3600 * 1000 * 24 * 1)
+        that.accuracy.inputDatetime = [start1, end1]
+
+        const start2 = new Date()
+        const end2 = new Date()
+        start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 31)
+        end2.setTime(end2.getTime() - 3600 * 1000 * 24 * 1)
+        that.abnormal.inputDatetime = [start2, end2]
+        // that.getFormulaList()
       },
       getFormulaList() {
         let page = 1
@@ -370,9 +382,7 @@
             this.accuracy.formulaList = response.data.list
             this.time.formulaList = response.data.list
             this.abnormal.formulaList = response.data.list
-            this.accuracy.value1 = this.accuracy.cattleTpyeList[0].value
-            this.time.value1 = this.time.cattleTpyeList[0].value
-            this.abnormal.value1 = this.abnormal.cattleTpyeList[0].value
+
           } else {
             this.accuracy.formulaList = []
             this.time.formulaList = []
@@ -588,7 +598,20 @@
         }else if(item == '2'){
           this.getChart2List()
         }else if(item == '3'){
-          this.getChart3List()
+          if (this.abnormal.inputDatetime) {
+            const startDate = this.abnormal.inputDatetime[0];
+            const endDate = this.abnormal.inputDatetime[1];
+            const days = Math.floor((endDate - startDate) / (1000 * 60 * 60 * 24)) + 1;
+            console.log('所选天数:', days);
+            if(days < 7){
+              this.$message({type: 'error',message: '最少选择7天时间', duration: 2000})
+            }else if(days > 365){
+              this.$message({type: 'error',message: '最多选择365天时间', duration: 2000})
+            }else{
+              this.getChart3List()
+            }
+          }
+
         }
       },
       getChart3List() {
@@ -785,7 +808,16 @@
         var option = {
           animation: false,
           tooltip: {
-            trigger: 'axis'
+            trigger: 'axis',
+            // formatter: function (data) {
+            //   console.log(data,'====')
+            //   let rate1 = parseFloat(data[0].value) / parseFloat(data[0].value)+ parseFloat(data[1].value) * 100
+            //   let rate2 = 100 - rate1
+            //   var res =
+            //   // data[0].axisValue+ <br/>+
+            //    data[0].seriesName+':'+<br/>+data[0].value + '次'+ "<span>总占比rate1%</span>"+<br/>
+            //    + data[1].seriesName+':'+<br/> +data[1].value + + '次'+ "<span>总占比rate2%</span>"
+            // }
           },
           legend: {
             data: ['正常撒料次数', '异常撒料次数'],

src/views/rangeManagement/feedClassification/index.vue

@@ -145,9 +145,11 @@
         let page_size = this.table.page_size
         let url = 'api/v1/ops/forage/category/list' + '?page=' + page + '&page_size=' + page_size
         let data = {
-          "parent_id": this.table.parammaps.parent_id,
           "name": this.table.parammaps.name,
           "number": this.table.parammaps.number
+        }
+        if (this.table.parammaps.parent_id !== '') {
+          data.parent_id = this.table.parammaps.parent_id
         }
         if (this.table.parammaps.is_show !== '') {
           data.is_show = this.table.parammaps.is_show

src/views/rangeManagement/feedTable/index.vue

@@ -9,7 +9,7 @@
         <el-option v-for="item in feedSourcesList" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
       <el-select v-model="table.parammaps.is_show" filterable placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
-        <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
+        <el-option v-for="item in enableList" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
       <div ref="selectInput" class="filter-item selectInput">
         <el-input type="text" name="" value="" placeholder="请点击选择搜索条件" class="Input" />
@@ -90,8 +90,19 @@
         <u-table-column label="包装单位重量(kg)" min-width="80px" align="center" prop="package_weight" />
         <u-table-column label="单价" min-width="80px" align="center" prop="price" />
         <u-table-column label="跳转重量域(kg)" min-width="80px" align="center" prop="jump_weight" />
-        <u-table-column label="跳转延时" min-width="80px" align="center" prop="jump_delay" />
-        <u-table-column label="确认开始" min-width="80px" align="center" prop="confirm_start" />
+        <u-table-column label="跳转延时" min-width="80px" align="center" prop="jump_delay">
+          <template slot-scope="scope">
+            <span v-if="scope.row.jump_delay == 0">禁用</span>
+            <span v-else-if="scope.row.jump_delay == 1">3秒</span>
+            <span v-else>6秒</span>
+          </template>
+        </u-table-column>
+        <u-table-column label="确认开始" min-width="80px" align="center" prop="confirm_start">
+          <template slot-scope="scope">
+            <span v-if="scope.row.confirm_start == 1">启用</span>
+            <span v-else>禁用</span>
+          </template>
+        </u-table-column> 
         <u-table-column label="继电器位置" min-width="80px" align="center" prop="relay_locations" />
         <u-table-column label="无上域" min-width="60px" align="center">
           <template slot-scope="scope">
@@ -971,6 +982,9 @@ export default {
       if(this.table.parammaps.allow_error !== ''){
         data.allow_error = this.table.parammaps.allow_error
       }
+      if(this.table.parammaps.jump_weight !== ''){
+        data.jump_weight = this.table.parammaps.jump_weight
+      }
       postJson(url, data).then(response => {
         if (response.code == 200) {
           this.table.list = response.data.list

src/views/rangeManagement/livestockCategory/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-select v-model="table.parammaps.parent_name" filterable placeholder="牲畜父类" class="filter-item"
+      <el-select v-model="table.parammaps.parent_id" filterable placeholder="牲畜父类" class="filter-item"
         style="width: 160px;" clearable>
         <el-option v-for="item in parentList" :key="item.value" :label="item.label" :value="item.label" />
       </el-select>
@@ -148,8 +148,10 @@
         let page_size = this.table.page_size
         let url = 'api/v1/ops/cattle/category/list' + '?page=' + page + '&page_size=' + page_size
         let data = {
-          "name": this.table.parammaps.name,
-          "parent_name": this.table.parammaps.parent_name
+          "name": this.table.parammaps.name
+        }
+        if (this.table.parammaps.parent_id !== '') {
+          data.parent_id = this.table.parammaps.parent_id
         }
         if (this.table.parammaps.is_show !== '') {
           data.is_show = this.table.parammaps.is_show
@@ -197,7 +199,7 @@
       handleRefresh() {
         console.log('点击了重置')
         this.table.parammaps.name = ''
-        this.table.parammaps.parent_name = ''
+        this.table.parammaps.parent_id = ''
         this.table.parammaps.is_show = ''
         this.table.page = 1
         this.getList()

src/views/rangeManagement/pastureList/index.vue

@@ -131,7 +131,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      enableList: JSON.parse(sessionStorage.downlist).is_show,
+      enableList: JSON.parse(sessionStorage.downlist).confirm_start,
       table: {
         page: 1,
         page_size: parseInt(Cookies.get('pageCount')),
@@ -268,7 +268,7 @@ export default {
     handleEnableChange(index, row) {
       let url = 'api/v1/ops/pasture/is_show'
       let data = {
-        "user_id":row.id,
+        "pasture_id":row.id,
         "is_show":row.is_show
       }
       postJson(url,data).then(response => {