From 7384c83e7eb8de6cfae73ca1607db87ab21072f0 Mon Sep 17 00:00:00 2001 From: zhangshujuan Date: Thu, 23 Nov 2023 09:21:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- god-ui/src/views/bigscreen1/index.vue | 1590 +++++++++-------- god-ui/src/views/bigscreen3/index.vue | 48 +- god-ui/src/views/bigscreen5/index.vue | 1550 ++++++++-------- .../cityManage/mapInfo/geography/index1.vue | 4 +- .../src/views/forest/firePosition/index.vue | 347 ++-- 5 files changed, 1856 insertions(+), 1683 deletions(-) diff --git a/god-ui/src/views/bigscreen1/index.vue b/god-ui/src/views/bigscreen1/index.vue index 0f0b21c2..2e836906 100644 --- a/god-ui/src/views/bigscreen1/index.vue +++ b/god-ui/src/views/bigscreen1/index.vue @@ -1,822 +1,864 @@ diff --git a/god-ui/src/views/bigscreen3/index.vue b/god-ui/src/views/bigscreen3/index.vue index 6eb885a2..e56fb06b 100644 --- a/god-ui/src/views/bigscreen3/index.vue +++ b/god-ui/src/views/bigscreen3/index.vue @@ -127,22 +127,24 @@ import { } from "@/utils/bigscreenTool/index.js"; import * as echarts from "echarts"; +import AMapLoader from "@amap/amap-jsapi-loader"; window._AMapSecurityConfig = { - securityJsCode:'289153494763707d55b03878ace1cb08', -} - + securityJsCode: "b6314ade5a42c3f3ac2284b6d4d89b1f", +}; export default { components: { BigScreenTime }, data() { const add0 = (val) => { - const numVal = parseInt(val) - return numVal < 10 ? ('0' + numVal) : numVal.toString() - } + const numVal = parseInt(val); + return numVal < 10 ? "0" + numVal : numVal.toString(); + }; const formatter = (offset = 0, date = new Date()) => { - const d = new Date(date.getTime() - offset) - return `${d.getFullYear()}/${add0(d.getMonth() + 1)}/${add0(d.getDate())} ${add0(d.getHours())}:${add0(d.getMinutes())}:${add0(d.getSeconds())}` - } + const d = new Date(date.getTime() - offset); + return `${d.getFullYear()}/${add0(d.getMonth() + 1)}/${add0( + d.getDate() + )} ${add0(d.getHours())}:${add0(d.getMinutes())}:${add0(d.getSeconds())}`; + }; return { map: null, height: "100%", @@ -199,11 +201,21 @@ export default { }, methods: { initMap() { - this.map = new AMap.Map("middleMap", { - zoom: 11,//级别 - center: [105.60178899809716, 27.14450662262202], //中心点坐标 - mapStyle: 'amap://styles/blue', - }); + AMapLoader.load({ + key: "e49669059fa36494531a82ed982f395c", // 申请好的Web端开发者Key,首次调用 load 时必填 + version: "1.4.15", // 指定要加载的 JSAPI 的版本,缺省时默认为 1.4.15 + plugins: ["AMap.AutoComplete", "AMap.PlaceSearch"], // 需要使用的的插件列表,如比例尺'AMap.Scale'等 + }) + .then((AMap) => { + this.map = new AMap.Map("middleMap", { + zoom: 11, //级别 + center: [105.60178899809716, 27.14450662262202], //中心点坐标 + mapStyle: "amap://styles/blue", + }); + }) + .catch((e) => { + console.log(e); + }); }, getEchart2Data() { // calEquipNumPerWeek({ locationId: 0 }).then((response) => { @@ -373,10 +385,10 @@ export default { }, }, grid: { - left: '6%', - top: '19%', - right: '6%', - bottom: '13%' + left: "6%", + top: "19%", + right: "6%", + bottom: "13%", }, tooltip: { trigger: "axis", diff --git a/god-ui/src/views/bigscreen5/index.vue b/god-ui/src/views/bigscreen5/index.vue index ca4f0b27..a859f47d 100644 --- a/god-ui/src/views/bigscreen5/index.vue +++ b/god-ui/src/views/bigscreen5/index.vue @@ -1,810 +1,846 @@ \ No newline at end of file + diff --git a/god-ui/src/views/cityManage/mapInfo/geography/index1.vue b/god-ui/src/views/cityManage/mapInfo/geography/index1.vue index c711351c..07e0f2f3 100644 --- a/god-ui/src/views/cityManage/mapInfo/geography/index1.vue +++ b/god-ui/src/views/cityManage/mapInfo/geography/index1.vue @@ -68,7 +68,7 @@