Merge branch 'main' of http://8.136.197.230:3000/sheyang/MaindataPGIS

提交
419 changed files with 781 additions and 5344 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,11 +1,11 @@
 {
-  "name": "sheyang_coastal_system",
+  "name": "sheyang-minedata",
  "version": "0.1.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
-      "name": "sheyang_coastal_system",
+      "name": "sheyang-minedata",
      "version": "0.1.0",
      "dependencies": {
        "@liveqing/liveplayer": "^2.6.9",
@ -14,7 +14,6 @@
        "core-js": "^3.8.3",
        "echarts": "^5.4.3",
        "element-ui": "^2.15.14",
        "js-cookie": "^3.0.5",
        "vue": "^2.6.14",
        "vue-router": "^3.5.1",
        "vuex": "^3.6.2"
@ -7365,14 +7364,6 @@
        "@sideway/pinpoint": "^2.0.0"
      }
    },
    "node_modules/js-cookie": {
      "version": "3.0.5",
      "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-3.0.5.tgz",
      "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
      "engines": {
        "node": ">=14"
      }
    },
    "node_modules/js-message": {
      "version": "1.0.7",
      "resolved": "https://registry.npmmirror.com/js-message/-/js-message-1.0.7.tgz",
@ -17740,11 +17731,6 @@
        "@sideway/pinpoint": "^2.0.0"
      }
    },
    "js-cookie": {
      "version": "3.0.5",
      "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-3.0.5.tgz",
      "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw=="
    },
    "js-message": {
      "version": "1.0.7",
      "resolved": "https://registry.npmmirror.com/js-message/-/js-message-1.0.7.tgz",
--- a/package.json
+++ b/package.json
@ -1,5 +1,5 @@
 {
-  "name": "sheyang_coastal_system",
+  "name": "sheyang-minedata",
  "version": "0.1.0",
  "private": true,
  "scripts": {
@ -14,7 +14,6 @@
    "core-js": "^3.8.3",
    "echarts": "^5.4.3",
    "element-ui": "^2.15.14",
    "js-cookie": "^3.0.5",
    "vue": "^2.6.14",
    "vue-router": "^3.5.1",
    "vuex": "^3.6.2"
--- a/public/static/background-img/icon_company_blue.png
+++ b/public/static/background-img/icon_company_blue.png
--- a/public/static/background-img/icon_company_red.png
+++ b/public/static/background-img/icon_company_red.png
--- a/public/static/background-img/icon_company_yellow.png
+++ b/public/static/background-img/icon_company_yellow.png
--- a/public/static/map.html
+++ b/public/static/map.html
@ -0,0 +1,132 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
  <meta charset="UTF-8">
  <title>自定义点标记内容</title>
  <link rel="stylesheet" href="http://50.144.11.244:21009/support/static/api/demo/js-api/zh/css/demo.css">
  <!-- 引入MineMap API插件 -->
  <link rel="stylesheet" href="http://50.144.11.244:21009/minemapapi/v2.1.0/minemap.css">
  <script src="http://50.144.11.244:21009/minemapapi/v2.1.0/minemap.js"></script>
  <!-- 引入 popup 样式 -->
  <link rel="stylesheet" href="./popup.css">
  <style>
    #map {
      margin: 0;
      padding: 0;
      box-sizing: border-box;
      width: 100vw;
      height: 100vh;
    }
    /* 原始标注图片 */
    .old_back {
      background-image: url(./background-img//icon_company_blue.png);
    }
    /* 点击标注图片 */
    .new_back {
      background-image: url(./background-img/icon_company_yellow.png);
    }
    /* 监控设备不正常标注图片 */
    .error_back {
      background-image: url('../../src/assets/icon_company_yellow.png');
    }
  </style>
 </head>
 <body>
  <div id="map"></div>
  <script>
    // * 地图全局参数设置
    minemap.domainUrl = 'http://50.144.11.244:21009';
    minemap.dataDomainUrl = 'http://50.144.11.244:21009';
    minemap.serverDomainUrl = 'http://50.144.11.244:21009';
    minemap.spriteUrl = 'http://50.144.11.244:21009/minemapapi/v2.1.0/sprite/sprite';
    minemap.serviceUrl = 'http://50.144.11.244:21009/service/';
    minemap.key = '16be596e00c44c86bb1569cb53424dc9';
    minemap.solution = 12877;
    // todo 获取vue中的设备数据
    window.addEventListener('message', (event) => {
      const deviceData = event.data
      // 筛选经纬度为0的数组
      const deviceDatas = deviceData.filter(item => item.Longitude !== 0)
      // 设备编号的数组
      // const deviceId = deviceDatas.map(item => item.DeviceID)
      // console.log(deviceId);
      console.log(deviceDatas);
      // * map 实例化
      const map = new minemap.Map({
        container: 'map',
        style: 'http://50.144.11.244:21009/service/solu/style/id/2365',
        center: [120.336617, 33.766037],
        zoom: 14,
        pitch: 0,
        maxZoom: 17,
        minZoom: 3,
        projection: 'LATLON'
      });
      // 循环设备数组进行打点
      for (let i = 0; i < deviceDatas.length; i++) {
        // 自定义点标记的内部DOM元素
        const el = document.createElement('div');
        el.id = 'marker';
        // 自定义DOM样式 或者通过css类设置    (http://50.144.11.244:21009/support/static/api/demo/js-api/zh/images/park.png)
        // el.style["background-image"] = "url(http://50.144.11.244:21009/support/static/api/demo/js-api/zh/images/park.png)";
        el.className = 'old_back'
        el.style["background-size"] = "cover";
        el.style.width = "20px";
        el.style.height = "30px";
        el.style["border-radius"] = "50%";
        // Marker构造函数接收两个参数，一个为自定义的DOM元素，一个是Object参数，其中包括偏移量等
        // offset参数为标注点相对于其左上角偏移像素大小
        // 调用setLngLat方法指定Marker的坐标位置
        const point = deviceDatas[i]
        const Longitude = point.Longitude
        const Latitude = point.Latitude
        const popup = new minemap.Popup({ offset: [0, -30] }).setHTML(`
        <div class="box">
          <div class="state state_a">人脸抓拍</div>
          <div class="state state_b">人脸抓拍</div>
          <div class="state state_c">人脸抓拍</div>
          <div class="state state_d">人脸抓拍</div>
          <button class="button_plus">
            <span class="plus">+</span>
          </button>
        </div>`)
        const marker = new minemap.Marker(el, { offset: [-25, -25] }).setPopup(popup).setLngLat([Longitude, Latitude]).addTo(map);
        // 视频
        const video = document.querySelector('video')
        // 点击监控标记时，发送 设备id 通知 vue 页面接受并通过设备 id 发起请求获取视频url并显示
        marker.getElement().addEventListener('click', function () {
          if (el.classList.contains('old_back')) {
            el.classList.remove('old_back')
            el.classList.add('new_back')
            window.parent.postMessage({
              cmd: 'myIframe',
              params: {
                channel: point.Channel,
              }
            }, '*')
            console.log(point.Channel, '点击标记播放视频');
          } else if (el.classList.contains('new_back')) {
            el.classList.remove('new_back')
            el.classList.add('old_back')
            // 隐藏视频时关闭视频流
            window.parent.postMessage({
              cmd: 'closeIframe',
              params: {
                channel: point.Channel,
                close: true
              }
            }, '*')
            console.log(point.Channel, '点击标记关闭视频');
          }
          // console.log(el.className);
        })
      }
    })
  </script>
 </body>
--- a/public/static/popup.css
+++ b/public/static/popup.css
@ -0,0 +1,58 @@
 .box {
  display: grid;
  grid-template-columns: repeat(3, 1fr);
  gap: 5px;
  width: 220px;
  height: 100px;
  background-color: #fff;
  border-radius: 5px;
 }
 .button_plus,
 .state {
  margin-top: 5px;
  margin-left: 5px;
  width: 60px;
  height: 30px;
  background-color: #2e92f7;
  border-radius: 5px;
  border: none;
  outline: none;
  cursor: pointer;
  font-size: 0.5rem;
  line-height: 30px;
  text-align: center;
 }
 .button_plus:active {
  transform: translateY(2px);
 }
 .state {
  width: 60px;
  height: 30px;
  border-radius: 5px;
  color: #fff;
  font-size: 0.1rem;
 }
 .state_a {
  background-color: #ff6600;
 }
 .state_b {
  background-color: #188801;
 }
 .state_c {
  background-color: #2278f8;
 }
 .state_d {
  background-color: #f74242;
 }
 .plus {
  font-size: 2rem;
  color: #fff;
 }
--- a/src/api/coastalMap/resource/index.js
+++ b/src/api/coastalMap/resource/index.js
@ -1,10 +0,0 @@
 // 资源概况
 import request from '@/utils/request'
 // 实有人口查询
 export function get_person_num(params) {
  return request({
    url: '/base/metaActualUserInfo',
    method: 'get',
    params
  })
 } 
--- a/src/assets/coastalMap/box_back.png
+++ b/src/assets/coastalMap/box_back.png
--- a/src/assets/coastalMap/box_back02.png
+++ b/src/assets/coastalMap/box_back02.png
--- a/src/assets/coastalMap/box_back03.png
+++ b/src/assets/coastalMap/box_back03.png
--- a/src/assets/coastalMap/box_title_back.png
+++ b/src/assets/coastalMap/box_title_back.png
--- a/src/assets/coastalMap/keyPerson/key_all_back.png
+++ b/src/assets/coastalMap/keyPerson/key_all_back.png
--- a/src/assets/coastalMap/keyPerson/key_li_back.png
+++ b/src/assets/coastalMap/keyPerson/key_li_back.png
--- a/src/assets/coastalMap/keyPerson/key_li_btn.png
+++ b/src/assets/coastalMap/keyPerson/key_li_btn.png
--- a/src/assets/coastalMap/policeStatus/rank_one.png
+++ b/src/assets/coastalMap/policeStatus/rank_one.png
--- a/src/assets/coastalMap/policeStatus/rank_three.png
+++ b/src/assets/coastalMap/policeStatus/rank_three.png
--- a/src/assets/coastalMap/policeStatus/rank_two.png
+++ b/src/assets/coastalMap/policeStatus/rank_two.png
--- a/src/assets/coastalMap/resource_item_back01.png
+++ b/src/assets/coastalMap/resource_item_back01.png
--- a/src/assets/coastalMap/resource_item_back02.png
+++ b/src/assets/coastalMap/resource_item_back02.png
--- a/src/assets/coastalMap/resource_item_back03.png
+++ b/src/assets/coastalMap/resource_item_back03.png
--- a/src/assets/coastalMap/resource_item_back04.png
+++ b/src/assets/coastalMap/resource_item_back04.png
--- a/src/assets/homepage/police.png
+++ b/src/assets/homepage/police.png
--- a/src/assets/icon-hza/24gf-playCircle.png
+++ b/src/assets/icon-hza/24gf-playCircle.png
--- a/src/assets/icon-hza/24gf-playCircle@2x.png
+++ b/src/assets/icon-hza/24gf-playCircle@2x.png
--- a/src/assets/icon-hza/Rectangle
+++ b/src/assets/icon-hza/Rectangle
--- a/src/assets/icon-hza/Rectangle
+++ b/src/assets/icon-hza/Rectangle
--- a/src/assets/icon-hza/Rectangle
+++ b/src/assets/icon-hza/Rectangle
--- a/src/assets/icon-hza/Rectangle
+++ b/src/assets/icon-hza/Rectangle
--- a/src/assets/icon-hza/Rectangle
+++ b/src/assets/icon-hza/Rectangle
--- a/src/assets/icon-hza/Rectangle
+++ b/src/assets/icon-hza/Rectangle
--- a/src/assets/icon-hza/bg3.png
+++ b/src/assets/icon-hza/bg3.png
--- a/src/assets/icon-hza/bg34.png
+++ b/src/assets/icon-hza/bg34.png
--- a/src/assets/icon-hza/bg_1(1).png
+++ b/src/assets/icon-hza/bg_1(1).png
--- a/src/assets/icon-hza/bg_1(2).png
+++ b/src/assets/icon-hza/bg_1(2).png
--- a/src/assets/icon-hza/bg_1.png
+++ b/src/assets/icon-hza/bg_1.png
--- a/src/assets/icon-hza/bg_100.png
+++ b/src/assets/icon-hza/bg_100.png
--- a/src/assets/icon-hza/bg_101.png
+++ b/src/assets/icon-hza/bg_101.png
--- a/src/assets/icon-hza/bg_102.png
+++ b/src/assets/icon-hza/bg_102.png
--- a/src/assets/icon-hza/bg_103.png
+++ b/src/assets/icon-hza/bg_103.png
--- a/src/assets/icon-hza/bg_104.png
+++ b/src/assets/icon-hza/bg_104.png
--- a/src/assets/icon-hza/bg_105.png
+++ b/src/assets/icon-hza/bg_105.png
--- a/src/assets/icon-hza/bg_11.png
+++ b/src/assets/icon-hza/bg_11.png
--- a/src/assets/icon-hza/bg_12／hover.png
+++ b/src/assets/icon-hza/bg_12／hover.png
--- a/src/assets/icon-hza/bg_13.png
+++ b/src/assets/icon-hza/bg_13.png
--- a/src/assets/icon-hza/bg_15.png
+++ b/src/assets/icon-hza/bg_15.png
--- a/src/assets/icon-hza/bg_16.png
+++ b/src/assets/icon-hza/bg_16.png
--- a/src/assets/icon-hza/bg_17.png
+++ b/src/assets/icon-hza/bg_17.png
--- a/src/assets/icon-hza/bg_18.png
+++ b/src/assets/icon-hza/bg_18.png
--- a/src/assets/icon-hza/bg_19.png
+++ b/src/assets/icon-hza/bg_19.png
--- a/src/assets/icon-hza/bg_1@2x(1).png
+++ b/src/assets/icon-hza/bg_1@2x(1).png
--- a/src/assets/icon-hza/bg_1@2x(2).png
+++ b/src/assets/icon-hza/bg_1@2x(2).png
--- a/src/assets/icon-hza/bg_1@2x.png
+++ b/src/assets/icon-hza/bg_1@2x.png
--- a/src/assets/icon-hza/bg_2.png
+++ b/src/assets/icon-hza/bg_2.png
--- a/src/assets/icon-hza/bg_20.png
+++ b/src/assets/icon-hza/bg_20.png
--- a/src/assets/icon-hza/bg_21.png
+++ b/src/assets/icon-hza/bg_21.png
--- a/src/assets/icon-hza/bg_22.png
+++ b/src/assets/icon-hza/bg_22.png
--- a/src/assets/icon-hza/bg_24.png
+++ b/src/assets/icon-hza/bg_24.png
--- a/src/assets/icon-hza/bg_25.png
+++ b/src/assets/icon-hza/bg_25.png
--- a/src/assets/icon-hza/bg_26.png
+++ b/src/assets/icon-hza/bg_26.png
--- a/src/assets/icon-hza/bg_28.png
+++ b/src/assets/icon-hza/bg_28.png
--- a/src/assets/icon-hza/bg_3.png
+++ b/src/assets/icon-hza/bg_3.png
--- a/src/assets/icon-hza/bg_30.png
+++ b/src/assets/icon-hza/bg_30.png
--- a/src/assets/icon-hza/bg_32.png
+++ b/src/assets/icon-hza/bg_32.png
--- a/src/assets/icon-hza/bg_34.png
+++ b/src/assets/icon-hza/bg_34.png
--- a/src/assets/icon-hza/bg_35.png
+++ b/src/assets/icon-hza/bg_35.png
--- a/src/assets/icon-hza/bg_36.png
+++ b/src/assets/icon-hza/bg_36.png
--- a/src/assets/icon-hza/bg_37.png
+++ b/src/assets/icon-hza/bg_37.png
--- a/src/assets/icon-hza/bg_38.png
+++ b/src/assets/icon-hza/bg_38.png
--- a/src/assets/icon-hza/bg_39.png
+++ b/src/assets/icon-hza/bg_39.png
--- a/src/assets/icon-hza/bg_40.png
+++ b/src/assets/icon-hza/bg_40.png
--- a/src/assets/icon-hza/bg_41.png
+++ b/src/assets/icon-hza/bg_41.png
--- a/src/assets/icon-hza/bg_42.png
+++ b/src/assets/icon-hza/bg_42.png
--- a/src/assets/icon-hza/bg_43.png
+++ b/src/assets/icon-hza/bg_43.png
--- a/src/assets/icon-hza/bg_44.png
+++ b/src/assets/icon-hza/bg_44.png
--- a/src/assets/icon-hza/bg_45.png
+++ b/src/assets/icon-hza/bg_45.png
--- a/src/assets/icon-hza/bg_46.png
+++ b/src/assets/icon-hza/bg_46.png
--- a/src/assets/icon-hza/bg_47.png
+++ b/src/assets/icon-hza/bg_47.png
--- a/src/assets/icon-hza/bg_48.png
+++ b/src/assets/icon-hza/bg_48.png
--- a/src/assets/icon-hza/bg_49.png
+++ b/src/assets/icon-hza/bg_49.png
--- a/src/assets/icon-hza/bg_5(1).png
+++ b/src/assets/icon-hza/bg_5(1).png
--- a/src/assets/icon-hza/bg_5.png
+++ b/src/assets/icon-hza/bg_5.png
--- a/src/assets/icon-hza/bg_50.png
+++ b/src/assets/icon-hza/bg_50.png
--- a/src/assets/icon-hza/bg_51.png
+++ b/src/assets/icon-hza/bg_51.png
--- a/src/assets/icon-hza/bg_52.png
+++ b/src/assets/icon-hza/bg_52.png
--- a/src/assets/icon-hza/bg_53.png
+++ b/src/assets/icon-hza/bg_53.png
--- a/src/assets/icon-hza/bg_54.png
+++ b/src/assets/icon-hza/bg_54.png
--- a/src/assets/icon-hza/bg_55.png
+++ b/src/assets/icon-hza/bg_55.png
--- a/src/assets/icon-hza/bg_56.png
+++ b/src/assets/icon-hza/bg_56.png
--- a/src/assets/icon-hza/bg_57.png
+++ b/src/assets/icon-hza/bg_57.png
--- a/src/assets/icon-hza/bg_58.png
+++ b/src/assets/icon-hza/bg_58.png
--- a/src/assets/icon-hza/bg_59.png
+++ b/src/assets/icon-hza/bg_59.png
--- a/src/assets/icon-hza/bg_5@2x(1).png
+++ b/src/assets/icon-hza/bg_5@2x(1).png
--- a/src/assets/icon-hza/bg_5@2x.png
+++ b/src/assets/icon-hza/bg_5@2x.png
--- a/src/assets/icon-hza/bg_6.png
+++ b/src/assets/icon-hza/bg_6.png
--- a/src/assets/icon-hza/bg_60.png
+++ b/src/assets/icon-hza/bg_60.png
--- a/src/assets/icon-hza/bg_61.png
+++ b/src/assets/icon-hza/bg_61.png
--- a/src/assets/icon-hza/bg_63.png
+++ b/src/assets/icon-hza/bg_63.png
--- a/src/assets/icon-hza/bg_64.png
+++ b/src/assets/icon-hza/bg_64.png
--- a/src/assets/icon-hza/bg_65.png
+++ b/src/assets/icon-hza/bg_65.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
独树的风	fdd0156b74	Merge branch 'main' of http://8.136.197.230:3000/sheyang/MaindataPGIS	10 months ago
独树的风	a5bcab0e83	提交	10 months ago