Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity

tangzy

2021-06-29 6de8b8a3e3790b874045d20b77bb7aa71dcdfb37

 src/views/clientManagement/clientManagement.vue

@@ -830,17 +830,9 @@
          const data = res.data.data;
          this.page.total = data.total;

          var Dqdate = new Date().getTime();

          for (var i = 0; i < data.records.length; i++) {
            var date = new Date(data.records[i].heartbeat).getTime();
            if ((Dqdate - date) >= (150 * 1000)) {
              data.records[i].dxzt = 0;
            } else if (data.records[i].heartbeat == "") {
              data.records[i].dxzt = 0;
            } else {
              if(data.records[i].dtype==1){
                  data.records[i].dxzt = data.records[i].dtype;
                  data.records[i].dxzt = 1;
              }
              if(data.records[i].dtype==2){
                  data.records[i].dxzt = 2;
@@ -849,15 +841,9 @@
                  data.records[i].dxzt = 3;
              }
              if(data.records[i].dtype=="" || data.records[i].dtype==0){
                  data.records[i].dxzt = 1;
                  data.records[i].dxzt = 0;
              }

            }
          }

          // data.records.sort((a, b) => {
          //   return a.dxzt - b.dxzt;
          // });

          this.data = data.records;
          this.loading = false;