Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

shuishen

2021-04-25 bfb1606a202ecfb1523c1ac13ee5ae78dbf14528

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

 public/map/popup/html/FlareClusterLayer_v3.html

@@ -19,7 +19,6 @@
        #appliu {
            /* border: 1px solid #000; */
            border-radius: 5px 5px 5px 5px;
            width: ;
        }

        .names {

 public/map/popup/html/SupervisoryMapPdata.html

@@ -165,7 +165,7 @@
        <!-- 从layui传值给iframe 的占位input -->
        <!-- <div class="aaa bbb">13223456745</div> -->
        <input type="text" id="sidIput" ref="sidIput" style="display:none">
        <div class="flare-liu-top" style="background-image: linear-gradient(to right, #F35B5B , #F35B5B">
        <div class="flare-liu-top" style="background-image: linear-gradient(to right, #F35B5B , #F35B5B)">
            <div class="f-l-t-heard">{{datas.place}}</div>
            <div class="f-l-t-right">
                <div class="f-l-t-r-number">设备编号：{{datas.deviceNumber}}</div>

 public/map/popup/html/SupervisoryMapYdata.html

@@ -134,6 +134,8 @@
            width: 70%;
            color: #5d5d5d;
            font-size: 12px;
            position: relative;
            left: -10px;

        }

@@ -148,6 +150,7 @@
            height: 260px;
            overflow: auto;
        }



        .el-tabs__active-bar {
@@ -167,100 +170,40 @@
        <!-- <div class="aaa bbb">13223456745</div> -->
        <input type="text" id="sidIput" ref="sidIput" style="display:none">
        <div class="flare-liu-top" style="background-image: linear-gradient(to right, #F35B5B , #F35B5B">
            <div class="f-l-t-heard">{{datas.place}}</div>
            <div class="f-l-t-heard">{{datas.tenant_name}}</div>
            <div class="f-l-t-right">
                <div class="f-l-t-r-number">名称：{{datas.deviceNumber}}</div>
                <div class="f-l-t-r-time">接警时间：{{datas.jjTime}}</div>
                <div class="f-l-t-r-number">级别：{{datas.dj}}</div>
                <div class="f-l-t-r-time">建立时间：{{datas.create_time}}</div>
            </div>
        </div>
        <div class="flare-liu-body">
            <el-tabs v-model="activeName" @tab-click="handleClick">
                <el-tab-pane label="警情信息" name="first">
                <el-tab-pane label="业主信息" name="first">
                    <div class="r-b-top">
                        <div class="r-b-t-main-once">
                            <span class="r-b-t-left">ID：</span>
                            <span class="r-b-t-right">{{ datas.alarmPeople }}</span>
                        </div>
                        <div class="r-b-t-main-once">
                            <span class="r-b-t-left">地址：</span>
                            <span class="r-b-t-right">{{ datas.galarmPeople }}</span>
                        </div>
                        <div class="r-b-t-main-once">
                            <span class="r-b-t-left">类型：</span>
                            <span class="r-b-t-right">{{ datas.galarmPeople }}</span>
                        </div>
                        <div class="r-b-t-main-once">
                            <span class="r-b-t-left">域名：</span>
                            <span class="r-b-t-right">{{ datas.galarmPeople }}</span>
                        </div>
                        <!-- <div class="r-b-t-main-once">
                            <span class="r-b-t-left">使用方：</span>
                            <span class="r-b-t-right">？？</span>
                        </div> -->
                        <!-- <div class="r-b-t-main">
                            <div class="rbt-l">
                                <span class="r-b-t-left">警情内容：</span>
                                <span class="r-b-t-right">{{ datas.content }} </span>
                            </div>
                            <div class="rbt-r">
                                <span class="r-b-t-left">警情类型：</span>
                                <span class="r-b-t-right">{{datas.waringType}}</span>
                            </div>
                        </div> -->
                        <div class="r-b-t-main">
                            <div class="rbt-l">
                                <span class="r-b-t-left">联系人：</span>
                                <span class="r-b-t-right">{{ datas.oneContacts }} </span>
                                <span class="r-b-t-right">{{ datas.linkman }} </span>
                            </div>
                            <div class="rbt-r">
                                <span class="r-b-t-left">联系电话：</span>
                                <span class="r-b-t-right">{{datas.onePhone}}</span>
                                <span class="r-b-t-left">电话：</span>
                                <span class="r-b-t-right">{{datas.contact_number}}</span>
                            </div>
                        </div>
                        <!-- <div class="r-b-t-main">
                            <div class="rbt-l">
                                <span class="r-b-t-left">二级负责人：</span>
                                <span class="r-b-t-right">{{ datas.twoContacts }} </span>
                            </div>
                            <div class="rbt-r">
                                <span class="r-b-t-left">call：</span>
                                <span class="r-b-t-right">{{datas.twoPhone}}</span>
                            </div>
                        <div class="r-b-t-main-once">
                            <span class="r-b-t-left">地址：</span>
                            <span class="r-b-t-right">{{ datas.address }}</span>
                        </div>
                        <div class="r-b-t-main">
                            <div class="rbt-l">
                                <span class="r-b-t-left">三级负责人：</span>
                                <span class="r-b-t-right">{{ datas.threeContacts }} </span>
                            </div>
                            <div class="rbt-r">
                                <span class="r-b-t-left">call：</span>
                                <span class="r-b-t-right">{{datas.threePhone}}</span>
                            </div>
                        </div> -->
                        <div class="r-b-t-main-once">
                            <span class="r-b-t-left">业主简介：</span>
                            <span class="r-b-t-right">{{ datas.content }}</span>
                            <!-- <span class="r-b-t-right introduce"></span> -->
                        </div>
                    
                    </div>
                </el-tab-pane>
                <!-- <el-tab-pane label="现场图片" name="second">
                     <el-card class="scene-image-box">
                        <el-image v-for="(item, index) in imgSrc" :key="index" :src="item" :preview-src-list="srcList"
                            v-show="imgSrc.length > 0"></el-image>
                        <span v-show="imgSrc.length == 0">暂无现场图片</span>
                    </el-card> -->

                <!-- <el-card class="scene-image-box">
                            <el-image v-for="url in imgSrc" :key="url" :src="url"  :preview-src-list="srcList" v-show="imgSrc.length"></el-image> -->
                <!--<el-image v-for="url in imgSrc" :key="url" :src="url"   v-show="imgSrc.length"></el-image>
                            <span v-show="imgSrc.length == 0">暂无现场图片</span>
                        </el-card>
               
                    
                </el-tab-pane> -->
                <!-- <el-tab-pane label="现场视频" name="third">
                    <el-card>
                        <video :src="feedbackVideo" style="width: 100%; height: 100%; object-fit: fill" controls
                            v-show="feedbackVideo != ''"></video>
                        <span v-show="feedbackVideo == ''">暂无现场视频</span>
                    </el-card>
                </el-tab-pane> -->
          
                <!-- <el-tab-pane label="现场视频" name="third"><el-card></el-card></el-tab-pane> -->
            </el-tabs>
        </div>
    </div>
@@ -275,59 +218,56 @@
            data: {
                datas: {},
                activeName: 'first',
                imgSrc: [],
                srcList: [],
                feedbackVideo: "",
                // aaa: "",
                // address: "南昌市东湖区永外正街17号",
                // addvcd: "",
                // city: "",
                // coordinate: "POINT(0 0)",
                // createtime: "2021-03-17 10:06:23",
                // district: "",
                // dj: "三级甲等",
                // haveJW: "无地图经纬度",
                // id: 10,
                // information: "<em>南昌一附院</em>一般指南昌大学第一附属医院。南昌大学第一附属医院有东湖院区和象湖院区两个院区，其中东湖院区位于江西省南昌市东湖区永外正街17号，始建于1939年，是一所集医疗、教学、科研、预防保健、康养于一体三级甲等综合医院",
                // isDelete: -1,
                // jd: "",
                // phone: "0791-88692748",
                // province: "",
                // type: "医院",
                // wd: "",
                // yname: "南昌大学第一附属医院",
                // ynumber: "CLRK202103171006232744",
                // account_number: -1,
                // address: "江西省南昌市永外正街17号南昌大学一附院人事处",
                // background_url: "",
                // city: "3601",
                // contact_number: "0791-88695116",
                // content: "昌大学第一附属医院是一所集医疗、教学、科研、预防保健、康养于一体三级甲等综合医院，是江西省、南昌市医保定点医院",
                // create_dept: "1123598813738675201",
                // create_time: "2021-01-26 15:48:06",
                // create_user: "1123598821738675201",
                // ctime: "1939-08-10 00:00:00",
                // datasource_id: "1161483357481541634",
                // district: "360113",
                // dj: "     三级甲等",
                // domain: "",
                // ht: " 综合医院",
                // id: "1353972967828533249",
                // is_deleted: 0,
                // jd: "115.91029100000003",
                // license_key: "77cfee8356bb00cf9917f072f228ee10e7d0f5f15b257a66adc0192ee0ca33034019abaa8f441ed91da8f295f5cc7f1d04dac41a822fe51f5c29cb43ff85b240",
                // linkman: "赵明明",
                // province: "36",
                // status: 1,
                // tenant_id: "963841",
                // tenant_name: "南昌大学第一附属医院",
                // type: "0",
                // update_time: "2021-04-25 11:17:36",
                // update_user: "1123598821738675201",
                // wd: "25.87018472992316",
                
                // category
                // attributes
                // developers
                // had
                // housetype
                // ho
                // content
                // id
                // nature
                // motto
                // ctime
                // content
                // hn
            },
            methods: {
                getdatas(dat) {
                    console.log(dat);
                    $('.introduce').append(dat.information)
                },
                handleClick(tab, event) {//标签tab点击事件
                    // console.log(tab, event);
                },
                getImgAndVideo() {
                    var that = this;
                    // console.log(this.datas.id)
                    axios({
                        method: "post",
                        url: "/api/blade-jfpts/feedback/feedback/selectFeedEdit",
                        params: {
                            jid: this.datas.id,
                        },
                    }).then((resdata) => {
                        var dL = resdata.data.data;
                        if (dL.length != 0) {
                            if (dL[0].tp.length > 0) {
                                // console.log(dL[0].tp);
                                that.imgSrc = dL[0].tp;
                                that.srcList = dL[0].tp;
                            }
                            if (dL[0].sp.length > 0) {
                                // console.log(dL[0].sp);
                                that.feedbackVideo = dL[0].sp[0];
                            }
                        }
                    });
                },
            },
            mounted() {

 public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js

@@ -196,7 +196,7 @@
      // console.log(und)
      if (und == '控制端') {//控制端弹窗关闭
        parent[0].layer.close(indexControl);
        parent[0].layer.close(+indexControl + 1);
        // parent[0].layer.close(+indexControl + 1);
      }

      if (eour == undefined) {
@@ -313,7 +313,7 @@
                  clickD = document.onclick = () => {
                    if (isclickD) {
                      parent[0].layer.close(index);
                      parent[0].layer.close(+index + 1);
                      // parent[0].layer.close(+index + 1);
                      // parent[0].layer.closeAll();
                      // console.log(111111111111)
                      clickD = document.onclick = null;
@@ -321,11 +321,11 @@
                  }

                  var mouseWheel = that.map.on("mouse-wheel", myMouseWheelHandler);

                  //鼠标滚轮事件
                  function myMouseWheelHandler(event) {
                    // console.log("Mouse wheel value = " + event.value);
                    parent[0].layer.close(index);
                    parent[0].layer.close(+index + 1);
                    // parent[0].layer.close(+index + 1);
                    mouseWheel.remove();
                  }

@@ -396,7 +396,7 @@
          var offsetMy = [+evt.screenY - 310 + 'px', +evt.screenX - 168 + 'px'];
          if (und == '控制端') {//控制端弹窗关闭
          var offsetMy = [+window.innerHeight / 2 - 115 + 'px', (+window.innerWidth - 360) / 2 + 257 + 'px'];
          console.log('控制端中浮',offsetMy)
          // console.log('控制端中浮',offsetMy)
        }
          // console.log(evt.screenY);
          var winSize = [+window.innerHeight / 2 - 242 + 'px', +window.innerWidth - 380 + 'px']
@@ -421,7 +421,7 @@
        this._map.centerAndZoom(position, this.map.getZoom() + 1);//缩放，10是缩放级别，可以自定义，数值越大缩放越大

        parent[0].layer.close(this.indexs)
        parent[0].layer.close(+this.indexs + 1)
        // parent[0].layer.close(+this.indexs + 1)

        // console.log('111:', this.map.zoomToFullExtent(), '222:', evt, evt.graphic._extent, 'zoom');
      }

 public/map/widgets/supervisoryMap/SupervisoryMap.css

@@ -345,6 +345,18 @@
    cursor: default;
}

.analysis-container .analysis-container-owner .table .tbody tr td:nth-child(2),
.analysis-container .analysis-container-owner .table .thead tr th:nth-child(2){
    width: 170px;
}
/* .analysis-container .analysis-container-owner .table .tbody tr td:nth-child(3),
.analysis-container .analysis-container-owner .table .thead tr th:nth-child(3){
    width: 50px;
} */
.analysis-container .analysis-container-owner .table .tbody tr td:nth-child(4),
.analysis-container .analysis-container-owner .table .thead tr th:nth-child(4){
    width: 60px;
}
.analysis-container .analysis-container-police .table .tbody tr input,
.analysis-container .analysis-container-owner .table .tbody tr input,
.analysis-container .analysis-container-equipment .table .tbody tr input {

 public/map/widgets/supervisoryMap/SupervisoryMap.js

@@ -364,7 +364,7 @@
            break;
          }
        }
        console.log(b, id);
        // console.log(b, id);
        event.stopPropagation();
        var winSize = [+window.innerHeight / 2 - 242 + 'px', +window.innerWidth - 380 + 'px'];

@@ -374,8 +374,10 @@
        } else {
          // console.log('有地图经纬度')
          b.haveJW = '有地图经纬度';
          var lgtd = Number($(this).find('input').attr('lgtd'));
          var lttd = Number($(this).find('input').attr('lttd'));
          // var lgtd = Number($(this).find('input').attr('lgtd'));
          // var lttd = Number($(this).find('input').attr('lttd'));
          var lgtd = Number(b.jd);
          var lttd = Number(b.wd);
          // console.log($(this).find('input').attr('lttd'));
          var position = new esri.geometry.Point(lgtd, lttd, new esri.SpatialReference({ wkid: 4326 }));//根据输入坐标信息找地图上的点
          that._map.centerAndZoom(position, 18);//缩放，10是缩放级别，可以自定义，数值越大缩放越大
@@ -392,7 +394,7 @@
              extend: 'myskin/FlareClusterLayer.css'
            });
            that.layuiLayer.close(that.layuiLayer.index);
            that.layuiLayer.open({ 
            that.layuiLayer.open({
              title: '',
              type: 2,
              shadeClose: true,
@@ -447,6 +449,23 @@
            break;
          }
        }

        event.stopPropagation();
        if (b.jd == '' || b.wd == '') {
          // console.log('无地图经纬度');
          b.haveJW = '无地图经纬度';
        } else {
          // console.log('有地图经纬度')
          b.haveJW = '有地图经纬度';
          var lgtd = Number(b.jd);
          var lttd = Number(b.wd);
          // console.log($(this).find('input').attr('lttd'));
          var position = new esri.geometry.Point(lgtd, lttd, new esri.SpatialReference({ wkid: 4326 }));//根据输入坐标信息找地图上的点
          that._map.centerAndZoom(position, 18);//缩放，10是缩放级别，可以自定义，数值越大缩放越大
        }



        console.log(b, id);
        var winSize = [+window.innerHeight / 2 - 242 + 'px', +window.innerWidth - 380 + 'px'];
        var as = b;
@@ -459,7 +478,7 @@
              extend: 'myskin/FlareClusterLayer.css'
            });
            that.layuiLayer.close(that.layuiLayer.index);
            that.layuiLayer.open({ 
            that.layuiLayer.open({
              title: '',
              type: 2,
              shadeClose: true,
@@ -513,19 +532,6 @@
        //   });
        // })

        event.stopPropagation();
        if (b.jd == '' || b.wd == '') {
          // console.log('无地图经纬度');
          b.haveJW = '无地图经纬度';
        } else {
          // console.log('有地图经纬度')
          b.haveJW = '有地图经纬度';
          var lgtd = Number($(this).find('input').attr('lgtd'));
          var lttd = Number($(this).find('input').attr('lttd'));
          // console.log($(this).find('input').attr('lttd'));
          var position = new esri.geometry.Point(lgtd, lttd, new esri.SpatialReference({ wkid: 4326 }));//根据输入坐标信息找地图上的点
          that._map.centerAndZoom(position, 18);//缩放，10是缩放级别，可以自定义，数值越大缩放越大
        }

        // var y = +window.innerHeight / 2 + 200;
        // var x = (+window.innerWidth - 360) / 2 + 360 + 70;
@@ -871,7 +877,7 @@
            str += '<td title=' + result[i].waringType + '>' + result[i].waringType + '</td>';
            str += '<td title=' + result[i].alarmPeople + '>' + result[i].alarmPeople + '</td>';
            str += "<td><a href='javascript:;' title=" + time + ">" + y + ' ' + h + "</a></td>";
            str += "<td class='location' style='display: none'> <input type='button' value='定位'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
            // str += "<td class='location' style='display: none'> <input type='button' value='定位'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
            if (result[i].jtype == 0) {
              str += "<td class='location'> <input style='color:#000000;background-color:#ffffff;background-image:linear-gradient(to right, #fffff , #fffff' type='button' value='未处理'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
            } else {
@@ -935,17 +941,31 @@
      dom.empty();
      var that = this;
      $.ajax({
        url: '/api/blade-jfpts/suser/suser/selectList?type=' + type + '&dj=' + dj,
        type: 'GET',
        // url: '/api/blade-system/tenant/page',
        // type: 'GET',
        url: '/api/blade-system/tenant/selectListTe',
        type: 'POST',
        dataType: 'JSON',
        success: function (data) {
          // var result = data.data;
          var oldData = data.data
          var oldData = data.data;
          console.log(oldData)
          var result = oldData;
          that.Ydata = oldData;
          var str = '';
          that.entitysData = [];
          that.analysisAddEntitys.clear();
          var createD = (id, a, name, dj, type) => {
            str += "<tr term-list=" + id + ">";
            str += '<td>' + a + '</td>';
            str += '<td>' + name + '</td>';
            str += '<td>' + dj + '</td>';
            str += '<td>' + type + '</td>';
            // str += "<td class='location' style='display: none'> <input type='button' value='定位'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
            str += '</tr>';
            dom.append(str);
            str = '';
          }
          for (var a, i = 0; i < result.length; i++) {

            that.createEntitysAnalysis(that.analysisAddEntitys, that.entitysData, '业主信息', {
@@ -953,19 +973,19 @@
              lttd: result[i].wd,
              id: result[i].id
            }, result[i].jd, result[i].wd, './images/owner.png');

            
            a = Number(i) + 1;
            str += "<tr term-list=" + result[i].id + ">";
            str += '<td>' + a + '</td>';
            str += '<td>' + result[i].type + '</td>';
            str += '<td>' + result[i].dj + '</td>';
            str += '<td>' + result[i].yname + '</td>';
            str += "<td class='location' style='display: none'> <input type='button' value='定位'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
            str += '</tr>';
            dom.append(str);
            str = '';
          }
            if (result[i].type === "0") {
              createD(result[i].id, a, result[i].tenant_name, result[i].dj, '医院')
            } else if (result[i].type === "1") {
              createD(result[i].id, a, result[i].tenant_name, result[i].nature, '学校')
            } else if (result[i].type === "2") {
              createD(result[i].id, a, result[i].tenant_name, result[i].housetype, '小区')
            } else {
              createD(result[i].id, a, result[i].tenant_name, result[i].dj, '其他')
            }

          }
        }
      })
    },

 public/map/widgets/supervisoryMap/template.html

@@ -176,9 +176,9 @@
                            <thead>
                                <tr>
                                    <th>序号</th>
                                    <th>类别</th>
                                    <th>等级</th>
                                    <th>名称</th>
                                    <th>等级</th>
                                    <th>类型</th>
                                    <!-- <th>操作</th> -->
                                </tr>
                            </thead>

 src/page/crumbsL/crumbsL.vue

@@ -89,6 +89,7 @@
        // console.log("path:" + p);
        // console.log("name:" + n);
        // console.log("state:  ", s);
        // console.log(this.sOld,s);
        if (this.sOld != s) {
          //一级菜单
          this.breadListLast = [];
@@ -303,6 +304,9 @@
      var abb = localStorage.getItem("crumbsl");
      if (abb) {
        this.isrf = true;
        if(this.$store.state.common.liuState == 0){
          this.sOld = 0;
        }
         console.log("页面被刷新");
      } else {
        this.isrf = false;