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

liuyg

2021-05-21 e96d6c76904bf9cab3658606476d2429cae4ebad

 src/views/clientManagement/clientManagement.vue

@@ -447,6 +447,7 @@
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
              searchSpan: 3,
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=manufacturers",
              props: {
                label: "dictValue",
@@ -1038,7 +1039,7 @@

          for (var i = 0; i < data.records.length; i++) {
            var date = new Date(data.records[i].heartbeat).getTime();
            if ((Dqdate - date) >= (60 * 60 * 24 * 1000)) {
            if ((Dqdate - date) >= (150 * 1000)) {
              data.records[i].dxzt = 0;
            } else if (data.records[i].heartbeat == "") {
              data.records[i].dxzt = 0;