Merge branch 'master' of http://192.168.1.7:3000/xsh1997/hyyfClient

src/views/Alarm/EventRem.vue

@@ -95,18 +95,6 @@ export default {
       ],
       title: "数据列表",
       list: [
-        {
-          id: 1,
-          time: "2021-10-11 14:09:09",
-          location: "育肥1栋2层死猪通道",
-          content: "死猪装袋处理",
-        },
-        {
-          id: 2,
-          time: "2021-10-11 14:09:09",
-          location: "卖猪台",
-          content: "猪只售卖",
-        },
       ],
       tableItems: [
         {

src/views/Alarm/ViolationUser.vue

@@ -89,20 +89,7 @@ export default {
         },
       ],
       title: "数据列表",
-      list: [
-        {
-          id: 1,
-          time: "2021-10-11 14:09:09",
-          location: "育肥1栋2层死猪通道",
-          content: "死猪装袋处理",
-        },
-        {
-          id: 2,
-          time: "2021-10-11 14:09:09",
-          location: "卖猪台",
-          content: "猪只售卖",
-        },
-      ],
+      list: [],
       tableItems: [
         {
           prop: "time",

src/views/dashboard/dashboard.vue

@@ -262,7 +262,7 @@
 import XForm from "../../components/XForm";
 import { mapState } from "vuex";
 import ChartWsd from "./chart/ChartWsd";
-import ChartDl from "./chart/ChartDl";
+// import ChartDl from "./chart/ChartDl";
 import ChartWater from "./chart/ChartWater";
 import ChartPig from "./chart/ChartPig";
 import {
@@ -280,7 +280,6 @@ export default {
   name: "dashboard",
   components: {
     ChartWsd,
-    ChartDl,
     ChartWater,
     ChartPig,
     XForm,
@@ -292,21 +291,25 @@ export default {
         {
           icon: "el-icon-s-order",
           name: "今日报警总数",
+          num: 0,
           unit: "条",
         },
         {
           icon: "el-icon-shopping-bag-1",
           name: "昨日卖猪总数",
+          num: 0,
           unit: "头",
         },
         {
           icon: "el-icon-coin",
           name: "昨日卖猪金额",
+          num: 0,
           unit: "元",
         },
         {
           icon: "el-icon-finished",
           name: "近7天卖猪总数",
+          num: 0,
           unit: "头",
         },
       ],