南昌市物联网技防平台-前端
liuyg
2021-04-23 294913571767548eff0764d205fd1b78f7415fbb
地图左控制状态绑定,详情状态绑定,颜色更改
4 files modified
116 ■■■■ changed files
public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js 12 ●●●● patch | view | raw | blame | history
public/map/widgets/supervisoryMap/SupervisoryMap.js 40 ●●●●● patch | view | raw | blame | history
public/map/widgets/supervisoryMap/template.html 1 ●●●● patch | view | raw | blame | history
src/views/dataL/dataL.vue 63 ●●●● patch | view | raw | blame | history
public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js
@@ -784,8 +784,9 @@
    },
    _clusterData: function () {
      //此函数当前仅适用于不使用预聚集数据的情况
      //this function currently only applies if not using preclustered data
      console.log('改变111111111111111')
      if (this.preClustered) {
        return;
      }
@@ -871,9 +872,10 @@
          cl.singles.push(obj);
        }
      }
      for (i = 0, len = this.gridClusters.length; i < len; i++) {
        if (this.gridClusters[i].clusterCount === 1) {
// console.log(this.gridClusters)
          this._createSingle(this.gridClusters[i].singles[0]);
        } else if (this.gridClusters[i].clusterCount > 0) {
          this._createCluster(this.gridClusters[i]);
@@ -929,6 +931,10 @@
      this.singles.push(single);
      delete single.graphic;
      var symbol;
      // console.log(single.state);
      if (single.state != '') {
        symbol = new esri.symbol.PictureMarkerSymbol("./images/by-jingbao.png", 40, 40);
      } else {
      if (single.jtype == 1) {
        symbol = new esri.symbol.PictureMarkerSymbol("./images/yj-jingbao.png", 40, 40);
      } else {
@@ -938,6 +944,8 @@
          symbol = new esri.symbol.PictureMarkerSymbol("./images/dx-jingbao.png", 40, 40);
        }
      }
      }
      var point = new Point(single[this.xPropertyName], single[this.yPropertyName], this.spatialRef);
      var attributes = lang.clone(single);
public/map/widgets/supervisoryMap/SupervisoryMap.js
@@ -816,11 +816,47 @@
        type: 'GET',
        dataType: 'JSON',
        success: function (data) {
          var result = data.data;
          console.log(result)
          var oldData = data.data
          var result = [];
          // console.log(result)
          var str = '';
          that.entitysData = [];
          that.analysisAddEntitys.clear();
          if(deviceType == ''){
            result = oldData;
          }else if(deviceType == '在线'){
            for (var key in oldData){
              // console.log(oldData[key]);
              if(oldData[key].state == '' && oldData[key].jtype != 1 && oldData[key].onlineStatus == 1){
                result.push(oldData[key]);
              }
            }
          }else if(deviceType == '离线'){
            for (var key in oldData){
              // console.log(oldData[key]);
              if(oldData[key].state == '' && oldData[key].jtype != 1 && oldData[key].onlineStatus != 1){
                result.push(oldData[key]);
              }
            }
          }else if(deviceType == '警报'){
            for (var key in oldData){
              // console.log(oldData[key]);
              if(oldData[key].state == '' && oldData[key].jtype == 1){
                result.push(oldData[key]);
              }
            }
          }else if(deviceType == '故障'){
            for (var key in oldData){
              // console.log(oldData[key]);
              if(oldData[key].state != ''){
                result.push(oldData[key]);
              }
            }
          }
          for (var a, i = 0; i < result.length; i++) {
            that.createEntitysAnalysis(that.analysisAddEntitys, that.entitysData, '设备信息', {
              lgtd: result[i].jd,
public/map/widgets/supervisoryMap/template.html
@@ -24,6 +24,7 @@
                                <li>全部</li>
                                <li>在线</li>
                                <li>警报</li>
                                <li>故障</li>
                                <li>离线</li>
                            </ul>
                        </div>
src/views/dataL/dataL.vue
@@ -8,11 +8,25 @@
              {{ name.length > 14 ? name.substr(0, 14) + "···" : name }}
            </p>
            <div class="l-t-state">
              <!-- dataState: ["掉线", "在线", "故障", "预警"],
                if (s != "") {
                    states = "故障";
                  } else {
                    if (j != 1) {
                      if (o == 1) {
                        states = "在线";
                      } else {
                        states = "掉线";
                      }
                    } else {
                      states = "预警";
                    }
                  }-->
              <span
                :class="{
                  'l-t-s-grey': state == dataState[0],
                  'l-t-s-green': state == dataState[1],
                  'l-t-s-yewllo': state == dataState[3],
                  'l-t-s-yewllo': state == dataState[2],
                  'l-t-s-red': state == dataState[3],
                  'l-t-s-yuan': true,
                }"
@@ -952,13 +966,12 @@
        var setimgl = null;
        //插入图片api获取图片
// this.stetDetails(data);
        getImg(imgdadta,'post').then((res) => {
        getImg(imgdadta, "post").then((res) => {
          // console.log(res.data.data.length != 0)
          var imgdatas = [];
          if(res.data.data.length != 0){
            imgdatas = res.data.data[0].paddress.split(',');
            imgdatas = res.data.data[0].paddress.split(",");
          }else{
          }
          // console.log(imgdatas);
          // imgdatas = [ //最多5张照片 
@@ -969,7 +982,7 @@
      //   "https://resource-city.sensoro.com/1723C1A66DB44F792564F3648E5AA1EE",
        // "https://web.byisf.com/minio/jfpt/upload/depl/ad049799e7024c529b9c890d3ba434bc.JPEG",
      // ];
          setimgl =  imgdatas.length == 0? ['no'] : imgdatas;
          setimgl = imgdatas.length == 0 ? ["no"] : imgdatas;
          this.stetDetails(data, setimgl);
        });
        // console.log(data);
@@ -988,16 +1001,34 @@
        o = this.a.onlineStatus,
        s = this.a.state,
        j = this.a.jtype;
      if (o == 0) {
        states = "掉线";
      } else if (o == 1) {
        states = "在线";
      } else if (s != "") {
      // if (o == 0) {
      //   states = "掉线";
      // } else if (o == 1) {
      //   states = "在线";
      // } else if (s != "") {
      //   states = "故障";
      // } else if (j != 2) {
      //   states = "预警";
      // }
      if (s != "") {
        states = "故障";
      } else if (j != 2) {
      } else {
        if (j != 1) {
          if (o == 1) {
            states = "在线";
          } else {
            states = "掉线";
          }
        } else {
        states = "预警";
      }
      this.state = "无数据" && states;
      }
      console.log(o, 1000);
      console.log(s, 1000);
      console.log(j, 1000);
      console.log(states, 1000);
      this.state =  states;
      this.evaluate = "空气质量";
      this.machineCode = "无数据" && this.a.deviceNumber;
@@ -1254,16 +1285,16 @@
              border: 1px solid transparent;
            }
            .l-t-s-grey {
              background-color: rgb(187, 187, 187);
              background-color: #CDCDCD;
            }
            .l-t-s-green {
              background-color: rgb(41, 202, 135);
              background-color: #32C1A2;
            }
            .l-t-s-yewllo {
              background-color: rgb(240, 181, 20);
              background-color: #F49966;
            }
            .l-t-s-red {
              background-color: rgba(247, 28, 28, 0.877);
              background-color: #F35B5B;
            }
          }
        }