地图位置信息改为从后端获取

public/index.html

@@ -6,7 +6,7 @@
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.png">
-    <script src="/map/config.js"></script>
+   
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>

public/map/config.js

@@ -1,3 +1,5 @@
+//文件已废弃-贾
+
 let mapConfig = {
   default: {
     map: "/map/fj.json",

src/api/board/cockpit.js

@@ -90,3 +90,13 @@ export function question(query) {
       method: "get"
     });
   }
+
+  
+// 地图
+export function mapInfo(orgId) {
+  return request({
+    url: '/core/cockpit/map',
+    method: 'get',
+    params: {orgId}
+  })
+}

src/views/board/charts/map/report.vue

@@ -8,7 +8,7 @@
 <script>
 import "./../../board.scss";
 import * as echarts from "echarts";
-import { getMap } from "@/api/board/cockpit.js";
+import { getMap,mapInfo } from "@/api/board/cockpit.js";
 import {
   findMaxIndex,
   getChartDOMSize,
@@ -79,8 +79,10 @@ export default {
       this.isMouseOver = false;
     },
     async getData() {
-      let map = window.boardMap.getMap(this.orgName);
-      let coordinates = window.boardMap.getCoord(this.orgName);
+      let mapinfo= await mapInfo(this.orgId);
+
+      let map = mapinfo.data.map;
+      let coordinates =mapinfo.data.sites.map(s=>({ name: s.orgName, value: [s.longitude,s.latitude, 10] })); 
       this.map = map;
       this.coordinates = coordinates;
       this.$nextTick(() => {

src/views/resumption/protection/index.vue

@@ -86,14 +86,14 @@
                   @click="resetQuery"
                   >重置</el-button
                 >
-                <el-button
+                <!-- <el-button
                   type="primary"
                   icon="el-icon-plus"
                   size="mini"
                   @click="handleAdd()"
                   v-hasPermi="['device:protection:add']"
                   >新增</el-button
-                >
+                > -->
                 <el-button
                   type="primary"
                   icon="el-icon-download"
@@ -194,14 +194,14 @@
                 v-hasPermi="['device:protectionstatus:maintain']"
                 >撤防</el-button
               > -->
-                <el-button
+                <!-- <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-edit-outline"
                   @click="onEdit(r.row.id)"
                   v-hasPermi="['device:protection:edit']"
                   >编辑</el-button
-                >
+                > -->
                 <el-button
                   size="mini"
                   type="text"
@@ -210,7 +210,7 @@
                   v-hasPermi="['device:protection']"
                   >布撤防历史</el-button
                 >
-                <el-popconfirm
+                <!-- <el-popconfirm
                   @confirm="onDel(r.row.id)"
                   title="点击确定删除报警控制器"
                 >
@@ -222,7 +222,7 @@
                     slot="reference"
                     >删除</el-button
                   >
-                </el-popconfirm>
+                </el-popconfirm> -->
               </template>
             </el-table-column>
           </el-table>