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

liuyg

2021-05-09 6582b5dd37e5779cc2eead7337e4b2cd7319a36d

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

 src/views/animalHeat/animalHeat.vue

@@ -217,6 +217,8 @@
      },
      //搜索按钮
      searchChange(params, done) {
        //清空this.$route.query
        this.$router.push({ query: {} });
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
@@ -308,7 +310,6 @@
          }
      },
      onLoad(page, params = {}) {
        // debugger;
        const { dateTime } = this.query;
        let values = {
          ...params,

 src/views/healthcode/healthcode.vue

@@ -240,6 +240,8 @@
        this.onLoad(this.page);
      },
      searchChange(params, done) {
        //清空this.$route.query
        this.$router.push({ query: {} });
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
@@ -322,7 +324,6 @@
        let values = {
          ...params,
        };
        debugger;
        if (this.$route.query.status!=undefined && this.$route.query != undefined && this.$route.query != null && this.$route.query != "" ) {
            if (this.$route.query.type != undefined) {
              this.page.currentPage = 1;

 src/views/parcel/parcel.vue

@@ -243,6 +243,8 @@
        this.onLoad(this.page);
      },
      searchChange(params, done) {
        //清空this.$route.query
        this.$router.push({ query: {} });
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);

 src/views/parcel/parcelKind.vue

@@ -226,6 +226,8 @@
        this.onLoad(this.page);
      },
      searchChange(params, done) {
        //清空this.$route.query
        this.$router.push({ query: {} });
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);

 src/views/realTimePolice/real.vue

@@ -460,6 +460,8 @@
      this.onLoad(this.page);
    },
    searchChange(params, done) {
      //清空this.$route.query
      this.$router.push({ query: {} });
      this.query = params;
      this.page.currentPage = 1;
      this.onLoad(this.page, params);

 src/views/supervisoryConsole/data.vue

@@ -320,6 +320,7 @@
  methods: {
    drawPie() {
      var that = this;
      debugger;
      var myChart = this.$echarts.init(
        document.getElementById("base_information_pie_echarts")
      );
@@ -332,6 +333,12 @@
          itemStyle: { color: "#29c194" },
        },
        {
          value: that.yj,
          legendname: "预警",
          name: "预警",
          itemStyle: { color: "#F34A4A" },
        },
        {
          value: that.gz,
          legendname: "故障",
          name: "故障",

 src/views/system/dept.vue

@@ -96,7 +96,7 @@
              }]
            },
            {
              label: "所属租户",
              label: "所属客户",
              prop: "tenantId",
              type: "tree",
              dicUrl: "/api/blade-system/tenant/select",
@@ -112,7 +112,7 @@
              search: website.tenantMode,
              rules: [{
                required: true,
                message: "请输入所属租户",
                message: "请输入所属客户",
                trigger: "click"
              }]
            },

 src/views/system/user.vue

@@ -279,10 +279,11 @@
              display: false
            },
            {
              label: "所属租户",
              label: "所属客户",
              prop: "tenantName",
              slot: true,
              display: false
              display: false,
              width:200
            },
            {
              label: "用户姓名",
@@ -300,7 +301,8 @@
              label: "所属部门",
              prop: "deptName",
              slot: true,
              display: false
              display: false,
              width:260
            },

            {
@@ -348,7 +350,7 @@
              icon: 'el-icon-user-solid',
              column: [
                {
                  label: "所属租户",
                  label: "所属客户",
                  prop: "tenantId",
                  type: "tree",
                  dicUrl: "/api/blade-system/tenant/select",