Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

Administrator

2021-03-21 60e5202efdc7a91315d2620f505de1b7111cc7b7

 src/views/realTimePolice/real.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-03-17 15:21:33
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-03-20 16:47:06
 * @Last Modified time: 2021-03-20 18:12:42
 */
<template>
  <basic-container>
@@ -812,35 +812,44 @@
      };

      if (
        this.$router.query &&
        this.$router.query != null &&
        this.$router.query != ""
        this.$route.query.waringType && 
        this.$route.query != undefined &&
        this.$route.query != null &&
        this.$route.query != ""
      ) {
        if (this.$router.query.status) {
          this.activeClass = this.$router.query.status;
        if (
          this.$route.query.status != undefined &&
          this.$route.query.status != null &&
          this.$route.query.status == ""
        ) {
          this.activeClass = this.$route.query.status;
          this.page.currentPage = 1;
          if (this.$router.query.status == 0) {
          if (this.$route.query.status == 0) {
            params = {
              waringType: this.$router.query.waringType,
              waringType: this.$route.query.waringType,
              beginTime: this.dateTime.day.beginTime,
              endTime: this.dateTime.day.endTime,
            };
          } else if (this.$router.query.status == 1) {
          } else if (this.$route.query.status == 1) {
            params = {
              waringType: this.$router.query.waringType,
              waringType: this.$route.query.waringType,
              beginTime: this.dateTime.week.beginTime,
              endTime: this.dateTime.week.endTime,
            };
          } else if (this.$router.query.status == 2) {
          } else if (this.$route.query.status == 2) {
            params = {
              waringType: this.$router.query.waringType,
              waringType: this.$route.query.waringType,
              beginTime: this.dateTime.month.beginTime,
              endTime: this.dateTime.month.endTime,
            };
          }
        } else {
          this.activeClass = 0;
          this.page.currentPage = 1;
          params = {
            waringType: this.$router.query.waringType,
            waringType: this.$route.query.waringType,
            beginTime: this.dateTime.day.beginTime,
            endTime: this.dateTime.day.endTime,
          };
        }
      }
@@ -859,6 +868,7 @@
          ...this.query,
        };
      }

      this.loading = true;
      getList(page.currentPage, page.pageSize, values).then((res) => {
        const data = res.data.data;