2021-12-22

src/components/bioSafety/QueryConditions.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-09-18 10:40:12
- * @LastEditTime: 2021-12-06 13:25:48
+ * @LastEditTime: 2021-12-22 09:36:15
  * @LastEditors: Please set LastEditors
  * @Description: 查询条件组件
  * @FilePath: \hyyfClient\src\components\bioSafety\QueryConditions.vue
@@ -148,7 +148,6 @@ export default {
       if (this.propFormData.time) {
         this.formData.time = this.propFormData.time;
         if (this.defaultEmit) {
-          console.log("自动触发");
           this.$emit("getQueryParams", this.formData);
         }
       }

src/views/Alarm/AlarmWarn.vue

@@ -180,24 +180,7 @@ export default {
       ],
       day: 2,
       title: "报警列表",
-      list: [
-        {
-          id: 1,
-          time: "2021-10-11 14:55:55",
-          type: 1,
-          class: 1,
-          content: "育肥1栋3单元温度过高",
-          dig: false,
-        },
-        {
-          id: 2,
-          time: "2021-10-11 14:55:55",
-          type: 2,
-          class: 2,
-          content: "育肥1栋2单元温度传感器异常",
-          dig: true,
-        },
-      ],
+      list: [],
       tableItems: [
         {
           prop: "warningTime",
@@ -301,7 +284,6 @@ export default {
     initOneWeekAlarm() {
       getOneWeekAlarm({}).then((res) => {
         if (res.code === 10000) {
-          console.log(res.data);
           this.alarmBarData = res.data;
         }
       });
@@ -336,6 +318,8 @@ export default {
         if (res.code === 10000) {
           this.list = res.data.records;
           this.total = res.data.total;
+        } else {
+          this.$message.warning(res.message);
         }
       });
     },

src/views/Alarm/ViolationUser.vue

@@ -145,7 +145,6 @@ export default {
         startSwingTime: this.form.time ? this.form.time[0] : "",
         endSwingTime: this.form.time ? this.form.time[1] : "",
       };
-      console.log(this.form.time);
       postPerson(params).then((res) => {
         if (res.code === 0) {
           this.total = parseInt(res.total);

src/views/Alarm/chart/AlarmBar.vue

@@ -33,11 +33,11 @@ export default {
       }
     },
     barData: {
-      handler(newVal) {
-        console.log(newVal);
+      handler() {
         this.myChart.clear();
         this.init();
       },
+      deep: true,
     },
   },
   methods: {
@@ -50,12 +50,12 @@ export default {
       ];
       let options = {
         title: {
-          text: '近7日数据',
-          left: 'center',
+          text: "近7日数据",
+          left: "center",
           textStyle: {
-            fontSize: 16
+            fontSize: 16,
           },
-          top: '5%'
+          top: "5%",
         },
         grid: {
           left: "2%",

src/views/BioSafety/DeadPig.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-09-16 11:27:35
- * @LastEditTime: 2021-12-17 16:11:00
+ * @LastEditTime: 2021-12-22 09:35:10
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \hyyfClient\src\views\BioSafety\DeadPig.vue
@@ -84,6 +84,7 @@ import TableFooter from "../../components/TableFooter";
 import { formItems, propFormData } from "./deadPig/queryCondition.config";
 import { title, tableItems, tableShows } from "./deadPig/table.config";
 import { mapState } from "vuex";
+import { timeDate } from "../../utils/index";
 
 import {
   getCarWash,
@@ -133,7 +134,6 @@ export default {
   methods: {
     // 获取查询条件
     handleQuery(params) {
-      console.log(params);
       this.params = params;
       this.pageNum = 1;
       this.pigManage();
@@ -152,17 +152,14 @@ export default {
       // this.init();
       this.pigManage();
     },
-    init() {
-      let params = {
-        pageNum: this.pageNum,
-        pageSize: this.size,
-        searchStr: this.keyword,
-      };
-      console.log(params);
-      // 获取后端数据
-    },
     // 死猪管理
     pigManage() {
+      if (!this.params.time) {
+        this.params.time = [
+          timeDate(new Date().getTime() - 1000 * 60 * 60 * 24),
+          timeDate(new Date().getTime()),
+        ];
+      }
       const loading = this.$loading({
         lock: true,
         text: "加载中...",
@@ -245,16 +242,24 @@ export default {
         dbType: 0,
       };
       getCarWash(queryParams).then(async (res) => {
-        loading.close();
-        const result = JSON.parse(res.result);
-        this.listData = result.data.pageData;
-        this.listData.forEach((item) => {
-          item.alarmPicture = `${this.ip}/video/picture/get?alarmPicture=${item.alarmPicture}`;
-        });
+        if (res) {
+          loading.close();
+          const result = JSON.parse(res.result);
+          this.listData = result.data.pageData;
+          this.listData.forEach((item) => {
+            item.alarmPicture = `${this.ip}/video/picture/get?alarmPicture=${item.alarmPicture}`;
+          });
+        }
       });
     },
     // 死猪管理 - 总数
-    pigTotal() {
+    async pigTotal() {
+      if (!this.params.time) {
+        this.params.time = [
+          timeDate(new Date().getTime() - 1000 * 60 * 60 * 24),
+          timeDate(new Date().getTime()),
+        ];
+      }
       let queryParams = {
         orgCodeList: [],
         nodeCodeList: [
@@ -329,9 +334,14 @@ export default {
         alarmType: 303,
         dbType: 0,
       };
-      getCarWashTotal(queryParams).then((res) => {
+      const res = await getCarWashTotal(queryParams);
+      if (res) {
         this.total = JSON.parse(res.result).data.value;
-      });
+      }
+      // getCarWashTotal(queryParams).then((res) => {
+      //   console.log(res.result);
+      //   this.total = JSON.parse(res.result).data.value;
+      // });
     },
     // 点击图片放大
     clickImg(url) {

src/views/BioSafety/DoorAdmin.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-17 15:50:33
- * @LastEditTime: 2021-12-17 16:10:05
+ * @LastEditTime: 2021-12-22 09:33:53
  * @LastEditors: Please set LastEditors
  * @Description: 大门事件
  * @FilePath: \hyyfClient\src\views\BioSafety\DoorAdmin.vue
@@ -84,6 +84,7 @@ import TableFooter from "../../components/TableFooter";
 import { formItems, propFormData } from "./doorAdmin/queryCondition.config";
 import { title, tableItems, tableShows } from "./doorAdmin/table.config";
 import { mapState } from "vuex";
+import { timeDate } from "../../utils/index";
 
 import {
   getDoorAdmin,
@@ -133,7 +134,6 @@ export default {
   methods: {
     // 获取查询条件
     handleQuery(params) {
-      console.log(params);
       this.params = params;
       this.pageNum = 1;
       this.pigManage();
@@ -152,15 +152,6 @@ export default {
       // this.init();
       this.pigManage();
     },
-    init() {
-      let params = {
-        pageNum: this.pageNum,
-        pageSize: this.size,
-        searchStr: this.keyword,
-      };
-      console.log(params);
-      // 获取后端数据
-    },
     // 死猪管理
     pigManage() {
       const loading = this.$loading({
@@ -169,6 +160,12 @@ export default {
         spinner: "el-icon-loading",
         background: "rgba(0, 0, 0, 0.7)",
       });
+      if (!this.params.time) {
+        this.params.time = [
+          timeDate(new Date().getTime() - 1000 * 60 * 60 * 24),
+          timeDate(new Date().getTime()),
+        ];
+      }
       let queryParams = {
         pageNum: this.pageNum,
         pageSize: this.size,
@@ -177,7 +174,7 @@ export default {
       };
       getDoorAdmin(queryParams).then(async (res) => {
         loading.close();
-        if (res.code === 0) {
+        if (res && res.code === 0) {
           const result = JSON.parse(res.data.result);
           this.listData = result.data.pageData;
           this.listData.forEach((item) => {
@@ -185,12 +182,18 @@ export default {
           });
           this.total = parseInt(res.total);
         } else {
-          this.$message.warning(res.message);
+          res && this.$message.warning(res.message);
         }
       });
     },
     // 死猪管理 - 总数
     pigTotal() {
+      // if (!this.params.time) {
+      //   this.params.time = [
+      //     timeDate(new Date().getTime() - 1000 * 60 * 60 * 24),
+      //     timeDate(new Date().getTime()),
+      //   ];
+      // }
       // let queryParams = {
       //   orgCodeList: [],
       //   nodeCodeList: [

src/views/DeviceMana/Device.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-07 14:27:28
- * @LastEditTime: 2021-12-17 11:17:44
+ * @LastEditTime: 2021-12-22 10:59:35
  * @LastEditors: Please set LastEditors
  * @Description: 设备管理页面
  * @FilePath: \hyyfClient\src\views\DeviceMana\Device.vue
@@ -133,7 +133,6 @@ export default {
     // 选中
     selectionChange(rows) {
       this.rows = rows;
-      console.log(rows);
     },
     // 删除事件
     handleDelete(flag, row) {
@@ -177,7 +176,6 @@ export default {
         pageNo: this.tableFooterData.pageNum,
         pageSize: this.tableFooterData.size,
       }).then((res) => {
-        console.log(res);
         if (res.code === 10000) {
           this.listData = res.data.content;
           this.tableFooterData.totals = res.data.totalElements;
@@ -190,7 +188,6 @@ export default {
       getDeviceSummer({
         bit: 2,
       }).then((res) => {
-        console.log(res);
         if (res.code === 10000) {
           this.manageItems[0].num = res.data.total;
           this.manageItems[1].num = res.data.num;

src/views/Env/chart/ChartElecLines.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-08 17:24:29
- * @LastEditTime: 2021-12-21 10:07:31
+ * @LastEditTime: 2021-12-22 10:31:40
  * @LastEditors: Please set LastEditors
  * @Description: 存栏结构 - 存栏变动折线图
  * @FilePath: \hyyfClient\src\views\PdcData\analysis\ChartInventoryLines.vue
@@ -135,7 +135,7 @@ export default {
           // }
         ],
       };
-      this.myChart.setOption(options);
+      this.myChart.setOption(options, true);
     },
   },
   mounted() {
@@ -146,8 +146,7 @@ export default {
   },
   watch: {
     data: {
-      handler(newValue) {
-        console.log(newValue);
+      handler() {
         this.init();
       },
       deep: true,

src/views/Env/chart/ChartStark.vue

@@ -3,70 +3,76 @@
 </template>
 
 <script>
-import {mapState} from "vuex";
+import { mapState } from "vuex";
 export default {
   name: "ChartStark",
   computed: {
-    ...mapState(['color'])
+    ...mapState(["color"]),
   },
   props: {
     id: {
       type: String,
-      default: () => '0'
+      default: () => "0",
     },
     starkCount: {
-      type: String,
-      default: () => '0'
-    }
+      type: Number,
+      default: () => "0",
+    },
   },
   data() {
     return {
-      myChart: null
-    }
+      myChart: null,
+    };
   },
   watch: {
     color(newVal) {
-      if(newVal) {
+      if (newVal) {
         this.myChart.clear();
-        this.init()
+        this.init();
       }
     },
     starkCount(newVal) {
-      if(newVal) {
+      if (newVal) {
         this.myChart.clear();
-        this.init()
+        this.init();
       }
-    }
+    },
   },
   methods: {
     init() {
-      let data = [{name: '总用料量', value: this.starkCount.toString()}]
+      let data = [{ name: "总用料量", value: this.starkCount.toString() }];
       let formatNumber = function(num) {
         let reg = /(?=(\B)(\d{3})+$)/g;
-        return num.toString().replace(reg, ',');
-      }
+        return num.toString().replace(reg, ",");
+      };
       let total = data.reduce((a, b) => {
-        return a + b.value * 1
+        return a + b.value * 1;
       }, 0);
       let options = {
         color: [this.color],
         title: [
           {
-            text: '{name|' + '总用料量' + '}\n{val|' + formatNumber(total) + 'Kg' +'}',
-            top: 'center',
-            left: 'center',
+            text:
+              "{name|" +
+              "总用料量" +
+              "}\n{val|" +
+              formatNumber(total) +
+              "Kg" +
+              "}",
+            top: "center",
+            left: "center",
             textStyle: {
               rich: {
                 name: {
                   fontSize: 14,
-                  fontWeight: 'normal',
-                  color: '#666666',
+                  fontWeight: "normal",
+                  color: "#666666",
                   padding: [10, 0],
                 },
                 val: {
                   fontSize: 32,
-                  fontWeight: 'bold',
-                  color: '#333333',
+                  fontWeight: "bold",
+                  color: "#333333",
                 },
               },
             },
@@ -74,65 +80,68 @@ export default {
         ],
         series: [
           {
-            type: 'pie',
-            radius: ['45%', '60%'],
-            center: ['50%', '50%'],
+            type: "pie",
+            radius: ["45%", "60%"],
+            center: ["50%", "50%"],
             data: data,
             hoverAnimation: false,
             itemStyle: {
               normal: {
-                borderColor: '#fff',
-                borderWidth: 2
-              }
+                borderColor: "#fff",
+                borderWidth: 2,
+              },
             },
             labelLine: {
               normal: {
                 length: 20,
                 length2: 120,
                 lineStyle: {
-                  color: '#e6e6e6'
-                }
-              }
+                  color: "#e6e6e6",
+                },
+              },
             },
             label: {
               normal: {
-                formatter: params => {
+                formatter: (params) => {
                   return (
-                      '{icon|●}{name|' + params.name + '}{value|' +
-                      formatNumber(params.value) + '}'
+                    "{icon|●}{name|" +
+                    params.name +
+                    "}{value|" +
+                    formatNumber(params.value) +
+                    "}"
                   );
                 },
-                padding: [0 , -100, 25, -100],
+                padding: [0, -100, 25, -100],
                 rich: {
                   icon: {
-                    fontSize: 16
+                    fontSize: 16,
                   },
                   name: {
                     fontSize: 14,
                     padding: [0, 10, 0, 4],
-                    color: '#666666'
+                    color: "#666666",
                   },
                   value: {
                     fontSize: 18,
-                    fontWeight: 'bold',
-                    color: '#333333'
-                  }
-                }
-              }
+                    fontWeight: "bold",
+                    color: "#333333",
+                  },
+                },
+              },
             },
-          }
-        ]
-      }
-      this.myChart.setOption(options)
-    }
+          },
+        ],
+      };
+      this.myChart.setOption(options);
+    },
   },
   mounted() {
-    this.myChart = this.$echarts.init(document.getElementById('chart-stark-pie-' + this.id));
-    this.init()
-  }
-}
+    this.myChart = this.$echarts.init(
+      document.getElementById("chart-stark-pie-" + this.id)
+    );
+    this.init();
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

src/views/PdcData/Analysis.vue

@@ -308,8 +308,26 @@ export default {
       height: 300,
       tableData: [],
       // 存栏情况
-      inventoryLinesData: {}, // 折线图数据
-      inventoryPieData: [], // 环形图数据
+      inventoryLinesData: {
+        month: [],
+      }, // 折线图数据
+      inventoryPieData: [
+        {
+          stockQuantity: 0,
+        },
+        {
+          stockQuantity: 0,
+        },
+        {
+          stockQuantity: 0,
+        },
+        {
+          stockQuantity: 0,
+        },
+        {
+          stockQuantity: 0,
+        },
+      ], // 环形图数据
       inventoryItemsData: [], // 下面块图的数据
       // 生产情况
       productionPercents: [], // 百分比
@@ -384,7 +402,9 @@ export default {
           },
         ],
       },
-      salesChartData: {}, // 销售图的数据
+      salesChartData: {
+        timeList: [],
+      }, // 销售图的数据
       // 应收排名
       yingshouTableItems: [],
       yingshouTableShows: {},
@@ -423,8 +443,8 @@ export default {
     this.initTheSales(); // 销售情况
   },
   methods: {
-    handleWorkInfoClick(item) {
-      console.log(item);
+    handleWorkInfoClick() {
+      // console.log(item);
     },
     // 修改size
     sizeChange(val) {
@@ -439,12 +459,11 @@ export default {
     // 销售额选中日期
     salesSetDay(data) {
       this.salesDay = data;
-      // console.log(this.salesDay);
-    },
-    // 销售额选中日周月
-    salesOnClickType(data) {
-      // console.log(data);
     },
+    // // 销售额选中日周月
+    // salesOnClickType(data) {
+    //   // console.log(data);
+    // },
     // 工作看板
     initWorkBoard() {
       getWorkTotal({}).then(async (res) => {
@@ -529,14 +548,29 @@ export default {
           // this.productionPercents = [res.data[12].rate*100, res.data[13].rate*100, res.data[14].rate*100, res.data[15].rate*100, res.data[16].rate*100]
           // this.productionItems = [res.data[17].stockQuantity, res.data[18].stockQuantity, res.data[19].stockQuantity, res.data[20].stockQuantity, res.data[21].stockQuantity, res.data[22].stockQuantity, res.data[23].stockQuantity, res.data[24].stockQuantity]
         } else {
-          // this.inventoryLinesData = {
-          //   boarStock: [],
-          //   fatpigStock: [],
-          //   griceStock: [],
-          //   month: [],
-          //   pigletStock: [],
-          //   sowStock: []
-          // }
+          const undefinedData = {
+            stockQuantity: 0,
+          };
+          // this.inventoryPieData = res.data.slice(0, 6)
+          this.inventoryPieData = [
+            res.data["sow_stock"] || undefinedData,
+            res.data["boar_stock"] || undefinedData,
+            res.data["grice_stock"] || undefinedData,
+            res.data["piglet_stock"] || undefinedData,
+            res.data["fatpig_stock"] || undefinedData,
+          ];
+          // console.log("object", this.inventoryPieData);
+          this.inventoryItemsData = [
+            res.data["sow_stock"] ? res.data["sow_stock"].stockQuantity : 0,
+            res.data["sow_stock_1"] ? res.data["sow_stock_1"].stockQuantity : 0,
+            res.data["sow_stock_2"] ? res.data["sow_stock_2"].stockQuantity : 0,
+            res.data["sow_stock_3"] ? res.data["sow_stock_3"].stockQuantity : 0,
+            res.data["boar_stock"] ? res.data["boar_stock"].stockQuantity : 0,
+            res.data["business_stock"]
+              ? res.data["business_stock"].stockQuantity
+              : 0,
+          ];
+          this.$message.warning(res.message);
         }
       });
     },
@@ -632,7 +666,6 @@ export default {
             { ...res.data["break_rate"], color: "rgb(2, 167, 240)" },
             { ...res.data["breed_rate"], color: "rgb(112, 0, 217)" },
           ];
-          console.log(this.productionPercents);
           this.productionItems = [
             res.data["avg_farrow_1"].stockQuantity,
             res.data["avg_farrow_2"].stockQuantity,

src/views/PdcData/analysis/ChartInventoryLines.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-08 17:24:29
- * @LastEditTime: 2021-12-09 17:19:23
+ * @LastEditTime: 2021-12-22 10:27:54
  * @LastEditors: Please set LastEditors
  * @Description: 存栏结构 - 存栏变动折线图
  * @FilePath: \hyyfClient\src\views\PdcData\analysis\ChartInventoryLines.vue
@@ -23,7 +23,9 @@ export default {
     data: {
       type: Object,
       required: true,
-      default: () => ({}),
+      default: () => ({
+        month: [],
+      }),
     },
   },
   methods: {
@@ -32,7 +34,6 @@ export default {
       if (this.data.month.length === 0) {
         flag = "暂无数据";
       }
-      console.log("日期为-------------", this.data.month);
       let options = {
         title: {
           text: "存栏变动",
@@ -201,8 +202,7 @@ export default {
   },
   watch: {
     data: {
-      handler(newValue) {
-        console.log(newValue);
+      handler() {
         this.init();
       },
       deep: true,

src/views/PdcData/analysis/ChartInventoryPie.vue

@@ -170,9 +170,11 @@ export default {
     this.init();
   },
   watch: {
-    data(newValue) {
-      console.log(newValue);
-      this.init();
+    data: {
+      handler() {
+        this.init();
+      },
+      deep: true,
     },
   },
 };

src/views/PdcData/analysis/CostHistogram.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-12 09:10:42
- * @LastEditTime: 2021-12-09 17:22:16
+ * @LastEditTime: 2021-12-22 10:29:13
  * @LastEditors: Please set LastEditors
  * @Description: 成本分析的柱状图
  * @FilePath: \hyyfClient\src\views\PdcData\analysis\CostHistogram.vue
@@ -193,9 +193,11 @@ export default {
     this.init();
   },
   watch: {
-    data(value) {
-      console.log("成本分析柱状图数据", value);
-      this.init();
+    data: {
+      handler() {
+        this.init();
+      },
+      deep: true,
     },
   },
 };

src/views/PdcData/analysis/CostPie.vue

@@ -34,7 +34,6 @@ export default {
       let syValue = parseFloat(this.data.syValue);
       let slValue = parseFloat(this.data.slValue);
       let total = gtValue + syValue + slValue;
-      console.log("total", total);
       let options = {
         title: {
           text: this.title,

src/views/PdcData/analysis/ImportantLine.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-12 10:31:13
- * @LastEditTime: 2021-12-02 13:47:35
+ * @LastEditTime: 2021-12-22 10:29:25
  * @LastEditors: Please set LastEditors
  * @Description: 重要指标
  * @FilePath: \hyyfClient\src\views\PdcData\analysis\ImportantLine.vue
@@ -137,7 +137,6 @@ export default {
           },
         });
       }
-      console.log("纵轴坐标", yAxisData);
       let options = {
         title: {
           text: "重要指标",
@@ -188,9 +187,11 @@ export default {
     // this.init();
   },
   watch: {
-    listData(newValue) {
-      console.log("重要指标的图", newValue);
-      this.init();
+    listData: {
+      handler() {
+        this.init();
+      },
+      deep: true,
     },
   },
 };

src/views/PdcData/analysis/InventoryItems.vue

@@ -128,8 +128,6 @@ export default {
     data: {
       handler(newValue) {
         this.getData = newValue;
-        console.log(this.getData, "-------------------------");
-        console.log("-------------------------", this.getData.length);
       },
       deep: true,
     },

src/views/PdcData/analysis/ProductionDonuts.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-11 14:56:37
- * @LastEditTime: 2021-12-21 08:45:19
+ * @LastEditTime: 2021-12-22 10:30:13
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \hyyfClient\src\views\PdcData\analysis\ProductionDonuts.vue

src/views/PdcData/analysis/SalesChart.vue

@@ -27,7 +27,9 @@ export default {
     // },
     data: {
       type: Object,
-      default: () => {},
+      default: () => ({
+        timeList: [],
+      }),
     },
     // dataValue: {
     //   type: Array,
@@ -57,13 +59,11 @@ export default {
         tooltip: {
           trigger: "axis",
           formatter: (params) => {
-            // console.log(params[0].value);
             var res = "<div>" + params[0].name + "</div>"; // 字符串形式的html标签会被echarts转换渲染成数据，这个res主要是画的tooltip里的上部分的标题部分
             const index = this.data.moneyList.findIndex(
               (item) => item === params[0].value
             );
             for (var i = 0; i < params.length; i++) {
-              console.log(parseFloat(params[0].value).toLocaleString());
               // console.log(moneyListTooltip[i]);
               //因为是个数组，所以要遍历拿到里面的数据，并加入到tooltip的数据内容部分里面去
               res +=