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

liuyg

2021-05-07 b76dcae851544bc375754c3ba964d66ebd34d22b

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

 public/map/widgets/supervisoryMap/SupervisoryMap.js

@@ -459,8 +459,7 @@
          mySelf.onceTimeMethod = setTimeout(() => {
            mySelf.onceTimeMethod = null;
          }, mySelf.onceTime);
        } else {
        };
                } else {};
      })
      $('.analysis-container-police .analysis-table-content .tbody').off('click', '.location').on('click', '.location', function (event) {
        event.stopPropagation();
@@ -556,8 +555,7 @@
          mySelf.onceTimeMethod = setTimeout(() => {
            mySelf.onceTimeMethod = null;
          }, mySelf.onceTime);
        } else {
        };
                } else {};

      })
      $('.analysis-container-owner .analysis-table-content .tbody').off('click', '.location').on('click', '.location', function (event) {
@@ -598,8 +596,8 @@
        // console.log(that.clusterLayer, that._map, 6)
        // console.log(id, 'id');
        // console.log(that.clusterLayer);
        var Tattributes = null
          , ds = that.clusterLayer.allData;
                    var Tattributes = null,
                        ds = that.clusterLayer.allData;
        for (var key in ds) {
          if (ds[key].id == id) {
            Tattributes = ds[key];
@@ -618,8 +616,7 @@
          mySelf.onceTimeMethod = setTimeout(() => {
            mySelf.onceTimeMethod = null;
          }, mySelf.onceTime);
        } else {
        };
                    } else {};


      })
@@ -1091,31 +1088,31 @@

          if (deviceType == '') {
            result = oldData;
          } else if (deviceType == '在线') {
                    } else if (deviceType == '正常') {
            for (var key in oldData) {
              // console.log(oldData[key]);
              if (oldData[key].state == '' && oldData[key].jtype != 1 && oldData[key].onlineStatus == 1) {
                            if (oldData[key].dtype == '1') {
                result.push(oldData[key]);
              }
            }
          } else if (deviceType == '离线') {
                    } else if (deviceType == '掉线') {
            for (var key in oldData) {
              // console.log(oldData[key]);
              if (oldData[key].state == '' && oldData[key].jtype != 1 && oldData[key].onlineStatus != 1) {
                            if (oldData[key].dtype == '0') {
                result.push(oldData[key]);
              }
            }
          } else if (deviceType == '警报') {
                    } else if (deviceType == '预警') {
            for (var key in oldData) {
              // console.log(oldData[key]);
              if (oldData[key].state == '' && oldData[key].jtype == 1) {
                            console.log(oldData[key], 111);
                            if (oldData[key].dtype == 2) {
                result.push(oldData[key]);
              }
            }
          } else if (deviceType == '故障') {
            for (var key in oldData) {
              // console.log(oldData[key]);
              if (oldData[key].state != '') {
                            if (oldData[key].dtype == 3) {
                result.push(oldData[key]);
              }
            }
@@ -1163,22 +1160,18 @@
            // console.log(result[i].state);


            if (result[i].state != '') {
                        if (result[i].dtype == '3') {
              stares = '故障';
              str += "<td class='location'> <input style='background-image:linear-gradient(to right, #F49966 , #F49966' type='button' value=" + stares + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
            } else {
              if (result[i].jtype != 1) {
                if (result[i].onlineStatus == 1) {//el-tabs__active-bar
                  stares = '在线';
                        } else if (result[i].dtype == '1') {
                            stares = '正常';
                  str += "<td class='location'> <input style='background-image:linear-gradient(to right, #32C1A2 , #32C1A2' type='button' value=" + stares + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
                } else {
                  stares = '离线';
                        } else if (result[i].dtype == '0') {
                            stares = '掉线';
                  str += "<td class='location'> <input style='background-image:linear-gradient(to right, #CDCDCD , #CDCDCD' type='button' value=" + stares + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
                }
              } else {
                stares = '警报';
                        } else if (result[i].dtype == '2') {
                            stares = '预警';
                str += "<td class='location'> <input style='background-image:linear-gradient(to right, #F35B5B , #F35B5B' type='button' value=" + stares + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
              }
            }
            str += '</tr>';
            dom.append(str);

 public/map/widgets/supervisoryMap/template.html

@@ -22,10 +22,10 @@
                        <div class='select-list'>
                            <ul>
                                <li>全部</li>
                                <li>在线</li>
                                <li>警报</li>
                                <li>正常</li>
                                <li>预警</li>
                                <li>故障</li>
                                <li>离线</li>
                                <li>掉线</li>
                            </ul>
                        </div>
                    </li>
@@ -96,8 +96,7 @@
                </ul>
            </div>
            <div class='analysis-selection-criteria'>
                <input type="text" id='analysis_select_time_start' readonly> <span>-</span> <input type="text"
                    id='analysis_select_time_end' readonly>
                <input type="text" id='analysis_select_time_start' readonly> <span>-</span> <input type="text" id='analysis_select_time_end' readonly>
                <input type="button" value='查询' id='policeSelectTime'>
            </div>
            <div class='analysis-table-content'>

 src/views/clientManagement/clientManagement.vue

@@ -861,7 +861,6 @@
        });
      },
      rowUpdate(row, index, done, loading) {
        debugger;
        if(Array.isArray(row.deptId)){
            row.deptId = row.deptId.join(",");
        }