Merge branch 'hdw' of http://118.89.139.230:10101/r/admin_manage into hdw

longyvfengyun

2022-04-08 5c87e3c6c7e8c96fb764ea4acab8b06ea2d4bce5

Merge branch 'hdw' of http://118.89.139.230:10101/r/admin_manage into hdw

 src/assets/js/tools/regEquipType.js

@@ -22,8 +22,8 @@
        isolating: /^111/,
        charger: /^112/,
        air: /^113/,
        aio0: /^8060/,      // 二期一体机
        aio: /^8059/,       // 一期一体机
        aio0: /^8060/,      // 一期一体机
        aio: /^8059/,       // 二期一体机
        lithium: /^9130/,   // 锂电池
        lithiumPack: /^9131/, // 锂电池包
        storage: /^3100/

 src/pages/reportStatistics/deviceWorkState/index.vue

@@ -96,8 +96,6 @@
        startSearch() {
            // 开启等待框
            let loading = this.$layer.loading();
            // 重置分页信息
            this.params.page.pageCurr = 1;
            // 设置定时查询
            this.timer.start(()=>{
                this.$axios.all([
@@ -143,6 +141,9 @@
                if(rs.code == 1) {
                    data = rs.data;
                    this.params.page.pageAll = data[data.length-1].page.pageAll;
                } else if (this.params.page.pageCurr > 1) {
                  this.searchFBS9100();
                  return;
                }
                this.list = data;
            }).catch(error=>{
@@ -161,6 +162,9 @@
                if(rs.code == 1) {
                    data = rs.data;
                    this.params.page.pageAll = data[data.length-1].page.pageAll;
                } else if (this.params.page.pageCurr > 1) {
                  this.searchFBS9600();
                  return;
                }
                this.list = data;
            }).catch(error=>{
@@ -179,6 +183,9 @@
                if(rs.code == 1) {
                    data = rs.data;
                    this.params.page.pageAll = data[data.length-1].page.pageAll;
                } else if (this.params.page.pageCurr > 1) {
                  this.searchFBS61850();
                  return;
                }
                this.list = data;
            }).catch(error=>{
@@ -193,7 +200,10 @@
            if(rs.code == 1) {
              data = rs.data;
              this.params.page.pageAll = data[data.length-1].page.pageAll;
            }
            } else if (this.params.page.pageCurr > 1) {
                  this.searchLD9();
                  return;
                }
            console.log(data);
            this.list = data;
          }).catch(error=>{