发起会议 地图调整

src/api/emergencyCommandMap/communication.ts

@@ -0,0 +1,10 @@
+import request from '@/utils/request';
+
+// 获取融合通信链接
+export function getStartMiniParan(data) {
+  return request({
+    url: '/api/videoResource/avcon/get_start_mini_param',
+    method: 'post',
+    data: data
+  });
+}

src/components/Map/company-map.vue

@@ -44,7 +44,6 @@
 </template>
 
 <script>
-
 import AMapLoader from '@amap/amap-jsapi-loader'
 
 export default {
@@ -179,6 +178,9 @@ export default {
         longitude: position[0],
         latitude: position[1]
       }
+      window._AMapSecurityConfig = {
+        securityJsCode: '4868bc1b8fac7d9e54e7279ed556879a'
+      };
       const AMap = await AMapLoader.load({
         key: '9c5041381e5e824f9ee324d8f7a40150',     // 申请好的Web端开发者Key，首次调用 load 时必填
         version: '2.0',      // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
@@ -227,7 +229,6 @@ export default {
           this.$emit("confirm", { lnglat: lnglat, address: result.regeocode.formattedAddress });
         }
       })
-
     },
     setMarks(lnglat) {//添加标记
       if (this.marker) this.map.remove(this.marker);

src/components/Map/index.vue

@@ -516,7 +516,7 @@ defineExpose({
     text-align: left !important;
     padding-left: 20px;
     color: #eaf3fc;
-    font-size: vw(32);
+    font-size: 12px;
     font-family: 'SourceHanSansCN';
   }
   :deep(.amap-scale-edgeleft),

src/utils/olMap/olMap.ts

@@ -285,25 +285,23 @@ export class olMap {
   /**
    *
    * @param {Geojon} chaozhou 根据geojson对象创建Featrue对象
-   * @param {String} layerName 图层名称
    * @returns VectorLayer
    */
-  createVecByJson(json, layerName = '') {
+  createVecByJson(json, options) {
     const format = new GeoJSON();
     const fs = format.readFeatures(json);
-    this.removeMask2();
-    this.maskLayer = new VectorLayer({
+    const converLayer = new VectorLayer({
       source: new VectorSource(),
       style: new Style({
         fill: new Fill({
-          color: 'rgba(16, 36, 59, 0.65)'
+          color: options.fillColor ? options.fillColor : 'rgba(16, 36, 59, 0.65)'
         }),
         stroke: new Stroke({
-          color: 'rgba(38, 138, 185, 1)',
+          color: options.strokeColor ? options.strokeColor : 'rgba(38, 138, 185, 1)',
           width: 2
         })
       }),
-      zIndex: 99
+      zIndex: options.zIndex ? options.zIndex : 99
     });
     this.map.addLayer(this.maskLayer);
     const extent = [-180, -90, 180, 90];

src/views/emergencyCommandMap/LeftSection/Communication.vue

@@ -92,7 +92,7 @@
           <div class="icon2"></div>
           <div class="text">电话呼叫</div>
         </div>
-        <div class="btn">
+        <div class="btn" @click="handleStartMeeting">
           <div class="icon3"></div>
           <div class="text">发起会议</div>
         </div>
@@ -103,6 +103,7 @@
 
 <script lang="ts" setup>
 import { Search } from '@element-plus/icons-vue';
+import { getStartMiniParan } from '@/api/emergencyCommandMap/communication';
 
 let activeIndex = ref(0);
 const options = ref([{ name: '全部', value: '全部' }]);
@@ -251,6 +252,23 @@ const deleteItem = (item) => {
     }
   }
 };
+// 发起会议
+const handleStartMeeting = () => {
+  const data = {
+    userid: 'mmyj0006@mm.zw.yj',
+    password: '123',
+    roomid: '',
+    'dev-list': [{ id: 'hh@mm.zw.yj', avtype: 'av' }]
+  };
+  getStartMiniParan(data).then((res) => {
+    // 创建一个a标签元素
+    const a = document.createElement('a');
+    // 设置a标签的href属性
+    a.href = res.data;
+    // 触发点击事件
+    a.click();
+  });
+};
 </script>
 
 <style lang="scss" scoped>

src/views/globalMap/RightMenu/GridPointRainfall.vue

@@ -23,6 +23,9 @@ const handleClose = () => {
 };
 let AMap, geocoder;
 onMounted(() => {
+  window._AMapSecurityConfig = {
+    securityJsCode: '4868bc1b8fac7d9e54e7279ed556879a'
+  };
   AMapLoader.load({
     key: '9c5041381e5e824f9ee324d8f7a40150', // 申请好的Web端开发者Key，首次调用 load 时必填
     version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15

src/views/routineCommandMap/PositionMap.vue

@@ -225,6 +225,9 @@ const updateForm = (position) => {
 };
 const initMap = () => {
   let position = [110.925175, 21.678955];
+  window._AMapSecurityConfig = {
+    securityJsCode: '4868bc1b8fac7d9e54e7279ed556879a'
+  };
   AMapLoader.load({
     key: '9c5041381e5e824f9ee324d8f7a40150', // 申请好的Web端开发者Key，首次调用 load 时必填
     version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15