From 1c6129d20058ae01caca367fa80f1a71f07def29 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 16 Apr 2021 17:48:29 +0800
Subject: [PATCH] 测试版本，地图弹窗未完成
---
src/page/crumbsL/crumbsL.vue | 14 +-
public/h5/static/js/pages-index-index.53024be5.js | 1
public/h5/static/js/index.ac6d2750.js | 1
public/h5/static/js/pages-index-index.9d77294c.js | 1
public/h5/index.html | 2
public/h5/static/js/index.9ee231ad.js | 1
public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js | 99 +++++++++++++++++++-----
public/map/popup/html/FlareClusterLayer_v3.html | 61 +++++++++++++++
public/map/popup/js/FlareClusterLayer_v3.js | 13 +++
public/map/popup/style/FlareClusterLayer_v3.css | 0
public/map/widgets/supervisoryMap/SupervisoryMap.js | 7 +
11 files changed, 169 insertions(+), 31 deletions(-)
diff --git a/public/h5/index.html b/public/h5/index.html
index d12afe6..e76aa66 100644
--- a/public/h5/index.html
+++ b/public/h5/index.html
@@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>xcx</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
- document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.f37b29dd.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.291d246c.js></script><script src=./static/js/index.150f9a23.js></script></body></html>
\ No newline at end of file
+ document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.f37b29dd.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.291d246c.js></script><script src=./static/js/index.9ee231ad.js></script></body></html>
\ No newline at end of file
diff --git a/public/h5/static/js/index.9ee231ad.js b/public/h5/static/js/index.9ee231ad.js
new file mode 100644
index 0000000..6962d13
--- /dev/null
+++ b/public/h5/static/js/index.9ee231ad.js
@@ -0,0 +1 @@
+(function(e){function n(n){for(var o,a,u=n[0],c=n[1],f=n[2],l=0,p=[];l<u.length;l++)a=u[l],Object.prototype.hasOwnProperty.call(i,a)&&i[a]&&p.push(i[a][0]),i[a]=0;for(o in c)Object.prototype.hasOwnProperty.call(c,o)&&(e[o]=c[o]);s&&s(n);while(p.length)p.shift()();return r.push.apply(r,f||[]),t()}function t(){for(var e,n=0;n<r.length;n++){for(var t=r[n],o=!0,a=1;a<t.length;a++){var c=t[a];0!==i[c]&&(o=!1)}o&&(r.splice(n--,1),e=u(u.s=t[0]))}return e}var o={},i={index:0},r=[];function a(e){return u.p+"static/js/"+({"pages-index-index":"pages-index-index"}[e]||e)+"."+{"pages-index-index":"9d77294c"}[e]+".js"}function u(n){if(o[n])return o[n].exports;var t=o[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,u),t.l=!0,t.exports}u.e=function(e){var n=[],t=i[e];if(0!==t)if(t)n.push(t[2]);else{var o=new Promise((function(n,o){t=i[e]=[n,o]}));n.push(t[2]=o);var r,c=document.createElement("script");c.charset="utf-8",c.timeout=120,u.nc&&c.setAttribute("nonce",u.nc),c.src=a(e);var f=new Error;r=function(n){c.onerror=c.onload=null,clearTimeout(l);var t=i[e];if(0!==t){if(t){var o=n&&("load"===n.type?"missing":n.type),r=n&&n.target&&n.target.src;f.message="Loading chunk "+e+" failed.\n("+o+": "+r+")",f.name="ChunkLoadError",f.type=o,f.request=r,t[1](f)}i[e]=void 0}};var l=setTimeout((function(){r({type:"timeout",target:c})}),12e4);c.onerror=c.onload=r,document.head.appendChild(c)}return Promise.all(n)},u.m=e,u.c=o,u.d=function(e,n,t){u.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},u.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},u.t=function(e,n){if(1&n&&(e=u(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(u.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)u.d(t,o,function(n){return e[n]}.bind(null,o));return t},u.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return u.d(n,"a",n),n},u.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},u.p="./",u.oe=function(e){throw console.error(e),e};var c=window["webpackJsonp"]=window["webpackJsonp"]||[],f=c.push.bind(c);c.push=n,c=c.slice();for(var l=0;l<c.length;l++)n(c[l]);var s=f;r.push([0,"chunk-vendors"]),t()})({0:function(e,n,t){e.exports=t("79f9")},"10b7":function(e,n,t){"use strict";t.r(n);var o=t("7f56"),i=t.n(o);for(var r in o)"default"!==r&&function(e){t.d(n,e,(function(){return o[e]}))}(r);n["default"]=i.a},1931:function(e,n,t){"use strict";(function(e){var n=t("4ea4"),o=n(t("e143"));e["________"]=!0,delete e["________"],e.__uniConfig={globalStyle:{navigationBarTextStyle:"black",navigationBarTitleText:"激活",navigationBarBackgroundColor:"#ffffff",backgroundColor:"#F8F8F8"}},e.__uniConfig.compilerVersion="3.1.8",e.__uniConfig.router={mode:"hash",base:"./"},e.__uniConfig.publicPath="./",e.__uniConfig["async"]={loading:"AsyncLoading",error:"AsyncError",delay:200,timeout:6e4},e.__uniConfig.debug=!1,e.__uniConfig.networkTimeout={request:6e4,connectSocket:6e4,uploadFile:6e4,downloadFile:6e4},e.__uniConfig.sdkConfigs={},e.__uniConfig.qqMapKey="XVXBZ-NDMC4-JOGUS-XGIEE-QVHDZ-AMFV2",e.__uniConfig.nvue={"flex-direction":"column"},e.__uniConfig.__webpack_chunk_load__=t.e,o.default.component("pages-index-index",(function(e){var n={component:t.e("pages-index-index").then(function(){return e(t("de84"))}.bind(null,t)).catch(t.oe),delay:__uniConfig["async"].delay,timeout:__uniConfig["async"].timeout};return __uniConfig["async"]["loading"]&&(n.loading={name:"SystemAsyncLoading",render:function(e){return e(__uniConfig["async"]["loading"])}}),__uniConfig["async"]["error"]&&(n.error={name:"SystemAsyncError",render:function(e){return e(__uniConfig["async"]["error"])}}),n})),e.__uniRoutes=[{path:"/",alias:"/pages/index/index",component:{render:function(e){return e("Page",{props:Object.assign({isQuit:!0,isEntry:!0},__uniConfig.globalStyle,{navigationBarTitleText:"激活窗口",titleNView:!1})},[e("pages-index-index",{slot:"page"})])}},meta:{id:1,name:"pages-index-index",isNVue:!1,maxWidth:0,pagePath:"pages/index/index",isQuit:!0,isEntry:!0,windowTop:0}},{path:"/preview-image",component:{render:function(e){return e("Page",{props:{navigationStyle:"custom"}},[e("system-preview-image",{slot:"page"})])}},meta:{name:"preview-image",pagePath:"/preview-image"}},{path:"/choose-location",component:{render:function(e){return e("Page",{props:{navigationStyle:"custom"}},[e("system-choose-location",{slot:"page"})])}},meta:{name:"choose-location",pagePath:"/choose-location"}},{path:"/open-location",component:{render:function(e){return e("Page",{props:{navigationStyle:"custom"}},[e("system-open-location",{slot:"page"})])}},meta:{name:"open-location",pagePath:"/open-location"}}],e.UniApp&&new e.UniApp}).call(this,t("c8ba"))},2123:function(e,n,t){"use strict";var o=t("8ffa"),i=t.n(o);i.a},"2acb":function(e,n,t){"use strict";var o;t.d(n,"b",(function(){return i})),t.d(n,"c",(function(){return r})),t.d(n,"a",(function(){return o}));var i=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("App",{attrs:{keepAliveInclude:e.keepAliveInclude}})},r=[]},"3eee":function(e,n,t){"use strict";t.r(n);var o=t("2acb"),i=t("10b7");for(var r in i)"default"!==r&&function(e){t.d(n,e,(function(){return i[e]}))}(r);t("2123");var a,u=t("f0c5"),c=Object(u["a"])(i["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],a);n["default"]=c.exports},"3ffe":function(e,n,t){var o=t("24fb");n=o(!1),n.push([e.i,"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n/*每个页面公共css */",""]),e.exports=n},"79f9":function(e,n,t){"use strict";var o=t("4ea4"),i=o(t("5530"));t("e260"),t("e6cf"),t("cca6"),t("a79d"),t("1931"),t("1c31");var r=o(t("e143")),a=o(t("3eee"));r.default.config.productionTip=!1,a.default.mpType="app";var u=new r.default((0,i.default)({},a.default));u.$mount()},"7f56":function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={onLaunch:function(){e("log","App Launch"," at App.vue:4")},onShow:function(){e("log","App Show"," at App.vue:7")},onHide:function(){e("log","App Hide"," at App.vue:10")}};n.default=t}).call(this,t("0de9")["log"])},"8ffa":function(e,n,t){var o=t("3ffe");"string"===typeof o&&(o=[[e.i,o,""]]),o.locals&&(e.exports=o.locals);var i=t("4f06").default;i("cc8fa96c",o,!0,{sourceMap:!1,shadowMode:!1})}});
\ No newline at end of file
diff --git a/public/h5/static/js/index.ac6d2750.js b/public/h5/static/js/index.ac6d2750.js
new file mode 100644
index 0000000..813b6af
--- /dev/null
+++ b/public/h5/static/js/index.ac6d2750.js
@@ -0,0 +1 @@
+(function(e){function n(n){for(var o,a,u=n[0],c=n[1],f=n[2],l=0,p=[];l<u.length;l++)a=u[l],Object.prototype.hasOwnProperty.call(i,a)&&i[a]&&p.push(i[a][0]),i[a]=0;for(o in c)Object.prototype.hasOwnProperty.call(c,o)&&(e[o]=c[o]);s&&s(n);while(p.length)p.shift()();return r.push.apply(r,f||[]),t()}function t(){for(var e,n=0;n<r.length;n++){for(var t=r[n],o=!0,a=1;a<t.length;a++){var c=t[a];0!==i[c]&&(o=!1)}o&&(r.splice(n--,1),e=u(u.s=t[0]))}return e}var o={},i={index:0},r=[];function a(e){return u.p+"static/js/"+({"pages-index-index":"pages-index-index"}[e]||e)+"."+{"pages-index-index":"53024be5"}[e]+".js"}function u(n){if(o[n])return o[n].exports;var t=o[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,u),t.l=!0,t.exports}u.e=function(e){var n=[],t=i[e];if(0!==t)if(t)n.push(t[2]);else{var o=new Promise((function(n,o){t=i[e]=[n,o]}));n.push(t[2]=o);var r,c=document.createElement("script");c.charset="utf-8",c.timeout=120,u.nc&&c.setAttribute("nonce",u.nc),c.src=a(e);var f=new Error;r=function(n){c.onerror=c.onload=null,clearTimeout(l);var t=i[e];if(0!==t){if(t){var o=n&&("load"===n.type?"missing":n.type),r=n&&n.target&&n.target.src;f.message="Loading chunk "+e+" failed.\n("+o+": "+r+")",f.name="ChunkLoadError",f.type=o,f.request=r,t[1](f)}i[e]=void 0}};var l=setTimeout((function(){r({type:"timeout",target:c})}),12e4);c.onerror=c.onload=r,document.head.appendChild(c)}return Promise.all(n)},u.m=e,u.c=o,u.d=function(e,n,t){u.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},u.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},u.t=function(e,n){if(1&n&&(e=u(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(u.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)u.d(t,o,function(n){return e[n]}.bind(null,o));return t},u.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return u.d(n,"a",n),n},u.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},u.p="./",u.oe=function(e){throw console.error(e),e};var c=window["webpackJsonp"]=window["webpackJsonp"]||[],f=c.push.bind(c);c.push=n,c=c.slice();for(var l=0;l<c.length;l++)n(c[l]);var s=f;r.push([0,"chunk-vendors"]),t()})({0:function(e,n,t){e.exports=t("79f9")},"10b7":function(e,n,t){"use strict";t.r(n);var o=t("7f56"),i=t.n(o);for(var r in o)"default"!==r&&function(e){t.d(n,e,(function(){return o[e]}))}(r);n["default"]=i.a},1931:function(e,n,t){"use strict";(function(e){var n=t("4ea4"),o=n(t("e143"));e["________"]=!0,delete e["________"],e.__uniConfig={globalStyle:{navigationBarTextStyle:"black",navigationBarTitleText:"激活",navigationBarBackgroundColor:"#ffffff",backgroundColor:"#F8F8F8"}},e.__uniConfig.compilerVersion="3.1.8",e.__uniConfig.router={mode:"hash",base:"./"},e.__uniConfig.publicPath="./",e.__uniConfig["async"]={loading:"AsyncLoading",error:"AsyncError",delay:200,timeout:6e4},e.__uniConfig.debug=!1,e.__uniConfig.networkTimeout={request:6e4,connectSocket:6e4,uploadFile:6e4,downloadFile:6e4},e.__uniConfig.sdkConfigs={},e.__uniConfig.qqMapKey="XVXBZ-NDMC4-JOGUS-XGIEE-QVHDZ-AMFV2",e.__uniConfig.nvue={"flex-direction":"column"},e.__uniConfig.__webpack_chunk_load__=t.e,o.default.component("pages-index-index",(function(e){var n={component:t.e("pages-index-index").then(function(){return e(t("de84"))}.bind(null,t)).catch(t.oe),delay:__uniConfig["async"].delay,timeout:__uniConfig["async"].timeout};return __uniConfig["async"]["loading"]&&(n.loading={name:"SystemAsyncLoading",render:function(e){return e(__uniConfig["async"]["loading"])}}),__uniConfig["async"]["error"]&&(n.error={name:"SystemAsyncError",render:function(e){return e(__uniConfig["async"]["error"])}}),n})),e.__uniRoutes=[{path:"/",alias:"/pages/index/index",component:{render:function(e){return e("Page",{props:Object.assign({isQuit:!0,isEntry:!0},__uniConfig.globalStyle,{navigationBarTitleText:"激活窗口",titleNView:!1})},[e("pages-index-index",{slot:"page"})])}},meta:{id:1,name:"pages-index-index",isNVue:!1,maxWidth:0,pagePath:"pages/index/index",isQuit:!0,isEntry:!0,windowTop:0}},{path:"/preview-image",component:{render:function(e){return e("Page",{props:{navigationStyle:"custom"}},[e("system-preview-image",{slot:"page"})])}},meta:{name:"preview-image",pagePath:"/preview-image"}},{path:"/choose-location",component:{render:function(e){return e("Page",{props:{navigationStyle:"custom"}},[e("system-choose-location",{slot:"page"})])}},meta:{name:"choose-location",pagePath:"/choose-location"}},{path:"/open-location",component:{render:function(e){return e("Page",{props:{navigationStyle:"custom"}},[e("system-open-location",{slot:"page"})])}},meta:{name:"open-location",pagePath:"/open-location"}}],e.UniApp&&new e.UniApp}).call(this,t("c8ba"))},2123:function(e,n,t){"use strict";var o=t("8ffa"),i=t.n(o);i.a},"2acb":function(e,n,t){"use strict";var o;t.d(n,"b",(function(){return i})),t.d(n,"c",(function(){return r})),t.d(n,"a",(function(){return o}));var i=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("App",{attrs:{keepAliveInclude:e.keepAliveInclude}})},r=[]},"3eee":function(e,n,t){"use strict";t.r(n);var o=t("2acb"),i=t("10b7");for(var r in i)"default"!==r&&function(e){t.d(n,e,(function(){return i[e]}))}(r);t("2123");var a,u=t("f0c5"),c=Object(u["a"])(i["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],a);n["default"]=c.exports},"3ffe":function(e,n,t){var o=t("24fb");n=o(!1),n.push([e.i,"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n/*每个页面公共css */",""]),e.exports=n},"79f9":function(e,n,t){"use strict";var o=t("4ea4"),i=o(t("5530"));t("e260"),t("e6cf"),t("cca6"),t("a79d"),t("1931"),t("1c31");var r=o(t("e143")),a=o(t("3eee"));r.default.config.productionTip=!1,a.default.mpType="app";var u=new r.default((0,i.default)({},a.default));u.$mount()},"7f56":function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={onLaunch:function(){e("log","App Launch"," at App.vue:4")},onShow:function(){e("log","App Show"," at App.vue:7")},onHide:function(){e("log","App Hide"," at App.vue:10")}};n.default=t}).call(this,t("0de9")["log"])},"8ffa":function(e,n,t){var o=t("3ffe");"string"===typeof o&&(o=[[e.i,o,""]]),o.locals&&(e.exports=o.locals);var i=t("4f06").default;i("cc8fa96c",o,!0,{sourceMap:!1,shadowMode:!1})}});
\ No newline at end of file
diff --git a/public/h5/static/js/pages-index-index.53024be5.js b/public/h5/static/js/pages-index-index.53024be5.js
new file mode 100644
index 0000000..102e403
--- /dev/null
+++ b/public/h5/static/js/pages-index-index.53024be5.js
@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-index-index"],{2207:function(t,e,s){"use strict";var n=s("2c52"),a=s.n(n);a.a},"23ec":function(t,e,s){"use strict";var n;s.d(e,"b",(function(){return a})),s.d(e,"c",(function(){return i})),s.d(e,"a",(function(){return n}));var a=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("v-uni-view",{attrs:{id:"our"}},[n("v-uni-view",{staticClass:"content"},[n("v-uni-view",{staticClass:"title"},[t._v("填写信息")]),n("v-uni-view",{staticClass:"one"},[n("v-uni-view",{staticClass:"stitle"},[t._v("票号：")]),n("v-uni-input",{attrs:{type:"number",value:"",placeholder:"请输入正确票号"},model:{value:t.ticket,callback:function(e){t.ticket=e},expression:"ticket"}}),n("v-uni-view",{staticClass:"line"}),n("v-uni-view",{staticClass:"msg"},[n("span",{directives:[{name:"show",rawName:"v-show",value:null==t.msgT.state,expression:"msgT.state == null"}],staticClass:"black"}),n("span",{directives:[{name:"show",rawName:"v-show",value:0==t.msgT.state,expression:"msgT.state == 0"}],staticClass:"red"},[n("img",{attrs:{src:s("dabe"),alt:"no"}}),t._v(t._s(t.msgT.msg))]),n("span",{directives:[{name:"show",rawName:"v-show",value:1==t.msgT.state,expression:"msgT.state == 1"}],staticClass:"green"},[n("img",{attrs:{src:s("7a43"),alt:"yes"}}),t._v(t._s(t.msgT.msg))])])],1),n("v-uni-view",{staticClass:"two"},[n("v-uni-view",{staticClass:"stitle"},[t._v("姓名：")]),n("v-uni-input",{attrs:{type:"text",value:"",placeholder:"请输入正确姓名"},model:{value:t.name,callback:function(e){t.name=e},expression:"name"}}),n("v-uni-view",{staticClass:"line"}),n("v-uni-view",{staticClass:"msg"},[n("span",{directives:[{name:"show",rawName:"v-show",value:null==t.msgN.state,expression:"msgN.state == null"}],staticClass:"black"}),n("span",{directives:[{name:"show",rawName:"v-show",value:0==t.msgN.state,expression:"msgN.state == 0"}],staticClass:"red"},[n("img",{attrs:{src:s("dabe"),alt:"no"}}),t._v(t._s(t.msgN.msg))]),n("span",{directives:[{name:"show",rawName:"v-show",value:1==t.msgN.state,expression:"msgN.state == 1"}],staticClass:"green"},[n("img",{attrs:{src:s("7a43"),alt:"yes"}}),t._v(t._s(t.msgN.msg))])])],1),n("v-uni-view",{staticClass:"three"},[n("v-uni-view",{staticClass:"stitle"},[t._v("身份证：")]),n("v-uni-input",{attrs:{type:"text",value:"",placeholder:"请输入正确身份证"},model:{value:t.ID,callback:function(e){t.ID=e},expression:"ID"}}),n("v-uni-view",{staticClass:"line"}),n("v-uni-view",{staticClass:"msg"},[n("span",{directives:[{name:"show",rawName:"v-show",value:null==t.msgI.state,expression:"msgI.state == null"}],staticClass:"black"}),n("span",{directives:[{name:"show",rawName:"v-show",value:0==t.msgI.state,expression:"msgI.state == 0"}],staticClass:"red"},[n("img",{attrs:{src:s("dabe"),alt:"no"}}),t._v(t._s(t.msgI.msg))]),n("span",{directives:[{name:"show",rawName:"v-show",value:1==t.msgI.state,expression:"msgI.state == 1"}],staticClass:"green"},[n("img",{attrs:{src:s("7a43"),alt:"yes"}}),t._v(t._s(t.msgI.msg))])])],1),n("v-uni-view",{staticClass:"buttons"},[n("v-uni-button",{directives:[{name:"show",rawName:"v-show",value:!t.oks,expression:"!oks"}],staticClass:"a",on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.but("post")}}},[t._v("确认激活")]),n("v-uni-button",{directives:[{name:"show",rawName:"v-show",value:t.oks,expression:"oks"}],staticClass:"b",on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.buts.apply(void 0,arguments)}}},[t._v("确认激活")])],1)],1)],1)},i=[]},"2c52":function(t,e,s){var n=s("b8ff");"string"===typeof n&&(n=[[t.i,n,""]]),n.locals&&(t.exports=n.locals);var a=s("4f06").default;a("7f7a807a",n,!0,{sourceMap:!1,shadowMode:!1})},"6f06":function(t,e,s){"use strict";(function(t){s("ac1f"),s("841c"),Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={data:function(){return{times:"",ticket:"",name:"",ID:"",msgT:{state:null,msg:""},msgN:{state:null,msg:""},msgI:{state:null,msg:""},axiosMsg:{code:"",msg:""},oks:!1}},computed:{doit:function(){return 1==this.msgT.state&&1==this.msgN.state&&1==this.msgI.state}},methods:{buts:function(){t("log","提交完成"," at pages/index/index.vue:96")},but:function(e){var s=this;if(this.doit){var n={name:s.name,identityCard:s.ID,ticketCode:s.ticket,activation:"1"};wx.request({url:"https://web.byisf.com/api/blade-jfpts/activation/activation/submit",data:n,header:{"content-type":"application/x-www-form-urlencoded"},method:e,success:function(n){s.axiosMsg={code:n.data.code,msg:n.data.msg},200==n.data.code?(t("log","git"==e?"use git":"use post"," at pages/index/index.vue:123"),s.oks=!0,wx.showLoading({title:"激活成功",mask:!0})):405==n.data.code&&s.but("git")},fail:function(t){s.axiosMsg={code:0,msg:t},wx.showLoading({title:"失去连接 请稍等",mask:!0}),setTimeout((function(){wx.hideLoading()}),500)}})}else this.rees()},checkOUR:function(t,e){var s=this;clearTimeout(this.times),this.times=setTimeout((function(){t(e),clearTimeout(s.times)}),200)},checkTicket:function(t){var e="",s="";""==t?(e="0",s="请输入票号"):(e="1",s=t),this.msgT.state=e,this.msgT.msg=s},checkName:function(t){var e="",s="";""==t?(s="请输入名字",e="0"):-1!=t.search(/[^\u4e00-\u9fa5]/)?(s="请输入汉字",e="0"):t.length>5?(s="名字太长",e="0"):(s="输入正确",e="1"),this.msgN.state=e,this.msgN.msg=s},checkID:function(t){var e=/^[1-9]\d{5}(18|19|20|21|22)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,s="",n="";""==t?(n="请输入身份证",s="0"):0!=t.search(e)?(n="身份证错误",s="0"):(n="输入正确",s="1"),this.msgI.state=s,this.msgI.msg=n},rees:function(){this.checkTicket(this.ticket),this.checkName(this.name),this.checkID(this.ID)},cc:function(){this.ticket="23",this.name="我二",this.ID="333333199701014455",this.checkTicket(this.ticket),this.checkName(this.name),this.checkID(this.ID)}},mounted:function(){this.cc()},watch:{ticket:function(){this.checkOUR(this.checkTicket,this.ticket)},name:function(){this.checkOUR(this.checkName,this.name)},ID:function(){this.checkOUR(this.checkID,this.ID)}}};e.default=n}).call(this,s("0de9")["log"])},"7a43":function(t,e,s){t.exports=s.p+"static/img/tg.0350b2e2.png"},b8ff:function(t,e,s){var n=s("24fb");e=n(!1),e.push([t.i,'@charset "UTF-8";\r\n/**\r\n * 这里是uni-app内置的常用样式变量\r\n *\r\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\r\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\r\n *\r\n */\r\n/**\r\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\r\n *\r\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\r\n */\r\n/* 颜色变量 */\r\n/* 行为相关颜色 */\r\n/* 文字基本颜色 */\r\n/* 背景颜色 */\r\n/* 边框颜色 */\r\n/* 尺寸变量 */\r\n/* 文字尺寸 */\r\n/* 图片尺寸 */\r\n/* Border Radius */\r\n/* 水平间距 */\r\n/* 垂直间距 */\r\n/* 透明度 */\r\n/* 文章场景相关 */.content[data-v-f682892e]{margin:0 auto;width:90%;height:100%;padding:%?5?%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;background-color:#fff;-webkit-border-radius:%?20?%;border-radius:%?20?%;-webkit-box-shadow:0 0 %?10?% #888;box-shadow:0 0 %?10?% #888;position:relative;top:%?10?%}.content .title[data-v-f682892e]{font-size:%?48?%;font-weight:300}.content .title[data-v-f682892e],\r\n.content .buttons[data-v-f682892e]{padding:%?30?%}.content .title .a[data-v-f682892e],\r\n.content .buttons .a[data-v-f682892e]{background-color:#409eff;color:#fff;-webkit-border-radius:%?60?%;border-radius:%?60?%}.content .title .b[data-v-f682892e],\r\n.content .buttons .b[data-v-f682892e]{background-color:#c7c7c7;color:#fff;-webkit-border-radius:%?60?%;border-radius:%?60?%}.content .one[data-v-f682892e],\r\n.content .two[data-v-f682892e],\r\n.content .three[data-v-f682892e]{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-justify-content:space-around;justify-content:space-around;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;padding:%?10?%}.content .one .line[data-v-f682892e],\r\n.content .one uni-input[data-v-f682892e],\r\n.content .one .stitle[data-v-f682892e],\r\n.content .one .msg[data-v-f682892e],\r\n.content .two .line[data-v-f682892e],\r\n.content .two uni-input[data-v-f682892e],\r\n.content .two .stitle[data-v-f682892e],\r\n.content .two .msg[data-v-f682892e],\r\n.content .three .line[data-v-f682892e],\r\n.content .three uni-input[data-v-f682892e],\r\n.content .three .stitle[data-v-f682892e],\r\n.content .three .msg[data-v-f682892e]{width:%?560?%;padding-bottom:%?15?%}.content .one .msg[data-v-f682892e],\r\n.content .two .msg[data-v-f682892e],\r\n.content .three .msg[data-v-f682892e]{font-size:%?26?%;height:%?20?%}.content .one .line[data-v-f682892e],\r\n.content .two .line[data-v-f682892e],\r\n.content .three .line[data-v-f682892e]{border-bottom:%?2?% solid #000}.content .red[data-v-f682892e]{color:red}.content .green[data-v-f682892e]{color:#409eff}.content img[data-v-f682892e]{width:%?35?%;height:%?35?%;position:relative;top:%?6?%}.scuss[data-v-f682892e]{position:absolute;top:%?-100?%;left:%?-100?%;width:500%;height:500%;background-color:#efefef}',""]),t.exports=e},c085:function(t,e,s){"use strict";s.r(e);var n=s("6f06"),a=s.n(n);for(var i in n)"default"!==i&&function(t){s.d(e,t,(function(){return n[t]}))}(i);e["default"]=a.a},dabe:function(t,e,s){t.exports=s.p+"static/img/jg.fbe1fed3.png"},de84:function(t,e,s){"use strict";s.r(e);var n=s("23ec"),a=s("c085");for(var i in a)"default"!==i&&function(t){s.d(e,t,(function(){return a[t]}))}(i);s("2207");var o,c=s("f0c5"),r=Object(c["a"])(a["default"],n["b"],n["c"],!1,null,"f682892e",null,!1,n["a"],o);e["default"]=r.exports}}]);
\ No newline at end of file
diff --git a/public/h5/static/js/pages-index-index.9d77294c.js b/public/h5/static/js/pages-index-index.9d77294c.js
new file mode 100644
index 0000000..970c180
--- /dev/null
+++ b/public/h5/static/js/pages-index-index.9d77294c.js
@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-index-index"],{"2f79":function(t,e,s){"use strict";var n;s.d(e,"b",(function(){return a})),s.d(e,"c",(function(){return i})),s.d(e,"a",(function(){return n}));var a=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("v-uni-view",{attrs:{id:"our"}},[n("v-uni-view",{staticClass:"content"},[n("v-uni-view",{staticClass:"title"},[t._v("填写信息")]),n("v-uni-view",{staticClass:"one"},[n("v-uni-view",{staticClass:"stitle"},[t._v("票号：")]),n("v-uni-input",{attrs:{type:"number",value:"",placeholder:"请输入正确票号"},model:{value:t.ticket,callback:function(e){t.ticket=e},expression:"ticket"}}),n("v-uni-view",{staticClass:"line"}),n("v-uni-view",{staticClass:"msg"},[n("span",{directives:[{name:"show",rawName:"v-show",value:null==t.msgT.state,expression:"msgT.state == null"}],staticClass:"black"}),n("span",{directives:[{name:"show",rawName:"v-show",value:0==t.msgT.state,expression:"msgT.state == 0"}],staticClass:"red"},[n("img",{attrs:{src:s("dabe"),alt:"no"}}),t._v(t._s(t.msgT.msg))]),n("span",{directives:[{name:"show",rawName:"v-show",value:1==t.msgT.state,expression:"msgT.state == 1"}],staticClass:"green"},[n("img",{attrs:{src:s("7a43"),alt:"yes"}}),t._v(t._s(t.msgT.msg))])])],1),n("v-uni-view",{staticClass:"two"},[n("v-uni-view",{staticClass:"stitle"},[t._v("姓名：")]),n("v-uni-input",{attrs:{type:"text",value:"",placeholder:"请输入正确姓名"},model:{value:t.name,callback:function(e){t.name=e},expression:"name"}}),n("v-uni-view",{staticClass:"line"}),n("v-uni-view",{staticClass:"msg"},[n("span",{directives:[{name:"show",rawName:"v-show",value:null==t.msgN.state,expression:"msgN.state == null"}],staticClass:"black"}),n("span",{directives:[{name:"show",rawName:"v-show",value:0==t.msgN.state,expression:"msgN.state == 0"}],staticClass:"red"},[n("img",{attrs:{src:s("dabe"),alt:"no"}}),t._v(t._s(t.msgN.msg))]),n("span",{directives:[{name:"show",rawName:"v-show",value:1==t.msgN.state,expression:"msgN.state == 1"}],staticClass:"green"},[n("img",{attrs:{src:s("7a43"),alt:"yes"}}),t._v(t._s(t.msgN.msg))])])],1),n("v-uni-view",{staticClass:"three"},[n("v-uni-view",{staticClass:"stitle"},[t._v("身份证：")]),n("v-uni-input",{attrs:{type:"text",value:"",placeholder:"请输入正确身份证"},model:{value:t.ID,callback:function(e){t.ID=e},expression:"ID"}}),n("v-uni-view",{staticClass:"line"}),n("v-uni-view",{staticClass:"msg"},[n("span",{directives:[{name:"show",rawName:"v-show",value:null==t.msgI.state,expression:"msgI.state == null"}],staticClass:"black"}),n("span",{directives:[{name:"show",rawName:"v-show",value:0==t.msgI.state,expression:"msgI.state == 0"}],staticClass:"red"},[n("img",{attrs:{src:s("dabe"),alt:"no"}}),t._v(t._s(t.msgI.msg))]),n("span",{directives:[{name:"show",rawName:"v-show",value:1==t.msgI.state,expression:"msgI.state == 1"}],staticClass:"green"},[n("img",{attrs:{src:s("7a43"),alt:"yes"}}),t._v(t._s(t.msgI.msg))])])],1),n("v-uni-view",{staticClass:"buttons"},[n("v-uni-button",{directives:[{name:"show",rawName:"v-show",value:!t.oks,expression:"!oks"}],staticClass:"a",on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.but("post")}}},[t._v("确认激活")]),n("v-uni-button",{directives:[{name:"show",rawName:"v-show",value:t.oks,expression:"oks"}],staticClass:"b",on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.buts.apply(void 0,arguments)}}},[t._v("确认激活")])],1)],1)],1)},i=[]},3185:function(t,e,s){var n=s("24fb");e=n(!1),e.push([t.i,'@charset "UTF-8";\r\n/**\r\n * 这里是uni-app内置的常用样式变量\r\n *\r\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\r\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\r\n *\r\n */\r\n/**\r\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\r\n *\r\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\r\n */\r\n/* 颜色变量 */\r\n/* 行为相关颜色 */\r\n/* 文字基本颜色 */\r\n/* 背景颜色 */\r\n/* 边框颜色 */\r\n/* 尺寸变量 */\r\n/* 文字尺寸 */\r\n/* 图片尺寸 */\r\n/* Border Radius */\r\n/* 水平间距 */\r\n/* 垂直间距 */\r\n/* 透明度 */\r\n/* 文章场景相关 */.content[data-v-54b16c56]{margin:0 auto;width:90%;height:100%;padding:%?5?%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;background-color:#fff;-webkit-border-radius:%?20?%;border-radius:%?20?%;-webkit-box-shadow:0 0 %?10?% #888;box-shadow:0 0 %?10?% #888;position:relative;top:%?10?%}.content .title[data-v-54b16c56]{font-size:%?48?%;font-weight:300}.content .title[data-v-54b16c56],\r\n.content .buttons[data-v-54b16c56]{padding:%?30?%}.content .title .a[data-v-54b16c56],\r\n.content .buttons .a[data-v-54b16c56]{background-color:#409eff;color:#fff;-webkit-border-radius:%?60?%;border-radius:%?60?%}.content .title .b[data-v-54b16c56],\r\n.content .buttons .b[data-v-54b16c56]{background-color:#c7c7c7;color:#fff;-webkit-border-radius:%?60?%;border-radius:%?60?%}.content .one[data-v-54b16c56],\r\n.content .two[data-v-54b16c56],\r\n.content .three[data-v-54b16c56]{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-justify-content:space-around;justify-content:space-around;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;padding:%?10?%}.content .one .line[data-v-54b16c56],\r\n.content .one uni-input[data-v-54b16c56],\r\n.content .one .stitle[data-v-54b16c56],\r\n.content .one .msg[data-v-54b16c56],\r\n.content .two .line[data-v-54b16c56],\r\n.content .two uni-input[data-v-54b16c56],\r\n.content .two .stitle[data-v-54b16c56],\r\n.content .two .msg[data-v-54b16c56],\r\n.content .three .line[data-v-54b16c56],\r\n.content .three uni-input[data-v-54b16c56],\r\n.content .three .stitle[data-v-54b16c56],\r\n.content .three .msg[data-v-54b16c56]{width:%?560?%;padding-bottom:%?15?%}.content .one .msg[data-v-54b16c56],\r\n.content .two .msg[data-v-54b16c56],\r\n.content .three .msg[data-v-54b16c56]{font-size:%?26?%;height:%?20?%}.content .one .line[data-v-54b16c56],\r\n.content .two .line[data-v-54b16c56],\r\n.content .three .line[data-v-54b16c56]{border-bottom:%?2?% solid #000}.content .red[data-v-54b16c56]{color:red}.content .green[data-v-54b16c56]{color:#409eff}.content img[data-v-54b16c56]{width:%?35?%;height:%?35?%;position:relative;top:%?6?%}.scuss[data-v-54b16c56]{position:absolute;top:%?-100?%;left:%?-100?%;width:500%;height:500%;background-color:#efefef}',""]),t.exports=e},"6f06":function(t,e,s){"use strict";(function(t){s("ac1f"),s("841c"),Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={data:function(){return{times:"",ticket:"",name:"",ID:"",msgT:{state:null,msg:""},msgN:{state:null,msg:""},msgI:{state:null,msg:""},axiosMsg:{code:"",msg:""},oks:!1}},computed:{doit:function(){return 1==this.msgT.state&&1==this.msgN.state&&1==this.msgI.state}},methods:{buts:function(){t("log","提交完成"," at pages/index/index.vue:96")},but:function(e){var s=this;if(this.doit){var n={name:s.name,identityCard:s.ID,ticketCode:s.ticket,activation:"1"};wx.request({url:"https://web.byisf.com/api/blade-jfpts/activation/activation/submit",data:n,header:{"content-type":"application/x-www-form-urlencoded"},method:e,success:function(n){s.axiosMsg={code:n.data.code,msg:n.data.msg},200==n.data.code?(t("log","git"==e?"use git":"use post"," at pages/index/index.vue:123"),s.oks=!0,wx.showLoading({title:"激活成功",mask:!0})):405==n.data.code&&s.but("git")},fail:function(t){s.axiosMsg={code:0,msg:t},wx.showLoading({title:"失去连接 请稍等",mask:!0}),setTimeout((function(){wx.hideLoading()}),500)}})}else this.rees()},checkOUR:function(t,e){var s=this;clearTimeout(this.times),this.times=setTimeout((function(){t(e),clearTimeout(s.times)}),200)},checkTicket:function(t){var e="",s="";""==t?(e="0",s="请输入票号"):(e="1",s=t),this.msgT.state=e,this.msgT.msg=s},checkName:function(t){var e="",s="";""==t?(s="请输入名字",e="0"):-1!=t.search(/[^\u4e00-\u9fa5]/)?(s="请输入汉字",e="0"):t.length>5?(s="名字太长",e="0"):(s="输入正确",e="1"),this.msgN.state=e,this.msgN.msg=s},checkID:function(t){var e=/^[1-9]\d{5}(18|19|20|21|22)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,s="",n="";""==t?(n="请输入身份证",s="0"):0!=t.search(e)?(n="身份证错误",s="0"):(n="输入正确",s="1"),this.msgI.state=s,this.msgI.msg=n},rees:function(){this.checkTicket(this.ticket),this.checkName(this.name),this.checkID(this.ID)},cc:function(){this.ticket="23",this.name="我二",this.ID="333333199701014455",this.checkTicket(this.ticket),this.checkName(this.name),this.checkID(this.ID)}},mounted:function(){},watch:{ticket:function(){this.checkOUR(this.checkTicket,this.ticket)},name:function(){this.checkOUR(this.checkName,this.name)},ID:function(){this.checkOUR(this.checkID,this.ID)}}};e.default=n}).call(this,s("0de9")["log"])},"7a43":function(t,e,s){t.exports=s.p+"static/img/tg.0350b2e2.png"},"8e0b":function(t,e,s){"use strict";var n=s("c361"),a=s.n(n);a.a},c085:function(t,e,s){"use strict";s.r(e);var n=s("6f06"),a=s.n(n);for(var i in n)"default"!==i&&function(t){s.d(e,t,(function(){return n[t]}))}(i);e["default"]=a.a},c361:function(t,e,s){var n=s("3185");"string"===typeof n&&(n=[[t.i,n,""]]),n.locals&&(t.exports=n.locals);var a=s("4f06").default;a("10fb0ebc",n,!0,{sourceMap:!1,shadowMode:!1})},dabe:function(t,e,s){t.exports=s.p+"static/img/jg.fbe1fed3.png"},de84:function(t,e,s){"use strict";s.r(e);var n=s("2f79"),a=s("c085");for(var i in a)"default"!==i&&function(t){s.d(e,t,(function(){return a[t]}))}(i);s("8e0b");var c,o=s("f0c5"),r=Object(o["a"])(a["default"],n["b"],n["c"],!1,null,"54b16c56",null,!1,n["a"],c);e["default"]=r.exports}}]);
\ No newline at end of file
diff --git a/public/map/popup/html/FlareClusterLayer_v3.html b/public/map/popup/html/FlareClusterLayer_v3.html
new file mode 100644
index 0000000..c696572
--- /dev/null
+++ b/public/map/popup/html/FlareClusterLayer_v3.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Document</title>
+ <link rel="stylesheet" href="../style/FlareClusterLayer_v3.css">
+ <script src='../../lib/jquery.js'></script>
+ <script src='../js/FlareClusterLayer_v3.js'></script>
+ <script src="https://cdn.jsdelivr.net/npm/vue@2.6.12"></script>
+ <!-- layui -->
+ <link rel="stylesheet" href="../../lib/layui/css/layui.css" media="all">
+ <style>
+
+ </style>
+</head>
+
+<body>
+ <div id="appliu" class='police-details-box' class="layui-anim" data-anim="layui-anim-down">
+ <div>{{name}}</div>
+ <div>{{num}}</div>
+ <div class="layui-anim" data-anim="layui-anim-scale">平滑放大</div>
+ <script src="../../lib/layui/layui.js" charset="utf-8"></script>
+ <script>
+ // var index = parent.layer.getFrameIndex(window.name);
+
+ </script>
+ <script>
+ var me = new Vue({
+ el: '#appliu',
+ data: {
+ num: '',
+ name: ''
+ },
+ methods: {
+ GetQueryString(useName) {
+ var reg = new RegExp("(^|&)" + useName + "=([^&]*)(&|$)", "i");
+ var r = window.location.search.substr(1).match(reg);
+ if (r != null) {
+ return decodeURI(r[2]);
+ } else {
+ return null;
+ }
+ }
+ },
+ mounted() {
+ window.onload = () => {
+ // console.log(me);
+ // console.log(window.location.href)
+ me.num = me.GetQueryString("num");
+ me.name = me.GetQueryString("name");
+ // console.log(me.num,me.name);
+ }
+
+ }
+ })
+ </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/public/map/popup/js/FlareClusterLayer_v3.js b/public/map/popup/js/FlareClusterLayer_v3.js
new file mode 100644
index 0000000..d74e05b
--- /dev/null
+++ b/public/map/popup/js/FlareClusterLayer_v3.js
@@ -0,0 +1,13 @@
+$(function () {
+ var num = GetQueryString("num"),
+ name = GetQueryString("name");
+ function GetQueryString(useName) {
+ var reg = new RegExp("(^|&)" + useName + "=([^&]*)(&|$)", "i");
+ var r = window.location.search.substr(1).match(reg);
+ if (r != null) {
+ return decodeURI(r[2]);
+ } else {
+ return null;
+ }
+ }
+})
diff --git a/public/map/popup/style/FlareClusterLayer_v3.css b/public/map/popup/style/FlareClusterLayer_v3.css
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/public/map/popup/style/FlareClusterLayer_v3.css
diff --git a/public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js b/public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js
index 5d15530..2199920 100644
--- a/public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js
+++ b/public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js
@@ -167,8 +167,84 @@
}
}
},
+ _mapClick: function (e) {//地图全局点击事件 标记不能点击
+ // console.log('地图全局点击事件');
+
+ if (!e.target) {
+ return;
+ }
- onClick: function (evt) {
+ var targetClass = e.target.getAttribute("class");
+ if (!targetClass || targetClass.indexOf("cluster-object") === -1) {
+ //if this was not a cluster object at all then clear any active one and return
+ this._clearActiveCluster();
+ } else if (targetClass.indexOf("cluster-object") !== -1) {
+ //if click reached map click event and it is a cluster object, make sure an info window doesn't display for the cluster graphic
+ if (this.map.infoWindow.cluster) {
+ this._restoreInfoWindowSettings();
+ }
+ this.map.infoWindow.hide();
+ }
+ },
+
+ onClick: function (evt) { //标志以及聚合表示点击事件
+ var eour = evt.graphic.attributes.clusterCount;
+ if(eour == undefined){
+ var dataO = evt
+ var data = {
+ nums : evt.graphic.attributes.deviceNumber,
+ nams : evt.graphic.attributes.deviceName,
+ }
+ console.log(dataO);
+
+ var rightCard = (num,name,posi)=>{
+ var that = this;
+ var url = './popup/html/FlareClusterLayer_v3.html?num=' + num + '&name=' + name;
+ layui.use('layer', function () {
+ that.layuiLayer = layui.layer;
+ // that.layuiLayer.config({
+ // extend: 'myskin/police-details.css'
+ // });
+ that.layuiLayer.close(that.layuiLayer.index);
+ that.layuiLayer.open({
+ title: '',
+ type: 2,
+ shadeClose: true,
+ shade: false,
+ skin: 'demo-class',
+ id: 'onelyOne',
+ maxmin: false, //开启最大化最小化按钮
+ // area: ['500px', '400px'],
+ offset: posi,
+ skin: 'police-details',
+ content: [url,'no'],
+ resize: false,
+ closeBtn: 1,
+ success: function(layero, index){//成功后添加全局点击关闭
+ console.log(layero, index);
+
+ // var a = window.onmousedown = ()=>{
+ // // parent[0].layer.close(index);
+ // // begins();
+ // }
+ var d = document.onclick = ()=>{
+ parent[0].layer.close(index);
+ d = '';
+ }
+ },
+ });
+ })
+ }
+ var offsetMy = [+evt.screenY - 370 + 'px',+evt.screenX - 370 + 'px'];
+ rightCard (data.nums,data.nams,offsetMy);
+ var begins = ()=>{
+ var offsetMy = [+evt.screenY - 370 + 'px',+evt.screenX - 370 + 'px'];
+ rightCard (data.nums,data.nams,offsetMy);
+ }
+ }else {
+ console.log(num,'zoom');
+ }
+ console.log(evt)
this._restoreInfoWindowSettings();
if (evt.graphic.attributes.isCluster) {
@@ -368,24 +444,7 @@
dojo.query("g.cluster-group:empty", this.getNode()).forEach(dojo.destroy);
},
- _mapClick: function (e) {
- if (!e.target) {
- return;
- }
-
- var targetClass = e.target.getAttribute("class");
- if (!targetClass || targetClass.indexOf("cluster-object") === -1) {
- //if this was not a cluster object at all then clear any active one and return
- this._clearActiveCluster();
- } else if (targetClass.indexOf("cluster-object") !== -1) {
- //if click reached map click event and it is a cluster object, make sure an info window doesn't display for the cluster graphic
- if (this.map.infoWindow.cluster) {
- this._restoreInfoWindowSettings();
- }
- this.map.infoWindow.hide();
- }
- },
-
+
_graphicDraw: function (e) {
var g = e.graphic;
if (g.attributes.isCluster) {
@@ -653,7 +712,7 @@
this.singles.push(single);
delete single.graphic;
var symbol;
- console.log(single.onlineStatus, 898989);
+ console.log(single.onlineStatus, '移动事件');
if (single.onlineStatus == 1) {
symbol = new esri.symbol.PictureMarkerSymbol("./images/zx-jingbao.png", 40, 40);
} else {
diff --git a/public/map/widgets/supervisoryMap/SupervisoryMap.js b/public/map/widgets/supervisoryMap/SupervisoryMap.js
index 740a9af..da07b11 100644
--- a/public/map/widgets/supervisoryMap/SupervisoryMap.js
+++ b/public/map/widgets/supervisoryMap/SupervisoryMap.js
@@ -282,10 +282,11 @@
entitys.add(graphic);
},
+ clickHand: function (e) {//top点击事件，导航
+ console.log(e);
+ },
//聚合图层事件
- flareClusterLayer: function (datas) {
-
- console.log(1);
+ flareClusterLayer: function (datas) { //top聚合事件，导航
var that = this;
diff --git a/src/page/crumbsL/crumbsL.vue b/src/page/crumbsL/crumbsL.vue
index c8faea3..24efc2e 100644
--- a/src/page/crumbsL/crumbsL.vue
+++ b/src/page/crumbsL/crumbsL.vue
@@ -71,9 +71,9 @@
p = path.split("/").pop(),
n = this.$route.name,
s = this.$store.state.common.liuState;
- console.log("path:" + p);
- console.log("name:" + n);
- console.log("state: ", s);
+ // console.log("path:" + p);
+ // console.log("name:" + n);
+ // console.log("state: ", s);
if (this.sOld != s) {
//一级菜单
this.breadListLast = [];
@@ -81,7 +81,7 @@
name: n == "首页" ? "数据模式" : n,
path: path,
});
- console.log(p, n, "写入一级面包屑");
+ // console.log(p, n, "写入一级面包屑");
} else if (this.sOld == s) {
//push
@@ -99,7 +99,7 @@
);
}
}
- console.log(p, n, "写入多级面包屑");
+ // console.log(p, n, "写入多级面包屑");
}
this.sOld = s;
@@ -210,7 +210,7 @@
na = this.$route.name;
var uspa = pa.split("/");
uspa.shift();
- console.log(uspa, pa);
+ // console.log(uspa, pa);
for (var upk in uspa) {
if (uspa[upk] == "wel") {
continue;
@@ -261,7 +261,7 @@
];
}
}
- console.log(this.breadListLast);
+ // console.log(this.breadListLast);
} else {
console.log("未识别到路由");
}
--
Gitblit v1.9.3