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

src/components/XForm.vue

@@ -78,9 +78,7 @@ export default {
   methods: {
     // 拿到方法
     onSelectText(value) {
-      if(this.formData.value1) {
-        delete this.formData.value1
-      }
+      this.formData.value1 = [];
       this.$emit('setDay', {type:value, data: this.formData})
     },
     onChange(val, data) {

src/views/BioSafety/personAdmin/AddOrEdit.vue

@@ -155,6 +155,7 @@ export default {
         } else {
           this.$message.error(`${this.form.id ? "修改" : "添加"}失败`);
         }
+        this.file = [];
       });
     },
     // 取消

src/views/Env/DrinkWater.vue

@@ -334,7 +334,7 @@ export default {
     },
     onClickType(data) {
       let params = {};
-      if (data.data.value1) {
+      if (data.data.value1.length > 0) {
         params = {
           startDate: data.data.value1[0],
           endDate: data.data.value1[1],
@@ -380,7 +380,7 @@ export default {
         let data1 = data.data;
         if (data1.unitId) {
           let params;
-          if (data1.value1) {
+          if (data1.value1.length > 0) {
             params = {
               roomId: data1.unitId,
               startDate: data1.value1[0],

src/views/Env/PigHouseEnv.vue

@@ -274,7 +274,7 @@ export default {
         let data1 = data.data;
         if (data1.unitId) {
           let params;
-          if (data1.value1) {
+          if (data1.value1.length > 0) {
             params = {
               roomId: data1.unitId,
               startDate: data1.value1[0],

src/views/Env/Stark.vue

@@ -180,7 +180,7 @@ export default {
     onClickType(data) {
       if(data.type === 'search') {
         let params = {};
-        if(data.data.value1) {
+        if(data.data.value1.length > 0) {
           params = {
             startDate: data.data.value1[0],
             endDate: data.data.value1[1],
@@ -225,7 +225,7 @@ export default {
         let data1 = data.data;
         if (data1.floorId) {
           let params;
-          if(data1.value1) {
+          if(data.data.value1.length > 0) {
             params = {
               floorId: data1.floorId,
               startDate: data1.value1[0],
@@ -243,6 +243,7 @@ export default {
           getFodder(params).then(res => {
             if(res.code === 10000) {
               this.starkCount = res.data.value;
+              console.log(this.starkCount);
               this.starkList = res.data.fodderList;
             }
           })

src/views/Env/chart/ChartStark.vue

@@ -16,7 +16,7 @@ export default {
     },
     starkCount: {
       type: Number,
-      default: () => "0",
+      default: () => 0,
     },
   },
   data() {
@@ -31,12 +31,20 @@ export default {
         this.init();
       }
     },
-    starkCount(newVal) {
-      if (newVal) {
+    starkCount: {
+      handler() {
         this.myChart.clear();
         this.init();
-      }
-    },
+      },
+      deep: true,
+    }
+    // starkCount(newVal) {
+    //   if (newVal) {
+    //     console.log(newVal)
+    //     this.myChart.clear();
+    //     this.init();
+    //   }
+    // },
   },
   methods: {
     init() {

src/views/Env/chart/ChartStarkBarOne.vue

@@ -101,7 +101,7 @@ export default {
         ],
         series: [
           {
-            name: '1号楼',
+            name: '用料情况',
             data: data1,
             type: 'bar',
             barWidth : 50,

src/views/dashboard/dashboard.vue

@@ -560,7 +560,7 @@ export default {
         let data1 = data.data;
         if (data1.unitId) {
           let params;
-          if (data1.value1) {
+          if (data1.value1.length > 0) {
             params = {
               roomId: data1.unitId,
               startDate: data1.value1[0],
@@ -585,7 +585,7 @@ export default {
         let data1 = data.data;
         if (data1.unitId) {
           let params;
-          if (data1.value1) {
+          if (data1.value1.length > 0) {
             params = {
               roomId: data1.unitId,
               startDate: data1.value1[0],