Преглед на файлове

配置一楼所有叫号,增加轮询时间全局定义

wdq_fcy преди 2 години
родител
ревизия
535ebdc35e
променени са 3 файла, в които са добавени 425 реда и са изтрити 67 реда
  1. 22 56
      package-lock.json
  2. 374 7
      public/static/config/config3.js
  3. 29 4
      src/components2/MainMap.vue

+ 22 - 56
package-lock.json

@@ -2181,12 +2181,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/video.js": {
-      "version": "7.3.51",
-      "resolved": "https://registry.npmmirror.com/@types/video.js/-/video.js-7.3.51.tgz",
-      "integrity": "sha512-xLlt/ZfCuWYBvG2MRn018RvaEplcK6dI63aOiVUeeAWFyjx3Br1hL749ndFgbrvNdY4m9FoHG1FQ/PB6IpfSAQ==",
-      "peer": true
-    },
     "node_modules/@types/ws": {
       "version": "8.5.4",
       "resolved": "https://registry.npmmirror.com/@types/ws/-/ws-8.5.4.tgz",
@@ -12915,12 +12909,6 @@
         "@types/node": "*"
       }
     },
-    "@types/video.js": {
-      "version": "7.3.51",
-      "resolved": "https://registry.npmmirror.com/@types/video.js/-/video.js-7.3.51.tgz",
-      "integrity": "sha512-xLlt/ZfCuWYBvG2MRn018RvaEplcK6dI63aOiVUeeAWFyjx3Br1hL749ndFgbrvNdY4m9FoHG1FQ/PB6IpfSAQ==",
-      "peer": true
-    },
     "@types/ws": {
       "version": "8.5.4",
       "resolved": "https://registry.npmmirror.com/@types/ws/-/ws-8.5.4.tgz",
@@ -12948,8 +12936,7 @@
     "@videojs-player/vue": {
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/@videojs-player/vue/-/vue-1.0.0.tgz",
-      "integrity": "sha512-WonTezRfKu3fYdQLt/ta+nuKH6gMZUv8l40Jke/j4Lae7IqeO/+lLAmBnh3ni88bwR+vkFXIlZ2Ci7VKInIYJg==",
-      "requires": {}
+      "integrity": "sha512-WonTezRfKu3fYdQLt/ta+nuKH6gMZUv8l40Jke/j4Lae7IqeO/+lLAmBnh3ni88bwR+vkFXIlZ2Ci7VKInIYJg=="
     },
     "@videojs/http-streaming": {
       "version": "2.16.2",
@@ -13219,8 +13206,7 @@
       "version": "5.0.8",
       "resolved": "https://registry.npmmirror.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.8.tgz",
       "integrity": "sha512-HSYWPqrunRE5ZZs8kVwiY6oWcn95qf/OQabwLfprhdpFWAGtLStShjsGED2aDpSSeGAskQETrtR/5h7VqgIlBA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@vue/cli-service": {
       "version": "5.0.8",
@@ -13303,8 +13289,7 @@
           "version": "6.3.1",
           "resolved": "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
           "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "cssnano": {
           "version": "5.1.15",
@@ -13358,8 +13343,7 @@
           "version": "3.1.0",
           "resolved": "https://registry.npmmirror.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
           "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "lru-cache": {
           "version": "6.0.0",
@@ -13417,29 +13401,25 @@
           "version": "5.1.2",
           "resolved": "https://registry.npmmirror.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
           "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "postcss-discard-duplicates": {
           "version": "5.1.0",
           "resolved": "https://registry.npmmirror.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
           "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "postcss-discard-empty": {
           "version": "5.1.1",
           "resolved": "https://registry.npmmirror.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
           "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "postcss-discard-overridden": {
           "version": "5.1.0",
           "resolved": "https://registry.npmmirror.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
           "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "postcss-loader": {
           "version": "6.2.1",
@@ -13518,8 +13498,7 @@
           "version": "5.1.0",
           "resolved": "https://registry.npmmirror.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
           "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "postcss-normalize-display-values": {
           "version": "5.1.0",
@@ -14148,8 +14127,7 @@
       "version": "1.8.0",
       "resolved": "https://registry.npmmirror.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
       "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "acorn-walk": {
       "version": "8.2.0",
@@ -14219,8 +14197,7 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "amfe-flexible": {
       "version": "2.2.1",
@@ -15103,8 +15080,7 @@
           "version": "5.1.0",
           "resolved": "https://registry.npmmirror.com/icss-utils/-/icss-utils-5.1.0.tgz",
           "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "lru-cache": {
           "version": "6.0.0",
@@ -15130,8 +15106,7 @@
           "version": "3.0.0",
           "resolved": "https://registry.npmmirror.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
           "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "postcss-modules-local-by-default": {
           "version": "4.0.0",
@@ -15218,8 +15193,7 @@
           "version": "6.3.1",
           "resolved": "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
           "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "cssnano": {
           "version": "5.1.15",
@@ -15273,8 +15247,7 @@
           "version": "3.1.0",
           "resolved": "https://registry.npmmirror.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
           "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "json-schema-traverse": {
           "version": "1.0.0",
@@ -15329,29 +15302,25 @@
           "version": "5.1.2",
           "resolved": "https://registry.npmmirror.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
           "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "postcss-discard-duplicates": {
           "version": "5.1.0",
           "resolved": "https://registry.npmmirror.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
           "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "postcss-discard-empty": {
           "version": "5.1.1",
           "resolved": "https://registry.npmmirror.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
           "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "postcss-discard-overridden": {
           "version": "5.1.0",
           "resolved": "https://registry.npmmirror.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
           "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "postcss-merge-longhand": {
           "version": "5.1.7",
@@ -15419,8 +15388,7 @@
           "version": "5.1.0",
           "resolved": "https://registry.npmmirror.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
           "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "postcss-normalize-display-values": {
           "version": "5.1.0",
@@ -19967,8 +19935,7 @@
           "version": "8.12.1",
           "resolved": "https://registry.npmmirror.com/ws/-/ws-8.12.1.tgz",
           "integrity": "sha512-1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         }
       }
     },
@@ -20089,8 +20056,7 @@
       "version": "7.5.9",
       "resolved": "https://registry.npmmirror.com/ws/-/ws-7.5.9.tgz",
       "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "y18n": {
       "version": "5.0.8",

+ 374 - 7
public/static/config/config3.js

@@ -2,23 +2,22 @@ var serviceAuth = "/proxy_oauth/proxy_qpData/qpData/api/getToken?username=shujuk
 var serviceWindowInfo = "/proxy_oauth/proxy_qpData/qpData/api/getCollectWindow";
 var serviceWindowQYM = "310000310100310118001"
 /*
-共67个,除去H01 H02 H07无叫号功能,可叫号窗口共计64
-一层(27):
-A01 A02 A03 A04 A05 A06 A07 A08 F01 F02 F03 F04 F05 F06 F07 F08 B01 B02 B03 B04 B05 B07 B08 B09 B10 B11 B12 
+共68个,除去H01 H02 H07无叫号功能,可叫号窗口共计65
+一层(28):
+A01 A02 A03 A04 A05 A06 A07 A08 F01 F02 F03 F04 F05 F06 F07 F08 B01 B02 B03 B04 B05 B06 B07 B08 B09 B10 B11 B12 
 二层(19):
 H01 H02 H03 H04 H05 H06 H07 K01 K02 K03 K04 K05 K06 K07 K08 K09 K10 K11 K12
 三层(21):
 M01 M02 M03 M04 M05 M06 M07 M08 M09 M10 M11 M12 M13 M14 M15 M16 D01 D02 D03 D04 17
 */
-var serviceWindowDefault = {
-    open: "欢迎光临",
-    close: "暂停服务"
-}
+var serviceWindowTime = 3 * 60 * 1000
 
 var serviceWindow = [
+    /* 1楼 */
     {
         id: "A01",
         name: "税务综合受理",
+        type: "1",
         topPoint: [
             {
                 lon: 121.12273519090121,
@@ -36,6 +35,7 @@ var serviceWindow = [
     {
         id: "A02",
         name: "税务综合受理",
+        type: "1",
         topPoint: [
             {
                 lon: 121.12273897717168 - 0.0000001,
@@ -53,6 +53,7 @@ var serviceWindow = [
     {
         id: "A03",
         name: "税务综合受理",
+        type: "1",
         topPoint: [
             {
                 lon: 121.12274257274815 - 0.0000001,
@@ -70,6 +71,7 @@ var serviceWindow = [
     {
         id: "A04",
         name: "税务综合受理",
+        type: "1",
         topPoint: [
             {
                 lon: 121.12274568374592 - 0.0000001,
@@ -87,6 +89,7 @@ var serviceWindow = [
     {
         id: "A05",
         name: "税务综合受理",
+        type: "1",
         topPoint: [
             {
                 lon: 121.12275042977554 - 0.0000001,
@@ -104,6 +107,7 @@ var serviceWindow = [
     {
         id: "A06",
         name: "税务综合受理",
+        type: "1",
         topPoint: [
             {
                 lon: 121.122753186265 - 0.0000001,
@@ -121,6 +125,7 @@ var serviceWindow = [
     {
         id: "A07",
         name: "税务综合受理",
+        type: "1",
         topPoint: [
             {
                 lon: 121.12275625753628 - 0.0000001,
@@ -138,6 +143,7 @@ var serviceWindow = [
     {
         id: "A08",
         name: "税务综合受理",
+        type: "1",
         topPoint: [
             {
                 lon: 121.12275923673195 - 0.0000001,
@@ -152,4 +158,365 @@ var serviceWindow = [
         ],
         endHeight: [2.807028457880749, 2.807028457880749],
     },
+    {
+        id: "B01",
+        name: "车驾管窗口",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.12260661427986,
+                lat: 31.15355503426402 - 0.0000001,
+                height: 3.283195911579293
+            },
+            {
+                lon: 121.1226185874843,
+                lat: 31.153557087337983 - 0.0000001,
+                height: 3.279739994384283
+            }
+        ],
+        endHeight: [2.8063114276929384, 2.8063114276929384],
+    },
+    {
+        id: "B02",
+        name: "车驾管窗口",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.12264103334125,
+                lat: 31.15356093526166 - 0.0000001,
+                height: 3.2831737471004083
+            },
+            {
+                lon: 121.12265193602416,
+                lat: 31.153562804807414 - 0.0000001,
+                height: 3.2808878567433686
+            }
+        ],
+        endHeight: [2.8063114276929384, 2.8063114276929384],
+    },
+    {
+        id: "B03",
+        name: "车驾管窗口",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.122671264387,
+                lat: 31.153566119028348 - 0.0000001,
+                height: 3.281699521801153
+            },
+            {
+                lon: 121.12268229773922,
+                lat: 31.15356801006522 - 0.0000001,
+                height: 3.2832485996194998
+            }
+        ],
+        endHeight: [2.8063114276929384, 2.8063114276929384],
+    },
+    {
+        id: "B04",
+        name: "车驾管窗口",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.12269136551014,
+                lat: 31.153569564897623 - 0.0000001,
+                height: 3.2816104914535464
+            },
+            {
+                lon: 121.12270253178879,
+                lat: 31.153571479623047 - 0.0000001,
+                height: 3.2802510242507594
+            }
+        ],
+        endHeight: [2.8063114276929384, 2.8063114276929384],
+    },
+    {
+        id: "B05",
+        name: "车驾管窗口",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.12271237438682,
+                lat: 31.153573166440324 - 0.0000001,
+                height: 3.2835744316975526
+            },
+            {
+                lon: 121.12272345741535,
+                lat: 31.153575066886425 - 0.0000001,
+                height: 3.282181839910529
+            }
+        ],
+        endHeight: [2.8063114276929384, 2.8063114276929384],
+    },
+    {
+        id: "B06",
+        name: "车驾管窗口",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.12273238649873,
+                lat: 31.15357659775514 - 0.0000001,
+                height: 3.2814533013055875
+            },
+            {
+                lon: 121.12274348836524,
+                lat: 31.153578500544484 - 0.000001,
+                height: 3.282983981240262
+            }
+        ],
+        endHeight: [2.8063114276929384, 2.8063114276929384],
+    },
+    {
+        id: "B07",
+        name: "综合受理",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.12259103725034,
+                lat: 31.153631456674997 + 0.0000001,
+                height: 3.2831478576080135
+            },
+            {
+                lon: 121.1225801463778,
+                lat: 31.153629589143996 + 0.0000001,
+                height: 3.280830135620502
+            }
+        ],
+        endHeight: [2.8063114276929384, 2.8063114276929384],
+    },
+    {
+        id: "B08",
+        name: "综合受理",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.12263281898906,
+                lat: 31.153638619938423 + 0.0000001,
+                height: 3.2821022414015975
+            },
+            {
+                lon: 121.1226215013769,
+                lat: 31.15363667927888 + 0.0000001,
+                height: 3.2813059507781372
+            }
+        ],
+        endHeight: [2.8063114276929384, 2.8063114276929384],
+    },
+    {
+        id: "B09",
+        name: "车驾管窗口",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.1226706392679,
+                lat: 31.153645103699912 + 0.0000001,
+                height: 3.278122199842989
+            },
+            {
+                lon: 121.1226594510653,
+                lat: 31.15364318611079 + 0.0000001,
+                height: 3.282169315389708
+            }
+        ],
+        endHeight: [2.8063114276929384, 2.8063114276929384],
+    },
+    {
+        id: "B10",
+        name: "车驾管窗口",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.12270508422148,
+                lat: 31.153651009096404 + 0.0000001,
+                height: 3.284163369227852
+            },
+            {
+                lon: 121.12269378084521,
+                lat: 31.15364907171104 + 0.0000001,
+                height: 3.282199860484244
+            }
+        ],
+        endHeight: [2.8063114276929384, 2.8063114276929384],
+    },
+    {
+        id: "B11",
+        name: "车驾管窗口",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.12272040747466,
+                lat: 31.153653636050002 + 0.0000001,
+                height: 3.27901719025353
+            },
+            {
+                lon: 121.12270893439296,
+                lat: 31.15365166927933 + 0.0000001,
+                height: 3.2803891563299126
+            }
+        ],
+        endHeight: [2.8063114276929384, 2.8063114276929384],
+    },
+    {
+        id: "B12",
+        name: "拍照服务",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.122860658243840 - 0.0000001,
+                lat: 31.153689053366595,
+                height: 3.2830137192846345
+            },
+            {
+                lon: 121.12286318188109 - 0.0000001,
+                lat: 31.15367816424453,
+                height: 3.276060148523403
+            }
+        ],
+        endHeight: [2.8926337475673285, 2.8926337475673285],
+    },
+    {
+        id: "F01",
+        name: "注销套餐",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.12244898455623 + 0.0000001,
+                lat: 31.1537518770131,
+                height: 3.282079991953883
+            },
+            {
+                lon: 121.12244664964672 + 0.0000001,
+                lat: 31.153761950071218,
+                height: 3.283772957903656
+            }
+        ],
+        endHeight: [2.8102168900618816, 2.8102168900618816],
+    },
+    {
+        id: "F02",
+        name: "注销套餐",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.12245247267131 + 0.0000001,
+                lat: 31.153736829377287,
+                height: 3.2826200537745334
+            },
+            {
+                lon: 121.12245015554049 + 0.0000001,
+                lat: 31.153746825789064,
+                height: 3.281697322413432
+            }
+        ],
+        endHeight: [2.8102168900618816, 2.8102168900618816],
+    },
+    {
+        id: "F03",
+        name: "注销套餐",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.12245511949806 + 0.0000001,
+                lat: 31.153725412104862,
+                height: 3.282110341705142
+            },
+            {
+                lon: 121.12245278112242 + 0.0000001,
+                lat: 31.15373549851205,
+                height: 3.2811990072674684
+            }
+        ],
+        endHeight: [2.8102168900618816, 2.8102168900618816],
+    },
+    {
+        id: "F04",
+        name: "注销套餐",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.12245859915274 + 0.0000001,
+                lat: 31.153710400500582,
+                height: 3.282805612270587
+            },
+            {
+                lon: 121.1224562590207 + 0.0000001,
+                lat: 31.153720496245395,
+                height: 3.2818925240777705
+            }
+        ],
+        endHeight: [2.8102168900618816, 2.8102168900618816],
+    },
+    {
+        id: "F05",
+        name: "注销套餐",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.1224618912544 + 0.0000001,
+                lat: 31.153696197727157,
+                height: 3.2808208624902435
+            },
+            {
+                lon: 121.1224595275027 + 0.0000001,
+                lat: 31.15370639456651,
+                height: 3.278557440820992
+            }
+        ],
+        endHeight: [2.8102168900618816, 2.8102168900618816],
+    },
+    {
+        id: "F06",
+        name: "注销套餐",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.12246461777968 + 0.0000001,
+                lat: 31.1536844364916,
+                height: 3.2816515741099814
+            },
+            {
+                lon: 121.12246227722942 + 0.0000001,
+                lat: 31.15369453261257,
+                height: 3.2807472953435344
+            }
+        ],
+        endHeight: [2.8102168900618816, 2.8102168900618816],
+    },
+    {
+        id: "F07",
+        name: "注销套餐",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.12246784055068 + 0.0000001,
+                lat: 31.153670531140193,
+                height: 3.282394773768614
+            },
+            {
+                lon: 121.12246550920018 + 0.0000001,
+                lat: 31.153680588173877,
+                height: 3.2814903514766125
+            }
+        ],
+        endHeight: [2.8102168900618816, 2.8102168900618816],
+    },
+    {
+        id: "F08",
+        name: "注销套餐",
+        type: "1",
+        topPoint: [
+            {
+                lon: 121.12247067183372 + 0.0000001,
+                lat: 31.153658317410706,
+                height: 3.283199651242031
+            },
+            {
+                lon: 121.12246833805091 + 0.0000001,
+                lat: 31.15366838562611,
+                height: 3.2836484212796955
+            }
+        ],
+        endHeight: [2.8102168900618816, 2.8102168900618816],
+    },
+    /* 2 楼 */
 ]

+ 29 - 4
src/components2/MainMap.vue

@@ -691,7 +691,14 @@ export default {
             .split(",")
             .map((num) => Number(num));
           that.getWindowInfo(item).then((info) => {
-            let image = that.createJHImage(item, info);
+            let image;
+            if (item.type == 1) {
+              image = that.createJHImage1(item, info);
+            } else if (item.type == 2) {
+              image = that.createJHImage2(item, info);
+            } else {
+              image = that.createJHImage1(item, info);
+            }
             let entity = globalVariable.viewer.entities.add({
               wall: {
                 positions: Cesium.Cartesian3.fromDegreesArrayHeights(pointArr),
@@ -713,7 +720,7 @@ export default {
       // 开始循环访问
       setInterval(() => {
         that.loopJH();
-      }, 5000); //3 * 60 * 1000
+      }, serviceWindowTime); //
     },
     getToken() {
       let that = this;
@@ -731,7 +738,7 @@ export default {
         });
       });
     },
-    createJHImage(item, info) {
+    createJHImage1(item, info) {
       // win_code: "A02",
       // win_id: "102",
       // area_id: "310000310100310118001",
@@ -786,6 +793,24 @@ export default {
 
       return canvas.toDataURL("image/png");
     },
+    createJHImage2() {
+      let width = 300,
+        height = 100;
+      var canvas = document.createElement("canvas");
+      canvas.width = 300;
+      canvas.height = 100;
+      var ctx = canvas.getContext("2d");
+      ctx.clearRect(0, 0, width, height);
+
+      ctx.fillStyle = "#000000";
+      ctx.fillRect(0, 0, width, height);
+
+      ctx.fillStyle = "#FF0000";
+      ctx.font = "30px Arial";
+      ctx.textAlign = "center";
+      ctx.fillText(info.win_code, 150, 60);
+    },
+
     loopJH() {
       let that = this;
       this.getToken().then(() => {
@@ -794,7 +819,7 @@ export default {
           let obj = that.JHEntityObj[index];
           let item = obj.item;
           that.getWindowInfo(obj.item).then((info) => {
-            let image = that.createJHImage(item, info);
+            let image = that.createJHImage1(item, info);
             obj.entity.wall.material = new Cesium.ImageMaterialProperty({
               image: image,
               transparent: true,