diff --git a/mock/biz/overview.js b/mock/biz/overview.js index 033ff41..84a78a0 100644 --- a/mock/biz/overview.js +++ b/mock/biz/overview.js @@ -71,7 +71,7 @@ 'id': 1, 'wellCode': 'N51F131', 'wellName': '宋郎路中压A闸1', - 'wellType': '3', + 'wellType': '1', 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', @@ -151,10 +151,10 @@ 'message': 'success', 'data': { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxType': '3', - 'boxTypeName': '雨水井', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '3', + 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', 'deep': 0.5, @@ -222,39 +222,34 @@ 'data': [ { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '1', 'deptid': '24', - 'deptName': '一分公司', 'deep': 0.0, 'position': '宋郎路', 'coordinateX': '39.899999999', 'coordinateY': '116.70000000', 'latBaidu': '39.901694', - 'lngBaidu': '116.709315', + 'lngBaidu': '116.409315', 'responseDept': '25', - 'latGaode': '39.901694', - 'lngGaode': '116.709315', + 'latGaode': '39.9', + 'lngGaode': '116.4', 'photos': 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100;', 'notes': '', - 'bfzt': '1', - 'bfztName': '布防', 'area': '110000', 'qu': '110000', 'staff': '', 'tel': '', 'valid': '1', - 'deviceCount': 3, 'ts': '2018-12-27 00:00:00' }, { 'id': 2, - 'boxCode': 'N51F132', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F132', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '2', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -263,8 +258,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.9014', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '0', @@ -278,10 +273,10 @@ }, { 'id': 3, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -290,8 +285,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90127', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -305,10 +300,10 @@ }, { 'id': 4, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -317,8 +312,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90124', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -332,10 +327,10 @@ }, { 'id': 5, - 'boxCode': 'N51F135', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F135', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -344,8 +339,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90135', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -359,10 +354,10 @@ }, { 'id': 6, - 'boxCode': 'N51F136', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F136', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -371,8 +366,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90140', + 'lngGaode': '116.449315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -386,10 +381,10 @@ }, { 'id': 7, - 'boxCode': 'N51F137', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F137', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -398,8 +393,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.90179', + 'lngGaode': '116.419315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -413,10 +408,10 @@ }, { 'id': 8, - 'boxCode': 'N51F138', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F138', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -425,8 +420,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.91169', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -440,10 +435,10 @@ }, { 'id': 9, - 'boxCode': 'N51F139', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F139', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -452,8 +447,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.901594', + 'lngGaode': '116.439315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -467,10 +462,10 @@ }, { 'id': 10, - 'boxCode': 'N51F1310', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F1310', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -479,8 +474,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.902694', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', diff --git a/mock/biz/overview.js b/mock/biz/overview.js index 033ff41..84a78a0 100644 --- a/mock/biz/overview.js +++ b/mock/biz/overview.js @@ -71,7 +71,7 @@ 'id': 1, 'wellCode': 'N51F131', 'wellName': '宋郎路中压A闸1', - 'wellType': '3', + 'wellType': '1', 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', @@ -151,10 +151,10 @@ 'message': 'success', 'data': { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxType': '3', - 'boxTypeName': '雨水井', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '3', + 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', 'deep': 0.5, @@ -222,39 +222,34 @@ 'data': [ { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '1', 'deptid': '24', - 'deptName': '一分公司', 'deep': 0.0, 'position': '宋郎路', 'coordinateX': '39.899999999', 'coordinateY': '116.70000000', 'latBaidu': '39.901694', - 'lngBaidu': '116.709315', + 'lngBaidu': '116.409315', 'responseDept': '25', - 'latGaode': '39.901694', - 'lngGaode': '116.709315', + 'latGaode': '39.9', + 'lngGaode': '116.4', 'photos': 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100;', 'notes': '', - 'bfzt': '1', - 'bfztName': '布防', 'area': '110000', 'qu': '110000', 'staff': '', 'tel': '', 'valid': '1', - 'deviceCount': 3, 'ts': '2018-12-27 00:00:00' }, { 'id': 2, - 'boxCode': 'N51F132', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F132', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '2', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -263,8 +258,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.9014', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '0', @@ -278,10 +273,10 @@ }, { 'id': 3, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -290,8 +285,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90127', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -305,10 +300,10 @@ }, { 'id': 4, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -317,8 +312,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90124', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -332,10 +327,10 @@ }, { 'id': 5, - 'boxCode': 'N51F135', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F135', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -344,8 +339,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90135', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -359,10 +354,10 @@ }, { 'id': 6, - 'boxCode': 'N51F136', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F136', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -371,8 +366,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90140', + 'lngGaode': '116.449315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -386,10 +381,10 @@ }, { 'id': 7, - 'boxCode': 'N51F137', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F137', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -398,8 +393,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.90179', + 'lngGaode': '116.419315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -413,10 +408,10 @@ }, { 'id': 8, - 'boxCode': 'N51F138', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F138', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -425,8 +420,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.91169', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -440,10 +435,10 @@ }, { 'id': 9, - 'boxCode': 'N51F139', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F139', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -452,8 +447,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.901594', + 'lngGaode': '116.439315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -467,10 +462,10 @@ }, { 'id': 10, - 'boxCode': 'N51F1310', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F1310', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -479,8 +474,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.902694', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', diff --git a/public/static/overview/icon-location-small.png b/public/static/overview/icon-location-small.png new file mode 100644 index 0000000..6ac371a --- /dev/null +++ b/public/static/overview/icon-location-small.png Binary files differ diff --git a/mock/biz/overview.js b/mock/biz/overview.js index 033ff41..84a78a0 100644 --- a/mock/biz/overview.js +++ b/mock/biz/overview.js @@ -71,7 +71,7 @@ 'id': 1, 'wellCode': 'N51F131', 'wellName': '宋郎路中压A闸1', - 'wellType': '3', + 'wellType': '1', 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', @@ -151,10 +151,10 @@ 'message': 'success', 'data': { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxType': '3', - 'boxTypeName': '雨水井', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '3', + 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', 'deep': 0.5, @@ -222,39 +222,34 @@ 'data': [ { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '1', 'deptid': '24', - 'deptName': '一分公司', 'deep': 0.0, 'position': '宋郎路', 'coordinateX': '39.899999999', 'coordinateY': '116.70000000', 'latBaidu': '39.901694', - 'lngBaidu': '116.709315', + 'lngBaidu': '116.409315', 'responseDept': '25', - 'latGaode': '39.901694', - 'lngGaode': '116.709315', + 'latGaode': '39.9', + 'lngGaode': '116.4', 'photos': 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100;', 'notes': '', - 'bfzt': '1', - 'bfztName': '布防', 'area': '110000', 'qu': '110000', 'staff': '', 'tel': '', 'valid': '1', - 'deviceCount': 3, 'ts': '2018-12-27 00:00:00' }, { 'id': 2, - 'boxCode': 'N51F132', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F132', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '2', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -263,8 +258,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.9014', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '0', @@ -278,10 +273,10 @@ }, { 'id': 3, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -290,8 +285,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90127', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -305,10 +300,10 @@ }, { 'id': 4, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -317,8 +312,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90124', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -332,10 +327,10 @@ }, { 'id': 5, - 'boxCode': 'N51F135', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F135', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -344,8 +339,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90135', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -359,10 +354,10 @@ }, { 'id': 6, - 'boxCode': 'N51F136', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F136', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -371,8 +366,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90140', + 'lngGaode': '116.449315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -386,10 +381,10 @@ }, { 'id': 7, - 'boxCode': 'N51F137', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F137', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -398,8 +393,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.90179', + 'lngGaode': '116.419315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -413,10 +408,10 @@ }, { 'id': 8, - 'boxCode': 'N51F138', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F138', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -425,8 +420,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.91169', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -440,10 +435,10 @@ }, { 'id': 9, - 'boxCode': 'N51F139', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F139', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -452,8 +447,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.901594', + 'lngGaode': '116.439315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -467,10 +462,10 @@ }, { 'id': 10, - 'boxCode': 'N51F1310', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F1310', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -479,8 +474,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.902694', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', diff --git a/public/static/overview/icon-location-small.png b/public/static/overview/icon-location-small.png new file mode 100644 index 0000000..6ac371a --- /dev/null +++ b/public/static/overview/icon-location-small.png Binary files differ diff --git a/src/assets/overview/gaode_sat.png b/src/assets/overview/gaode_sat.png new file mode 100644 index 0000000..d8c0320 --- /dev/null +++ b/src/assets/overview/gaode_sat.png Binary files differ diff --git a/mock/biz/overview.js b/mock/biz/overview.js index 033ff41..84a78a0 100644 --- a/mock/biz/overview.js +++ b/mock/biz/overview.js @@ -71,7 +71,7 @@ 'id': 1, 'wellCode': 'N51F131', 'wellName': '宋郎路中压A闸1', - 'wellType': '3', + 'wellType': '1', 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', @@ -151,10 +151,10 @@ 'message': 'success', 'data': { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxType': '3', - 'boxTypeName': '雨水井', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '3', + 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', 'deep': 0.5, @@ -222,39 +222,34 @@ 'data': [ { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '1', 'deptid': '24', - 'deptName': '一分公司', 'deep': 0.0, 'position': '宋郎路', 'coordinateX': '39.899999999', 'coordinateY': '116.70000000', 'latBaidu': '39.901694', - 'lngBaidu': '116.709315', + 'lngBaidu': '116.409315', 'responseDept': '25', - 'latGaode': '39.901694', - 'lngGaode': '116.709315', + 'latGaode': '39.9', + 'lngGaode': '116.4', 'photos': 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100;', 'notes': '', - 'bfzt': '1', - 'bfztName': '布防', 'area': '110000', 'qu': '110000', 'staff': '', 'tel': '', 'valid': '1', - 'deviceCount': 3, 'ts': '2018-12-27 00:00:00' }, { 'id': 2, - 'boxCode': 'N51F132', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F132', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '2', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -263,8 +258,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.9014', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '0', @@ -278,10 +273,10 @@ }, { 'id': 3, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -290,8 +285,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90127', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -305,10 +300,10 @@ }, { 'id': 4, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -317,8 +312,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90124', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -332,10 +327,10 @@ }, { 'id': 5, - 'boxCode': 'N51F135', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F135', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -344,8 +339,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90135', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -359,10 +354,10 @@ }, { 'id': 6, - 'boxCode': 'N51F136', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F136', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -371,8 +366,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90140', + 'lngGaode': '116.449315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -386,10 +381,10 @@ }, { 'id': 7, - 'boxCode': 'N51F137', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F137', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -398,8 +393,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.90179', + 'lngGaode': '116.419315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -413,10 +408,10 @@ }, { 'id': 8, - 'boxCode': 'N51F138', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F138', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -425,8 +420,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.91169', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -440,10 +435,10 @@ }, { 'id': 9, - 'boxCode': 'N51F139', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F139', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -452,8 +447,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.901594', + 'lngGaode': '116.439315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -467,10 +462,10 @@ }, { 'id': 10, - 'boxCode': 'N51F1310', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F1310', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -479,8 +474,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.902694', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', diff --git a/public/static/overview/icon-location-small.png b/public/static/overview/icon-location-small.png new file mode 100644 index 0000000..6ac371a --- /dev/null +++ b/public/static/overview/icon-location-small.png Binary files differ diff --git a/src/assets/overview/gaode_sat.png b/src/assets/overview/gaode_sat.png new file mode 100644 index 0000000..d8c0320 --- /dev/null +++ b/src/assets/overview/gaode_sat.png Binary files differ diff --git a/src/assets/overview/gaode_vec.png b/src/assets/overview/gaode_vec.png new file mode 100644 index 0000000..acfbc81 --- /dev/null +++ b/src/assets/overview/gaode_vec.png Binary files differ diff --git a/mock/biz/overview.js b/mock/biz/overview.js index 033ff41..84a78a0 100644 --- a/mock/biz/overview.js +++ b/mock/biz/overview.js @@ -71,7 +71,7 @@ 'id': 1, 'wellCode': 'N51F131', 'wellName': '宋郎路中压A闸1', - 'wellType': '3', + 'wellType': '1', 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', @@ -151,10 +151,10 @@ 'message': 'success', 'data': { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxType': '3', - 'boxTypeName': '雨水井', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '3', + 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', 'deep': 0.5, @@ -222,39 +222,34 @@ 'data': [ { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '1', 'deptid': '24', - 'deptName': '一分公司', 'deep': 0.0, 'position': '宋郎路', 'coordinateX': '39.899999999', 'coordinateY': '116.70000000', 'latBaidu': '39.901694', - 'lngBaidu': '116.709315', + 'lngBaidu': '116.409315', 'responseDept': '25', - 'latGaode': '39.901694', - 'lngGaode': '116.709315', + 'latGaode': '39.9', + 'lngGaode': '116.4', 'photos': 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100;', 'notes': '', - 'bfzt': '1', - 'bfztName': '布防', 'area': '110000', 'qu': '110000', 'staff': '', 'tel': '', 'valid': '1', - 'deviceCount': 3, 'ts': '2018-12-27 00:00:00' }, { 'id': 2, - 'boxCode': 'N51F132', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F132', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '2', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -263,8 +258,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.9014', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '0', @@ -278,10 +273,10 @@ }, { 'id': 3, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -290,8 +285,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90127', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -305,10 +300,10 @@ }, { 'id': 4, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -317,8 +312,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90124', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -332,10 +327,10 @@ }, { 'id': 5, - 'boxCode': 'N51F135', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F135', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -344,8 +339,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90135', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -359,10 +354,10 @@ }, { 'id': 6, - 'boxCode': 'N51F136', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F136', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -371,8 +366,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90140', + 'lngGaode': '116.449315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -386,10 +381,10 @@ }, { 'id': 7, - 'boxCode': 'N51F137', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F137', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -398,8 +393,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.90179', + 'lngGaode': '116.419315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -413,10 +408,10 @@ }, { 'id': 8, - 'boxCode': 'N51F138', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F138', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -425,8 +420,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.91169', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -440,10 +435,10 @@ }, { 'id': 9, - 'boxCode': 'N51F139', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F139', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -452,8 +447,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.901594', + 'lngGaode': '116.439315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -467,10 +462,10 @@ }, { 'id': 10, - 'boxCode': 'N51F1310', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F1310', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -479,8 +474,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.902694', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', diff --git a/public/static/overview/icon-location-small.png b/public/static/overview/icon-location-small.png new file mode 100644 index 0000000..6ac371a --- /dev/null +++ b/public/static/overview/icon-location-small.png Binary files differ diff --git a/src/assets/overview/gaode_sat.png b/src/assets/overview/gaode_sat.png new file mode 100644 index 0000000..d8c0320 --- /dev/null +++ b/src/assets/overview/gaode_sat.png Binary files differ diff --git a/src/assets/overview/gaode_vec.png b/src/assets/overview/gaode_vec.png new file mode 100644 index 0000000..acfbc81 --- /dev/null +++ b/src/assets/overview/gaode_vec.png Binary files differ diff --git a/src/assets/overview/icon-location-small.png b/src/assets/overview/icon-location-small.png new file mode 100644 index 0000000..6ac371a --- /dev/null +++ b/src/assets/overview/icon-location-small.png Binary files differ diff --git a/mock/biz/overview.js b/mock/biz/overview.js index 033ff41..84a78a0 100644 --- a/mock/biz/overview.js +++ b/mock/biz/overview.js @@ -71,7 +71,7 @@ 'id': 1, 'wellCode': 'N51F131', 'wellName': '宋郎路中压A闸1', - 'wellType': '3', + 'wellType': '1', 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', @@ -151,10 +151,10 @@ 'message': 'success', 'data': { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxType': '3', - 'boxTypeName': '雨水井', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '3', + 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', 'deep': 0.5, @@ -222,39 +222,34 @@ 'data': [ { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '1', 'deptid': '24', - 'deptName': '一分公司', 'deep': 0.0, 'position': '宋郎路', 'coordinateX': '39.899999999', 'coordinateY': '116.70000000', 'latBaidu': '39.901694', - 'lngBaidu': '116.709315', + 'lngBaidu': '116.409315', 'responseDept': '25', - 'latGaode': '39.901694', - 'lngGaode': '116.709315', + 'latGaode': '39.9', + 'lngGaode': '116.4', 'photos': 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100;', 'notes': '', - 'bfzt': '1', - 'bfztName': '布防', 'area': '110000', 'qu': '110000', 'staff': '', 'tel': '', 'valid': '1', - 'deviceCount': 3, 'ts': '2018-12-27 00:00:00' }, { 'id': 2, - 'boxCode': 'N51F132', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F132', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '2', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -263,8 +258,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.9014', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '0', @@ -278,10 +273,10 @@ }, { 'id': 3, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -290,8 +285,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90127', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -305,10 +300,10 @@ }, { 'id': 4, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -317,8 +312,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90124', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -332,10 +327,10 @@ }, { 'id': 5, - 'boxCode': 'N51F135', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F135', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -344,8 +339,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90135', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -359,10 +354,10 @@ }, { 'id': 6, - 'boxCode': 'N51F136', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F136', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -371,8 +366,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90140', + 'lngGaode': '116.449315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -386,10 +381,10 @@ }, { 'id': 7, - 'boxCode': 'N51F137', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F137', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -398,8 +393,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.90179', + 'lngGaode': '116.419315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -413,10 +408,10 @@ }, { 'id': 8, - 'boxCode': 'N51F138', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F138', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -425,8 +420,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.91169', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -440,10 +435,10 @@ }, { 'id': 9, - 'boxCode': 'N51F139', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F139', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -452,8 +447,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.901594', + 'lngGaode': '116.439315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -467,10 +462,10 @@ }, { 'id': 10, - 'boxCode': 'N51F1310', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F1310', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -479,8 +474,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.902694', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', diff --git a/public/static/overview/icon-location-small.png b/public/static/overview/icon-location-small.png new file mode 100644 index 0000000..6ac371a --- /dev/null +++ b/public/static/overview/icon-location-small.png Binary files differ diff --git a/src/assets/overview/gaode_sat.png b/src/assets/overview/gaode_sat.png new file mode 100644 index 0000000..d8c0320 --- /dev/null +++ b/src/assets/overview/gaode_sat.png Binary files differ diff --git a/src/assets/overview/gaode_vec.png b/src/assets/overview/gaode_vec.png new file mode 100644 index 0000000..acfbc81 --- /dev/null +++ b/src/assets/overview/gaode_vec.png Binary files differ diff --git a/src/assets/overview/icon-location-small.png b/src/assets/overview/icon-location-small.png new file mode 100644 index 0000000..6ac371a --- /dev/null +++ b/src/assets/overview/icon-location-small.png Binary files differ diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue index cbe5542..b9510a6 100644 --- a/src/components/Amap/AMapContainer.vue +++ b/src/components/Amap/AMapContainer.vue @@ -41,6 +41,10 @@ type: Array, required: true }, // 初始化地图中心点位置 [lng,lat] + baseLayer: { + type: String, + default: 'gaode_vec' + }, plugins: { type: Array, default: () => [] @@ -52,7 +56,13 @@ }, data() { return { - map: null + map: null, + satelliteLayer: null // 影像图层 + } + }, + watch: { + baseLayer(val) { + this.changeBaseLayer() } }, mounted() { @@ -82,9 +92,11 @@ } }).then((AMap) => { window.AMap = AMap + /* eslint-disable */ const options = { viewMode: viewMode, - zoom: zoom + zoom: zoom, + layers: [new AMap.createDefaultLayer()] } if (zooms) options.zooms = zooms if (center) options.center = center @@ -98,6 +110,20 @@ }).catch(e => { this.$message.error('地图加载失败') }) + }, + changeBaseLayer() { + const layers = this.map.getLayers() + const type = this.baseLayer + if (type === 'gaode_sat') { + this.satelliteLayer = new window.AMap.TileLayer.Satellite(); + // const roadNet = new window.AMap.TileLayer.RoadNet(); + this.map.addLayer(this.satelliteLayer) + } else if (type === 'gaode_vec') { + // 找到satellite图层移除 + this.map.removeLayer(this.satelliteLayer) + /* eslint-disable */ + // this.map.setLayers([new window.AMap.createDefaultLayer()]) + } } } } diff --git a/mock/biz/overview.js b/mock/biz/overview.js index 033ff41..84a78a0 100644 --- a/mock/biz/overview.js +++ b/mock/biz/overview.js @@ -71,7 +71,7 @@ 'id': 1, 'wellCode': 'N51F131', 'wellName': '宋郎路中压A闸1', - 'wellType': '3', + 'wellType': '1', 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', @@ -151,10 +151,10 @@ 'message': 'success', 'data': { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxType': '3', - 'boxTypeName': '雨水井', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '3', + 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', 'deep': 0.5, @@ -222,39 +222,34 @@ 'data': [ { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '1', 'deptid': '24', - 'deptName': '一分公司', 'deep': 0.0, 'position': '宋郎路', 'coordinateX': '39.899999999', 'coordinateY': '116.70000000', 'latBaidu': '39.901694', - 'lngBaidu': '116.709315', + 'lngBaidu': '116.409315', 'responseDept': '25', - 'latGaode': '39.901694', - 'lngGaode': '116.709315', + 'latGaode': '39.9', + 'lngGaode': '116.4', 'photos': 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100;', 'notes': '', - 'bfzt': '1', - 'bfztName': '布防', 'area': '110000', 'qu': '110000', 'staff': '', 'tel': '', 'valid': '1', - 'deviceCount': 3, 'ts': '2018-12-27 00:00:00' }, { 'id': 2, - 'boxCode': 'N51F132', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F132', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '2', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -263,8 +258,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.9014', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '0', @@ -278,10 +273,10 @@ }, { 'id': 3, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -290,8 +285,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90127', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -305,10 +300,10 @@ }, { 'id': 4, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -317,8 +312,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90124', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -332,10 +327,10 @@ }, { 'id': 5, - 'boxCode': 'N51F135', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F135', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -344,8 +339,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90135', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -359,10 +354,10 @@ }, { 'id': 6, - 'boxCode': 'N51F136', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F136', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -371,8 +366,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90140', + 'lngGaode': '116.449315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -386,10 +381,10 @@ }, { 'id': 7, - 'boxCode': 'N51F137', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F137', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -398,8 +393,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.90179', + 'lngGaode': '116.419315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -413,10 +408,10 @@ }, { 'id': 8, - 'boxCode': 'N51F138', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F138', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -425,8 +420,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.91169', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -440,10 +435,10 @@ }, { 'id': 9, - 'boxCode': 'N51F139', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F139', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -452,8 +447,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.901594', + 'lngGaode': '116.439315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -467,10 +462,10 @@ }, { 'id': 10, - 'boxCode': 'N51F1310', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F1310', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -479,8 +474,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.902694', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', diff --git a/public/static/overview/icon-location-small.png b/public/static/overview/icon-location-small.png new file mode 100644 index 0000000..6ac371a --- /dev/null +++ b/public/static/overview/icon-location-small.png Binary files differ diff --git a/src/assets/overview/gaode_sat.png b/src/assets/overview/gaode_sat.png new file mode 100644 index 0000000..d8c0320 --- /dev/null +++ b/src/assets/overview/gaode_sat.png Binary files differ diff --git a/src/assets/overview/gaode_vec.png b/src/assets/overview/gaode_vec.png new file mode 100644 index 0000000..acfbc81 --- /dev/null +++ b/src/assets/overview/gaode_vec.png Binary files differ diff --git a/src/assets/overview/icon-location-small.png b/src/assets/overview/icon-location-small.png new file mode 100644 index 0000000..6ac371a --- /dev/null +++ b/src/assets/overview/icon-location-small.png Binary files differ diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue index cbe5542..b9510a6 100644 --- a/src/components/Amap/AMapContainer.vue +++ b/src/components/Amap/AMapContainer.vue @@ -41,6 +41,10 @@ type: Array, required: true }, // 初始化地图中心点位置 [lng,lat] + baseLayer: { + type: String, + default: 'gaode_vec' + }, plugins: { type: Array, default: () => [] @@ -52,7 +56,13 @@ }, data() { return { - map: null + map: null, + satelliteLayer: null // 影像图层 + } + }, + watch: { + baseLayer(val) { + this.changeBaseLayer() } }, mounted() { @@ -82,9 +92,11 @@ } }).then((AMap) => { window.AMap = AMap + /* eslint-disable */ const options = { viewMode: viewMode, - zoom: zoom + zoom: zoom, + layers: [new AMap.createDefaultLayer()] } if (zooms) options.zooms = zooms if (center) options.center = center @@ -98,6 +110,20 @@ }).catch(e => { this.$message.error('地图加载失败') }) + }, + changeBaseLayer() { + const layers = this.map.getLayers() + const type = this.baseLayer + if (type === 'gaode_sat') { + this.satelliteLayer = new window.AMap.TileLayer.Satellite(); + // const roadNet = new window.AMap.TileLayer.RoadNet(); + this.map.addLayer(this.satelliteLayer) + } else if (type === 'gaode_vec') { + // 找到satellite图层移除 + this.map.removeLayer(this.satelliteLayer) + /* eslint-disable */ + // this.map.setLayers([new window.AMap.createDefaultLayer()]) + } } } } diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue index d3ee778..0c51a6c 100644 --- a/src/views/overview/components/alarmList.vue +++ b/src/views/overview/components/alarmList.vue @@ -7,7 +7,7 @@
- 告警列表 + 告警列表({{ data.length }})
@@ -36,9 +36,6 @@
告警列表 - - -
@@ -67,7 +64,7 @@ { text: '告警原因', value: 'alarmContent', align: 'center' }, { text: '时间', value: 'alarmTime', width: 180, align: 'center' } ], // 告警列表显示列 - tableShow: true // 表格显示 + tableShow: false // 表格显示 } }, methods: { @@ -95,6 +92,9 @@ font-weight: 500; writing-mode:vertical-rl; color: #7f7e7e; + span{ + writing-mode: lr-tb; + } &:hover{ cursor: pointer; color: #535252; diff --git a/mock/biz/overview.js b/mock/biz/overview.js index 033ff41..84a78a0 100644 --- a/mock/biz/overview.js +++ b/mock/biz/overview.js @@ -71,7 +71,7 @@ 'id': 1, 'wellCode': 'N51F131', 'wellName': '宋郎路中压A闸1', - 'wellType': '3', + 'wellType': '1', 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', @@ -151,10 +151,10 @@ 'message': 'success', 'data': { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxType': '3', - 'boxTypeName': '雨水井', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '3', + 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', 'deep': 0.5, @@ -222,39 +222,34 @@ 'data': [ { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '1', 'deptid': '24', - 'deptName': '一分公司', 'deep': 0.0, 'position': '宋郎路', 'coordinateX': '39.899999999', 'coordinateY': '116.70000000', 'latBaidu': '39.901694', - 'lngBaidu': '116.709315', + 'lngBaidu': '116.409315', 'responseDept': '25', - 'latGaode': '39.901694', - 'lngGaode': '116.709315', + 'latGaode': '39.9', + 'lngGaode': '116.4', 'photos': 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100;', 'notes': '', - 'bfzt': '1', - 'bfztName': '布防', 'area': '110000', 'qu': '110000', 'staff': '', 'tel': '', 'valid': '1', - 'deviceCount': 3, 'ts': '2018-12-27 00:00:00' }, { 'id': 2, - 'boxCode': 'N51F132', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F132', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '2', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -263,8 +258,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.9014', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '0', @@ -278,10 +273,10 @@ }, { 'id': 3, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -290,8 +285,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90127', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -305,10 +300,10 @@ }, { 'id': 4, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -317,8 +312,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90124', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -332,10 +327,10 @@ }, { 'id': 5, - 'boxCode': 'N51F135', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F135', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -344,8 +339,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90135', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -359,10 +354,10 @@ }, { 'id': 6, - 'boxCode': 'N51F136', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F136', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -371,8 +366,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90140', + 'lngGaode': '116.449315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -386,10 +381,10 @@ }, { 'id': 7, - 'boxCode': 'N51F137', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F137', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -398,8 +393,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.90179', + 'lngGaode': '116.419315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -413,10 +408,10 @@ }, { 'id': 8, - 'boxCode': 'N51F138', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F138', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -425,8 +420,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.91169', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -440,10 +435,10 @@ }, { 'id': 9, - 'boxCode': 'N51F139', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F139', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -452,8 +447,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.901594', + 'lngGaode': '116.439315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -467,10 +462,10 @@ }, { 'id': 10, - 'boxCode': 'N51F1310', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F1310', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -479,8 +474,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.902694', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', diff --git a/public/static/overview/icon-location-small.png b/public/static/overview/icon-location-small.png new file mode 100644 index 0000000..6ac371a --- /dev/null +++ b/public/static/overview/icon-location-small.png Binary files differ diff --git a/src/assets/overview/gaode_sat.png b/src/assets/overview/gaode_sat.png new file mode 100644 index 0000000..d8c0320 --- /dev/null +++ b/src/assets/overview/gaode_sat.png Binary files differ diff --git a/src/assets/overview/gaode_vec.png b/src/assets/overview/gaode_vec.png new file mode 100644 index 0000000..acfbc81 --- /dev/null +++ b/src/assets/overview/gaode_vec.png Binary files differ diff --git a/src/assets/overview/icon-location-small.png b/src/assets/overview/icon-location-small.png new file mode 100644 index 0000000..6ac371a --- /dev/null +++ b/src/assets/overview/icon-location-small.png Binary files differ diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue index cbe5542..b9510a6 100644 --- a/src/components/Amap/AMapContainer.vue +++ b/src/components/Amap/AMapContainer.vue @@ -41,6 +41,10 @@ type: Array, required: true }, // 初始化地图中心点位置 [lng,lat] + baseLayer: { + type: String, + default: 'gaode_vec' + }, plugins: { type: Array, default: () => [] @@ -52,7 +56,13 @@ }, data() { return { - map: null + map: null, + satelliteLayer: null // 影像图层 + } + }, + watch: { + baseLayer(val) { + this.changeBaseLayer() } }, mounted() { @@ -82,9 +92,11 @@ } }).then((AMap) => { window.AMap = AMap + /* eslint-disable */ const options = { viewMode: viewMode, - zoom: zoom + zoom: zoom, + layers: [new AMap.createDefaultLayer()] } if (zooms) options.zooms = zooms if (center) options.center = center @@ -98,6 +110,20 @@ }).catch(e => { this.$message.error('地图加载失败') }) + }, + changeBaseLayer() { + const layers = this.map.getLayers() + const type = this.baseLayer + if (type === 'gaode_sat') { + this.satelliteLayer = new window.AMap.TileLayer.Satellite(); + // const roadNet = new window.AMap.TileLayer.RoadNet(); + this.map.addLayer(this.satelliteLayer) + } else if (type === 'gaode_vec') { + // 找到satellite图层移除 + this.map.removeLayer(this.satelliteLayer) + /* eslint-disable */ + // this.map.setLayers([new window.AMap.createDefaultLayer()]) + } } } } diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue index d3ee778..0c51a6c 100644 --- a/src/views/overview/components/alarmList.vue +++ b/src/views/overview/components/alarmList.vue @@ -7,7 +7,7 @@
- 告警列表 + 告警列表({{ data.length }})
@@ -36,9 +36,6 @@
告警列表 - - -
@@ -67,7 +64,7 @@ { text: '告警原因', value: 'alarmContent', align: 'center' }, { text: '时间', value: 'alarmTime', width: 180, align: 'center' } ], // 告警列表显示列 - tableShow: true // 表格显示 + tableShow: false // 表格显示 } }, methods: { @@ -95,6 +92,9 @@ font-weight: 500; writing-mode:vertical-rl; color: #7f7e7e; + span{ + writing-mode: lr-tb; + } &:hover{ cursor: pointer; color: #535252; diff --git a/src/views/overview/components/layerChooseWindow.vue b/src/views/overview/components/layerChooseWindow.vue new file mode 100644 index 0000000..fbffa65 --- /dev/null +++ b/src/views/overview/components/layerChooseWindow.vue @@ -0,0 +1,82 @@ + + + + + + diff --git a/mock/biz/overview.js b/mock/biz/overview.js index 033ff41..84a78a0 100644 --- a/mock/biz/overview.js +++ b/mock/biz/overview.js @@ -71,7 +71,7 @@ 'id': 1, 'wellCode': 'N51F131', 'wellName': '宋郎路中压A闸1', - 'wellType': '3', + 'wellType': '1', 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', @@ -151,10 +151,10 @@ 'message': 'success', 'data': { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxType': '3', - 'boxTypeName': '雨水井', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '3', + 'wellTypeName': '雨水井', 'deptid': '3', 'deptName': '第一分公司', 'deep': 0.5, @@ -222,39 +222,34 @@ 'data': [ { 'id': 1, - 'boxCode': 'N51F131', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F131', + 'wellName': '宋郎路中压A闸1', + 'wellType': '1', 'deptid': '24', - 'deptName': '一分公司', 'deep': 0.0, 'position': '宋郎路', 'coordinateX': '39.899999999', 'coordinateY': '116.70000000', 'latBaidu': '39.901694', - 'lngBaidu': '116.709315', + 'lngBaidu': '116.409315', 'responseDept': '25', - 'latGaode': '39.901694', - 'lngGaode': '116.709315', + 'latGaode': '39.9', + 'lngGaode': '116.4', 'photos': 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100;', 'notes': '', - 'bfzt': '1', - 'bfztName': '布防', 'area': '110000', 'qu': '110000', 'staff': '', 'tel': '', 'valid': '1', - 'deviceCount': 3, 'ts': '2018-12-27 00:00:00' }, { 'id': 2, - 'boxCode': 'N51F132', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F132', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '2', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -263,8 +258,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.9014', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '0', @@ -278,10 +273,10 @@ }, { 'id': 3, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -290,8 +285,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90127', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -305,10 +300,10 @@ }, { 'id': 4, - 'boxCode': 'N51F133', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F133', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -317,8 +312,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90124', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -332,10 +327,10 @@ }, { 'id': 5, - 'boxCode': 'N51F135', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F135', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -344,8 +339,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90135', + 'lngGaode': '116.409315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -359,10 +354,10 @@ }, { 'id': 6, - 'boxCode': 'N51F136', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F136', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -371,8 +366,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '116.709315', + 'latGaode': '39.90140', + 'lngGaode': '116.449315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -386,10 +381,10 @@ }, { 'id': 7, - 'boxCode': 'N51F137', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F137', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -398,8 +393,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.90179', + 'lngGaode': '116.419315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -413,10 +408,10 @@ }, { 'id': 8, - 'boxCode': 'N51F138', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F138', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -425,8 +420,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '39.90169', - 'lngGaode': '', + 'latGaode': '39.91169', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -440,10 +435,10 @@ }, { 'id': 9, - 'boxCode': 'N51F139', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F139', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -452,8 +447,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.901594', + 'lngGaode': '116.439315', 'photos': '', 'notes': '', 'bfzt': '1', @@ -467,10 +462,10 @@ }, { 'id': 10, - 'boxCode': 'N51F1310', - 'boxName': '宋郎路中压A闸1', - 'boxTypeName': '雨水井', - 'boxType': '3', + 'wellCode': 'N51F1310', + 'wellName': '宋郎路中压A闸1', + 'wellTypeName': '雨水井', + 'wellType': '3', 'deptid': '3', 'deptName': '一分公司', 'deep': 0.0, @@ -479,8 +474,8 @@ 'coordinateY': '116.70000000', 'latBaidu': '39.901694', 'lngBaidu': '116.709315', - 'latGaode': '', - 'lngGaode': '', + 'latGaode': '39.902694', + 'lngGaode': '116.429315', 'photos': '', 'notes': '', 'bfzt': '1', diff --git a/public/static/overview/icon-location-small.png b/public/static/overview/icon-location-small.png new file mode 100644 index 0000000..6ac371a --- /dev/null +++ b/public/static/overview/icon-location-small.png Binary files differ diff --git a/src/assets/overview/gaode_sat.png b/src/assets/overview/gaode_sat.png new file mode 100644 index 0000000..d8c0320 --- /dev/null +++ b/src/assets/overview/gaode_sat.png Binary files differ diff --git a/src/assets/overview/gaode_vec.png b/src/assets/overview/gaode_vec.png new file mode 100644 index 0000000..acfbc81 --- /dev/null +++ b/src/assets/overview/gaode_vec.png Binary files differ diff --git a/src/assets/overview/icon-location-small.png b/src/assets/overview/icon-location-small.png new file mode 100644 index 0000000..6ac371a --- /dev/null +++ b/src/assets/overview/icon-location-small.png Binary files differ diff --git a/src/components/Amap/AMapContainer.vue b/src/components/Amap/AMapContainer.vue index cbe5542..b9510a6 100644 --- a/src/components/Amap/AMapContainer.vue +++ b/src/components/Amap/AMapContainer.vue @@ -41,6 +41,10 @@ type: Array, required: true }, // 初始化地图中心点位置 [lng,lat] + baseLayer: { + type: String, + default: 'gaode_vec' + }, plugins: { type: Array, default: () => [] @@ -52,7 +56,13 @@ }, data() { return { - map: null + map: null, + satelliteLayer: null // 影像图层 + } + }, + watch: { + baseLayer(val) { + this.changeBaseLayer() } }, mounted() { @@ -82,9 +92,11 @@ } }).then((AMap) => { window.AMap = AMap + /* eslint-disable */ const options = { viewMode: viewMode, - zoom: zoom + zoom: zoom, + layers: [new AMap.createDefaultLayer()] } if (zooms) options.zooms = zooms if (center) options.center = center @@ -98,6 +110,20 @@ }).catch(e => { this.$message.error('地图加载失败') }) + }, + changeBaseLayer() { + const layers = this.map.getLayers() + const type = this.baseLayer + if (type === 'gaode_sat') { + this.satelliteLayer = new window.AMap.TileLayer.Satellite(); + // const roadNet = new window.AMap.TileLayer.RoadNet(); + this.map.addLayer(this.satelliteLayer) + } else if (type === 'gaode_vec') { + // 找到satellite图层移除 + this.map.removeLayer(this.satelliteLayer) + /* eslint-disable */ + // this.map.setLayers([new window.AMap.createDefaultLayer()]) + } } } } diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue index d3ee778..0c51a6c 100644 --- a/src/views/overview/components/alarmList.vue +++ b/src/views/overview/components/alarmList.vue @@ -7,7 +7,7 @@
- 告警列表 + 告警列表({{ data.length }})
@@ -36,9 +36,6 @@
告警列表 - - -
@@ -67,7 +64,7 @@ { text: '告警原因', value: 'alarmContent', align: 'center' }, { text: '时间', value: 'alarmTime', width: 180, align: 'center' } ], // 告警列表显示列 - tableShow: true // 表格显示 + tableShow: false // 表格显示 } }, methods: { @@ -95,6 +92,9 @@ font-weight: 500; writing-mode:vertical-rl; color: #7f7e7e; + span{ + writing-mode: lr-tb; + } &:hover{ cursor: pointer; color: #535252; diff --git a/src/views/overview/components/layerChooseWindow.vue b/src/views/overview/components/layerChooseWindow.vue new file mode 100644 index 0000000..fbffa65 --- /dev/null +++ b/src/views/overview/components/layerChooseWindow.vue @@ -0,0 +1,82 @@ + + + + + + diff --git a/src/views/overview/components/toolBox.vue b/src/views/overview/components/toolBox.vue index 5790190..0e8f159 100644 --- a/src/views/overview/components/toolBox.vue +++ b/src/views/overview/components/toolBox.vue @@ -3,18 +3,179 @@ * @Author: 王晓颖 * @Date: 2022-05-16 18:41:50 --> - @@ -21,28 +24,36 @@ import DeptSelect from '../../components/DeptSelect/index' import AMapContainer from '@/components/Amap/AMapContainer' import AlarmInfoWindow from './components/alarmInfoWindow' +import WellInfoWindow from './components/wellInfoWindow' import AMapMarker from '@/components/Amap/AMapMarker' import AlarmList from './components/alarmList' import Vue from 'vue' +import ToolBox from '@/views/overview/components/toolBox' export default { name: 'Overview', - components: { AlarmList, AMapMarker, AMapContainer, DeptSelect }, + components: { ToolBox, AlarmList, AMapMarker, AMapContainer, DeptSelect }, data() { return { map: null, // 地图对象 + baseLayer: 'gaode_vec', // 底图图层 + layers: [{ id: 'well', name: '井图层', children: [] }, { id: 'alarm', name: '报警图层' }], + checkedLayer: [], center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心 zoom: 12, // 地图缩放比例 type: this.baseConfig.showPointType, // 加载数据方式：massMarkers海量点或cluster聚合点 refreshType: this.baseConfig.refreshType, // 刷新数据方式：clock定时器或websocket推送 - alarmIcon: require('../../assets/icons/icon-alarm1.png'), // 报警图标 + alarmIcon: require('@/assets/icons/icon-alarm1.png'), // 报警图标 alarmIconSize: [30, 30], // 报警图标大小 alarmOffset: [-15, -30], // 报警图标偏移量 - wellIcon: require('../../assets/icons/icon-position.png'), // 井图标 - wellIconSize: [30, 30], // 井图标大小 - wellOffset: [-10, -10], // 井偏移量 + wellIcon: require('@/assets/overview/icon-location-small.png'), // 井图标 + wellIconSize: [16, 16], // 井图标大小 + wellOffset: [-8, -16], // 井偏移量 + massMarkerUrl: './static/overview/icon-location-small.png', + massMarkerSize: [15, 15], + massMarkerOffset: [8, 8], showAlarm: true, // 是否显示报警 - showAll: this.baseConfig.showAllWell, // 是否显示全部井 + toolShow: false, // 工具栏是否显示 listQuery: { keywords: '', // 关键字 wellType: '', // 井类型 @@ -85,7 +96,6 @@ this.listQuery.deptid = '' this.listQuery.keywords = '' this.listQuery.wellType = '' - debugger if (this.firstAmount) { // 初次加载直接调用mount if (this.type === 'massMarkers') { this.mountMassMarker() // 加载海量点 @@ -108,7 +118,7 @@ showAlarm(val) { // 关闭报警显示地时候清除掉报警弹窗 if (!val) { - this.closeAlarmWindow() + this.clearInfoWindow() } } }, @@ -125,8 +135,9 @@ // 初始化放这里 mapReady(map) { this.map = map - // this.getWellList() + this.fetchWellList() // 加载全部井 this.firstAmount = true + this.toolShow = true this.refreshAlarm() if (this.refreshType === 'clock') { // 如果需要倒计时刷新的 setTimeout(() => { @@ -134,6 +145,10 @@ }, 1000) } }, + // 切换底图 + changeBaseMap(type) { + this.baseLayer = type + }, // 倒计时函数 countDown() { this.clock = setInterval(() => { @@ -153,6 +168,22 @@ this.wellTypeList = response.data.filter(wellType => { return supportWellTypes.findIndex(item => item == wellType.value) > -1 }) + const wellLayer = { + id: 'well', + name: '井图层', + children: this.wellTypeList.map(item => { + return { + id: 'well-' + item.value, + name: item.name + } + }) + } + this.layers.splice(0, 1, wellLayer) + if (this.baseConfig.showAllWell) { + this.checkedLayer = [...this.checkedLayer, 'well', this.wellTypeList.map(item => 'well-' + item.value)] + } else { + this.checkedLayer = [...this.checkedLayer] + } if (this.wellTypeList.length <= 1) { this.showWellType = false } @@ -178,45 +209,75 @@ this.filterIcon() this.showClearBtn = false }, - // 过滤Marker - filterIcon(showMessage = false) { - // 1.如果有弹窗，将弹窗隐藏 - this.currentWindow.visible = false + // 过滤海量点，给markers赋visible值 + filterMassMarker(listQuery, showMessage = false) { const hideWellIds = []// 要隐藏的井编号 let center = [] // 待移动到的地图中心 // 2. 整理查询条件 - const keywords = this.listQuery.keywords - const wellType = this.listQuery.wellType - const deptid = this.listQuery.deptid - let deptids = [] - if (deptid) { - deptids = this.fetchDeptList(deptid) // 获取所有下级 + const keywords = listQuery.keywords // 关键字 + const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : [listQuery.wellType] // 井类型 + let deptids = [] // 所有权属 + if (listQuery.deptid) { + deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级 } // 3.查询全部井，是否匹配，只要有一项不匹配则show为false for (const marker of this.markers) { let show = true // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置 - if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.positionInfo.indexOf(keywords) !== -1)) { + if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) { show = false } // 部门不为空， 且没有匹配成功，多部门匹配 - if (deptid && deptid !== '' && deptids.indexOf(marker.deptid) === -1) { + if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) { show = false } // 井类型不为空，且没有匹配成功 - if (wellType && wellType !== '' && marker.wellType !== wellType) { + if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) { show = false } // 如果show为false，放入需要隐藏的井id列表 if (show === false) { hideWellIds.push(marker.wellId) } else { - center = marker.position + center = marker.lnglat + } + marker.visible = show + } + this.resetMassMarker() + }, + // 过滤报警 + filterAlarm(listQuery, showMessage = false) { + const hideWellIds = []// 要隐藏的井编号 + // 整理筛选条件 + const keywords = listQuery.keywords + const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : [listQuery.wellType] + let deptids = [] // 所有权属 + if (listQuery.deptid) { + deptids = this.fetchDeptList(listQuery.deptid) // 获取所有下级 + } + // 查询报警的井 + for (const marker of this.alarmWells) { + let show = true + // 关键字不为空，且没有匹配成功，不显示， 关键字匹配井编号和位置 + if (keywords && keywords !== '' && !(marker.wellCode.indexOf(keywords) !== -1 || marker.position.indexOf(keywords) !== -1)) { + show = false + } + // 部门不为空， 且没有匹配成功，多部门匹配 + if (deptids.length > 0 && deptids.indexOf(marker.deptid) === -1) { + show = false + } + // 井类型不为空，且没有匹配成功 + if (wellTypes && wellTypes.length > 0 && wellTypes.indexOf(marker.wellType) === -1) { + show = false + } + // 如果show为false，放入需要隐藏的井id列表 + if (show === false) { + hideWellIds.push(marker.wellId) } marker.visible = show } // 4.过滤报警marker：alarmWells 如果没有找到符合要求的井，直接将全部查询结果隐藏，并将所有报警隐藏，否则按照查询结果筛选需要隐藏的报警 - if (hideWellIds.length === this.markers.length) { + if (hideWellIds.length === this.alarmWells.length) { if (showMessage) { this.$message.warning('查无结果') } @@ -245,58 +306,54 @@ } else { // 如果没有直接等于alarmListOri this.alarmList = this.alarmListOri } - if (center.length > 0) { - this.center = center - } - if (this.type === 'massMarkers') { - this.resetMassMarker() - } else if (this.type === 'cluster') { - this.clearClusters() - } }, - // 加载海量点 - mountMassMarker() { - const { map } = this + // 初始化海量点，并不复制 + initMassMarker() { + const { map, massMarkerUrl, massMarkerSize, massMarkerOffset } = this this.firstAmount = false - // 创建样式对象 - const style = { - url: require('@/assets/icons/icon-position.png'), - anchor: toPixel(8, 15), - size: toSize(15, 15) - } - console.log('海量点初始化') + // 海量点样式 + const style = { url: massMarkerUrl, anchor: toPixel(massMarkerOffset), size: toSize(massMarkerSize) } // 海量点初始化 - this.massMarks = new window.AMap.MassMarks(this.markers, { + this.massMarks = new window.AMap.MassMarks([], { zIndex: 5, // 海量点图层叠加的顺序 - zooms: [3, 20], // 在指定地图缩放级别范围内展示海量点图层 + zooms: [3, 18], // 在指定地图缩放级别范围内展示海量点图层 + cursor: 'pointer', style: style // 设置样式对象 }) - console.log(this.massMarkers) - // 将海量点添加至地图实例 + // this.massMarks.setData(this.markers) this.massMarks.setMap(map) - // 海量点点击事件 - const that = this - this.massMarks.on('click', function(e) { - that.openInfoWindow(e.data.id) + // 点击弹窗 + this.massMarks.on('click', e => { + this.openInfoWindow(e.data.id, e.data.lnglat, -massMarkerOffset[1]) }) + console.log('初始化海量点完毕') }, - // 过滤海量点 + // 重置海量点，根据marker的visible属性，重置海量点图层数据 resetMassMarker() { const { map } = this - if (this.showAll === false) { // 如果showAll为false 则不显示海量点 + const markers = this.markers.filter(item => item.visible) // 过滤全部visible为true的显示 + if (markers.length == 0) { this.massMarks.clear() } else { - let markers = this.markers.filter(item => { - return item.visible === true - }) - if (markers === null) { - markers = [] - this.massMarks.clear() - } else { - this.massMarks.setData(markers) - } - // 将海量点添加至地图实例 - this.massMarks.setMap(map) + this.massMarks.setData(markers) + } + // 将海量点添加至地图实例 + this.massMarks.setMap(map) + }, + // 过滤图层 + filterLayer(checkedLayer) { + // 1.过滤井图层 + if (this.type === 'massMarkers') { + const wellTypes = checkedLayer.filter(item => item.indexOf('well-') > -1).map(item => item.substring(5)) + if (wellTypes && wellTypes.length > 0) this.filterMassMarker({ wellTypes: wellTypes }) // 加载海量点 + } else if (this.type === 'cluster') { + this.filterClusters() // 加载聚合点 + } + // 2.选中or没选中报警图层 + if (checkedLayer.indexOf('alarm') !== -1) { + this.showAlarm = true + } else { + this.showAlarm = false } }, // 加载聚合点 @@ -328,10 +385,6 @@ clearClusters() { }, - // 关闭报警弹窗 - closeAlarmWindow() { - - }, _renderCluserMarker(context) { console.log(context) const count = this.markers.length @@ -357,7 +410,7 @@ context.marker.setContent(div) }, // 获取全部井列表 - getWellList() { + fetchWellList() { this.loading = true getWellList().then(response => { this.loading = false @@ -365,63 +418,34 @@ const wells = response.data if (wells.length > 0) { this.markers = [] - const centerxs = [] // 存储所有坐标，用于计算中点 - const centerys = [] for (const well of wells) { const marker = { ...well, lnglat: [parseFloat(well.lngGaode), parseFloat(well.latGaode)], - position: [parseFloat(well.lngGaode), parseFloat(well.latGaode)], icon: this.commonIcon, visible: true, wellStatus: 'normal' } this.markers.push(marker) - centerxs.push(parseFloat(well.lngGaode)) - centerys.push(parseFloat(well.latGaode)) } - // 坐标排序取最中间的为中心 - centerxs.sort() - centerys.sort() - const index = Math.floor(centerxs.length / 2) - this.center = [centerxs[index], centerys[index]] - console.log('总数据数：' + this.markers.length) - if (this.type === 'massMarkers' && this.showAll) { - this.mountMassMarker() // 加载海量点 - } else if (this.type === 'cluster' && this.showAll) { + if (this.type === 'massMarkers') { + this.initMassMarker() // 加载海量点 + } else if (this.type === 'cluster' && this.checkedLayer.indexOf('well') > -1) { this.mountClusters() // 加载聚合点 } } } }) }, - // 点击井详情气泡 - openInfoWindow(wellId) { - this.currentWindow.visible = false - getWellInfo(wellId).then(response => { - if (response.code === 200) { - const wellInfo = response.data - this.wellInfo = { - wellCode: wellInfo.wellCode, - position: wellInfo.position, - wellTypeName: wellInfo.wellTypeName, - deptName: wellInfo.deptName, - bfztName: wellInfo.bfztName, - deep: wellInfo.deep - } - this.currentWindow.position = [wellInfo.lngGaode, wellInfo.latGaode] - this.$nextTick(() => { - this.currentWindow.visible = true - this.currentWindow.windowType = 'info' - }) - } - }) - }, // 刷新报警列表 refreshAlarm() { console.log('refreshAlarm') this.count = this.baseConfig.refreshTime this.loading = true + // 如果showAlarm为ture, 确保选中图层报警 + if (this.showAlarm && this.checkedLayer.indexOf('alarm') == -1) { + this.checkedLayer.push('alarm') + } getAlarmsNow().then(response => { if (response.code === 200) { this.loading = false @@ -458,31 +482,14 @@ } } console.log('alarmWells Length', this.alarmWells.length) - // this.drawMarkers(this.alarmWells, 'alarm') } }) }, - // 绘制点 - drawMarkers(list, type) { - for (const item of list) { - if (type == 'alarm') { - // 报警图标 - const marker = new window.AMap.Marker({ - position: toLngLat([item.lngGaode, item.latGaode]), - icon: this.alarmIcon, - offset: this.alarmOffset - }) - marker.on('click', () => { - this.openAlarmWindow(item.wellId, [item.lngGaode, item.latGaode]) - }) - this.map.add(marker) - } - } - }, /** * 打开报警弹窗 * @param wellId 井id * @param coordinates 弹窗位置： [经度，纬度] + * @param needCenter 是否需要将点居中 */ openAlarmWindow(wellId, coordinates, needCenter = false) { console.log('openAlarmWindow:' + wellId) @@ -514,6 +521,37 @@ } }) }, + /** + * 打开井详情弹窗 + * @param wellId 井id + * @param coordinates 弹窗位置： [经度，纬度] + * @param offsetY 弹窗Y轴偏移，为负值 + */ + openInfoWindow(wellId, coordinates, offsetY = 0) { + this.clearInfoWindow() + // 首先获取井详情 + getWellInfo(wellId).then(response => { + if (response.code === 200) { + const wellInfo = { ...response.data } + // 加载弹窗组件 + const WellInfo = Vue.extend({ + render: h => h(WellInfoWindow, { props: { wellInfo: wellInfo }}) + }) + const wellWindow = new WellInfo().$mount() + const infoWindow = new window.AMap.InfoWindow({ + content: wellWindow.$el, // 显示内容 + offset: [0, offsetY], // 偏移 + autoMove: true // 是否自动调整窗体到视野内 + }) + infoWindow.open(this.map, new toLngLat(coordinates)) + } + }) + }, + // 关闭所有弹窗 + clearInfoWindow() { + const { map } = this + map.clearInfoWindow() + }, // 点击报警列表 alarmRowClick(row) { console.log('alarmRowClick')