ZheJiangNingBo
/
pingAnQiYeWeb
7
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'liwei' of http://8.136.197.230:3000/ZheJiangNingBo/pingAnQiYeWeb into liwei

Browse Source
master
loveflow 11 months ago
parent 49dfb017ad f93b087e2c
commit 8a2616b0e9
14 changed files with 8442 additions and 8414 deletions
Show Stats Download Patch File Download Diff File

1
public/index.html
Unescape View File

@ -28,5 +28,6 @@
</noscript> --> </noscript> -->
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
<script src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=CSfWwqFqSVkQaqcAAMxKyXg6Moe9UUqA"></script>
</body> </body>
</html> </html>

5
public/static/config.js
Unescape View File

@ -1,9 +1,12 @@
window.$mapCfg = { window.$mapCfg = {
mapType: "online", //在线；offline:离线
lgt: "", //经度 lgt: "", //经度
lat: "", //纬度 lat: "", //纬度
center: [121.619992, 30.025703], center: [121.619992, 30.025703],
zoom: 12, zoom: 12,
tiles_path: "http://172.18.113.50:8118", minZoom: 12,
maxZoom: 13,
tiles_path: "",
tiles_hybrid: "", //卫星瓦片图的地址，为空默认在 offlinemap/tiles_hybrid/ 目录 tiles_hybrid: "", //卫星瓦片图的地址，为空默认在 offlinemap/tiles_hybrid/ 目录
tiles_self: "", //自定义图层的地址，为空默认在 offlinemap/tiles_self/ 目录 tiles_self: "", //自定义图层的地址，为空默认在 offlinemap/tiles_self/ 目录
}; };

8
src/components/offLineMap/index.vue
Unescape View File

@ -14,7 +14,9 @@ export default {
name: "zhenhaimap", name: "zhenhaimap",
data() { data() {
return { return {
dongtaiPoint: [121.604192, 29.971189], dongtaiPoint: window.$mapCfg.center,
minZoom: window.$mapCfg.minZoom,
maxZoom: window.$mapCfg.maxZoom,
isGoBack: false, isGoBack: false,
villageList: [], villageList: [],
villageSumList: [], villageSumList: [],
@ -48,8 +50,8 @@ export default {
new BMap.Point(this.dongtaiPoint[0], this.dongtaiPoint[1]), new BMap.Point(this.dongtaiPoint[0], this.dongtaiPoint[1]),
12 12
); );
map.setMinZoom(12); map.setMinZoom(this.minZoom); // 初始化地图，设置中心点坐标和地图级别
map.setMaxZoom(19); map.setMaxZoom(this.maxZoom);
map.enableScrollWheelZoom(true); map.enableScrollWheelZoom(true);
// hjrequest({ // hjrequest({
// url: '/yc/dt/statistical/village', // url: '/yc/dt/statistical/village',

1
src/views/applySupermarket/legalAdvice/index.vue
Unescape View File

@ -100,6 +100,7 @@ export default {
margin-top: -2vh; margin-top: -2vh;
.legalLeft { .legalLeft {
display: none;
width: 360px; width: 360px;
background: url("~@/assets/companyFile/menuback.png") no-repeat; background: url("~@/assets/companyFile/menuback.png") no-repeat;
padding: 20px; padding: 20px;

12
src/views/compositeIndex/components/homeMap.vue
Unescape View File

@ -10,11 +10,13 @@ export default {
data() { data() {
return { return {
// center_point: [121.607097, 30.036752], // center_point: [121.607097, 30.036752],
center_point: [121.625992, 30.025703], center_point: window.$mapCfg.center,
minZoom: window.$mapCfg.minZoom,
maxZoom: window.$mapCfg.maxZoom,
}; };
}, },
mounted() { mounted() {
this.init_map() this.init_map();
}, },
methods: { methods: {
// 创建地图 // 创建地图
@ -30,11 +32,11 @@ export default {
new build_map.Point(this.center_point[0], this.center_point[1]), new build_map.Point(this.center_point[0], this.center_point[1]),
15 15
); // 根据中心点去创建地图 ); // 根据中心点去创建地图
map.setMinZoom(12); // 初始化地图，设置中心点坐标和地图级别 map.setMinZoom(this.minZoom); // 初始化地图，设置中心点坐标和地图级别
map.setMaxZoom(19); map.setMaxZoom(this.maxZoom);
map.enableScrollWheelZoom(true); map.enableScrollWheelZoom(true);
showPoint(); showPoint();
console.log('MapLine',MapLine.features); console.log("MapLine", MapLine.features);
// 只需要懈浦镇区域展示 // 只需要懈浦镇区域展示
showBoundaryEx(MapLine.features[5]); // 传入懈浦镇边界数据，准备创造懈浦镇多边形 showBoundaryEx(MapLine.features[5]); // 传入懈浦镇边界数据，准备创造懈浦镇多边形
//////////////// 创造边界--多边形 ///////////////// //////////////// 创造边界--多边形 /////////////////

9
src/views/compositeIndex/components/mapWrap.vue
Unescape View File

@ -11,6 +11,8 @@ export default {
data() { data() {
return { return {
center_point: window.$mapCfg.center, center_point: window.$mapCfg.center,
minZoom: window.$mapCfg.minZoom,
maxZoom: window.$mapCfg.maxZoom,
}; };
}, },
mounted() { mounted() {
@ -27,7 +29,8 @@ export default {
initMap(data) { initMap(data) {
// 创建地图实例 // 创建地图实例
let BMapGL = window.BMap; let BMapGL = window.BMap;
let map = new BMapGL.Map("container"); // 创建地图实例 let map = new BMapGL.Map("container", {
}); // 创建地图实例
let company_list = data; let company_list = data;
console.log("data01", company_list); console.log("data01", company_list);
@ -116,8 +119,8 @@ export default {
new BMapGL.Point(this.center_point[0], this.center_point[1]), new BMapGL.Point(this.center_point[0], this.center_point[1]),
14 14
); // 创建点坐标 ); // 创建点坐标
map.setMinZoom(12); // 初始化地图，设置中心点坐标和地图级别 map.setMinZoom(this.minZoom); // 初始化地图，设置中心点坐标和地图级别
map.setMaxZoom(19); map.setMaxZoom(this.maxZoom);
map.enableScrollWheelZoom(true); map.enableScrollWheelZoom(true);
}, },
}, },

2
src/views/enterpriseTopic/fireSafety/ssTable.vue
Unescape View File

@ -85,7 +85,7 @@ export default {
margin-top: 10px; margin-top: 10px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: vw(58); height: vw(70);
background: url("~@/assets/images/topic/cust.png") no-repeat center center; background: url("~@/assets/images/topic/cust.png") no-repeat center center;
background-size: 100% 100%; background-size: 100% 100%;
padding: 0 8px; padding: 0 8px;

7
src/views/enterpriseTopic/fireSafety/xfsjTable.vue
Unescape View File

@ -7,7 +7,7 @@
<div class="label">事件类型：</div> <div class="label">事件类型：</div>
<div class="value">{{ item.flowType }}</div> <div class="value">{{ item.flowType }}</div>
</div> </div>
<div class="item"> <div class="item" style="flex: 1.3">
<div class="label">关联企业：</div> <div class="label">关联企业：</div>
<div class="value">{{ item.cmy }}</div> <div class="value">{{ item.cmy }}</div>
</div> </div>
@ -76,7 +76,7 @@ export default {
margin-top: 10px; margin-top: 10px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: vw(58); height: vw(70);
background: url("~@/assets/images/topic/cust.png") no-repeat center center; background: url("~@/assets/images/topic/cust.png") no-repeat center center;
background-size: 100% 100%; background-size: 100% 100%;
padding: 8px; padding: 8px;
@ -94,6 +94,9 @@ export default {
color: #d0deee; color: #d0deee;
} }
.value { .value {
margin-right: vw(6);
word-break: keep-all;
overflow: hidden;
flex: 1; flex: 1;
color: #ffffff; color: #ffffff;
} }

16
src/views/factor/components/factorMap.vue
Unescape View File

@ -38,10 +38,12 @@ export default {
data() { data() {
return { return {
center_point: window.$mapCfg.center, center_point: window.$mapCfg.center,
minZoom: window.$mapCfg.minZoom,
maxZoom: window.$mapCfg.maxZoom,
}; };
}, },
mounted() { mounted() {
console.log(this.center_point) console.log(this.minZoom);
this.init_map(); this.init_map();
}, },
methods: { methods: {
@ -125,7 +127,9 @@ export default {
imageOffset: new BMap.Size(0, 0, 5), // 设置图片偏移 imageOffset: new BMap.Size(0, 0, 5), // 设置图片偏移
} }
); );
var camera_marker = new BMap.Marker(camera_point, { icon: camera_icon }); // 创建点位 var camera_marker = new BMap.Marker(camera_point, {
icon: camera_icon,
}); // 创建点位
map.addOverlay(camera_marker); map.addOverlay(camera_marker);
// camera_marker.addEventListener("click", function () { // camera_marker.addEventListener("click", function () {
// // 查看车辆轨迹 // // 查看车辆轨迹
@ -138,8 +142,8 @@ export default {
new BMap.Point(this.center_point[0], this.center_point[1]), new BMap.Point(this.center_point[0], this.center_point[1]),
14 14
); // 创建点坐标 ); // 创建点坐标
map.setMinZoom(12); // 初始化地图，设置中心点坐标和地图级别 map.setMinZoom(this.minZoom); // 初始化地图，设置中心点坐标和地图级别
map.setMaxZoom(19); map.setMaxZoom(this.maxZoom);
map.enableScrollWheelZoom(true); map.enableScrollWheelZoom(true);
showPoint(); // 分区区名 showPoint(); // 分区区名
// for (var i = 0, n = MapLine.features.length; i < n; i++) { // for (var i = 0, n = MapLine.features.length; i < n; i++) {
@ -290,8 +294,8 @@ export default {
}, 500); }, 500);
map.centerAndZoom(new BMap.Point(item.longitude, item.latitude), 8); // 创建点坐标 map.centerAndZoom(new BMap.Point(item.longitude, item.latitude), 8); // 创建点坐标
map.setMinZoom(12); // 初始化地图，设置中心点坐标和地图级别 map.setMinZoom(this.minZoom); // 初始化地图，设置中心点坐标和地图级别
map.setMaxZoom(19); map.setMaxZoom(this.maxZoom);
map.enableScrollWheelZoom(true); map.enableScrollWheelZoom(true);
// showBoundaryx(MapLine.features[5]); // showBoundaryx(MapLine.features[5]);

14
src/views/factorResources/map.vue
Unescape View File

@ -14,8 +14,10 @@ export default {
props: ["companyInfoList", "deviceVideoInfoList"], props: ["companyInfoList", "deviceVideoInfoList"],
data() { data() {
return { return {
mapType:['BMAP_NORMAL_MAP', 'BMAP_SATELLITE_MAP'], mapType: ["BMAP_NORMAL_MAP", "BMAP_SATELLITE_MAP"],
dongtaiPoint: [121.604192, 29.977299], dongtaiPoint: window.$mapCfg.center,
minZoom: window.$mapCfg.minZoom,
maxZoom: window.$mapCfg.maxZoom,
WaringList: this.companyInfoList, WaringList: this.companyInfoList,
VideoInfoList: this.deviceVideoInfoList, VideoInfoList: this.deviceVideoInfoList,
villageList: [], villageList: [],
@ -62,15 +64,15 @@ export default {
styleJson, styleJson,
}, },
}); });
console.log('mapppp',map); console.log("mapppp", map);
// console.log(this.WaringList, 'waringList'); // console.log(this.WaringList, 'waringList');
let that = this; let that = this;
map.centerAndZoom( map.centerAndZoom(
new BMap.Point(this.dongtaiPoint[0], this.dongtaiPoint[1]), new BMap.Point(this.dongtaiPoint[0], this.dongtaiPoint[1]),
13 13
); );
map.setMinZoom(12); map.setMinZoom(this.minZoom); // 初始化地图，设置中心点坐标和地图级别
map.setMaxZoom(19); map.setMaxZoom(this.maxZoom);
map.enableScrollWheelZoom(true); map.enableScrollWheelZoom(true);
// map.setMapType(this.mapType[1]); // map.setMapType(this.mapType[1]);
// hjrequest({ // hjrequest({
@ -174,7 +176,7 @@ export default {
label.addEventListener("click", function () { label.addEventListener("click", function () {
that.$emit("showCameraData", item); that.$emit("showCameraData", item);
}); });
}) });
}); });
} }
function showPoint() { function showPoint() {

16
src/views/realtimeWarning/components/warnMap.vue
Unescape View File

@ -16,7 +16,9 @@ export default {
}, },
data() { data() {
return { return {
center_point: [121.619992,30.025703], center_point: window.$mapCfg.center,
minZoom: window.$mapCfg.minZoom,
maxZoom: window.$mapCfg.maxZoom,
trans_list: [], // 接收右边展示页点击传过来的公司进行重新打点 trans_list: [], // 接收右边展示页点击传过来的公司进行重新打点
is_flag: false, // 判断右边是否点击传输公司信息，没传则正常全区域打点，传了则重新打点 is_flag: false, // 判断右边是否点击传输公司信息，没传则正常全区域打点，传了则重新打点
}; };
@ -185,8 +187,8 @@ export default {
new BMap.Point(this.center_point[0], this.center_point[1]), new BMap.Point(this.center_point[0], this.center_point[1]),
14 14
); // 创建点坐标 ); // 创建点坐标
map.setMinZoom(12); // 初始化地图，设置中心点坐标和地图级别 map.setMinZoom(this.minZoom); // 初始化地图，设置中心点坐标和地图级别
map.setMaxZoom(19); map.setMaxZoom(this.maxZoom);
map.enableScrollWheelZoom(true); map.enableScrollWheelZoom(true);
showPoint(); showPoint();
// for (var i = 0, n = MapLine.features.length; i < n; i++) { // for (var i = 0, n = MapLine.features.length; i < n; i++) {
@ -199,7 +201,7 @@ export default {
function showBoundaryEx(city) { function showBoundaryEx(city) {
var paths = []; var paths = [];
var list = city.geometry.coordinates; var list = city.geometry.coordinates;
console.log('city.geometry.coordinates',list[0]); console.log("city.geometry.coordinates", list[0]);
var polygon = {}; var polygon = {};
if (list.length > 1) { if (list.length > 1) {
for (let a = 0; a < list.length; a++) { for (let a = 0; a < list.length; a++) {
@ -215,7 +217,7 @@ export default {
fillOpacity: 0.6, fillOpacity: 0.6,
strokeWeight: 1, strokeWeight: 1,
}); //创建多边形 }); //创建多边形
polygon.disableMassClear() polygon.disableMassClear();
map.addOverlay(polygon); //增加多边形 map.addOverlay(polygon); //增加多边形
} }
} else { } else {
@ -228,7 +230,7 @@ export default {
fillOpacity: 0.6, fillOpacity: 0.6,
strokeWeight: 1, strokeWeight: 1,
}); //创建多边形 }); //创建多边形
polygon.disableMassClear() polygon.disableMassClear();
map.addOverlay(polygon); //增加多边形 map.addOverlay(polygon); //增加多边形
} }
polygon.infowindow = new BMap.InfoWindow(); polygon.infowindow = new BMap.InfoWindow();
@ -289,7 +291,7 @@ export default {
border: "0", border: "0",
fontFamily: "微软雅黑", fontFamily: "微软雅黑",
}); });
unit_name.disableMassClear() unit_name.disableMassClear();
map.addOverlay(unit_name); map.addOverlay(unit_name);
} }
} }

15
src/views/realtimeWarning/map.vue
Unescape View File

@ -24,7 +24,9 @@ export default {
}, },
data() { data() {
return { return {
dongtaiPoint: [121.604192, 29.977299], dongtaiPoint: window.$mapCfg.center,
minZoom: window.$mapCfg.minZoom,
maxZoom: window.$mapCfg.maxZoom,
WaringList: this.waringList, WaringList: this.waringList,
villageList: [], villageList: [],
villageSumList: [], villageSumList: [],
@ -63,8 +65,8 @@ export default {
new BMap.Point(this.dongtaiPoint[0], this.dongtaiPoint[1]), new BMap.Point(this.dongtaiPoint[0], this.dongtaiPoint[1]),
13 13
); );
map.setMinZoom(12); map.setMinZoom(this.minZoom); // 初始化地图，设置中心点坐标和地图级别
map.setMaxZoom(19); map.setMaxZoom(this.maxZoom);
map.enableScrollWheelZoom(true); map.enableScrollWheelZoom(true);
// hjrequest({ // hjrequest({
// url: '/yc/dt/statistical/village', // url: '/yc/dt/statistical/village',
@ -154,8 +156,10 @@ export default {
var point = new BMap.Point(item.longitude, item.latitude); var point = new BMap.Point(item.longitude, item.latitude);
// 自定义图标 // 自定义图标
var myIcon = new BMap.Icon( var myIcon = new BMap.Icon(
require("@/assets/realtimeWarning/redcity.png"), new BMap.Size(60, 60),{ require("@/assets/realtimeWarning/redcity.png"),
anchor:new BMap.Size(100,25) new BMap.Size(60, 60),
{
anchor: new BMap.Size(100, 25),
} }
); );
var marker = new BMap.Marker(point, { icon: myIcon }); // 创建点位 var marker = new BMap.Marker(point, { icon: myIcon }); // 创建点位
@ -372,6 +376,5 @@ font-weight: 400;'>转处置</div>
justify-content: center; justify-content: center;
align-items: center; align-items: center;
z-index: 50; z-index: 50;
} }
</style> </style>

4
src/views/systemManagement/floatPopulation/index.vue
Unescape View File

@ -6,7 +6,7 @@
<span>流动人口</span> <span>流动人口</span>
</div> </div>
<div class="cardBody"> <div class="cardBody loveflow">
<div class="flexSpaceBetween"> <div class="flexSpaceBetween">
<div class="tableOperator"></div> <div class="tableOperator"></div>
<div class="searchWrap"> <div class="searchWrap">
@ -342,6 +342,7 @@ export default {
color: #ffffff; color: #ffffff;
background: #1b3736; background: #1b3736;
border: 1px solid #fff; border: 1px solid #fff;
overflow: hidden;
.floatLeft { .floatLeft {
margin-right: 12px; margin-right: 12px;
img { img {
@ -354,6 +355,7 @@ export default {
.item { .item {
display: flex; display: flex;
line-height: 24px; line-height: 24px;
overflow: hidden;
.label { .label {
width: 80px; width: 80px;
text-align: right; text-align: right;

16580
yarn.lock
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save