警情页面大数据地图

package-lock.json

@@ -1342,9 +1342,9 @@
             "dev": true
         },
         "@types/lodash": {
-            "version": "4.14.171",
-            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.171.tgz",
-            "integrity": "sha512-7eQ2xYLLI/LsicL2nejW9Wyko3lcpN6O/z0ZLHrEQsg280zIdCv1t/0m6UtBjUHokCGBQ3gYTbHzDkZ1xOBwwg=="
+            "version": "4.14.172",
+            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.172.tgz",
+            "integrity": "sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw=="
         },
         "@types/mime": {
             "version": "1.3.2",
@@ -1773,6 +1773,44 @@
                     "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
                     "dev": true
                 },
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "optional": true
+                },
                 "find-cache-dir": {
                     "version": "2.1.0",
                     "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
@@ -1793,6 +1831,25 @@
                         "locate-path": "^3.0.0"
                     }
                 },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "optional": true
+                },
+                "loader-utils": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+                    "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "big.js": "^5.2.2",
+                        "emojis-list": "^3.0.0",
+                        "json5": "^2.1.2"
+                    }
+                },
                 "locate-path": {
                     "version": "3.0.0",
                     "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
@@ -1863,6 +1920,16 @@
                         "minipass": "^3.1.1"
                     }
                 },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                },
                 "terser-webpack-plugin": {
                     "version": "1.4.5",
                     "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
@@ -1879,6 +1946,18 @@
                         "webpack-sources": "^1.4.0",
                         "worker-farm": "^1.7.0"
                     }
+                },
+                "vue-loader-v16": {
+                    "version": "npm:vue-loader@16.5.0",
+                    "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz",
+                    "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "chalk": "^4.1.0",
+                        "hash-sum": "^2.0.0",
+                        "loader-utils": "^2.0.0"
+                    }
                 }
             }
         },
@@ -2641,11 +2720,6 @@
                 "resolve": "^1.12.0"
             }
         },
-        "babel-helper-vue-jsx-merge-props": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
-            "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
-        },
         "babel-loader": {
             "version": "8.2.2",
             "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
@@ -2697,27 +2771,6 @@
                 "@babel/helper-define-polyfill-provider": "^0.2.2"
             }
         },
-        "babel-runtime": {
-            "version": "6.26.0",
-            "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-            "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-            "requires": {
-                "core-js": "^2.4.0",
-                "regenerator-runtime": "^0.11.0"
-            },
-            "dependencies": {
-                "core-js": {
-                    "version": "2.6.12",
-                    "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-                    "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
-                },
-                "regenerator-runtime": {
-                    "version": "0.11.1",
-                    "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-                    "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-                }
-            }
-        },
         "balanced-match": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -4398,7 +4451,8 @@
         "deepmerge": {
             "version": "1.5.2",
             "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-            "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
+            "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==",
+            "dev": true
         },
         "default-gateway": {
             "version": "5.0.5",
@@ -4875,28 +4929,6 @@
             "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
             "dev": true
         },
-        "el-table-infinite-scroll": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/el-table-infinite-scroll/-/el-table-infinite-scroll-1.0.10.tgz",
-            "integrity": "sha512-O7gcfcF9wOec/weeygMlJKQ8626jF5hIY6zABYKYqY96yxXZRrvPqEZW65Vb+C0D5d+8B8EgU9ax7mlA4K1x4A==",
-            "requires": {
-                "core-js": "^2.6.5",
-                "element-ui": "^2.12.0",
-                "vue": "^2.6.10"
-            },
-            "dependencies": {
-                "core-js": {
-                    "version": "2.6.12",
-                    "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-                    "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
-                },
-                "vue": {
-                    "version": "2.6.14",
-                    "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz",
-                    "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
-                }
-            }
-        },
         "electron-to-chromium": {
             "version": "1.3.754",
             "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.754.tgz",
@@ -4918,29 +4950,6 @@
                 "resize-observer-polyfill": "^1.5.1"
             }
         },
-        "element-ui": {
-            "version": "2.15.5",
-            "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.5.tgz",
-            "integrity": "sha512-B/YCdz2aRY2WnFXzbTRTHPKZHBD/2KV6u88EBnkaARC/Lyxnap+7vpvrcW5UNTyVwjItS5Fj1eQyRy6236lbXg==",
-            "requires": {
-                "async-validator": "~1.8.1",
-                "babel-helper-vue-jsx-merge-props": "^2.0.0",
-                "deepmerge": "^1.2.0",
-                "normalize-wheel": "^1.0.1",
-                "resize-observer-polyfill": "^1.5.0",
-                "throttle-debounce": "^1.0.1"
-            },
-            "dependencies": {
-                "async-validator": {
-                    "version": "1.8.5",
-                    "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
-                    "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
-                    "requires": {
-                        "babel-runtime": "6.x"
-                    }
-                }
-            }
-        },
         "elliptic": {
             "version": "6.5.4",
             "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
@@ -11713,11 +11722,6 @@
                 "neo-async": "^2.6.0"
             }
         },
-        "throttle-debounce": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
-            "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
-        },
         "through": {
             "version": "2.3.8",
             "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -12336,87 +12340,6 @@
                 }
             }
         },
-        "vue-loader-v16": {
-            "version": "npm:vue-loader@16.2.0",
-            "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
-            "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "chalk": "^4.1.0",
-                "hash-sum": "^2.0.0",
-                "loader-utils": "^2.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-                    "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true,
-                    "optional": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true,
-                    "optional": true
-                },
-                "loader-utils": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-                    "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "big.js": "^5.2.2",
-                        "emojis-list": "^3.0.0",
-                        "json5": "^2.1.2"
-                    }
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
         "vue-router": {
             "version": "4.0.10",
             "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.10.tgz",

package.json

@@ -4,11 +4,11 @@
     "private": true,
     "scripts": {
         "serve": "vue-cli-service serve",
-        "build": "vue-cli-service build",
-        "lint": "vue-cli-service lint",
         "build:dev": "vue-cli-service build --mode dev",
         "build:prod": "vue-cli-service build --mode prod",
-        "build:test": "vue-cli-service build --mode test"
+        "build:test": "vue-cli-service build --mode test",
+        "build": "vue-cli-service build",
+        "lint": "vue-cli-service lint"
     },
     "dependencies": {
         "axios": "^0.21.1",
@@ -17,7 +17,6 @@
         "echarts-gl": "^2.0.4",
         "echarts-liquidfill": "^3.0.0",
         "echarts-wordcloud": "^2.0.0",
-        "el-table-infinite-scroll": "^1.0.10",
         "element-plus": "^1.0.2-beta.54",
         "vue": "^3.0.11",
         "vue-amap": "^0.5.10",
@@ -26,6 +25,7 @@
     },
     "devDependencies": {
         "@amap/amap-jsapi-loader": "^1.0.1",
+        "@types/lodash": "^4.14.172",
         "@vue/cli-plugin-babel": "~4.5.0",
         "@vue/cli-plugin-eslint": "~4.5.0",
         "@vue/cli-plugin-router": "~4.5.0",
@@ -41,4 +41,4 @@
         "terser-webpack-plugin": "^5.1.3",
         "vue-cli-plugin-element-plus": "0.0.13"
     }
-}
+}

proxy-dev.js

@@ -3,6 +3,7 @@
 module.exports = {
     table: {
         '/': {
+            // target: 'http://172.200.50.17:8083',
             target: 'http://172.16.120.104:8083',
             ws: true, // 代理websockets
             changeOrigin: true,
@@ -10,6 +11,7 @@ module.exports = {
         },
     },
     // 本地配置ip访问（手机可通过IP访问），需要修改成本地Ip地址
+    // localhost: '172.200.50.18',
     localhost: '172.16.120.200',
     port: '3000',
 }

public/index.html

@@ -10,10 +10,10 @@
         <%= htmlWebpackPlugin.options.title %>
     </title>
     <!-- 高德地图 -->
-    <script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=8e266e1ac2ad2383c7773ff504ac248f"></script>
-    <script type="text/javascript" src="//webapi.amap.com/ui/1.1/main.js"></script>
+    <!-- <script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=8e266e1ac2ad2383c7773ff504ac248f"></script>
+    <script type="text/javascript" src="//webapi.amap.com/ui/1.1/main.js"></script> -->
     <!-- 大数据地图 -->
-    <!-- <script src="http://gis.dcp.shmh.gov.cn/mh_map/js/index_v1.0.js"></script> -->
+    <script src="http://gis.dcp.shmh.gov.cn/mh_map/js/index_v1.0.js"></script>
 </head>
 
 <body>

src/assets/scss/common.scss

@@ -254,6 +254,7 @@ body {
             z-index: 3;
             width: 100%;
             height: 100%;
+            overflow: hidden;
         }
     }
 }

src/components/gauge/index.vue

@@ -28,7 +28,7 @@ export default {
     },
   },
   mounted() {
-    this.getData();
+    // this.getData();
   },
   methods: {
     getData() {

src/components/mixins/linstener.js

@@ -9,6 +9,8 @@ export default {
             isVsTab: false,
             leftBtn: true,
             rightBtn: true,
+            current: 1,
+            size: 20,
         }
     },
     watch: {

src/components/mixins/map-data.js

@@ -1,5 +1,5 @@
-// import JMap from 'JMap'
-// import JMapQuery from 'JMapQuery'
+import JMap from 'JMap'
+import JMapQuery from 'JMapQuery'
 export default {
     data() {
         return {
@@ -22,7 +22,8 @@ export default {
                 ['#7dc', "#F33"],
             ],
             colorIndList: [-1, 7, 21, 26, 31, 37, 46, 52, 57, 66, 68, 71, 74, 100],
-            oldPopup: null
+            oldPopup: null,
+            oldPopupId: null,
         }
     },
     computed: {
@@ -106,7 +107,7 @@ export default {
                             id: val.attributes.code,
                             position: { x: Number(val.attributes.center_x), y: Number(val.attributes.center_y), z: 0 },
                             element: `<div class='ysc-dynamic-layer ys-css3-box' onclick="vue.clickFlag(${val.attributes.code})"><div class='biaozhu'>${val.attributes.name}   ${val.attributes.code}</div></div>`
-                        }, { isZoom: false, offset: [0, 0] })
+                        }, { isZoom: false,})
                     });
                 }
             })

src/components/mixins/map-gaode.js

@@ -1,4 +1,4 @@
-import AMap from 'AMap'
+// import AMap from 'AMap'
 import mapData from '@a/js/map-data.js'
 // import AMapUI from 'AMapUI'
 export default {

src/http/api.js

@@ -29,6 +29,8 @@ let api = {
         alertStatisticsByMonth: '/alert/alertStatisticsByMonth',
         alertStatistics: '/alert/alertStatistics',
         page: '/alert/page',
+        pageMap: '/alert/pageMap',
+        one: '/alert/one',
     },
     fireSite: {
         page: '/fireSite/page',

src/main.js

@@ -26,6 +26,13 @@ app.config.globalProperties.$qs = querystring;
 
 app.use(store).use(router).use(querystring).use(http, api).mount('#app')
 
+// 大数据地图
+// import JMap from 'JMap'
+// window.vue = this;
+// window.jMap = null;
+// window.jmapQuery = null;
+// window.jMap = new JMap();
+
 // (new Date()).Format("yyyy-MM-dd hh:mm:ss.S") ==> 2006-07-02 08:09:04.423
 Date.prototype.Format = function(fmt) {
     let o = {

src/store/index.js

@@ -7,14 +7,14 @@ export default createStore({
         resizeTime: true,
         windowWidth: 0,
         typeTime: null,
-        // timeList: [
-        //     new Date().getFullYear() + '-' + (new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : '' + (new Date().getMonth() + 1)) + '-' + (new Date().getDate() < 10 ? '0' + (new Date().getDate()) : new Date().getDate()) + ' 00:00:00',
-        //     new Date().getFullYear() + '-' + (new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : '' + (new Date().getMonth() + 1)) + '-' + (new Date().getDate() < 10 ? '0' + (new Date().getDate()) : new Date().getDate()) + ' 23:59:59',
-        // ],
         timeList: [
-            '2020-06-01 00:00:00',
-            '2021-07-03 23:59:59',
+            new Date().getFullYear() + '-' + (new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : '' + (new Date().getMonth() + 1)) + '-' + (new Date().getDate() < 10 ? '0' + (new Date().getDate()) : new Date().getDate()) + ' 00:00:00',
+            new Date().getFullYear() + '-' + (new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : '' + (new Date().getMonth() + 1)) + '-' + (new Date().getDate() < 10 ? '0' + (new Date().getDate()) : new Date().getDate()) + ' 23:59:59',
         ],
+        // timeList: [
+        //     '2020-06-01 00:00:00',
+        //     '2021-07-03 23:59:59',
+        // ],
         educationHeader: [
             { prop: "type", name: "消防站" },
             { prop: "policeTime", name: "成立时间/联系人" },

src/views/comprehensive-disposal.vue

@@ -60,23 +60,38 @@
             <el-row>
               <el-row class="rightTopTitle"><span>火灾</span></el-row>
               <el-row class="rightTopChart">
-                <gauge ref="gauge1" :dataMap="0.2" :dataNumber="20" color="#468EFD"></gauge>
+                <gauge ref="gauge1" :dataMap="proptionList.find(val=>val.type === '火灾') && proptionList.find(val=>val.type === '火灾').number/proptionList[4] || 0" :dataNumber="proptionList.find(val=>val.type === '火灾') && proptionList.find(val=>val.type === '火灾').number || 0" color="#468EFD"></gauge>
+              </el-row>
+              <el-row class="rightTopNumber">
+                <span>
+                  同比：{{proptionList.find(val=>val.type === '火灾') && (proptionList.find(val=>val.type === '火灾').radio * 100).toFixed(2) || 0}}%
+                  <span :style="{color: proptionList.find(val=>val.type === '火灾') && proptionList.find(val=>val.type === '火灾').sameStatus === 2 ? 'green' : 'red'}">{{proptionList.find(val=>val.type === '火灾') && proptionList.find(val=>val.type === '火灾').sameStatus === 2 ? '↓' : proptionList.find(val=>val.type === '火灾') && proptionList.find(val=>val.type === '火灾').sameStatus === 2?'↑':''}}</span>
+                </span>
               </el-row>
-              <el-row class="rightTopNumber"><span>同比：14% <span style="color:green;font-wight:800">↓</span></span></el-row>
             </el-row>
             <el-row>
               <el-row class="rightTopTitle"><span>社会救助</span></el-row>
               <el-row class="rightTopChart">
-                <gauge ref="gauge2" :dataMap="0.3" :dataNumber="30" color="#06B1B9"></gauge>
+                <gauge ref="gauge2" :dataMap="proptionList.find(val=>val.type === '社会救助') && proptionList.find(val=>val.type === '社会救助').number/proptionList[4] || 0" :dataNumber="proptionList.find(val=>val.type === '社会救助') && proptionList.find(val=>val.type === '社会救助').number || 0" color="#06B1B9"></gauge>
+              </el-row>
+              <el-row class="rightTopNumber">
+                <span>
+                  同比：{{proptionList.find(val=>val.type === '社会救助') && (proptionList.find(val=>val.type === '社会救助').radio * 100).toFixed(2) || 0}}%
+                  <span :style="{color: proptionList.find(val=>val.type === '社会救助') && proptionList.find(val=>val.type === '社会救助').sameStatus === 2 ? 'green' : 'red'}">{{proptionList.find(val=>val.type === '社会救助') && proptionList.find(val=>val.type === '社会救助').sameStatus === 2 ? '↓' : proptionList.find(val=>val.type === '社会救助') && proptionList.find(val=>val.type === '社会救助').sameStatus === 2?'↑':''}}</span>
+                </span>
               </el-row>
-              <el-row class="rightTopNumber"><span>同比：14% <span style="color:green">↓</span></span></el-row>
             </el-row>
             <el-row>
               <el-row class="rightTopTitle"><span>抢险救援</span></el-row>
               <el-row class="rightTopChart">
-                <gauge ref="gauge3" :dataMap="0.5"  :dataNumber="50" color="#E4951E"></gauge>
+                <gauge ref="gauge3" :dataMap="proptionList.find(val=>val.type === '抢险救援') && proptionList.find(val=>val.type === '抢险救援').number/proptionList[4] || 0" :dataNumber="proptionList.find(val=>val.type === '抢险救援') && proptionList.find(val=>val.type === '抢险救援').number || 0" color="#E4951E"></gauge>
+              </el-row>
+              <el-row class="rightTopNumber">
+                <span>
+                  同比：{{proptionList.find(val=>val.type === '抢险救援') && (proptionList.find(val=>val.type === '抢险救援').radio * 100).toFixed(2) || 0}}%
+                  <span :style="{color: proptionList.find(val=>val.type === '抢险救援') && proptionList.find(val=>val.type === '抢险救援').sameStatus === 2 ? 'green' : 'red'}">{{proptionList.find(val=>val.type === '抢险救援') && proptionList.find(val=>val.type === '抢险救援').sameStatus === 2 ? '↓' : proptionList.find(val=>val.type === '抢险救援') && proptionList.find(val=>val.type === '抢险救援').sameStatus === 2?'↑':''}}</span>
+                </span>
               </el-row>
-              <el-row class="rightTopNumber"><span>同比：14% <span style="color:red">↑</span></span></el-row>
             </el-row>
           </div>
         </el-col>
@@ -89,6 +104,7 @@
             row-style="height:.425rem;"
             cell-style="height:.425rem;box-sizing: border-box;"
             style="width: 100%; margin: 0 auto"
+            @row-click="rowClickMap"
           >
             <el-table-column
               show-overflow-tooltip
@@ -176,99 +192,22 @@ import barChart from "@c/bar";
 import lineSmooth from "@c/line-smooth";
 import gauge from "@c/gauge";
 import linstener from "@c/mixins/linstener";
-import map from "@c/mixins/map-gaode";
+import map from "@c/mixins/map-data";
 
 
 export default {
   data() {
     return {
-      tableData: [
-        {
-          type: "火灾",
-          policeTime: "23:00:00",
-          alertLevel: "二级",
-          address: "闵行区",
-          car: "2辆",
-          policeCause: "电器火灾",
-          department: "吴泾支队",
-          status: "1",
-          callingUp: "1号",
-          equipName: "一七",
-          carNumber: "沪X5477应急",
-          carStatus: "出动",
-          disposeTime: "1:00:00",
-          correspondent: "张三",
-          commander: "李四",
-          firemen: "王五",
-          driver: "赵六",
-        },
-        {
-          type: "火灾",
-          policeTime: "23:00:00",
-          alertLevel: "二级",
-          address: "闵行区",
-          car: "2辆",
-          policeCause: "电器火灾",
-          department: "吴泾支队",
-          status: "1",
-          callingUp: "1号",
-          equipName: "一七",
-          carNumber: "沪X5477应急",
-          carStatus: "出动",
-          disposeTime: "1:00:00",
-          correspondent: "张三",
-          commander: "李四",
-          firemen: "王五",
-          driver: "赵六",
-        },
-        {
-          type: "火灾",
-          policeTime: "23:00:00",
-          alertLevel: "二级",
-          address: "闵行区",
-          car: "2辆",
-          policeCause: "电器火灾",
-          department: "吴泾支队",
-          status: "1",
-          callingUp: "1号",
-          equipName: "一七",
-          carNumber: "沪X5477应急",
-          carStatus: "出动",
-          disposeTime: "1:00:00",
-          correspondent: "张三",
-          commander: "李四",
-          firemen: "王五",
-          driver: "赵六",
-        },
-        {
-          type: "火灾",
-          policeTime: "23:00:00",
-          alertLevel: "二级",
-          address: "闵行区",
-          car: "2辆",
-          policeCause: "电器火灾",
-          department: "吴泾支队",
-          status: "1",
-          callingUp: "1号",
-          equipName: "一七",
-          carNumber: "沪X5477应急",
-          carStatus: "出动",
-          disposeTime: "1:00:00",
-          correspondent: "张三",
-          commander: "李四",
-          firemen: "王五",
-          driver: "赵六",
-        },
-      ],
+      tableData: [],
       headerData: [
         { prop: "type", name: "类型" },
-        { prop: "policeTime", name: "立案时间" },
-        { prop: "alertLevel", name: "警情等级" },
-        { prop: "address", name: "案发地址" },
-        { prop: "car", name: "调动车辆" },
-        { prop: "policeCause", name: "原因" },
-        { prop: "department", name: "所属中队" },
-        { prop: "status", name: "状况" },
+        { prop: "lasj", name: "立案时间" },
+        { prop: "ajdj", name: "警情等级" },
+        { prop: "afdz", name: "案发地址" },
+        { prop: "cdcl", name: "调动车辆" },
+        { prop: "bcxx", name: "原因" },
+        { prop: "zhongdui", name: "所属中队" },
+        { prop: "ajzt", name: "状况" },
       ],
       isVideo:false,
       playerOptions: {
@@ -301,6 +240,7 @@ export default {
       monthList:[],
       houseList:[],
       proptionList:[],
+      proptionMapList:[],
       timeArea: 1,
     };
   },
@@ -330,7 +270,8 @@ export default {
         this.$axios.get(this.$api.fire.fireType),
       ]);
       if (res[0]) this.fireTypeList = res[0].data;
-      // this.getPage();
+      this.getPage();
+      this.getPageMap();
       this.getHouse();
       this.getProption();
       this.getMonth();
@@ -341,12 +282,106 @@ export default {
           "?" +
           this.$qs.stringify({
             current: 1,
-            size: 100,
+            size: 50,
+          })
+      );
+      if (res) this.tableData = res.data.records;
+    },
+    // 实时警情处理
+    async getPageMap() {
+      let res = await this.$axios.get(this.$api.house.pageMap +
+          "?" +
+          this.$qs.stringify({
             startTime: this.$store.state.timeList[0] || "",
             endTime: this.$store.state.timeList[1] || "",
           })
       );
-      if (res) this.tableData = res.data;
+      if (res){
+        window.jMap.Locate.clearLocate()
+        this.proptionMapList = res.data.records
+        this.addMarker(res.data.records)
+      }
+    },
+    async rowClickMap(row){
+      if(this.proptionMapList.every(val=>val.id !== row.id)){
+        this.addMarker([row])
+        window.jMap.goTo({
+            x: Number(row.gisX),
+            y: Number(row.gisY),
+            radius: 1000
+        }, {
+            duration: 3,
+            offset: {
+                heading: -4,
+                pitch: -70,
+                range: 0
+            }
+        })
+      }
+        this.addMarkerInfo(row)
+    },
+    // 创建标点和点击事件
+    addMarker(lnglats) {
+        let target = lnglats.map((val, ind) => {
+            let marker = {
+                id: val.id,
+                attrbutes: val,
+                position: { x: val.gisX, y: val.gisY, z: 0 },
+                // image: { url: icon,width:29.5,height:48.5 },
+            };
+            return marker
+        })
+        console.log(target)
+        window.jMap.Locate.pointLocate(target, {
+            isZoom: false,
+            scaleByDistance: { minScaling: 0, maxScaling: 1, minDistance: 1000, maxDistance: 30000 },
+            click: async (val) => {
+              console.log(val)
+              let res = await this.$axios.get(this.$api.house.one +
+                    "?" +
+                    this.$qs.stringify({
+                      id: val.attrbutes.id,
+                    })
+                );
+                if (res){
+                  this.addMarkerInfo(res.data)
+                }
+            }
+        })
+    },
+    // 标点点击弹窗
+    addMarkerInfo(res) {
+        if (this.oldPopupId && res.id === this.oldPopupId) {
+            window.jMap.Popup.hide();
+            return this.oldPopup = null
+        }
+        window.jMap.Popup.show({
+            id: res.id,
+            //使用自定义窗体
+            position: { x: Number(res.gisX), y: Number(res.gisY), z: Number(0) }, //使用自定义窗体
+            element: `<div class="ysc-dynamic-layer ys-css3-box" onclick="vue.removePopup">
+                          <div class="tableTooltip mapTab">
+                          <div class="tableTitle">
+                              <div>${res.ajlx}</div>
+                          </div>
+                          <el-row class="tableContent">
+                              <div class="max">案发地址：${res.afdz}</div>
+                              <div>案件性质：${res.ajxz}</div>
+                              <div>案件状态：${res.ajzt}</div>
+                              <div class="max">立案时间：${res.lasj}</div>
+                              <div>警情等级：${res.ajdj}</div>
+                              <div>所属中队：${res.zhongdui}</div>
+                              <div>调动车辆：${res.cdcl}</div>
+                              <div>状况：${res.ajzt}</div>
+                              <div class="max" :title="${res.bcxx}">报警原因：${res.bcxx}</div>
+                              <div>死亡人数：${res.qrqk}</div>
+                              <div>受伤人数：${res.qrqk}</div>
+                              <div class="max">经济损失：${res.qrqk}</div>
+                          </el-row>
+                          </div>
+                      </div>`,
+        }, { isZoom: false, offset: [-170, -310] });
+        this.oldPopup = res.id
     },
     // 警情时段分布 
     async getHouse() {
@@ -364,8 +399,23 @@ export default {
     },
     // 警情处置情况
     async getProption() {
-      let res = await this.$axios.get(this.$api.house.alertStatistics);
-      if (res) this.proptionList = res.data;
+      let res = await this.$axios.get(this.$api.house.alertStatistics +
+          "?" +
+          this.$qs.stringify({
+            startTime: this.$store.state.timeList[0] || "",
+            endTime: this.$store.state.timeList[1] || "",
+          }));
+      if (res){
+        this.proptionList = res.data;
+        this.proptionList[4] = res.data.reduce((data, rel) => {
+          console.log(data + rel.number)
+          return data + rel.number;
+        }, 0);
+        console.log(this.proptionList[4]);
+        this.$refs.gauge1.getData();
+        this.$refs.gauge2.getData();
+        this.$refs.gauge3.getData();
+      }
     },
     // 历史警情趋势图
     async getMonth() {

src/views/enforcement-dynamic.vue

@@ -163,7 +163,7 @@
 <script>
 import wordCloud from "@c/wordCloud";
 import linstener from "@c/mixins/linstener";
-import map from "@c/mixins/map-gaode";
+import map from "@c/mixins/map-data";
 import category from "@c/category";
 import liquidFill from "@c/liquid-fill";
 export default {

src/views/fire-data-analysis.vue

@@ -119,102 +119,16 @@ import linstener from "@c/mixins/linstener";
 import categoryLine from "@c/category-line";
 import firePie from "@c/fire-pie";
 import scatter from "@c/scatter";
-import AMap from 'AMap'
-import map from "@c/mixins/map-gaode";
+// import AMap from 'AMap'
+import map from "@c/mixins/map-data";
+
 export default {
   components: { categoryLine, firePie, scatter },
   mixins: [linstener,map],
   data() {
     return {
+      box:null,
       tableData: [],
-      tableData2: [
-        {
-          type: "火灾",
-          policeTime: "23:00:00",
-          alertLevel: "二级",
-          address: "闵行区",
-          car: "2辆",
-          policeCause: "电器火灾",
-          department: "吴泾支队",
-          status: "1",
-          callingUp: "1号",
-          equipName: "一七",
-          carNumber: "沪X5477应急",
-          carStatus: "出动",
-          disposeTime: "1:00：00",
-          correspondent: "张三",
-          commander: "李四",
-          firemen: "王五",
-          driver: "赵六",
-        },
-        {
-          type: "火灾",
-          policeTime: "23:00:00",
-          alertLevel: "二级",
-          address: "闵行区",
-          car: "2辆",
-          policeCause: "电器火灾",
-          department: "吴泾支队",
-          status: "1",
-          callingUp: "1号",
-          equipName: "一七",
-          carNumber: "沪X5477应急",
-          carStatus: "出动",
-          disposeTime: "1:00：00",
-          correspondent: "张三",
-          commander: "李四",
-          firemen: "王五",
-          driver: "赵六",
-        },
-        {
-          type: "火灾",
-          policeTime: "23:00:00",
-          alertLevel: "二级",
-          address: "闵行区",
-          car: "2辆",
-          policeCause: "电器火灾",
-          department: "吴泾支队",
-          status: "1",
-          callingUp: "1号",
-          equipName: "一七",
-          carNumber: "沪X5477应急",
-          carStatus: "出动",
-          disposeTime: "1:00：00",
-          correspondent: "张三",
-          commander: "李四",
-          firemen: "王五",
-          driver: "赵六",
-        },
-        {
-          type: "火灾",
-          policeTime: "23:00:00",
-          alertLevel: "二级",
-          address: "闵行区",
-          car: "2辆",
-          policeCause: "电器火灾",
-          department: "吴泾支队",
-          status: "1",
-          callingUp: "1号",
-          equipName: "一七",
-          carNumber: "沪X5477应急",
-          carStatus: "出动",
-          disposeTime: "1:00：00",
-          correspondent: "张三",
-          commander: "李四",
-          firemen: "王五",
-          driver: "赵六",
-        },
-      ],
-      headerData2: [
-        { prop: "type", name: "类型" },
-        { prop: "policeTime", name: "立案时间" },
-        { prop: "alertLevel", name: "警情等级" },
-        { prop: "address", name: "案发地址" },
-        { prop: "car", name: "调动车辆" },
-        { prop: "policeCause", name: "原因" },
-        { prop: "department", name: "所属中队" },
-        { prop: "status", name: "状况" },
-      ],
       headerData: [
         { prop: "address", name: "火灾地址" },
         { prop: "burnedArea", name: "过火面积（m²）" },
@@ -243,6 +157,7 @@ export default {
         address: "",
       },
       timeArea: 1,
+      isScroll:true,
     };
   },
   created() {
@@ -257,6 +172,23 @@ export default {
     }
   },
   mounted() {
+    // 通过$refs获取dom元素
+    this.box = this.$refs.seTable.$el.childNodes[2];
+      console.log( this.box)
+    // 监听这个dom的scroll事件
+    this.box.addEventListener('scroll', (e) => {
+      const scrollTop = e.target.scrollTop // 已滚动到可视区域上方的高度
+      const clientHeight = e.target.clientHeight // 可视区域高度
+      const scrollHeight = e.target.scrollHeight // 滚动内容的总高度
+      if (scrollHeight - (scrollTop + clientHeight) <= 20) { // 不足10像素触发加载更多
+        if(this.isScroll){
+          this.isScroll = false
+          ++this.current
+          this.getFireStatis()
+          console.log(scrollHeight - (scrollTop + clientHeight) <= 20)
+        }
+      }
+    })
     window.addEventListener(
       "resize",
       () =>
@@ -271,43 +203,46 @@ export default {
     this.initMap()
   },
   methods: {
+    load(){
+      console.log(2)
+    },
     tableRowClassName({row, column}) {
       if (column.property === 'deathToll' && row.deathToll > 0) {
         return "death";
       }
     },
     // 添加标点
-    addMarkerInfo(position, content, value) {
-        // this.map.getIsOpen();
-        this.map.clearInfoWindow();
-        var infoWindow = new AMap.InfoWindow({
-            isCustom: true, //使用自定义窗体
-            closeWhenClickMap: true,
-            content: content || `
-                <div class="tableTooltip mapTab">
-                  <div class="tableTitle">
-                    <div>${'单位及执法情况'}</div>
-                  </div>
-                  <el-row class="tableContent">
-                    <div>单位名称：${value.callingUp}</div>
-                    <div>单位地址：${'XX路135弄'}</div>
-                    <div>法人：${'张三'}</div>
-                    <div>管理人：${'李四'}</div>
-                    <div>历史检查次数：<a>${'6次'}</a></div>
-                    <div class="divTitle">行政许可记录</div>
-                    <div>审核时间：${'2021-06-26'}</div>
-                    <div>验收时间：${'2021-06-26'}</div>
-                    <div>安检时间：${'2021-06-26'}</div>
-                    <div>历史隐患数：${'2处'}</div>
-                    <div class="divTitle">历史处罚情况</div>
-                    <div>历史火灾数：${'2'}</div>
-                    <div>单位自主管理情况：<a>点击查看</a></div>
-                  </el-row>
-                </div>`,
-            offset: new AMap.Pixel(16, -30)
-        });
-        infoWindow.open(this.map, position);
-    },
+    // addMarkerInfo(position, content, value) {
+    //     // this.map.getIsOpen();
+    //     this.map.clearInfoWindow();
+    //     var infoWindow = new AMap.InfoWindow({
+    //         isCustom: true, //使用自定义窗体
+    //         closeWhenClickMap: true,
+    //         content: content || `
+    //             <div class="tableTooltip mapTab">
+    //               <div class="tableTitle">
+    //                 <div>${'单位及执法情况'}</div>
+    //               </div>
+    //               <el-row class="tableContent">
+    //                 <div>单位名称：${value.callingUp}</div>
+    //                 <div>单位地址：${'XX路135弄'}</div>
+    //                 <div>法人：${'张三'}</div>
+    //                 <div>管理人：${'李四'}</div>
+    //                 <div>历史检查次数：<a>${'6次'}</a></div>
+    //                 <div class="divTitle">行政许可记录</div>
+    //                 <div>审核时间：${'2021-06-26'}</div>
+    //                 <div>验收时间：${'2021-06-26'}</div>
+    //                 <div>安检时间：${'2021-06-26'}</div>
+    //                 <div>历史隐患数：${'2处'}</div>
+    //                 <div class="divTitle">历史处罚情况</div>
+    //                 <div>历史火灾数：${'2'}</div>
+    //                 <div>单位自主管理情况：<a>点击查看</a></div>
+    //               </el-row>
+    //             </div>`,
+    //         offset: new AMap.Pixel(16, -30)
+    //     });
+    //     infoWindow.open(this.map, position);
+    // },
     async getData() {
       let res = await this.$axios.all([
         this.$axios.get(this.$api.fire.fireType),
@@ -386,39 +321,27 @@ export default {
         this.$api.fire.fireStatistics +
           "?" +
           this.$qs.stringify({
-            current: 1,
-            size: 1000,
+            current: this.current,
+            size: this.size,
             startTime: this.$store.state.timeList[0] || "",
             endTime: this.$store.state.timeList[1] || "",
           })
       );
       if (res){ 
-        if(res.data.records.some(val=> val.propertyLoss > 10 * 10000)){
-          this.headerData[2].name = '财产损失（万元）'
-          this.tableData = res.data.records.map(val=> {
-            val.propertyLoss = val.propertyLoss / 10000
+        this.isScroll = true
+        // if(res.data.records.some(val=> val.propertyLoss > 10 * 10000)){
+          // this.headerData[2].name = '财产损失（万元）'
+          this.tableData.push(...(res.data.records.map(val=> {
+            val.propertyLoss = val.propertyLoss && (val.propertyLoss / 10000) || val.propertyLoss
             return val
-          });
-        } else{
-          this.tableData = res.data.records;
-          this.headerData[3].name = '财产损失（元）'
-        }
+          })));
+        // } else{
+          // this.tableData.push(res.data.records);
+          // this.headerData[3].name = '财产损失（元）'
+        // }
         // }
       }
     },
-    // 实时警情处理
-    async getPage() {
-      let res = await this.$axios.get(this.$api.house.page +
-          "?" +
-          this.$qs.stringify({
-            current: 1,
-            size: 100,
-            startTime: "2020-03-03 00:00:00",
-            endTime: "2020-03-03 23:59:59",
-          })
-      );
-      if (res) this.tableData2 = res.data;
-    },
     searchTime(val){
       if(val === this.timeArea) return
       this.timeArea = val

src/views/fire-signs.vue

@@ -122,7 +122,7 @@ import linstener from "@c/mixins/linstener";
 import categoryLine from "@c/category-line";
 import category from "@c/category";
 import seTable from "@c/se-table";
-import AMap from 'AMap'
+// import AMap from 'AMap'
 import map from "@c/mixins/map-gaode";
 import radarChart from "@c/radar";
 import wordCloud from "@c/wordCloud";
@@ -194,37 +194,37 @@ export default {
   },
   methods: {
     // 添加标点
-    addMarkerInfo(position, content, value) {
-        // this.map.getIsOpen();
-        this.map.clearInfoWindow();
-        var infoWindow = new AMap.InfoWindow({
-            isCustom: true, //使用自定义窗体
-            closeWhenClickMap: true,
-            content: content || `
-                <div class="tableTooltip mapTab">
-                  <div class="tableTitle">
-                    <div>${'单位及执法情况'}</div>
-                  </div>
-                  <el-row class="tableContent">
-                    <div>单位名称：${value.callingUp}</div>
-                    <div>单位地址：${'XX路135弄'}</div>
-                    <div>法人：${'张三'}</div>
-                    <div>管理人：${'李四'}</div>
-                    <div>历史检查次数：<a>${'6次'}</a></div>
-                    <div class="divTitle">行政许可记录</div>
-                    <div>审核时间：${'2021-06-26'}</div>
-                    <div>验收时间：${'2021-06-26'}</div>
-                    <div>安检时间：${'2021-06-26'}</div>
-                    <div>历史隐患数：${'2处'}</div>
-                    <div class="divTitle">历史处罚情况</div>
-                    <div>历史火灾数：${'2'}</div>
-                    <div>单位自主管理情况：<a>点击查看</a></div>
-                  </el-row>
-                </div>`,
-            offset: new AMap.Pixel(16, -30)
-        });
-        infoWindow.open(this.map, position);
-    },
+    // addMarkerInfo(position, content, value) {
+    //     // this.map.getIsOpen();
+    //     this.map.clearInfoWindow();
+    //     var infoWindow = new AMap.InfoWindow({
+    //         isCustom: true, //使用自定义窗体
+    //         closeWhenClickMap: true,
+    //         content: content || `
+    //             <div class="tableTooltip mapTab">
+    //               <div class="tableTitle">
+    //                 <div>${'单位及执法情况'}</div>
+    //               </div>
+    //               <el-row class="tableContent">
+    //                 <div>单位名称：${value.callingUp}</div>
+    //                 <div>单位地址：${'XX路135弄'}</div>
+    //                 <div>法人：${'张三'}</div>
+    //                 <div>管理人：${'李四'}</div>
+    //                 <div>历史检查次数：<a>${'6次'}</a></div>
+    //                 <div class="divTitle">行政许可记录</div>
+    //                 <div>审核时间：${'2021-06-26'}</div>
+    //                 <div>验收时间：${'2021-06-26'}</div>
+    //                 <div>安检时间：${'2021-06-26'}</div>
+    //                 <div>历史隐患数：${'2处'}</div>
+    //                 <div class="divTitle">历史处罚情况</div>
+    //                 <div>历史火灾数：${'2'}</div>
+    //                 <div>单位自主管理情况：<a>点击查看</a></div>
+    //               </el-row>
+    //             </div>`,
+    //         offset: new AMap.Pixel(16, -30)
+    //     });
+    //     infoWindow.open(this.map, position);
+    // },
     async getData() {
       let res = await this.$axios.all([
         this.$axios.get(this.$api.fire.fireType),

src/views/rescue-station.vue

@@ -204,7 +204,7 @@
 
 <script>
 import linstener from "@c/mixins/linstener";
-import map from "@c/mixins/map-gaode";
+import map from "@c/mixins/map-data";
 import seTable from "@c/se-table";
 export default {
   data() {

src/views/security-plan.vue

@@ -165,7 +165,7 @@
 
 <script>
 import linstener from "@c/mixins/linstener";
-import map from "@c/mixins/map-gaode";
+import map from "@c/mixins/map-data";
 import gauge from "@c/gauge";
 export default {
   mixins: [linstener, map],

src/views/self-management.vue

@@ -127,7 +127,7 @@ import linstener from "@c/mixins/linstener";
 import categoryEnterprise from "@c/category-enterprise";
 import seTable from "@c/se-table";
 import gauge from "@c/gauge";
-import map from "@c/mixins/map-gaode";
+import map from "@c/mixins/map-data";
 import radarChart from "@c/radar";
 export default {
   components: { categoryEnterprise, seTable, radarChart, gauge},

src/views/water-sources.vue

@@ -172,7 +172,7 @@
 
 <script>
 import linstener from "@c/mixins/linstener";
-import map from "@c/mixins/map-gaode";
+import map from "@c/mixins/map-data";
 import waterGauge from "@c/water-gauge";
 import gauge from "@c/gauge";
 import seTable from "@c/se-table";

vue.config.js

@@ -45,12 +45,12 @@ module.exports = {
         Object.assign(config, {
             externals: {
                 // 大数据地图
-                // 'JMap': 'JMap',
-                // 'JMapQuery': 'JMapQuery',
+                'JMap': 'JMap',
+                'JMapQuery': 'JMapQuery',
 
                 // 高德地图
-                'AMap': 'AMap',
-                'AMapUI': 'AMapUI'
+                // 'AMap': 'AMap',
+                // 'AMapUI': 'AMapUI'
             }
         })
     },