add： daping home

package.json

@@ -77,7 +77,8 @@
 		"sass-loader": "10.1.1",
 		"script-ext-html-webpack-plugin": "2.1.5",
 		"svg-sprite-loader": "5.1.1",
-		"vue-template-compiler": "2.6.12"
+		"vue-template-compiler": "2.6.12",
+		"highcharts": "^9.2.2"
 	},
 	"engines": {
 		"node": ">=8.9",

src/assets/js/CoordTransform.js

+var CoordTransform = new function(){
+	//定义一些常量
+	const BD_FACTOR = (3.14159265358979324 * 3000.0) / 180.0;
+	const PI = 3.1415926535897932384626;
+	const RADIUS = 6378245.0;
+	const EE = 0.00669342162296594323;
+
+	/**
+	 * 判断是否在国内，不在国内则不做偏移
+	 * @param lng
+	 * @param lat
+	 * @returns {boolean}
+	 */
+	function out_of_china(lng, lat) {
+		return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false);
+	};
+
+	return {
+		/**
+		   * BD-09(百度坐标系) To GCJ-02(火星坐标系)
+		   * @param lng
+		   * @param lat
+		   * @returns {number[]}
+		   */
+		BD09ToGCJ02: function(){
+			let x = +lng - 0.0065;
+			let y = +lat - 0.006;
+			let z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * BD_FACTOR);
+			let theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * BD_FACTOR);
+			let gg_lng = z * Math.cos(theta);
+			let gg_lat = z * Math.sin(theta);
+			return [gg_lng, gg_lat];
+		},
+
+		/**
+		   * GCJ-02(火星坐标系) To BD-09(百度坐标系)
+		   * @param lng
+		   * @param lat
+		   * @returns {number[]}
+		   * @constructor
+		   */
+		GCJ02ToBD09: function(){
+			let z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * BD_FACTOR);
+			let theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * BD_FACTOR);
+			let bd_lng = z * Math.cos(theta) + 0.0065;
+			let bd_lat = z * Math.sin(theta) + 0.006;
+			return [bd_lng, bd_lat];
+		},
+		/**
+		   * GCJ-02(火星坐标系) To WGS-84(世界大地坐标系)
+		   * @param lng
+		   * @param lat
+		   * @returns {number[]}
+		   * @constructor
+		   */
+		GCJ02ToWGS84: function(lng, lat){
+			if (out_of_china(lng, lat)) {
+			  return [lng, lat];
+			} else {
+			  let d = this.delta(lng, lat);
+			  let mgLng = lng + d[0];
+			  let mgLat = lat + d[1];
+			  return [lng * 2 - mgLng, lat * 2 - mgLat];
+			}
+		},
+
+		/**
+		   *
+		   * @param lng
+		   * @param lat
+		   * @returns {number[]}
+		   */
+		delta: function(lng, lat){
+			let dLng = this.transformLng(lng - 105, lat - 35);
+			let dLat = this.transformLat(lng - 105, lat - 35);
+			const radLat = (lat / 180) * PI;
+			let magic = Math.sin(radLat);
+			magic = 1 - EE * magic * magic;
+			const sqrtMagic = Math.sqrt(magic);
+			dLng = (dLng * 180) / ((RADIUS / sqrtMagic) * Math.cos(radLat) * PI);
+			dLat = (dLat * 180) / (((RADIUS * (1 - EE)) / (magic * sqrtMagic)) * PI);
+			return [dLng, dLat];
+		},
+		
+		transformLng: function(lng, lat){
+			lat = +lat;
+			lng = +lng;
+			let ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng));
+			ret += ((20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0) / 3.0;
+			ret += ((20.0 * Math.sin(lng * PI) + 40.0 * Math.sin((lng / 3.0) * PI)) * 2.0) / 3.0;
+			ret += ((150.0 * Math.sin((lng / 12.0) * PI) + 300.0 * Math.sin((lng / 30.0) * PI)) * 2.0) / 3.0;
+			return ret;
+		},
+		transformLat: function(lng, lat){
+			let ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng));
+			ret += ((20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0) / 3.0;
+			ret += ((20.0 * Math.sin(lat * PI) + 40.0 * Math.sin((lat / 3.0) * PI)) * 2.0) / 3.0;
+			ret += ((160.0 * Math.sin((lat / 12.0) * PI) + 320 * Math.sin((lat * PI) / 30.0)) * 2.0) / 3.0;
+			return ret;
+		},
+		/**
+		   * WGS-84(世界大地坐标系) To GCJ-02(火星坐标系)
+		   * @param lng
+		   * @param lat
+		   * @returns {number[]}
+		   */
+		WGS84ToGCJ02: function(lng, lat){
+			if (this.out_of_china(lng, lat)) {
+			  return [lng, lat];
+			} else {
+			  let d = this.delta(lng, lat);
+			  return [lng + d[0], lat + d[1]];
+			}
+		},
+		out_of_china: function(lng, lat){
+			return !(lng > 73.66 && lng < 135.05 && lat > 3.86 && lat < 53.55);
+		},
+	};
+};
+
+export var CoordTransform = CoordTransform;
\ No newline at end of file

src/router/index.js

@@ -61,19 +61,19 @@ export const constantRoutes = [
     component: () => import('@/views/error/401'),
     hidden: true
   },
-  {
-    path: '',
-    component: Layout,
-    redirect: 'index',
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/index'),
-        name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
-      }
-    ]
-  },
+  // {
+  //   path: '',
+  //   component: Layout,
+  //   redirect: 'index',
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       component: () => import('@/views/index'),
+  //       name: 'Index',
+  //       meta: { title: '首页', icon: 'dashboard', affix: true }
+  //     }
+  //   ]
+  // },
   {
     path: '/user',
     component: Layout,

src/utils/encryption.js

+
+
+/******* SHA1 ******/
+function hex_sha1(txt) {
+	var hexcase = 0, chrsz = 8;
+
+	var hex_sha1 = function(r) {
+		return binb2hex(core_sha1(AlignSHA1(r)))
+	}
+	function sha1_vm_test() {
+		return "a9993e364706816aba3e25717850c26c9cd0d89d" == hex_sha1("abc")
+	}
+	function core_sha1(r) {
+		for (var e = r, t = Array(80), n = 1732584193, a = -271733879, h = -1732584194, d = 271733878, c = -1009589776, f = 0; f < e.length; f += 16) {
+			for (var o = n, i = a, _ = h, m = d, g = c, s = 0; 80 > s; s++) {
+				t[s] = 16 > s ? e[f + s] : rol(t[s - 3] ^ t[s - 8] ^ t[s - 14] ^ t[s - 16], 1);
+				var l = safe_add(safe_add(rol(n, 5), sha1_ft(s, a, h, d)), safe_add(safe_add(c, t[s]), sha1_kt(s)));
+				c = d,
+				d = h,
+				h = rol(a, 30),
+				a = n,
+				n = l
+			}
+			n = safe_add(n, o),
+			a = safe_add(a, i),
+			h = safe_add(h, _),
+			d = safe_add(d, m),
+			c = safe_add(c, g)
+		}
+		return new Array(n,a,h,d,c)
+	}
+	function sha1_ft(r, e, t, n) {
+		return 20 > r ? e & t | ~e & n : 40 > r ? e ^ t ^ n : 60 > r ? e & t | e & n | t & n : e ^ t ^ n
+	}
+	function sha1_kt(r) {
+		return 20 > r ? 1518500249 : 40 > r ? 1859775393 : 60 > r ? -1894007588 : -899497514
+	}
+	function safe_add(r, e) {
+		var t = (65535 & r) + (65535 & e)
+		  , n = (r >> 16) + (e >> 16) + (t >> 16);
+		return n << 16 | 65535 & t
+	}
+	function rol(r, e) {
+		return r << e | r >>> 32 - e
+	}
+	function AlignSHA1(r) {
+		for (var e = (r.length + 8 >> 6) + 1, t = new Array(16 * e), n = 0; 16 * e > n; n++)
+			t[n] = 0;
+		for (n = 0; n < r.length; n++)
+			t[n >> 2] |= r.charCodeAt(n) << 24 - 8 * (3 & n);
+		return t[n >> 2] |= 128 << 24 - 8 * (3 & n),
+		t[16 * e - 1] = 8 * r.length,
+		t
+	}
+	function binb2hex(r) {
+		for (var e = hexcase ? "0123456789ABCDEF" : "0123456789abcdef", t = "", n = 0; n < 4 * r.length; n++)
+			t += e.charAt(15 & r[n >> 2] >> 8 * (3 - n % 4) + 4) + e.charAt(15 & r[n >> 2] >> 8 * (3 - n % 4));
+		return t
+	}
+	return hex_sha1(txt);
+};
+
+module.exports = {
+	//Base64: Base64,
+	//hex_md5: hex_md5,
+	hex_sha1: hex_sha1,
+	//des: des,
+}
\ No newline at end of file

src/utils/rsaEncrypt.js

+import JSEncrypt from 'jsencrypt/bin/jsencrypt.min';
+//import jsencrypt from 'jsencrypt'
+//import crypto from 'crypto'
+import encryption from './encryption'
+
+// 密钥对生成 http://web.chacuo.net/netrsakeypair
+/* Node env
+const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKgzvKMsX/l5eI+12W6reo5VDw5wOS380zdNc6HpmdRYvfwrM02GOKgvx8pJGaSNf7ZF7llofOwNVIaIrCOS6nECAwEAAQ==';
+// 加密
+export function encrypt(txt) {
+	var hashCode = encryption.hex_sha1(txt);
+	var encryptor = new JSEncrypt();
+	encryptor.setPublicKey(publicKey) // 设置公钥
+	return encryptor.encrypt(hashCode);
+}; */
+
+// eladmin
+const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD\n2iRe41HdTNF8RUhNnHit5NpMNtGL0NPTSSpPjjI1kJfVorRvaQerUgkCAwEAAQ==';
+// 加密
+export function encrypt(txt) {
+	const encryptor = new JSEncrypt()
+	encryptor.setPublicKey(publicKey) // 设置公钥
+	return encryptor.encrypt(txt) // 对需要加密的数据进行加密
+}
+
+
+// 解密
+/* export function decrypt(txt) {
+  const encryptor = new JSEncrypt()
+  encryptor.setPrivateKey(privateKey)
+  return encryptor.decrypt(txt)
+} */
+

src/views/Screen/index.vue

@@ -107,10 +107,12 @@
 		</section>
 	  </div>
 	</div>
-  </template>
+</template>
 
-  <script>
-  import { Highchart } from "@/assets/js/chartTemplates.js";
+<script>
+
+
+import { Highchart } from "@/assets/js/chartTemplates.js";
   import cuAmap from "@/components/AMap";
   import request from "@/utils/request";
   import { Tools } from '@/assets/js/common.js';
@@ -136,9 +138,8 @@
   let pxValue = remValue * fontSize;
 	return pxValue
   }
-
-  export default {
-	data() {
+export default {
+data() {
 	  return {
 		isTechUser: false,
 		// 图表数据为空情况
@@ -183,7 +184,7 @@ emptyFlag4byqyndsjsfbhqs:false,
   
 		this.navActive = 0;
   
-		this.getRoleInfo();
+		// this.getRoleInfo();
 	  });
 	},
 	methods: {
@@ -946,10 +947,10 @@ emptyFlag4byqyndsjsfbhqs:false,
 		});
 	  },
 	},
-  };
-  </script>
+}
+</script>
 
-  <style lang="scss" scope>
+<style lang="scss" scope>
   .amap-icon {
 	// 高德地图样式覆盖
 	img {