diff --git a/.gitignore b/.gitignore
index 403adbc..1993aea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
.DS_Store
node_modules
/dist
-
+/jinshui-screen
+/jinshui-screen.zip
# local env files
.env.local
diff --git a/package-lock.json b/package-lock.json
index 5704b09..ea4e8cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
"@amap/amap-jsapi-loader": "^1.0.1",
"axios": "^1.4.0",
"core-js": "^3.6.5",
+ "jquery.js": "^0.0.2-security",
"js-cookie": "^3.0.5",
"swiper": "^9.4.1",
"vue": "^2.6.11",
@@ -9434,6 +9435,11 @@
"integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==",
"dev": true
},
+ "node_modules/jquery.js": {
+ "version": "0.0.2-security",
+ "resolved": "https://registry.npmmirror.com/jquery.js/-/jquery.js-0.0.2-security.tgz",
+ "integrity": "sha512-ezUV4Jx39k9jyZjKQEkvno0JDSICSixlXEEJP7QlH2g0FS+nPinvunuI2sWHTikXq6fr44JOgEnCAIsfLZufcg=="
+ },
"node_modules/js-base64": {
"version": "2.6.4",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
@@ -24540,6 +24546,11 @@
"integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==",
"dev": true
},
+ "jquery.js": {
+ "version": "0.0.2-security",
+ "resolved": "https://registry.npmmirror.com/jquery.js/-/jquery.js-0.0.2-security.tgz",
+ "integrity": "sha512-ezUV4Jx39k9jyZjKQEkvno0JDSICSixlXEEJP7QlH2g0FS+nPinvunuI2sWHTikXq6fr44JOgEnCAIsfLZufcg=="
+ },
"js-base64": {
"version": "2.6.4",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
diff --git a/package.json b/package.json
index 1abf810..08db51c 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
"private": true,
"scripts": {
"serve": "vue-cli-service serve --mode development",
+ "dev": "vue-cli-service serve --mode development",
"build:beta": "vue-cli-service build --mode beta",
"build:prod": "vue-cli-service build --mode production",
"lint": "vue-cli-service lint"
@@ -12,6 +13,7 @@
"@amap/amap-jsapi-loader": "^1.0.1",
"axios": "^1.4.0",
"core-js": "^3.6.5",
+ "jquery.js": "^0.0.2-security",
"js-cookie": "^3.0.5",
"swiper": "^9.4.1",
"vue": "^2.6.11",
diff --git a/public/index.html b/public/index.html
index b943589..b70f695 100644
--- a/public/index.html
+++ b/public/index.html
@@ -14,6 +14,8 @@
+
+
diff --git a/public/js/jsencrypt.min.js b/public/js/jsencrypt.min.js
new file mode 100644
index 0000000..27c29d5
--- /dev/null
+++ b/public/js/jsencrypt.min.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.JSEncrypt={})}(this,function(t){"use strict";var e="0123456789abcdefghijklmnopqrstuvwxyz";function a(t){return e.charAt(t)}function i(t,e){return t&e}function u(t,e){return t|e}function r(t,e){return t^e}function n(t,e){return t&~e}function s(t){if(0==t)return-1;var e=0;return 0==(65535&t)&&(t>>=16,e+=16),0==(255&t)&&(t>>=8,e+=8),0==(15&t)&&(t>>=4,e+=4),0==(3&t)&&(t>>=2,e+=2),0==(1&t)&&++e,e}function o(t){for(var e=0;0!=t;)t&=t-1,++e;return e}var h="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";function c(t){var e,i,r="";for(e=0;e+3<=t.length;e+=3)i=parseInt(t.substring(e,e+3),16),r+=h.charAt(i>>6)+h.charAt(63&i);for(e+1==t.length?(i=parseInt(t.substring(e,e+1),16),r+=h.charAt(i<<2)):e+2==t.length&&(i=parseInt(t.substring(e,e+2),16),r+=h.charAt(i>>2)+h.charAt((3&i)<<4));0<(3&r.length);)r+="=";return r}function f(t){var e,i="",r=0,n=0;for(e=0;e>2),n=3&s,r=1):1==r?(i+=a(n<<2|s>>4),n=15&s,r=2):2==r?(i+=a(n),i+=a(s>>2),n=3&s,r=3):(i+=a(n<<2|s>>4),i+=a(15&s),r=0))}return 1==r&&(i+=a(n<<2)),i}var l,p=function(t,e){return(p=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var i in e)e.hasOwnProperty(i)&&(t[i]=e[i])})(t,e)};var g,d=function(t){var e;if(void 0===l){var i="0123456789ABCDEF",r=" \f\n\r\t \u2028\u2029";for(l={},e=0;e<16;++e)l[i.charAt(e)]=e;for(i=i.toLowerCase(),e=10;e<16;++e)l[i.charAt(e)]=e;for(e=0;e>16,r[r.length]=n>>8&255,r[r.length]=255&n,s=n=0):n<<=6}}switch(s){case 1:throw new Error("Base64 encoding incomplete: at least 2 bits missing");case 2:r[r.length]=n>>10;break;case 3:r[r.length]=n>>16,r[r.length]=n>>8&255}return r},re:/-----BEGIN [^-]+-----([A-Za-z0-9+\/=\s]+)-----END [^-]+-----|begin-base64[^\n]+\n([A-Za-z0-9+\/=\s]+)====/,unarmor:function(t){var e=v.re.exec(t);if(e)if(e[1])t=e[1];else{if(!e[2])throw new Error("RegExp out of sync");t=e[2]}return v.decode(t)}},m=1e13,y=function(){function t(t){this.buf=[+t||0]}return t.prototype.mulAdd=function(t,e){var i,r,n=this.buf,s=n.length;for(i=0;ie&&(t=t.substring(0,e)+b),t}var w,D=function(){function i(t,e){this.hexDigits="0123456789ABCDEF",t instanceof i?(this.enc=t.enc,this.pos=t.pos):(this.enc=t,this.pos=e)}return i.prototype.get=function(t){if(void 0===t&&(t=this.pos++),t>=this.enc.length)throw new Error("Requesting byte offset "+t+" on a stream of length "+this.enc.length);return"string"==typeof this.enc?this.enc.charCodeAt(t):this.enc[t]},i.prototype.hexByte=function(t){return this.hexDigits.charAt(t>>4&15)+this.hexDigits.charAt(15&t)},i.prototype.hexDump=function(t,e,i){for(var r="",n=t;n>u&1?"1":"0";if(s.length>i)return n+E(s,i)}return n+s},i.prototype.parseOctetString=function(t,e,i){if(this.isASCII(t,e))return E(this.parseStringISO(t,e),i);var r=e-t,n="("+r+" byte)\n";(i/=2)i)return E(r,i);n=new y,s=0}}return 0>6,this.tagConstructed=0!=(32&e),this.tagNumber=31&e,31==this.tagNumber){for(var i=new y;e=t.get(),i.mulAdd(128,127&e),128&e;);this.tagNumber=i.simplify()}}return t.prototype.isUniversal=function(){return 0===this.tagClass},t.prototype.isEOC=function(){return 0===this.tagClass&&0===this.tagNumber},t}(),B=[2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73,79,83,89,97,101,103,107,109,113,127,131,137,139,149,151,157,163,167,173,179,181,191,193,197,199,211,223,227,229,233,239,241,251,257,263,269,271,277,281,283,293,307,311,313,317,331,337,347,349,353,359,367,373,379,383,389,397,401,409,419,421,431,433,439,443,449,457,461,463,467,479,487,491,499,503,509,521,523,541,547,557,563,569,571,577,587,593,599,601,607,613,617,619,631,641,643,647,653,659,661,673,677,683,691,701,709,719,727,733,739,743,751,757,761,769,773,787,797,809,811,821,823,827,829,839,853,857,859,863,877,881,883,887,907,911,919,929,937,941,947,953,967,971,977,983,991,997],A=(1<<26)/B[B.length-1],O=function(){function b(t,e,i){null!=t&&("number"==typeof t?this.fromNumber(t,e,i):null==e&&"string"!=typeof t?this.fromString(t,256):this.fromString(t,e))}return b.prototype.toString=function(t){if(this.s<0)return"-"+this.negate().toString(t);var e;if(16==t)e=4;else if(8==t)e=3;else if(2==t)e=1;else if(32==t)e=5;else{if(4!=t)return this.toRadix(t);e=2}var i,r=(1<>h)&&(n=!0,s=a(i));0<=o;)h>(h+=this.DB-e)):(i=this[o]>>(h-=e)&r,h<=0&&(h+=this.DB,--o)),0>24},b.prototype.shortValue=function(){return 0==this.t?this.s:this[0]<<16>>16},b.prototype.signum=function(){return this.s<0?-1:this.t<=0||1==this.t&&this[0]<=0?0:1},b.prototype.toByteArray=function(){var t=this.t,e=[];e[0]=this.s;var i,r=this.DB-t*this.DB%8,n=0;if(0>r)!=(this.s&this.DM)>>r&&(e[n++]=i|this.s<>(r+=this.DB-8)):(i=this[t]>>(r-=8)&255,r<=0&&(r+=this.DB,--t)),0!=(128&i)&&(i|=-256),0==n&&(128&this.s)!=(128&i)&&++n,(0=this.t?0!=this.s:0!=(this[e]&1<>n-a&u:(f=(t[p]&(1<>this.DB+n-a)),h=i;0==(1&f);)f>>=1,--h;if((n-=h)<0&&(n+=this.DB,--p),g)o[f].copyTo(s),g=!1;else{for(;1this.DB?(this[this.t-1]|=(o&(1<>this.DB-s):this[this.t-1]|=o<=this.DB&&(s-=this.DB))}8==i&&0!=(128&+t[0])&&(this.s=-1,0>r|o,o=(this[h]&n)<=this.t)e.t=0;else{var r=t%this.DB,n=this.DB-r,s=(1<>r;for(var o=i+1;o>r;0>=this.DB;if(t.t>=this.DB;r+=this.s}else{for(r+=this.s;i>=this.DB;r-=t.s}e.s=r<0?-1:0,r<-1?e[i++]=this.DV+r:0=e.DV&&(t[i+e.t]-=e.DV,t[i+e.t+1]=1)}0>this.F2:0),l=this.FV/f,p=(1<=i&&(this.dMultiply(r),this.dAddOffset(o,0),o=s=0))}0t&&this.subTo(b.ONE.shiftLeft(t-1),this);else{var r=[],n=7&t;r.length=1+(t>>3),e.nextBytes(r),0>=this.DB;if(t.t>=this.DB;r+=this.s}else{for(r+=this.s;i>=this.DB;r+=t.s}e.s=r<0?-1:0,0=this.DV;)this[e]-=this.DV,++e>=this.t&&(this[this.t++]=0),++this[e]}},b.prototype.multiplyLowerTo=function(t,e,i){var r=Math.min(this.t+t.t,e);for(i.s=0,i.t=r;0>1)&&(t=B.length);for(var n=M(),s=0;st&&n.subTo(b.ONE.shiftLeft(t-1),n),n.isProbablePrime(e)?setTimeout(function(){r()},0):setTimeout(s,0)};setTimeout(s,0)}else{var o=[],h=7&t;o.length=1+(t>>3),e.nextBytes(o),0>15,this.um=(1<>15)*this.mpl&this.um)<<15)&t.DM;for(t[i=e+this.m.t]+=this.m.am(0,r,t,e,0,this.m.t);t[i]>=t.DV;)t[i]-=t.DV,t[++i]++}t.clamp(),t.drShiftTo(this.m.t,t),0<=t.compareTo(this.m)&&t.subTo(this.m,t)},t.prototype.mulTo=function(t,e,i){t.multiplyTo(e,i),this.reduce(i)},t.prototype.sqrTo=function(t,e){t.squareTo(e),this.reduce(e)},t}(),P=function(){function t(t){this.m=t,this.r2=M(),this.q3=M(),O.ONE.dlShiftTo(2*t.t,this.r2),this.mu=this.r2.divide(t)}return t.prototype.convert=function(t){if(t.s<0||t.t>2*this.m.t)return t.mod(this.m);if(t.compareTo(this.m)<0)return t;var e=M();return t.copyTo(e),this.reduce(e),e},t.prototype.revert=function(t){return t},t.prototype.reduce=function(t){for(t.drShiftTo(this.m.t-1,this.r2),t.t>this.m.t+1&&(t.t=this.m.t+1,t.clamp()),this.mu.multiplyUpperTo(this.r2,this.m.t+1,this.q3),this.m.multiplyLowerTo(this.q3,this.m.t+1,this.r2);t.compareTo(this.r2)<0;)t.dAddOffset(1,this.m.t+1);for(t.subTo(this.r2,t);0<=t.compareTo(this.m);)t.subTo(this.m,t)},t.prototype.mulTo=function(t,e,i){t.multiplyTo(e,i),this.reduce(i)},t.prototype.sqrTo=function(t,e){t.squareTo(e),this.reduce(e)},t}();function M(){return new O(null)}function q(t,e){return new O(t,e)}"Microsoft Internet Explorer"==navigator.appName?(O.prototype.am=function(t,e,i,r,n,s){for(var o=32767&e,h=e>>15;0<=--s;){var a=32767&this[t],u=this[t++]>>15,c=h*a+u*o;n=((a=o*a+((32767&c)<<15)+i[r]+(1073741823&n))>>>30)+(c>>>15)+h*u+(n>>>30),i[r++]=1073741823&a}return n},w=30):"Netscape"!=navigator.appName?(O.prototype.am=function(t,e,i,r,n,s){for(;0<=--s;){var o=e*this[t++]+i[r]+n;n=Math.floor(o/67108864),i[r++]=67108863&o}return n},w=26):(O.prototype.am=function(t,e,i,r,n,s){for(var o=16383&e,h=e>>14;0<=--s;){var a=16383&this[t],u=this[t++]>>14,c=h*a+u*o;n=((a=o*a+((16383&c)<<14)+i[r]+n)>>28)+(c>>14)+h*u,i[r++]=268435455&a}return n},w=28),O.prototype.DB=w,O.prototype.DM=(1<>>16)&&(t=e,i+=16),0!=(e=t>>8)&&(t=e,i+=8),0!=(e=t>>4)&&(t=e,i+=4),0!=(e=t>>2)&&(t=e,i+=2),0!=(e=t>>1)&&(t=e,i+=1),i}O.ZERO=F(0),O.ONE=F(1);var K=function(){function t(){this.i=0,this.j=0,this.S=[]}return t.prototype.init=function(t){var e,i,r;for(e=0;e<256;++e)this.S[e]=e;for(e=i=0;e<256;++e)i=i+this.S[e]+t[e%t.length]&255,r=this.S[e],this.S[e]=this.S[i],this.S[i]=r;this.i=0,this.j=0},t.prototype.next=function(){var t;return this.i=this.i+1&255,this.j=this.j+this.S[this.i]&255,t=this.S[this.i],this.S[this.i]=this.S[this.j],this.S[this.j]=t,this.S[t+this.S[this.i]&255]},t}();var k,_,z=256,Z=null;if(null==Z){Z=[];var G=void(_=0);if(window.crypto&&window.crypto.getRandomValues){var $=new Uint32Array(256);for(window.crypto.getRandomValues($),G=0;G<$.length;++G)Z[_++]=255&$[G]}var Y=function(t){if(this.count=this.count||0,256<=this.count||z<=_)window.removeEventListener?window.removeEventListener("mousemove",Y,!1):window.detachEvent&&window.detachEvent("onmousemove",Y);else try{var e=t.x+t.y;Z[_++]=255&e,this.count+=1}catch(t){}};window.addEventListener?window.addEventListener("mousemove",Y,!1):window.attachEvent&&window.attachEvent("onmousemove",Y)}function J(){if(null==k){for(k=new K;_>6|192):(i[--e]=63&n|128,i[--e]=n>>6&63|128,i[--e]=n>>12|224)}i[--e]=0;for(var s=new X,o=[];2>3);if(null==e)return null;var i=this.doPublic(e);if(null==i)return null;var r=i.toString(16);return 0==(1&r.length)?r:"0"+r},t.prototype.setPrivate=function(t,e,i){null!=t&&null!=e&&0>1;this.e=parseInt(e,16);for(var n=new O(e,16);;){for(;this.p=new O(t-r,1,i),0!=this.p.subtract(O.ONE).gcd(n).compareTo(O.ONE)||!this.p.isProbablePrime(10););for(;this.q=new O(r,1,i),0!=this.q.subtract(O.ONE).gcd(n).compareTo(O.ONE)||!this.q.isProbablePrime(10););if(this.p.compareTo(this.q)<=0){var s=this.p;this.p=this.q,this.q=s}var o=this.p.subtract(O.ONE),h=this.q.subtract(O.ONE),a=o.multiply(h);if(0==a.gcd(n).compareTo(O.ONE)){this.n=this.p.multiply(this.q),this.d=n.modInverse(a),this.dmp1=this.d.mod(o),this.dmq1=this.d.mod(h),this.coeff=this.q.modInverse(this.p);break}}},t.prototype.decrypt=function(t){var e=q(t,16),i=this.doPrivate(e);return null==i?null:function(t,e){var i=t.toByteArray(),r=0;for(;r=i.length)return null;var n="";for(;++r>3)},t.prototype.generateAsync=function(t,e,n){var s=new X,o=t>>1;this.e=parseInt(e,16);var h=new O(e,16),a=this,u=function(){var e=function(){if(a.p.compareTo(a.q)<=0){var t=a.p;a.p=a.q,a.q=t}var e=a.p.subtract(O.ONE),i=a.q.subtract(O.ONE),r=e.multiply(i);0==r.gcd(h).compareTo(O.ONE)?(a.n=a.p.multiply(a.q),a.d=h.modInverse(r),a.dmp1=a.d.mod(e),a.dmq1=a.d.mod(i),a.coeff=a.q.modInverse(a.p),setTimeout(function(){n()},0)):setTimeout(u,0)},i=function(){a.q=M(),a.q.fromNumberAsync(o,1,s,function(){a.q.subtract(O.ONE).gcda(h,function(t){0==t.compareTo(O.ONE)&&a.q.isProbablePrime(10)?setTimeout(e,0):setTimeout(i,0)})})},r=function(){a.p=M(),a.p.fromNumberAsync(t-o,1,s,function(){a.p.subtract(O.ONE).gcda(h,function(t){0==t.compareTo(O.ONE)&&a.p.isProbablePrime(10)?setTimeout(i,0):setTimeout(r,0)})})};setTimeout(r,0)};setTimeout(u,0)},t.prototype.sign=function(t,e,i){var r=function(t,e){if(e=e?t:new Array(e-t.length+1).join("0")+t},this.getString=function(){return this.s},this.setString=function(t){this.hTLV=null,this.isModified=!0,this.s=t,this.hV=stohex(t)},this.setByDateValue=function(t,e,i,r,n,s){var o=new Date(Date.UTC(t,e-1,i,r,n,s,0));this.setByDate(o)},this.getFreshValueHex=function(){return this.hV}},tt.lang.extend(et.asn1.DERAbstractTime,et.asn1.ASN1Object),et.asn1.DERAbstractStructured=function(t){et.asn1.DERAbstractString.superclass.constructor.call(this),this.setByASN1ObjectArray=function(t){this.hTLV=null,this.isModified=!0,this.asn1Array=t},this.appendASN1Object=function(t){this.hTLV=null,this.isModified=!0,this.asn1Array.push(t)},this.asn1Array=new Array,void 0!==t&&void 0!==t.array&&(this.asn1Array=t.array)},tt.lang.extend(et.asn1.DERAbstractStructured,et.asn1.ASN1Object),et.asn1.DERBoolean=function(){et.asn1.DERBoolean.superclass.constructor.call(this),this.hT="01",this.hTLV="0101ff"},tt.lang.extend(et.asn1.DERBoolean,et.asn1.ASN1Object),et.asn1.DERInteger=function(t){et.asn1.DERInteger.superclass.constructor.call(this),this.hT="02",this.setByBigInteger=function(t){this.hTLV=null,this.isModified=!0,this.hV=et.asn1.ASN1Util.bigIntToMinTwosComplementsHex(t)},this.setByInteger=function(t){var e=new O(String(t),10);this.setByBigInteger(e)},this.setValueHex=function(t){this.hV=t},this.getFreshValueHex=function(){return this.hV},void 0!==t&&(void 0!==t.bigint?this.setByBigInteger(t.bigint):void 0!==t.int?this.setByInteger(t.int):"number"==typeof t?this.setByInteger(t):void 0!==t.hex&&this.setValueHex(t.hex))},tt.lang.extend(et.asn1.DERInteger,et.asn1.ASN1Object),et.asn1.DERBitString=function(t){if(void 0!==t&&void 0!==t.obj){var e=et.asn1.ASN1Util.newObject(t.obj);t.hex="00"+e.getEncodedHex()}et.asn1.DERBitString.superclass.constructor.call(this),this.hT="03",this.setHexValueIncludingUnusedBits=function(t){this.hTLV=null,this.isModified=!0,this.hV=t},this.setUnusedBitsAndHexValue=function(t,e){if(t<0||70&&b[0]<4?1:+(b[0]+b[1])),!g&&X&&(!(b=X.match(/Edge\/(\d+)/))||b[1]>=74)&&(b=X.match(/Chrome\/(\d+)/))&&(g=+b[1]);var ee=g,te=ee,ne=u,oe=!!Object.getOwnPropertySymbols&&!ne((function(){var e=Symbol();return!String(e)||!(Object(e)instanceof Symbol)||!Symbol.sham&&te&&te<41})),re=oe&&!Symbol.sham&&"symbol"==t(Symbol.iterator),ie=Z,se=M,ae=H,ue=re,ce=s.Object,le=ue?function(e){return"symbol"==t(e)}:function(e){var t=ie("Symbol");return se(t)&&ae(t.prototype,ce(e))},de=s.String,fe=function(e){try{return de(e)}catch(e){return"Object"}},he=M,pe=fe,ve=s.TypeError,be=function(e){if(he(e))return e;throw ve(pe(e)+" is not a function")},ge=be,me=function(e,t){var n=e[t];return null==n?void 0:ge(n)},ye=d,_e=M,we=J,Ce=s.TypeError,ke={exports:{}},Se=s,Re=Object.defineProperty,qe=function(e,t){try{Re(Se,e,{value:t,configurable:!0,writable:!0})}catch(n){Se[e]=t}return t},Ie=qe,Pe="__core-js_shared__",Ee=s[Pe]||Ie(Pe,{}),Oe=Ee;(ke.exports=function(e,t){return Oe[e]||(Oe[e]=void 0!==t?t:{})})("versions",[]).push({version:"3.19.1",mode:"global",copyright:"© 2021 Denis Pushkarev (zloirock.ru)"});var Te=D,ze=s.Object,Ae=function(e){return ze(Te(e))},Ue=Ae,De=k({}.hasOwnProperty),xe=Object.hasOwn||function(e,t){return De(Ue(e),t)},We=k,Fe=0,Me=Math.random(),Le=We(1..toString),Je=function(e){return"Symbol("+(void 0===e?"":e)+")_"+Le(++Fe+Me,36)},je=s,Ne=ke.exports,Be=xe,Ze=Je,He=oe,Ge=re,Ve=Ne("wks"),Xe=je.Symbol,Ye=Xe&&Xe.for,Ke=Ge?Xe:Xe&&Xe.withoutSetter||Ze,$e=function(e){if(!Be(Ve,e)||!He&&"string"!=typeof Ve[e]){var t="Symbol."+e;He&&Be(Xe,e)?Ve[e]=Xe[e]:Ve[e]=Ge&&Ye?Ye(t):Ke(t)}return Ve[e]},Qe=d,et=J,tt=le,nt=me,ot=function(e,t){var n,o;if("string"===t&&_e(n=e.toString)&&!we(o=ye(n,e)))return o;if(_e(n=e.valueOf)&&!we(o=ye(n,e)))return o;if("string"!==t&&_e(n=e.toString)&&!we(o=ye(n,e)))return o;throw Ce("Can't convert object to primitive value")},rt=$e,it=s.TypeError,st=rt("toPrimitive"),at=function(e,t){if(!et(e)||tt(e))return e;var n,o=nt(e,st);if(o){if(void 0===t&&(t="default"),n=Qe(o,e,t),!et(n)||tt(n))return n;throw it("Can't convert object to primitive value")}return void 0===t&&(t="number"),ot(e,t)},ut=le,ct=function(e){var t=at(e,"string");return ut(t)?t:t+""},lt=J,dt=s.document,ft=lt(dt)&<(dt.createElement),ht=function(e){return ft?dt.createElement(e):{}},pt=ht,vt=!c&&!u((function(){return 7!=Object.defineProperty(pt("div"),"a",{get:function(){return 7}}).a})),bt=c,gt=d,mt=f,yt=m,_t=F,wt=ct,Ct=xe,kt=vt,St=Object.getOwnPropertyDescriptor;a.f=bt?St:function(e,t){if(e=_t(e),t=wt(t),kt)try{return St(e,t)}catch(e){}if(Ct(e,t))return yt(!gt(mt.f,e,t),e[t])};var Rt={},qt=s,It=J,Pt=qt.String,Et=qt.TypeError,Ot=function(e){if(It(e))return e;throw Et(Pt(e)+" is not an object")},Tt=c,zt=vt,At=Ot,Ut=ct,Dt=s.TypeError,xt=Object.defineProperty;Rt.f=Tt?xt:function(e,t,n){if(At(e),t=Ut(t),At(n),zt)try{return xt(e,t,n)}catch(e){}if("get"in n||"set"in n)throw Dt("Accessors not supported");return"value"in n&&(e[t]=n.value),e};var Wt=Rt,Ft=m,Mt=c?function(e,t,n){return Wt.f(e,t,Ft(1,n))}:function(e,t,n){return e[t]=n,e},Lt={exports:{}},Jt=M,jt=Ee,Nt=k(Function.toString);Jt(jt.inspectSource)||(jt.inspectSource=function(e){return Nt(e)});var Bt,Zt,Ht,Gt=jt.inspectSource,Vt=M,Xt=Gt,Yt=s.WeakMap,Kt=Vt(Yt)&&/native code/.test(Xt(Yt)),$t=ke.exports,Qt=Je,en=$t("keys"),tn=function(e){return en[e]||(en[e]=Qt(e))},nn={},on=Kt,rn=s,sn=k,an=J,un=Mt,cn=xe,ln=Ee,dn=tn,fn=nn,hn="Object already initialized",pn=rn.TypeError,vn=rn.WeakMap;if(on||ln.state){var bn=ln.state||(ln.state=new vn),gn=sn(bn.get),mn=sn(bn.has),yn=sn(bn.set);Bt=function(e,t){if(mn(bn,e))throw new pn(hn);return t.facade=e,yn(bn,e,t),t},Zt=function(e){return gn(bn,e)||{}},Ht=function(e){return mn(bn,e)}}else{var _n=dn("state");fn[_n]=!0,Bt=function(e,t){if(cn(e,_n))throw new pn(hn);return t.facade=e,un(e,_n,t),t},Zt=function(e){return cn(e,_n)?e[_n]:{}},Ht=function(e){return cn(e,_n)}}var wn={set:Bt,get:Zt,has:Ht,enforce:function(e){return Ht(e)?Zt(e):Bt(e,{})},getterFor:function(e){return function(t){var n;if(!an(t)||(n=Zt(t)).type!==e)throw pn("Incompatible receiver, "+e+" required");return n}}},Cn=c,kn=xe,Sn=Function.prototype,Rn=Cn&&Object.getOwnPropertyDescriptor,qn=kn(Sn,"name"),In={EXISTS:qn,PROPER:qn&&"something"===function(){}.name,CONFIGURABLE:qn&&(!Cn||Cn&&Rn(Sn,"name").configurable)},Pn=s,En=M,On=xe,Tn=Mt,zn=qe,An=Gt,Un=In.CONFIGURABLE,Dn=wn.get,xn=wn.enforce,Wn=String(String).split("String");(Lt.exports=function(e,t,n,o){var r,i=!!o&&!!o.unsafe,s=!!o&&!!o.enumerable,a=!!o&&!!o.noTargetGet,u=o&&void 0!==o.name?o.name:t;En(n)&&("Symbol("===String(u).slice(0,7)&&(u="["+String(u).replace(/^Symbol\(([^)]*)\)/,"$1")+"]"),(!On(n,"name")||Un&&n.name!==u)&&Tn(n,"name",u),(r=xn(n)).source||(r.source=Wn.join("string"==typeof u?u:""))),e!==Pn?(i?!a&&e[t]&&(s=!0):delete e[t],s?e[t]=n:Tn(e,t,n)):s?e[t]=n:zn(t,n)})(Function.prototype,"toString",(function(){return En(this)&&Dn(this).source||An(this)}));var Fn={},Mn=Math.ceil,Ln=Math.floor,Jn=function(e){var t=+e;return t!=t||0===t?0:(t>0?Ln:Mn)(t)},jn=Jn,Nn=Math.max,Bn=Math.min,Zn=Jn,Hn=Math.min,Gn=function(e){return e>0?Hn(Zn(e),9007199254740991):0},Vn=function(e){return Gn(e.length)},Xn=F,Yn=function(e,t){var n=jn(e);return n<0?Nn(n+t,0):Bn(n,t)},Kn=Vn,$n=function(e){return function(t,n,o){var r,i=Xn(t),s=Kn(i),a=Yn(o,s);if(e&&n!=n){for(;s>a;)if((r=i[a++])!=r)return!0}else for(;s>a;a++)if((e||a in i)&&i[a]===n)return e||a||0;return!e&&-1}},Qn={includes:$n(!0),indexOf:$n(!1)},eo=xe,to=F,no=Qn.indexOf,oo=nn,ro=k([].push),io=function(e,t){var n,o=to(e),r=0,i=[];for(n in o)!eo(oo,n)&&eo(o,n)&&ro(i,n);for(;t.length>r;)eo(o,n=t[r++])&&(~no(i,n)||ro(i,n));return i},so=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],ao=io,uo=so.concat("length","prototype");Fn.f=Object.getOwnPropertyNames||function(e){return ao(e,uo)};var co={};co.f=Object.getOwnPropertySymbols;var lo=Z,fo=Fn,ho=co,po=Ot,vo=k([].concat),bo=lo("Reflect","ownKeys")||function(e){var t=fo.f(po(e)),n=ho.f;return n?vo(t,n(e)):t},go=xe,mo=bo,yo=a,_o=Rt,wo=function(e,t){for(var n=mo(t),o=_o.f,r=yo.f,i=0;ir;)for(var a,u=Yo(arguments[r++]),c=i?Qo(Ho(u),i(u)):Ho(u),l=c.length,d=0;l>d;)a=c[d++],jo&&!Bo(s,u,a)||(n[a]=u[a]);return n}:Ko,tr=er;Fo({target:"Object",stat:!0,forced:Object.assign!==tr},{assign:tr});var nr=s;nr.Object.assign;var or,rr=!u((function(){function e(){}return e.prototype.constructor=null,Object.getPrototypeOf(new e)!==e.prototype})),ir=s,sr=xe,ar=M,ur=Ae,cr=rr,lr=tn("IE_PROTO"),dr=ir.Object,fr=dr.prototype,hr=cr?dr.getPrototypeOf:function(e){var t=ur(e);if(sr(t,lr))return t[lr];var n=t.constructor;return ar(n)&&t instanceof n?n.prototype:t instanceof dr?fr:null},pr=s,vr=M,br=pr.String,gr=pr.TypeError,mr=k,yr=Ot,_r=function(e){if("object"==t(e)||vr(e))return e;throw gr("Can't set "+br(e)+" as a prototype")},wr=Object.setPrototypeOf||("__proto__"in{}?function(){var e,t=!1,n={};try{(e=mr(Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set))(n,[]),t=n instanceof Array}catch(e){}return function(n,o){return yr(n),_r(o),t?e(n,o):n.__proto__=o,n}}():void 0),Cr=Rt,kr=Ot,Sr=F,Rr=Jo,qr=c?Object.defineProperties:function(e,t){kr(e);for(var n,o=Sr(t),r=Rr(t),i=r.length,s=0;i>s;)Cr.f(e,n=r[s++],o[n]);return e},Ir=Z("document","documentElement"),Pr=Ot,Er=qr,Or=so,Tr=nn,zr=Ir,Ar=ht,Ur=tn("IE_PROTO"),Dr=function(){},xr=function(e){return"
diff --git a/src/views/next/index.vue b/src/views/next/index.vue
index 86713a1..d766133 100644
--- a/src/views/next/index.vue
+++ b/src/views/next/index.vue
@@ -157,20 +157,20 @@ export default {
transform-origin: 0 0;
overflow: hidden;
.left-border {
- width: 167px;
+ width: 660px;
height: 100%;
background: url("~@/assets/next-images/left-border.png") no-repeat;
- background-size: 167px 100%;
+ background-size: 100% 100%;
position: absolute;
left: 0px;
top: 0;
z-index: 10;
}
.right-border {
- width: 167px;
+ width: 660px;
height: 100%;
background: url("~@/assets/next-images/right-border.png") no-repeat;
- background-size: 167px 100%;
+ background-size: 100% 100%;
position: absolute;
right: 0px;
top: 0;
diff --git a/src/views/next/screen-content-left/index.vue b/src/views/next/screen-content-left/index.vue
index b5c227b..12722be 100644
--- a/src/views/next/screen-content-left/index.vue
+++ b/src/views/next/screen-content-left/index.vue
@@ -132,6 +132,9 @@ export default {
.rest-content {
width: 100%;
height: calc(100% - 30px - 30px);
+ border-radius:10px;
+ padding: 10px;
+ box-sizing: border-box;
.change-container {
width: 100%;
height: calc(100% - 250px - 32px);
diff --git a/src/views/next/screen-content-map/index.vue b/src/views/next/screen-content-map/index.vue
index 9dce02a..37db428 100644
--- a/src/views/next/screen-content-map/index.vue
+++ b/src/views/next/screen-content-map/index.vue
@@ -1,8 +1,12 @@
-
+
+
+
@@ -58,6 +62,18 @@
+
+

+
+
+
+
+

+
+
+
+
+
@@ -96,7 +112,8 @@ export default {
],
searchSelect: '1',
searchValue: '',
- collapse: true
+ collapse: true,
+ show3D:false
}
},
computed: {
@@ -120,7 +137,20 @@ export default {
Bus.$on('drowDownToGrid', this.drowDownToGrid.bind(this))
},
mounted () {
- this.getMapStatistics()
+ this.initMap()
+ window.addEventListener('click', this.handleWindowClick.bind(this))
+ },
+ beforeDestroy () {
+ window.removeEventListener('click', this.handleWindowClick.bind(this))
+ },
+ methods: {
+ ...mapActions({
+ set_mapLevel: 'SET_MAPLEVEL',
+ set_communityId: 'SET_COMMUNITYID',
+ showGlobalDialog: 'showGlobalDialog'
+ }),
+ initMap(){
+ this.getMapStatistics()
/* eslint-disable */
Promise.all([
this.getCommunityDistrict(),
@@ -134,17 +164,14 @@ export default {
gridGeoJson
})
})
- window.addEventListener('click', this.handleWindowClick.bind(this))
- },
- beforeDestroy () {
- window.removeEventListener('click', this.handleWindowClick.bind(this))
- },
- methods: {
- ...mapActions({
- set_mapLevel: 'SET_MAPLEVEL',
- set_communityId: 'SET_COMMUNITYID',
- showGlobalDialog: 'showGlobalDialog'
- }),
+ },
+ changMap(){
+ this.show3D = true
+ },
+ changMapS(){
+ this.show3D = false
+ this.initMap()
+ },
// 获取顶部统计数
getMapStatistics () {
if (this.mapLevel === 'community' || (this.mapLevel === 'grid' && !this.communityId)) {
@@ -354,14 +381,34 @@ img {
cursor: pointer;
}
}
+.map-chang{
+ position: absolute;
+ bottom: 124px;
+ right: calc(560px + 32px + 10px);
+ left: calc(64% - 32px - 560px - 10px - 44px - 360px);
+ z-index: 30;
+ width: 80px;
+ height: 80px;
+ cursor: pointer;
+}
+.map-changs{
+ position: absolute;
+ bottom: 124px;
+ right: calc(560px + 32px + 10px);
+ left: calc(64% - 32px - 560px - 10px - 44px - 360px);
+ z-index: 30;
+ width: 80px;
+ height: 80px;
+ cursor: pointer;
+}
-