From 32d010f8f0777bdba4cbb377d4a974d67d7cc586 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Wed, 9 Oct 2024 16:59:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E7=AE=A1=E7=90=86=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E6=9B=B4=E6=8D=A2=E9=AB=98=E5=BE=B7=E3=80=81=E6=B8=85?=
 =?UTF-8?q?=E6=9C=97=E4=B8=93=E9=A1=B9=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=8F=AA=E7=BB=9F=E8=AE=A1=E8=BF=91=E5=8D=8A=E5=B9=B4=E7=9A=84?=
 =?UTF-8?q?=E3=80=81=E7=BD=91=E7=BB=9C=E5=AE=89=E5=85=A8=E5=AE=98=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             |  49 ++++
 package.json                                  |   1 +
 public/index.html                             |   8 +-
 src/main.js                                   |  10 +-
 src/styles/mapbox.scss                        |  35 +++
 .../ecosphere/components/componentRight.vue   | 214 ++++++----------
 .../ecosphere/components/componentmapbox.vue  | 242 ++++++++++++------
 .../components/componentLeft.vue              |   6 +-
 src/views/privateOrder/sentiment/index.vue    |   3 +
 src/views/privateOrder/supplyChain.vue        |   2 +
 10 files changed, 351 insertions(+), 219 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 87d8893..2f7afb0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,11 @@
         "js-message": "1.0.7"
       }
     },
+    "@amap/amap-jsapi-loader": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz",
+      "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw=="
+    },
     "@ampproject/remapping": {
       "version": "2.2.0",
       "resolved": "http://10.10.2.34:8081/repository/npm-group/@ampproject/remapping/-/remapping-2.2.0.tgz",
@@ -3416,6 +3421,11 @@
         "d3-voronoi": "1.1.2"
       }
     },
+    "@tweenjs/tween.js": {
+      "version": "18.6.4",
+      "resolved": "https://registry.npmmirror.com/@tweenjs/tween.js/-/tween.js-18.6.4.tgz",
+      "integrity": "sha512-lB9lMjuqjtuJrx7/kOkqQBtllspPIN+96OvTCeJ2j5FEzinoAXTdAMFnDAQT1KVPRlnYfBrqxtqP66vDM40xxQ=="
+    },
     "@types/babel__core": {
       "version": "7.1.19",
       "resolved": "http://10.10.2.34:8081/repository/npm-group/@types/babel__core/-/babel__core-7.1.19.tgz",
@@ -4195,6 +4205,25 @@
       "integrity": "sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA==",
       "dev": true
     },
+    "@vuemap/vue-amap": {
+      "version": "0.1.17",
+      "resolved": "https://registry.npmmirror.com/@vuemap/vue-amap/-/vue-amap-0.1.17.tgz",
+      "integrity": "sha512-b30KnFrfhOlyhec88muYE5/ZaKJZ+PNcPNRFnpMs/FW5q+8rvLKZ1MN2WBwYOjRgvSk0j+rS3x83ssrNnMRc8w==",
+      "requires": {
+        "@amap/amap-jsapi-loader": "^1.0.1",
+        "@tweenjs/tween.js": "^18.6.4",
+        "lodash-es": "^4.17.21",
+        "three": "0.141.0",
+        "uppercamelcase": "^1.1.0"
+      },
+      "dependencies": {
+        "three": {
+          "version": "0.141.0",
+          "resolved": "https://registry.npmmirror.com/three/-/three-0.141.0.tgz",
+          "integrity": "sha512-JaSDAPWuk4RTzG5BYRQm8YZbERUxTfTDVouWgHMisS2to4E5fotMS9F2zPFNOIJyEFTTQDDKPpsgZVThKU3pXA=="
+        }
+      }
+    },
     "@webassemblyjs/ast": {
       "version": "1.9.0",
       "resolved": "http://10.10.2.34:8081/repository/npm-group/@webassemblyjs/ast/-/ast-1.9.0.tgz",
@@ -12287,6 +12316,11 @@
       "resolved": "http://10.10.2.34:8081/repository/npm-group/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
+    "lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
     "lodash.assign": {
       "version": "4.2.0",
       "resolved": "http://10.10.2.34:8081/repository/npm-group/lodash.assign/-/lodash.assign-4.2.0.tgz",
@@ -17788,6 +17822,21 @@
       "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
       "dev": true
     },
+    "uppercamelcase": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/uppercamelcase/-/uppercamelcase-1.1.0.tgz",
+      "integrity": "sha512-C7YEMvhgrvTEKEEVqA7LXNID/1TvvIwYZqNIKLquS6y/MGSkRQAav9LnTTILlC1RqUM8eTVBOe1U/fnB652PRA==",
+      "requires": {
+        "camelcase": "^1.2.1"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g=="
+        }
+      }
+    },
     "uri-js": {
       "version": "4.4.1",
       "resolved": "http://10.10.2.34:8081/repository/npm-group/uri-js/-/uri-js-4.4.1.tgz",
diff --git a/package.json b/package.json
index fe217bf..60ceace 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "@turf/turf": "^6.5.0",
     "@vue-office/docx": "^1.3.0",
     "@vue/composition-api": "^1.7.2",
+    "@vuemap/vue-amap": "^0.1.17",
     "axios": "^0.21.4",
     "clipboard": "^2.0.6",
     "core-js": "3.6.5",
diff --git a/public/index.html b/public/index.html
index 73381c0..ea34939 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,8 +1,8 @@
 <!--
  * @Author: lough
  * @Date: 2021-12-03 09:21:03
- * @LastEditors: lough
- * @LastEditTime: 2022-11-18 09:26:43
+ * @LastEditors: JC9527
+ * @LastEditTime: 2024-10-08 14:39:21
  * @Description:
 -->
 <!DOCTYPE html>
@@ -20,11 +20,11 @@
     <script src="<%= BASE_URL %>application.js"></script>
     <script src="<%= BASE_URL %>static/videoMonitorPlayer/jsencrypt.min.js"></script>
     <script src="<%= BASE_URL %>static/videoMonitorPlayer/jsWebControl-1.0.0.min.js"></script>
-    <script
+    <!-- <script
       type="text/javascript"
       src="https://webapi.amap.com/maps?v=1.4.15&key=84594d0df3ebdc1dbb4cee3f1bac7916"
     ></script>
-    <script src="https://webapi.amap.com/loca?v=1.3.0&key=84594d0df3ebdc1dbb4cee3f1bac7916"></script>
+    <script src="https://webapi.amap.com/loca?v=1.3.0&key=84594d0df3ebdc1dbb4cee3f1bac7916"></script> -->
     <script src="<%= BASE_URL %>static/flv/flv.js"></script>
     <script src="<%= BASE_URL %>static/extends.js"></script>
     <script>
diff --git a/src/main.js b/src/main.js
index 1ab99db..b28666c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,7 +3,7 @@
  * @Author: kery.chen
  * @Description:
  * @Date: 2021-09-06 15:12:07
- * @LastEditTime: 2022-08-17 21:14:06
+ * @LastEditTime: 2024-10-08 15:30:44
  * @FilePath: \dzcBigScreenFrontPro\src\main.js
  */
 import Vue from 'vue'
@@ -47,6 +47,14 @@ ElementUI.Dialog.props.closeOnClickModal.default = false
 // 如果想要中文版 element-ui，按如下方式声明
 Vue.use(ElementUI)
 
+import VueAMap from '@vuemap/vue-amap';
+import '@vuemap/vue-amap/dist/style.css'
+
+VueAMap.initAMapApiLoader({
+  key: 'b3c7a7ce466721c3be1d4ea539f82421',              // 高德key
+  securityJsCode: 'ec84db9c5dfc3d304ca9219e764ffeb8',   // 安全密钥
+});
+
 import VueAwesomeSwiper from 'vue-awesome-swiper'
 import 'swiper/swiper-bundle.css'
 Vue.use(VueAwesomeSwiper)
diff --git a/src/styles/mapbox.scss b/src/styles/mapbox.scss
index 1808858..201e640 100644
--- a/src/styles/mapbox.scss
+++ b/src/styles/mapbox.scss
@@ -13,3 +13,38 @@
         color: #fff;
     }
 }
+.amap-markers {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    img {
+        width: 60px;
+        height: 60px;
+    }
+}
+.amap-info-content {
+    background-color: transparent;
+    padding: 0;
+    .amap-info-close {
+      display: none;
+    }
+  }
+  .amap-info-sharp {
+    display: none;
+  }
+  .amap-info-contentContainer .bottom-center {
+    padding-bottom: 0;
+  }
+  // 文本注记
+  .amap-overlay-text-container {
+    background-color: transparent;
+    border-radius: 0;
+    border: none;
+  }
+  
+  .amap-logo{
+    display: none !important; //去掉高德地图logo
+  }
+  .amap-copyright {
+    opacity:0;                //去掉高德的版本号
+  }
diff --git a/src/views/privateOrder/ecosphere/components/componentRight.vue b/src/views/privateOrder/ecosphere/components/componentRight.vue
index 70622af..43b6097 100644
--- a/src/views/privateOrder/ecosphere/components/componentRight.vue
+++ b/src/views/privateOrder/ecosphere/components/componentRight.vue
@@ -3,7 +3,7 @@
  * @Author: kery.chen
  * @Description: 总体概览右侧
  * @Date: 2021-11-30 11:08:50
- * @LastEditTime: 2023-10-23 16:50:10
+ * @LastEditTime: 2024-10-09 16:34:07
  * @FilePath     : \\tcingiocpro\\src\\views\\privateOrder\\ecosphere\\components\\componentRight.vue
 -->
 <template>
@@ -52,7 +52,7 @@
         <div class="qlzfsjtj">
           <div class="qlzf-head">
             <div>处理有害信息数量(条)</div>
-            <div>关闭直播平台违规账号(个)</div>
+            <div>处置平台违规账号(个)</div>
           </div>
           <div class="qlzf-box">
             <div class="qlzf-left">
@@ -182,6 +182,8 @@ export default {
     ModuleTitle
   },
   data() {
+    var ndate = new Date();
+    var nmonth = ndate.getMonth();
     return {
       imgList: [
         { url: require('@/assets/ecosphere/清朗专项行动图/1-1.png') },
@@ -203,53 +205,53 @@ export default {
           title: '处理有害信息数量(条)',
           data: [
             {
-              name: '2月',
+              name: nmonth + '月',
               num: 0
             },
             {
-              name: '1月',
+              name: (nmonth - 1) + '月',
               num: 0
             },
             {
-              name: '12月',
+              name: (nmonth - 1) + '月',
               num: 0
             },
             {
-              name: '11月',
+              name: (nmonth - 1) + '月',
               num: 0
             },
             {
-              name: '10月',
+              name: (nmonth - 1) + '月',
               num: 0
             },
             {
-              name: '9月',
+              name: (nmonth - 1) + '月',
               num: 0
             },
-            {
-              name: '8月',
-              num: 0
-            },
-            {
-              name: '7月',
-              num: 0
-            },
-            {
-              name: '6月',
-              num: 0
-            },
-            {
-              name: '5月',
-              num: 0
-            },
-            {
-              name: '4月',
-              num: 0
-            },
-            {
-              name: '3月',
-              num: 0
-            }
+            // {
+            //   name: '8月',
+            //   num: 0
+            // },
+            // {
+            //   name: '7月',
+            //   num: 0
+            // },
+            // {
+            //   name: '6月',
+            //   num: 0
+            // },
+            // {
+            //   name: '5月',
+            //   num: 0
+            // },
+            // {
+            //   name: '4月',
+            //   num: 0
+            // },
+            // {
+            //   name: '3月',
+            //   num: 0
+            // }
 
           ]
         },
@@ -257,53 +259,53 @@ export default {
           title: '关闭直播平台违规账号(个)',
           data: [
             {
-              name: '2月',
-              num: 0
-            },
-            {
-              name: '1月',
-              num: 0
-            },
-            {
-              name: '12月',
-              num: 0
-            },
-            {
-              name: '11月',
-              num: 0
-            },
-            {
-              name: '10月',
+              name: nmonth + '月',
               num: 0
             },
             {
-              name: '9月',
+              name: (nmonth - 1) + '月',
               num: 0
             },
             {
-              name: '8月',
+              name: (nmonth - 2) + '月',
               num: 0
             },
             {
-              name: '7月',
+              name: (nmonth - 3) + '月',
               num: 0
             },
             {
-              name: '6月',
+              name: (nmonth - 4) + '月',
               num: 0
             },
             {
-              name: '5月',
+              name: (nmonth - 5) + '月',
               num: 0
             },
-            {
-              name: '4月',
-              num: 0
-            },
-            {
-              name: '3月',
-              num: 0
-            }
+            // {
+            //   name: '8月',
+            //   num: 0
+            // },
+            // {
+            //   name: '7月',
+            //   num: 0
+            // },
+            // {
+            //   name: '6月',
+            //   num: 0
+            // },
+            // {
+            //   name: '5月',
+            //   num: 0
+            // },
+            // {
+            //   name: '4月',
+            //   num: 0
+            // },
+            // {
+            //   name: '3月',
+            //   num: 0
+            // }
 
           ]
         }
@@ -448,17 +450,19 @@ export default {
     // 举报事件年度分类统计
     async reportbyyearDate(){
       // let data = await reportbyyear();
-      let arr = [{name:'上级下发',value:''},{name:'部门转发',value:''},{name:'无效',value:''},{name:'小程序',value:''}]
+      // let arr = [{name:'上级下发',value:''},{name:'部门转发',value:''},{name:'无效',value:''},{name:'小程序',value:''}]
+      let arr = []
       listJbsjndfltj().then(data=>{
         data.rows.forEach((item,index)=>{
-          arr.forEach(item2=>{
-            if(item.type == item2.name) {
-              item2.value = item.count;
-            }
-          })
-          // obj.value = item.count;
-          // obj.name = item.type;
-          // arr.push(obj)
+          // arr.forEach(item2=>{
+          //   if(item.type == item2.name) {
+          //     item2.value = item.count;
+          //   }
+          // })
+          let obj = {};
+          obj.value = item.count;
+          obj.name = item.type;
+          arr.push(obj)
         })
         // obj.value = value;
         // obj.name = '上级下发';
@@ -466,74 +470,6 @@ export default {
         this.pieData = arr;
         this.inItPie()
       })
-      // listJbsjndfltj({type:'上级下发'}).then(data=>{
-      //   let value = 0
-      //   let obj = {}
-      //   data.rows.forEach(item=>{
-      //     value += item.count
-      //   })
-      //   obj.value = value;
-      //   obj.name = '上级下发';
-      //   arr.push(obj)
-      // }).then(res=>{
-      //   this.pieData = arr;
-      //   this.inItPie()
-      // })
-      // listJbsjndfltj({type:'部门转发'}).then(data=>{
-      //   let value = 0
-      //   let obj = {}
-      //   data.rows.forEach(item=>{
-      //     value += item.count
-      //   })
-      //   obj.value = value;
-      //   obj.name = '部门转发'
-      //   arr.push(obj)
-      // }).then(res=>{
-      //   this.pieData = arr;
-      //   this.inItPie()
-      // })
-      // listJbsjndfltj({type:'无效'}).then(data=>{
-      //   let value = 0
-      //   let obj = {}
-      //   data.rows.forEach(item=>{
-      //     value += item.count
-      //   })
-      //   obj.value = value;
-      //   obj.name = '无效'
-      //   arr.push(obj)
-      // }).then(res=>{
-      //   this.pieData = arr;
-      //   this.inItPie()
-      // })
-      // listJbsjndfltj({type:'小程序'}).then(data=>{
-      //   let value = 0
-      //   let obj = {}
-      //   data.rows.forEach(item=>{
-      //     value += item.count
-      //   })
-      //   obj.value = value;
-      //   obj.name = '小程序'
-      //   arr.push(obj)
-      // }).then(res=>{
-      //   this.pieData = arr;
-      //   this.inItPie()
-      // })
-      // for(let i = 1; i < 5; i++){
-      //   let obj = {}
-      //   listJbsjndfltj({type:i}).then(data=>{
-      //     console.log(data,'data')
-      //     let value = 0
-      //     data.rows.forEach(item=>{
-      //       value += item.count
-      //       obj.value = value;
-      //       obj.name = item.type == '1' ? '上级下发' : item.type == '2' ? '部门转发' : item.type == '3' ? '无效' : '小程序'
-      //       arr.push(obj)
-      //     })
-      //     arr = arr.filter((item, index, self)=>{
-      //       return self.indexOf(item) == index;
-      //     })
-      //   })
-      // }
       // let arr = []
       // for(let i = 0; i < data.data.length; i++){
       //   let obj = {}
diff --git a/src/views/privateOrder/ecosphere/components/componentmapbox.vue b/src/views/privateOrder/ecosphere/components/componentmapbox.vue
index 425fe24..690bb5a 100644
--- a/src/views/privateOrder/ecosphere/components/componentmapbox.vue
+++ b/src/views/privateOrder/ecosphere/components/componentmapbox.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="map-container">
-    <div id="map"></div>
+    <div id="container"></div>
     <el-dialog
       v-if="isShowDialog"
       title=""
@@ -69,17 +69,30 @@
 </template>
 
 <script>
-import mapboxgl from 'mapbox-gl'
-import 'mapbox-gl/dist/mapbox-gl.css'
-import { reportList, reportInfo } from '@/api/zongzhi/manage'
+// import mapboxgl from 'mapbox-gl'
+// import 'mapbox-gl/dist/mapbox-gl.css'
+// import VueAMap from '@vuemap/vue-amap';
+// import '@vuemap/vue-amap/dist/style.css'
+import location from '@/assets/ecosphere/point.png'
+// import { reportList, reportInfo } from '@/api/zongzhi/manage'
 import {
   listJbmap,
   getJbmap,
 } from "@/api/netManage/index.js";
+
 export default {
   data() {
+    // VueAMap.initAMapApiLoader({
+    //   key: 'b3c7a7ce466721c3be1d4ea539f82421',              // 高德key
+    //   securityJsCode: 'ec84db9c5dfc3d304ca9219e764ffeb8',   // 安全密钥
+    // });
     return {
       isShowDialog: false,
+      center: [121.136909, 31.463778],
+      zoom: 14.5,
+      zooms:[14,18],
+      // markerOffset: [-35,-123],
+      // markers: [],
       // 展示的内容
       currentMsg: {
         jbdx: '电子科技有限公司',
@@ -95,93 +108,178 @@ export default {
         { id: 3, lng: 121.05452, lat: 31.515175, title: '太仓星兴亮机械设备有限公司' },
         { id: 4, lng: 121.127801, lat: 31.472566, title: '兴和电子有限公司' },
         { id: 5, lng: 121.142345, lat: 31.477655, title: '太仓裕盛体育用品有限公司' }
-      ]
+      ],
+      layers:{
+        layer:null,
+      }
     }
   },
-  async mounted() {
+  mounted() {
+    var layer = new AMap.createDefaultLayer({
+      zooms:[14,18],    //可见级别
+      visible:true,    //是否可见
+      opacity:1,       //透明度
+      zIndex:10,         //叠加层级
+      mapStyle: 'amap://styles/d02b66b0a7f190d5a1556a3f59c86518',
+    })
+    var map = new AMap.Map('container',{
+      zoom: 16,  //设置地图显示的缩放级别
+      zooms: this.zooms,
+      center: this.center,//设置地图中心点坐标
+      mapStyle: 'amap://styles/d02b66b0a7f190d5a1556a3f59c86518',  //设置地图的显示样式
+      layers: [
+        // 高德默认标准图层
+        // new AMap.TileLayer.Satellite(),
+        layer,
+        // 楼块图层
+        new AMap.Buildings({
+          zooms: [14, 18],
+          zIndex: 11,
+          wallColor: 'rgba(24,79,129,1)',
+          roofColor: 'rgba(24,79,129,1)',
+          // heightFactor: 2//2倍于默认高度，3D下有效
+        })
+      ],
+      resizeEnable: true,
+      rotateEnable:false,
+      pitchEnable:false,
+      pitch: 55,
+      rotation: 25,
+      viewMode: '3D',  //设置地图模式
+      lang:'zh_cn',  //设置地图语言类型
+      buildingAnimation:true,
+      // expandZoomRange:true,
+    });
+    this.layers.layer = new AMap.OverlayGroup();            // 点位
+    map.add(this.layers.layer);
+    this.map = map;
+    this.init(this.map);
     // let data = await reportList();
-    listJbmap({isStatus:1,pageNum:1,pageSize:50}).then(data=>{
-      let arr = []
-      data.rows.map((item)=>{
-        let obj = {}
-        obj.id = item.id
-        obj.lng = item.longitude
-        obj.lat = item.latitude
-        obj.title = item.jbObj
-        arr.push(obj)
-      })
-      this.pointList = arr
-      const _this = this
-      mapboxgl.accessToken = 'pk.eyJ1Ijoic2hhcmVhbGV4IiwiYSI6ImNsaXNhZmRjbTFhbnczZmxib3h1OW05YXYifQ.PhlKv60ar3K359d8x2yBPw'
-      const map = new mapboxgl.Map({
-        container: 'map', // 地图容器的id或元素
-        style: 'mapbox://styles/sharealex/cl3ntpire000314ookb5o81oo', // 地图样式
-        center: [121.136909, 31.463778], // 中心点经纬度
-        zoom: 14.5,
-        pitch: 50
-      })
+    // listJbmap({isStatus:1,pageNum:1,pageSize:50}).then(data=>{
+    //   let arr = []
+    //   data.rows.map((item)=>{
+    //     let obj = {}
+    //     obj.id = item.id
+    //     obj.lng = item.longitude
+    //     obj.lat = item.latitude
+    //     obj.title = item.jbObj
+    //     arr.push(obj)
+    //   })
+    //   this.pointList = arr
+    //   const _this = this
+    //   mapboxgl.accessToken = 'pk.eyJ1Ijoic2hhcmVhbGV4IiwiYSI6ImNsaXNhZmRjbTFhbnczZmxib3h1OW05YXYifQ.PhlKv60ar3K359d8x2yBPw'
+    //   const map = new mapboxgl.Map({
+    //     container: 'map', // 地图容器的id或元素
+    //     style: 'mapbox://styles/sharealex/cl3ntpire000314ookb5o81oo', // 地图样式
+    //     center: [121.136909, 31.463778], // 中心点经纬度
+    //     zoom: 14.5,
+    //     pitch: 50
+    //   })
 
-      // 地图加载完毕
-      map.on('load', function() {
-        // 地图点位
-        _this.pointList.forEach(item => {
-          const el = document.createElement('div')
-          el.className = 'map-marker'
-          el.innerHTML = `
-          <img  class="marker-img" src= "${require('@/assets/ecosphere/point.png')}" />
-          <div  class="marker-text">${item.title}</div>
-      `
-          new mapboxgl.Marker(el)
-            .setLngLat([item.lng, item.lat])
-            .addTo(map)
-          el.addEventListener('click', () => {
-            // 点击事件里去修改内容
-            // reportInfo(item.id).then(res=>{
+    //   // 地图加载完毕
+    //   map.on('load', function() {
+    //     // 地图点位
+    //     _this.pointList.forEach(item => {
+    //       const el = document.createElement('div')
+    //       el.className = 'map-marker'
+    //       el.innerHTML = `
+    //       <img  class="marker-img" src= "${require('@/assets/ecosphere/point.png')}" />
+    //       <div  class="marker-text">${item.title}</div>
+    //   `
+    //       new mapboxgl.Marker(el)
+    //         .setLngLat([item.lng, item.lat])
+    //         .addTo(map)
+    //       el.addEventListener('click', () => {
+    //         // 点击事件里去修改内容
+    //         // reportInfo(item.id).then(res=>{
+    //         getJbmap(item.id).then(res=>{
+    //           let { jbObj, number, jbTime, address, content } = res.data
+    //           _this.currentMsg.jbdx = jbObj
+    //           _this.currentMsg.szbh = number
+    //           _this.currentMsg.jbsj = jbTime
+    //           _this.currentMsg.dz = address
+    //           _this.currentMsg.jbnr = content
+    //           _this.isShowDialog = true
+    //         })
+    //       })
+    //     })
+    //     map.addLayer({
+    //       id: 'lou-extrusion',
+    //       type: 'fill-extrusion',
+    //       source: {
+    //         type: 'geojson',
+    //         data: require('@/utils/mapGeojson/1.json')
+    //       },
+    //       paint: {
+    //         // 设置填充颜色
+    //         'fill-extrusion-color': '#2998F8',
+    //         // 从属性中获得高度，这里用的是height字段
+    //         'fill-extrusion-height': ['get', 'height'],
+    //         'fill-extrusion-base': 0,
+    //         // 透明度设置
+    //         'fill-extrusion-opacity': 0.7
+    //       }
+    //     })
+    //   })
+    //   this.map = map
+    // })
+  },
+  methods: {
+    init(map){
+      
+      listJbmap({isStatus:1,pageNum:1,pageSize:50}).then(data=>{
+        // let arr = [];
+        map.clearMap();
+        data.rows.map((item)=>{
+          // let obj = {}
+          // obj.id = item.id;
+          // obj.imgSrc = location;
+          // obj.lng = item.longitude
+          // obj.lat = item.latitude
+          // obj.title = item.jbObj
+          var marker = new AMap.Marker({
+            position: new AMap.LngLat(item.longitude, item.latitude),   // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+            // <span style="color: #fff; font-size: 25px;width:${item.jbObj.length * 26}px">${item.jbObj}</span>
+            content: `<div class="amap-markers" data-projectid="${item.id}">
+                <img src="${location}" />
+                <div style="color: #fff; font-size: 25px;width:${item.jbObj.length * 26}px">${item.jbObj}</div>
+              </div>`,
+            offset:new AMap.Pixel(-(item.jbObj.length * 10), -30),
+          });
+          marker.on('click', (e)=>{
             getJbmap(item.id).then(res=>{
               let { jbObj, number, jbTime, address, content } = res.data
-              _this.currentMsg.jbdx = jbObj
-              _this.currentMsg.szbh = number
-              _this.currentMsg.jbsj = jbTime
-              _this.currentMsg.dz = address
-              _this.currentMsg.jbnr = content
-              _this.isShowDialog = true
+              this.currentMsg.jbdx = jbObj
+              this.currentMsg.szbh = number
+              this.currentMsg.jbsj = jbTime
+              this.currentMsg.dz = address
+              this.currentMsg.jbnr = content
+              this.isShowDialog = true
             })
           })
+          map.add(marker);
+          // arr.push(obj)
         })
-        map.addLayer({
-          id: 'lou-extrusion',
-          type: 'fill-extrusion',
-          source: {
-            type: 'geojson',
-            data: require('@/utils/mapGeojson/1.json')
-          },
-          paint: {
-            // 设置填充颜色
-            'fill-extrusion-color': '#2998F8',
-            // 从属性中获得高度，这里用的是height字段
-            'fill-extrusion-height': ['get', 'height'],
-            'fill-extrusion-base': 0,
-            // 透明度设置
-            'fill-extrusion-opacity': 0.7
-          }
-        })
+        // this.pointList = arr;
       })
-      this.map = map
-    })
-  },
-  methods: {}
+    },
+    aaaa(){
+      console.log(1111111);
+    },
+  }
 }
 </script>
 
 <style lang='scss' scoped>
 .map-container{
-      width: 100%;
+  width: 100%;
   height: $ScreenHeight;
-  #map{
+  #container{
     height: 100%;
     width: 100%;
-    }
+  }
 }
+
 .screen-dialog {
   left: 30%;
   right: 30%;
diff --git a/src/views/privateOrder/positiveEnergy/components/componentLeft.vue b/src/views/privateOrder/positiveEnergy/components/componentLeft.vue
index 0e88b60..5fcc361 100644
--- a/src/views/privateOrder/positiveEnergy/components/componentLeft.vue
+++ b/src/views/privateOrder/positiveEnergy/components/componentLeft.vue
@@ -2,7 +2,7 @@
  * @Author: lough
  * @Date: 2021-12-17 10:07:07
  * @LastEditors: JC9527
- * @LastEditTime: 2023-10-23 14:23:00
+ * @LastEditTime: 2024-10-09 13:26:10
  * @Description:
 -->
 <template>
@@ -531,9 +531,9 @@ export default {
         this.tableKey = [
           { name: '单位', value: 'unit' },
           { name: '第一负责人', value: 'fzr' },
-          { name: '职务', value: 'duty' },
+          // { name: '职务', value: 'duty' },
           { name: '直接负责人', value: 'fzr1' },
-          { name: '职务_1', value: 'duty1' },
+          // { name: '职务_1', value: 'duty1' },
           { name: '负责科室', value: 'fzks' },
           { name: '网络安全官', value: 'fzr3' },
           { name: '职务_2', value: 'duty3' },
diff --git a/src/views/privateOrder/sentiment/index.vue b/src/views/privateOrder/sentiment/index.vue
index 4df41c0..385ad9c 100644
--- a/src/views/privateOrder/sentiment/index.vue
+++ b/src/views/privateOrder/sentiment/index.vue
@@ -108,6 +108,9 @@ export default {
 .main {
   width: 100%;
   height: 100%;
+  overflow: hidden;
+  user-select: none;
+  position: relative;
   background: url("~@/assets/privateOrder/positiveEnergy/背景底图.png")
     no-repeat;
     background-size: 100% 100%;
diff --git a/src/views/privateOrder/supplyChain.vue b/src/views/privateOrder/supplyChain.vue
index 09f2cee..971df3a 100644
--- a/src/views/privateOrder/supplyChain.vue
+++ b/src/views/privateOrder/supplyChain.vue
@@ -23,6 +23,8 @@ export default {
     getToken() {
       singleLoginTwo().then(res=>{
         console.log(res);
+        // let url = res.data;
+        // this.iframeSrc = url.replace("https://2.35.38.240","http://20.1.0.157:88");
         this.iframeSrc = res.data;
       })
     },