地区

src/views/Env/DrinkWater.vue

@@ -15,26 +15,28 @@
     </div>
     <br/>
     <div class="reply" :style="{color: color}">饮用水详情</div>
-    <div class="carousel">
-      <swiper class="swiper" :options="swiperOption">
-        <swiper-slide v-for="(item, i) in list" :key="i" style="padding-top: 10px">
-          <div class="box">
-            <p>{{item.room}}</p>
-            <div class="flex">
-              <div>
-                <i class="icon1"></i>
-              </div>
-              <div>
-                <span>{{item.water == null ? '设备暂无数据' : item.water + '吨'}}</span>
+    <el-skeleton style="width: 100%; height: 150px;" :loading="loading" animated>
+      <div class="carousel">
+        <swiper class="swiper" :options="swiperOption">
+          <swiper-slide v-for="(item, i) in list" :key="i" style="padding-top: 10px">
+            <div class="box">
+              <p>{{item.room}}</p>
+              <div class="flex">
+                <div>
+                  <i class="icon1"></i>
+                </div>
+                <div>
+                  <span>{{item.water == null ? '设备暂无数据' : item.water + '吨'}}</span>
+                </div>
               </div>
             </div>
-          </div>
-        </swiper-slide>
-        <div class="swiper-pagination" slot="pagination"></div>
-        <div class="swiper-button-prev" slot="button-prev"></div>
-        <div class="swiper-button-next" slot="button-next"></div>
-      </swiper>
-    </div>
+          </swiper-slide>
+          <div class="swiper-pagination" slot="pagination"></div>
+          <div class="swiper-button-prev" slot="button-prev"></div>
+          <div class="swiper-button-next" slot="button-next"></div>
+        </swiper>
+      </div>
+    </el-skeleton>
     <br/>
     <div class="reply" :style="{color: color}">筛选查询</div>
     <x-form :formItems="selectItems" :day="day1"  @setDay="setDay1" @setChange="setChange" @onClickType="onClickType1"></x-form>
@@ -200,13 +202,13 @@ export default {
           col: 1,
           click: 'search'
         },
-        {
-          id: 7,
-          type: 'button',
-          text: '导出数据',
-          col: 2,
-          click: 'derive'
-        }
+        // {
+        //   id: 7,
+        //   type: 'button',
+        //   text: '导出数据',
+        //   col: 2,
+        //   click: 'derive'
+        // }
       ],
       day1: 2,
       dataValue: [12, 13, 10, 13, 9, 23, 21, 21, 24, 23, 14, 21, 21],
@@ -216,13 +218,17 @@ export default {
       waterList: [],
       waterCount: null,
       waterRoom: '',
+      loading: true,
     }
   },
   methods: {
     init() {
       getAllDayWater({}).then(res => {
         if(res.code === 10000) {
-          this.list = res.data
+          setTimeout(() => {
+            this.list = res.data
+            this.loading = false
+          }, 1000)
         }
       })
     },

src/views/Env/Electro.vue

@@ -123,13 +123,13 @@ export default {
           field: 'value1',
           col: 6
         },
-        {
-          id: 7,
-          type: 'button',
-          text: '导出数据',
-          col: 2,
-          click: 'derive'
-        }
+        // {
+        //   id: 7,
+        //   type: 'button',
+        //   text: '导出数据',
+        //   col: 2,
+        //   click: 'derive'
+        // }
       ],
       day1: 2,
       dataValue: [12, 13, 10, 13, 9, 23, 21, 21, 24, 23, 14, 21, 21]

src/views/Env/PigHouseEnv.vue

@@ -1,34 +1,36 @@
 <template>
   <div class="pigHouse">
-    <div style="height: 200px">
-      <swiper class="swiper" :options="swiperOption">
-        <swiper-slide v-for="(item, i) in list" :key="i" style="padding-top: 10px">
-          <div class="box">
-            <p>{{item.room}}</p>
-            <div class="flex">
-              <div>
-                <i class="icon1"></i>
+    <el-skeleton style="width: 100%; height: 200px;" :loading="loading" animated>
+      <div style="height: 200px">
+        <swiper class="swiper" :options="swiperOption">
+          <swiper-slide v-for="(item, i) in list" :key="i" style="padding-top: 10px">
+            <div class="box">
+              <p>{{item.room}}</p>
+              <div class="flex">
+                <div>
+                  <i class="icon1"></i>
+                </div>
+                <div>
+                  <span>{{item.temperature ? item.temperature + '℃' : '设备暂无数据'}}</span>
+                </div>
               </div>
-              <div>
-                <span>{{item.temperature ? item.temperature + '℃' : '设备暂无数据'}}</span>
+              <div style="margin-top: 20px" class="flex">
+                <div>
+                  <i class="icon2"></i>
+                </div>
+                <div>
+                  <span>{{item.humidity ? item.humidity + 'RH' : '设备暂无数据'}}</span>
+                </div>
               </div>
             </div>
-            <div style="margin-top: 20px" class="flex">
-              <div>
-                <i class="icon2"></i>
-              </div>
-              <div>
-                <span>{{item.humidity ? item.humidity + 'RH' : '设备暂无数据'}}</span>
-              </div>
-            </div>
-          </div>
 
-        </swiper-slide>
-        <div class="swiper-pagination" slot="pagination"></div>
-        <div class="swiper-button-prev" slot="button-prev"></div>
-        <div class="swiper-button-next" slot="button-next"></div>
-      </swiper>
-    </div>
+          </swiper-slide>
+          <div class="swiper-pagination" slot="pagination"></div>
+          <div class="swiper-button-prev" slot="button-prev"></div>
+          <div class="swiper-button-next" slot="button-next"></div>
+        </swiper>
+      </div>
+    </el-skeleton>
     <br/>
     <x-form :formItems="formItems" :day="day" @setDay="setDay" @setChange="setChange" @onClickType="onClickType"></x-form>
     <br/>
@@ -143,13 +145,13 @@ export default {
           col: 1,
           click: 'search'
         },
-        {
-          id: 7,
-          type: 'button',
-          text: '导出数据',
-          col: 2,
-          click: 'derive'
-        }
+        // {
+        //   id: 7,
+        //   type: 'button',
+        //   text: '导出数据',
+        //   col: 2,
+        //   click: 'derive'
+        // }
       ],
       // 默认选择本周
       day: 2,
@@ -160,14 +162,18 @@ export default {
       humList: {
         name: '',
         list: [],
-      }
+      },
+      loading: true
     }
   },
   methods: {
     init() {
       getEnv({}).then(res => {
         if(res.code === 10000) {
-          this.list = res.data;
+          setTimeout(() => {
+            this.list = res.data;
+            this.loading = false;
+          }, 1000)
         }
       })
     },

src/views/Env/Stark.vue

@@ -119,13 +119,13 @@ export default {
           col: 2,
           click: 'search'
         },
-        {
-          id: 7,
-          type: 'button',
-          text: '导出数据',
-          col: 2,
-          click: 'derive'
-        }
+        // {
+        //   id: 7,
+        //   type: 'button',
+        //   text: '导出数据',
+        //   col: 2,
+        //   click: 'derive'
+        // }
       ],
       day1: 1,
       starkCount: 0,
@@ -184,8 +184,8 @@ export default {
         }
         getAllFodder(params).then(res => {
           if(res.code === 10000) {
-            this.starkCount = res.data.value;
-            this.starkList = res.data.fodderList
+            this.starkAllCount = res.data.value;
+            this.starkAllList = res.data.fodderList;
           }
         })
       }

src/views/Video/AreaAdmin.vue

@@ -123,8 +123,8 @@ export default {
       showType: false,
       dialogVisible: false,
       rules: {
-        areaName: [ { required: true, message: '请输入区域名称', trigger: 'blur' } ],
-        publicUrl: [ { required: true, message: '请输入绑定IP', trigger: 'blur' } ],
+        areaName: [ { required: true, message: '区域名称不能为空', trigger: 'blur' } ],
+        publicUrl: [ { required: true, message: 'IP不能为空', trigger: 'blur' } ],
       },
       form: {
         areaName: '',
@@ -181,7 +181,7 @@ export default {
           this.init();
           this.$message.success(res.message)
         } else {
-          this.$message.error('删除失败')
+          this.$message.error(res.message)
         }
       })
     },
@@ -206,7 +206,7 @@ export default {
               this.init();
               this.$message.success(res.message)
             } else {
-              this.$message.error('删除失败')
+              this.$message.error(res.message)
             }
           })
         }).catch(() => {
@@ -247,7 +247,7 @@ export default {
                 this.init();
                 this.$message.success(res.message)
               } else {
-                this.$message.error('编辑失败')
+                this.$message.error(res.message)
               }
             })
           } else {
@@ -263,7 +263,7 @@ export default {
                 this.init();
                 this.$message.success(res.message);
               } else {
-                this.$message.error('添加失败')
+                this.$message.error(res.message)
               }
             })
           }
@@ -287,4 +287,4 @@ export default {
     box-sizing: border-box;
     padding: 20px;
   }
-</style>
+</style>

src/views/Video/CameraBrand.vue

@@ -139,16 +139,16 @@ export default {
       },
       rules: {
         brandName: [
-          { required: true, message: '请输入品牌名称', trigger: 'blur' }
+          { required: true, message: '品牌名称不能为空', trigger: 'blur' }
         ],
         mainStream: [
-          { required: true, message: '请输入主码流', trigger: 'blur' }
+          { required: true, message: '主码流不能为空', trigger: 'blur' }
         ],
         assistStream: [
-          { required: true, message: '请输入副码流', trigger: 'blur' }
+          { required: true, message: '副码流不能为空', trigger: 'blur' }
         ],
         streamType: [
-          { required: true, message: '请选择所用码流', trigger: 'change' }
+          { required: true, message: '所用码流不能为空', trigger: 'change' }
         ]
       },
       options: [
@@ -227,7 +227,7 @@ export default {
               this.init();
               this.$message.success(res.message)
             } else {
-              this.$message.error('删除失败')
+              this.$message.error(res.message)
             }
           })
         }).catch(() => {
@@ -260,7 +260,7 @@ export default {
                 this.init();
                 this.$message.success(res.message)
               } else {
-                this.$message.error('编辑失败')
+                this.$message.error(res.message)
               }
             })
           } else {
@@ -277,7 +277,7 @@ export default {
                 this.init();
                 this.$message.success(res.message);
               } else {
-                this.$message.error('添加失败')
+                this.$message.error(res.message)
               }
             })
           }
@@ -324,4 +324,4 @@ export default {
     box-sizing: border-box;
     padding: 20px;
   }
-</style>
+</style>

src/views/Video/VideoAdmin.vue

@@ -56,7 +56,7 @@
           <el-form-item label="密码" prop="password">
             <el-input v-model="form.password"></el-input>
           </el-form-item>
-          <el-form-item label="对应erp栋舍id">
+          <el-form-item label="斯高德房间id">
             <el-input v-model="form.roomId"></el-input>
           </el-form-item>
 <!--          <el-form-item label="排序" prop="sort">-->
@@ -224,12 +224,12 @@ export default {
         roomId: '',
       },
       rules: {
-        cameraName: [ { required: true, message: '请输入摄像头名称', trigger: 'blur' } ],
-        areaId: [ { required: true, message: '请选择区域', trigger: 'change' } ],
-        brandId: [ { required: true, message: '请选择品牌', trigger: 'change' } ],
-        cameraIp: [ { required: true, message: '请输入ip地址', trigger: 'blur' } ],
-        account: [ { required: true, message: '请输入用户名', trigger: 'blur' } ],
-        password: [ { required: true, message: '请输入密码', trigger: 'blur' } ],
+        cameraName: [ { required: true, message: '摄像头名称不能为空', trigger: 'blur' } ],
+        areaId: [ { required: true, message: '区域不能为空', trigger: 'change' } ],
+        brandId: [ { required: true, message: '品牌不能为空', trigger: 'change' } ],
+        cameraIp: [ { required: true, message: 'ip地址不能为空', trigger: 'blur' } ],
+        account: [ { required: true, message: '用户名不能为空', trigger: 'blur' } ],
+        password: [ { required: true, message: '密码不能为空', trigger: 'blur' } ],
         sort:  [ { required: true, message: '请输入排序', trigger: 'blur' } ],
       },
       selectList: [],
@@ -397,13 +397,13 @@ export default {
        getVideo(params).then(res => {
          if(res.code === 10000) {
            this.isVideo = true;
-           this.cameraTitle = res.data[0].cameraName;
+           // this.cameraTitle = res.data[0].cameraName;
            this.cameraOne = res.data[0].wsUrl;
            this.cameraTwo = res.data[0].rtspUrl;
            this.last = res.data[0].lastId;
            this.next = res.data[0].nextId;
          } else {
-           this.$message.error('查看失败');
+           this.$message.error(res.message);
          }
        })
       } else {
@@ -433,7 +433,7 @@ export default {
                 this.init();
                 this.$message.success(res.message)
               } else {
-                this.$message.error('编辑失败')
+                this.$message.error(res.message)
               }
             })
 
@@ -455,7 +455,7 @@ export default {
                 this.init();
                 this.$message.success(res.message);
               } else {
-                this.$message.error('添加失败')
+                this.$message.error(res.message)
               }
             })
           }
@@ -495,7 +495,7 @@ export default {
           this.last = res.data[0].lastId;
           this.next = res.data[0].nextId;
         } else {
-          this.$message.error('查看失败');
+          this.$message.error(res.message);
         }
       })
     }