diff --git a/public/static/map.html b/public/static/map.html index 34d3751..ed952c6 100644 --- a/public/static/map.html +++ b/public/static/map.html @@ -24,28 +24,143 @@
diff --git a/public/static/top01.png b/public/static/top01.png new file mode 100644 index 0000000..4c58337 Binary files /dev/null and b/public/static/top01.png differ diff --git a/public/static/top02.png b/public/static/top02.png new file mode 100644 index 0000000..79ccf31 Binary files /dev/null and b/public/static/top02.png differ diff --git a/public/static/top03.png b/public/static/top03.png new file mode 100644 index 0000000..c9a3192 Binary files /dev/null and b/public/static/top03.png differ diff --git a/public/static/top04.png b/public/static/top04.png new file mode 100644 index 0000000..4acff08 Binary files /dev/null and b/public/static/top04.png differ diff --git a/public/static/top05.png b/public/static/top05.png new file mode 100644 index 0000000..44ecb86 Binary files /dev/null and b/public/static/top05.png differ diff --git a/public/static/top06.png b/public/static/top06.png new file mode 100644 index 0000000..6c69525 Binary files /dev/null and b/public/static/top06.png differ diff --git a/src/api/factorResources/index.js b/src/api/factorResources/index.js index bbd64ae..8fb0699 100644 --- a/src/api/factorResources/index.js +++ b/src/api/factorResources/index.js @@ -38,4 +38,20 @@ export function car_point(params) { method:'get', params }) +} +// 车辆轨迹 +export function car_line(params) { + return request({ + url:'/SafeCompanyVehicleTrack/getById', + method:'get', + params + }) +} +// 感知设备 +export function camera_point(params) { + return request({ + url:'/ThreeProoFingsData/CameraList', + method:'get', + params + }) } \ No newline at end of file diff --git a/src/assets/factor/car_end.png b/src/assets/factor/car_end.png new file mode 100644 index 0000000..2667c7a Binary files /dev/null and b/src/assets/factor/car_end.png differ diff --git a/src/assets/factor/car_start.png b/src/assets/factor/car_start.png new file mode 100644 index 0000000..811dc3e Binary files /dev/null and b/src/assets/factor/car_start.png differ diff --git a/src/assets/factor/factor04.png b/src/assets/factor/factor04.png new file mode 100644 index 0000000..db5ad21 Binary files /dev/null and b/src/assets/factor/factor04.png differ diff --git a/src/assets/safetyIndex/编组 38备份21.png b/src/assets/safetyIndex/back007.png similarity index 100% rename from src/assets/safetyIndex/编组 38备份21.png rename to src/assets/safetyIndex/back007.png diff --git a/src/assets/safetyIndex/蓝色.png b/src/assets/safetyIndex/blueicon.png similarity index 100% rename from src/assets/safetyIndex/蓝色.png rename to src/assets/safetyIndex/blueicon.png diff --git a/src/assets/safetyIndex/涉危企业.png b/src/assets/safetyIndex/dangericon.png similarity index 100% rename from src/assets/safetyIndex/涉危企业.png rename to src/assets/safetyIndex/dangericon.png diff --git a/src/assets/safetyIndex/易制毒2.png b/src/assets/safetyIndex/drugicon.png similarity index 100% rename from src/assets/safetyIndex/易制毒2.png rename to src/assets/safetyIndex/drugicon.png diff --git a/src/assets/safetyIndex/易制爆企业2.png b/src/assets/safetyIndex/explodeicon.png similarity index 100% rename from src/assets/safetyIndex/易制爆企业2.png rename to src/assets/safetyIndex/explodeicon.png diff --git a/src/assets/safetyIndex/绿色.png b/src/assets/safetyIndex/greenicon.png similarity index 100% rename from src/assets/safetyIndex/绿色.png rename to src/assets/safetyIndex/greenicon.png diff --git a/src/assets/safetyIndex/主屏板块1.png b/src/assets/safetyIndex/modelback.png similarity index 100% rename from src/assets/safetyIndex/主屏板块1.png rename to src/assets/safetyIndex/modelback.png diff --git a/src/assets/safetyIndex/主屏板块4.png b/src/assets/safetyIndex/modelback02.png similarity index 100% rename from src/assets/safetyIndex/主屏板块4.png rename to src/assets/safetyIndex/modelback02.png diff --git a/src/assets/safetyIndex/主屏板块5.png b/src/assets/safetyIndex/modelback03.png similarity index 100% rename from src/assets/safetyIndex/主屏板块5.png rename to src/assets/safetyIndex/modelback03.png diff --git a/src/assets/safetyIndex/放射源2.png b/src/assets/safetyIndex/radioactiveicon.png similarity index 100% rename from src/assets/safetyIndex/放射源2.png rename to src/assets/safetyIndex/radioactiveicon.png diff --git a/src/assets/safetyIndex/编组 3521.png b/src/assets/safetyIndex/ranking01.png similarity index 100% rename from src/assets/safetyIndex/编组 3521.png rename to src/assets/safetyIndex/ranking01.png diff --git a/src/assets/safetyIndex/编组 352111.png b/src/assets/safetyIndex/ranking03.png similarity index 100% rename from src/assets/safetyIndex/编组 352111.png rename to src/assets/safetyIndex/ranking03.png diff --git a/src/assets/safetyIndex/红色.png b/src/assets/safetyIndex/redicon.png similarity index 100% rename from src/assets/safetyIndex/红色.png rename to src/assets/safetyIndex/redicon.png diff --git a/src/assets/safetyIndex/标题样式.png b/src/assets/safetyIndex/titleback.png similarity index 100% rename from src/assets/safetyIndex/标题样式.png rename to src/assets/safetyIndex/titleback.png diff --git a/src/assets/safetyIndex/top01.png b/src/assets/safetyIndex/top01.png new file mode 100644 index 0000000..4c58337 Binary files /dev/null and b/src/assets/safetyIndex/top01.png differ diff --git a/src/assets/safetyIndex/top02.png b/src/assets/safetyIndex/top02.png new file mode 100644 index 0000000..79ccf31 Binary files /dev/null and b/src/assets/safetyIndex/top02.png differ diff --git a/src/assets/safetyIndex/top03.png b/src/assets/safetyIndex/top03.png new file mode 100644 index 0000000..c9a3192 Binary files /dev/null and b/src/assets/safetyIndex/top03.png differ diff --git a/src/assets/safetyIndex/top04.png b/src/assets/safetyIndex/top04.png new file mode 100644 index 0000000..4acff08 Binary files /dev/null and b/src/assets/safetyIndex/top04.png differ diff --git a/src/assets/safetyIndex/top05.png b/src/assets/safetyIndex/top05.png new file mode 100644 index 0000000..44ecb86 Binary files /dev/null and b/src/assets/safetyIndex/top05.png differ diff --git a/src/assets/safetyIndex/top06.png b/src/assets/safetyIndex/top06.png new file mode 100644 index 0000000..6c69525 Binary files /dev/null and b/src/assets/safetyIndex/top06.png differ diff --git a/src/assets/safetyIndex/黄色.png b/src/assets/safetyIndex/yellowicon.png similarity index 100% rename from src/assets/safetyIndex/黄色.png rename to src/assets/safetyIndex/yellowicon.png diff --git a/src/views/companyCanban/daolu.vue b/src/views/companyCanban/daolu.vue index f4c0508..0ae7e68 100644 --- a/src/views/companyCanban/daolu.vue +++ b/src/views/companyCanban/daolu.vue @@ -360,13 +360,13 @@ export default { height: 34%; width: 100%; margin-bottom: 20px; - background: url('~@/assets/safetyIndex/主屏板块1.png') no-repeat; + background: url('~@/assets/safetyIndex/modelback.png') no-repeat; background-size: 100% 100%; .title { width: 100%; height: 33px; - background: url('~@/assets/safetyIndex/标题样式.png') no-repeat; + background: url('~@/assets/safetyIndex/titleback.png') no-repeat; background-size: 100% 100%; font-size: 16px; color: #D9E7FF; diff --git a/src/views/companyCanban/fanggopngji.vue b/src/views/companyCanban/fanggopngji.vue index b7593d1..73b12f1 100644 --- a/src/views/companyCanban/fanggopngji.vue +++ b/src/views/companyCanban/fanggopngji.vue @@ -307,13 +307,13 @@ export default { height: 28.06%; width: 100%; margin-bottom: 20px; - background: url('~@/assets/safetyIndex/主屏板块1.png') no-repeat; + background: url('~@/assets/safetyIndex/modelback.png') no-repeat; background-size: 100% 100%; .title { width: 100%; height: 33px; - background: url('~@/assets/safetyIndex/标题样式.png') no-repeat; + background: url('~@/assets/safetyIndex/titleback.png') no-repeat; background-size: 100% 100%; font-size: 16px; color: #D9E7FF; diff --git a/src/views/companyCanban/fangyi.vue b/src/views/companyCanban/fangyi.vue index 704f498..a965ecd 100644 --- a/src/views/companyCanban/fangyi.vue +++ b/src/views/companyCanban/fangyi.vue @@ -369,13 +369,13 @@ export default { height: 36.42%; width: 100%; margin-bottom: 20px; - background: url('~@/assets/safetyIndex/主屏板块1.png') no-repeat; + background: url('~@/assets/safetyIndex/modelback.png') no-repeat; background-size: 100% 100%; .title { width: 100%; height: 33px; - background: url('~@/assets/safetyIndex/标题样式.png') no-repeat; + background: url('~@/assets/safetyIndex/titleback.png') no-repeat; background-size: 100% 100%; font-size: 16px; color: #D9E7FF; diff --git a/src/views/companyCanban/lieguan.vue b/src/views/companyCanban/lieguan.vue index c0cedac..0841d77 100644 --- a/src/views/companyCanban/lieguan.vue +++ b/src/views/companyCanban/lieguan.vue @@ -454,7 +454,7 @@ export default { .xfwp { width: calc(33.33% - 13.33px); height: 100%; - background: url('~@/assets/safetyIndex/主屏板块1.png') no-repeat; + background: url('~@/assets/safetyIndex/modelback.png') no-repeat; background-size: 100% 100%; display: flex; flex-wrap: wrap; @@ -463,7 +463,7 @@ export default { .title { width: 100%; height: 33px; - background: url('~@/assets/safetyIndex/标题样式.png') no-repeat; + background: url('~@/assets/safetyIndex/titleback.png') no-repeat; background-size: 100% 100%; font-size: 16px; color: #D9E7FF; diff --git a/src/views/companyCanban/renyuan.vue b/src/views/companyCanban/renyuan.vue index 74ccec2..65400cc 100644 --- a/src/views/companyCanban/renyuan.vue +++ b/src/views/companyCanban/renyuan.vue @@ -263,13 +263,13 @@ export default { height: 25.64%; width: 100%; margin-bottom: 20px; - background: url('~@/assets/safetyIndex/主屏板块1.png') no-repeat; + background: url('~@/assets/safetyIndex/modelback.png') no-repeat; background-size: 100% 100%; .title { width: 100%; height: 33px; - background: url('~@/assets/safetyIndex/标题样式.png') no-repeat; + background: url('~@/assets/safetyIndex/titleback.png') no-repeat; background-size: 100% 100%; font-size: 16px; color: #D9E7FF; @@ -358,7 +358,7 @@ export default { .green { width: 90px; height: 90px; - background: url('~@/assets/safetyIndex/绿色.png') no-repeat; + background: url('~@/assets/safetyIndex/greenicon.png') no-repeat; background-size: 100% 100%; margin: 0 auto; margin-bottom: 10px; @@ -384,7 +384,7 @@ export default { .blue { width: 90px; height: 90px; - background: url('~@/assets/safetyIndex/蓝色.png') no-repeat; + background: url('~@/assets/safetyIndex/blueicon.png') no-repeat; background-size: 100% 100%; margin: 0 auto; margin-bottom: 10px; @@ -410,7 +410,7 @@ export default { .yellow { width: 90px; height: 90px; - background: url('~@/assets/safetyIndex/黄色.png') no-repeat; + background: url('~@/assets/safetyIndex/yellowicon.png') no-repeat; background-size: 100% 100%; margin: 0 auto; margin-bottom: 10px; @@ -436,7 +436,7 @@ export default { .red { width: 90px; height: 90px; - background: url('~@/assets/safetyIndex/红色.png') no-repeat; + background: url('~@/assets/safetyIndex/redicon.png') no-repeat; background-size: 100% 100%; margin: 0 auto; margin-bottom: 10px; diff --git a/src/views/companyCanban/wangluo.vue b/src/views/companyCanban/wangluo.vue index 4e9ee44..e23d081 100644 --- a/src/views/companyCanban/wangluo.vue +++ b/src/views/companyCanban/wangluo.vue @@ -243,13 +243,13 @@ export default { height: calc(37.94% - 40px); width: 100%; margin-bottom: 20px; - background: url('~@/assets/safetyIndex/主屏板块1.png') no-repeat; + background: url('~@/assets/safetyIndex/modelback.png') no-repeat; background-size: 100% 100%; .title { width: 100%; height: 33px; - background: url('~@/assets/safetyIndex/标题样式.png') no-repeat; + background: url('~@/assets/safetyIndex/titleback.png') no-repeat; background-size: 100% 100%; font-size: 16px; color: #D9E7FF; diff --git a/src/views/companyCanban/weihuapin.vue b/src/views/companyCanban/weihuapin.vue index 8d9519a..718abad 100644 --- a/src/views/companyCanban/weihuapin.vue +++ b/src/views/companyCanban/weihuapin.vue @@ -274,13 +274,13 @@ export default { height: calc(37.94% - 40px); width: 100%; margin-bottom: 20px; - background: url('~@/assets/safetyIndex/主屏板块1.png') no-repeat; + background: url('~@/assets/safetyIndex/modelback.png') no-repeat; background-size: 100% 100%; .title { width: 100%; height: 33px; - background: url('~@/assets/safetyIndex/标题样式.png') no-repeat; + background: url('~@/assets/safetyIndex/titleback.png') no-repeat; background-size: 100% 100%; font-size: 16px; color: #D9E7FF; diff --git a/src/views/companyCanban/xiaofang.vue b/src/views/companyCanban/xiaofang.vue index bcc699d..f377aad 100644 --- a/src/views/companyCanban/xiaofang.vue +++ b/src/views/companyCanban/xiaofang.vue @@ -1,616 +1,657 @@ \ No newline at end of file diff --git a/src/views/companyCanban/zhian.vue b/src/views/companyCanban/zhian.vue index 6f1c58a..92845d4 100644 --- a/src/views/companyCanban/zhian.vue +++ b/src/views/companyCanban/zhian.vue @@ -153,7 +153,7 @@ export default { .xfwp { width: calc(33.33% - 13.33px); height: 100%; - background: url('~@/assets/safetyIndex/主屏板块1.png') no-repeat; + background: url('~@/assets/safetyIndex/modelback.png') no-repeat; background-size: 100% 100%; display: flex; flex-wrap: wrap; @@ -162,7 +162,7 @@ export default { .title { width: 100%; height: 33px; - background: url('~@/assets/safetyIndex/标题样式.png') no-repeat; + background: url('~@/assets/safetyIndex/titleback.png') no-repeat; background-size: 100% 100%; font-size: 16px; color: #D9E7FF; diff --git a/src/views/compositeIndex/components/companyService.vue b/src/views/compositeIndex/components/companyService.vue index b4f5342..d2a6430 100644 --- a/src/views/compositeIndex/components/companyService.vue +++ b/src/views/compositeIndex/components/companyService.vue @@ -206,7 +206,7 @@ export default { init_right_chart() { let data = [ ["业务咨询", 532], - ["法律服务", 231], + ["法律办理", 231], ["证照办理", 234], ]; this.right_option.series[0].data = data; diff --git a/src/views/compositeIndex/components/employee.vue b/src/views/compositeIndex/components/employee.vue index 4f82d50..f2b5a94 100644 --- a/src/views/compositeIndex/components/employee.vue +++ b/src/views/compositeIndex/components/employee.vue @@ -38,7 +38,7 @@
普通岗位
重点岗位
-
专家岗位
+
专家人员
重点人员
diff --git a/src/views/compositeIndex/components/homeMap.vue b/src/views/compositeIndex/components/homeMap.vue index 2f301db..575372f 100644 --- a/src/views/compositeIndex/components/homeMap.vue +++ b/src/views/compositeIndex/components/homeMap.vue @@ -51,7 +51,7 @@ export default { paths.push(new build_map.Point(lng, lat)); } polygon = new build_map.Polygon(paths, { - fillColor: "#dcdfe6", + fillColor: "#3b4c44", strokeColor: "#0f1423", fillOpacity: 0.4, strokeWeight: 1, @@ -66,7 +66,7 @@ export default { paths.push(new build_map.Point(lng, lat)); } polygon = new build_map.Polygon(paths, { - fillColor: "#dcdfe6", + fillColor: "#3b4c44", strokeColor: "#0f1423", fillOpacity: 0.4, strokeWeight: 1, diff --git a/src/views/compositeIndex/components/lineMap.vue b/src/views/compositeIndex/components/lineMap.vue new file mode 100644 index 0000000..d5d49d2 --- /dev/null +++ b/src/views/compositeIndex/components/lineMap.vue @@ -0,0 +1,31 @@ + + + \ No newline at end of file diff --git a/src/views/compositeIndex/index.vue b/src/views/compositeIndex/index.vue index f3aa3f2..5fd479f 100644 --- a/src/views/compositeIndex/index.vue +++ b/src/views/compositeIndex/index.vue @@ -18,6 +18,9 @@ +
@@ -61,6 +64,8 @@ import CompanyService from "./components/companyService"; import Notification from "./components/notification"; import Endanger from "./components/endanger"; // import HomeMap from "./components/homeMap"; +// import LineMap from "./components/lineMap" +import { topRanking } from '@/api/safetyIndex' export default { name: "CompositeIndex", components: { @@ -71,6 +76,7 @@ export default { Notification, Endanger, // HomeMap, + // LineMap }, data() { return { @@ -88,6 +94,9 @@ export default { select_value: "地图", }; }, + mounted() { + this.get_rank() + }, methods: { change_map(val) { if (val == "2") { @@ -97,6 +106,17 @@ export default { }); } }, + // 排名查询 + async get_rank() { + let params = { + scoreType: 'month' + } + let res = await topRanking(params) + console.log('restop',res); + let iframe_window = this.$refs.iframeDom.contentWindow + let data = res.data + iframe_window.postMessage(data,'*') + }, }, }; diff --git a/src/views/factor/components/factorMap.vue b/src/views/factor/components/factorMap.vue index 355f024..905013f 100644 --- a/src/views/factor/components/factorMap.vue +++ b/src/views/factor/components/factorMap.vue @@ -24,6 +24,16 @@ export default { type: Array, default: () => [], }, + // 感知设备 + camera_list: { + type: Array, + default: () => [], + }, + // 车辆轨迹 + new_line: { + type: Array, + default: () => [], + }, }, data() { return { @@ -96,11 +106,31 @@ export default { ); var car_marker = new BMap.Marker(car_point, { icon: car_icon }); // 创建点位 map.addOverlay(car_marker); - car_marker.addEventListener("click",function() { + car_marker.addEventListener("click", function () { // 查看车辆轨迹 // 查看轨迹的点击事件是要重新创建地图的，以该车坐标为中心 - that.$emit('get_car_text',item) - }) + that.$emit("get_car_text", item); + }); + }); + // 感知设备点位上图 + that.camera_list.forEach((item) => { + var camera_point = new BMap.Point(item.longitude, item.latitude); + // 自定义图标; + var camera_icon = {}; + camera_icon = new BMap.Icon( + require("@/assets/factor/factor04.png"), + new BMap.Size(20, 40), + { + imageOffset: new BMap.Size(0, 0, 5), // 设置图片偏移 + } + ); + var camera_marker = new BMap.Marker(camera_point, { icon: camera_icon }); // 创建点位 + map.addOverlay(camera_marker); + // camera_marker.addEventListener("click", function () { + // // 查看车辆轨迹 + // // 查看轨迹的点击事件是要重新创建地图的，以该车坐标为中心 + // that.$emit("get_car_text", item); + // }); }); }, 500); map.centerAndZoom( @@ -198,37 +228,121 @@ export default { } }, // 根据车辆点位重新创建地图 - cause_car_line_map(item) { + cause_car_line_map(item, new_line) { let BMap = window.BMap; let map = new BMap.Map("container", { style: { styleJson, }, }); + console.log("item", item); //let that = this; // 不改指向后面很多函数无法执行 - //let label = new BMap.Label(); + // let label = new BMap.Label(); + // 以车辆出发点为中心重新绘制地图 + //119.460741 + //29.531762999999998 + //29.531762 setTimeout(() => { - var point = new BMap.Point(item.longitude, item.latitude) - // 自定义图标; - var myIcon = {}; - myIcon = new BMap.Icon( - require("@/assets/factor/factor03.png"), - new BMap.Size(20, 40), - { - imageOffset: new BMap.Size(0, 0, 5), // 设置图片偏移 - } + var point = new BMap.Point(new_line[0].longitude, new_line[0].latitude); + // 自定义起点图标; + var myIcon = {}; + myIcon = new BMap.Icon( + require("@/assets/factor/car_start.png"), + new BMap.Size(20, 40), + { + imageOffset: new BMap.Size(0, 0, 5), // 设置图片偏移 + } + ); + var marker = new BMap.Marker(point, { icon: myIcon }); // 创建点位 + map.addOverlay(marker); + // 自定义终点坐标 + var end_point = new BMap.Point( + new_line[new_line.length - 1].longitude, + new_line[new_line.length - 1].latitude + ); + var end_icon = {}; + end_icon = new BMap.Icon( + require("@/assets/factor/car_end.png"), + new BMap.Size(20, 40), + { + imageOffset: new BMap.Size(0, 0, 5), // 设置图片偏移 + } + ); + var end_marker = new BMap.Marker(end_point, { icon: end_icon }); // 创建点位 + map.addOverlay(end_marker); + + // 车辆轨迹绘画 + var line_point = []; + for (let i = 0; i < new_line.length; i++) { + line_point.push( + new BMap.Point(new_line[i].longitude, new_line[i].latitude) ); - var marker = new BMap.Marker(point, { icon: myIcon }); // 创建点位 - map.addOverlay(marker); - },500) + } + console.log("line_point", line_point); + var polyline = new BMap.Polyline(line_point, { + strokeColor: "red", + strokeWeight: 6, + strokeOpacity: 1, + }); + console.log("pl", polyline); + map.addOverlay(polyline); + }, 500); - map.centerAndZoom( - new BMap.Point(item.longitude, item.latitude), - 16 - ); // 创建点坐标 + map.centerAndZoom(new BMap.Point(item.longitude, item.latitude), 8); // 创建点坐标 map.setMinZoom(12); // 初始化地图，设置中心点坐标和地图级别 map.setMaxZoom(19); map.enableScrollWheelZoom(true); + + // showBoundaryx(MapLine.features[5]); + + // function showBoundaryx(city) { + // var paths = []; + // var list = city.geometry.coordinates; + // var polygon = {}; + // if (list.length > 1) { + // for (let a = 0; a < list.length; a++) { + // paths = []; + // for (let i = 0; i < list[a][0].length; i++) { + // let lat = list[a][0][i][1], + // lng = list[a][0][i][0]; + // paths.push(new BMap.Point(lng, lat)); + // } + // console.log('paths',paths); + // polygon = new BMap.Polygon(paths, { + // fillColor: "#3b4c44", + // strokeColor: "#0f1423", + // fillOpacity: 0.6, + // strokeWeight: 1, + // }); //创建多边形 + // polygon.disableMassClear(); + // map.addOverlay(polygon); //增加多边形 + // } + // } else { + // for (let i = 0; i < list[0].length; i++) { + // let lat = list[0][i][1], + // lng = list[0][i][0]; + // paths.push(new BMap.Point(lng, lat)); + // } + // console.log('paths',paths); + // polygon = new BMap.Polygon(paths, { + // fillColor: "#3b4c44", + // strokeColor: "#0f1423", + // fillOpacity: 0.6, + // strokeWeight: 1, + // }); //创建多边形 + // polygon.disableMassClear(); + // map.addOverlay(polygon); //增加多边形 + // } + // polygon.infowindow = new BMap.InfoWindow(); + // polygon.infowindow.name = city.properties.name; + // polygon.addEventListener("mouseover", function () { + // polygon.setFillColor("#ffa500"); + // }); + // polygon.addEventListener("mouseout", function () { + // map.removeOverlay(label); + // polygon.setFillColor("#3b4c44"); + // }); + // } }, }, }; diff --git a/src/views/factor/index.vue b/src/views/factor/index.vue index 27f87e6..0d1b9be 100644 --- a/src/views/factor/index.vue +++ b/src/views/factor/index.vue @@ -10,6 +10,7 @@ :company_list="company_list" :video_list="video_list" :car_list="car_list" + :camera_list="camera_list" @get_company_text="get_company_text" @get_video_text="get_video_text" @get_car_text="get_car_text" @@ -58,6 +59,9 @@ {{ this.btn_car }} + {{ + this.btn_camera + }}
@@ -158,6 +162,8 @@ import { queryCompany, queryVideo, car_point, + car_line, + camera_point, } from "@/api/factorResources"; export default { name: "factor", @@ -168,7 +174,8 @@ export default { return { company_list: [], // 七个区域所有的企业 video_list: [], // 七个区域所有监控单位 - car_list:[], // 车辆点位 + car_list: [], // 车辆点位 + camera_list: [], // 感知设备点位 search: { word: "", select: "企业", @@ -179,7 +186,8 @@ export default { ], btn_video: "", // 复选框文字 btn_item: "", // 复选框文字 - btn_car:'', // 危化品车辆文字 + btn_car: "", // 危化品车辆文字 + btn_camera: "", // 感知设备文字 company_flag: "0", // 公司详情框展示 /////////// 以下范围公司详情框所需对应变量声明 text_company: "", @@ -208,6 +216,7 @@ export default { // 默认地图打开展示视频监控 this.get_video(); this.get_car_point(); + this.get_camera_point(); }, methods: { // 七个区域所有的企业 @@ -250,26 +259,43 @@ export default { }; queryVideo(param).then((res) => { this.video_list = res.data; + this.camera_list = []; this.company_list = []; - this.car_list = [] + this.car_list = []; // 重新在地图打点 this.$refs.factorMap.init_map(); }); }, // 展示危化品车辆点位 async get_car() { - this.company_flag = '0' + this.company_flag = "0"; let res = await car_point(); console.log("resss", res); - if(res.code == 200) { - this.car_list = res.data + if (res.code == 200) { + this.car_list = res.data; + this.camera_list = []; this.company_list = []; - this.video_list = [] - // 重新在地图打点 + this.video_list = []; + // 重新在地图打点 this.$refs.factorMap.init_map(); // this.btn_car = `危化品车辆(${res.data.length})`; } else if (res.code == 500) { - this.$message.warning(res.msg) + this.$message.warning(res.msg); + } + }, + // 展示感知设备点位 + async get_camera() { + this.company_flag = "0"; + let res = await camera_point(); + if (res.code == 200) { + this.camera_list = res.data; + this.car_list = []; + this.company_list = []; + this.video_list = []; + // 重新在地图打点 + this.$refs.factorMap.init_map(); + } else if (res.code == 500) { + this.$message.warning(res.msg); } }, // 查询企业 @@ -323,20 +349,49 @@ export default { } }, // 查看危化品车辆轨迹 - get_car_text(item) { - // 查看轨迹的点击事件是要重新创建地图的，以该车坐标为中心 - console.log('item',item); - this.$refs.factorMap.cause_car_line_map(item) + async get_car_text(item) { + let params = { + vehicleNo: item.vehicleNo, + }; + let res = await car_line(params); + if (res.code == 200) { + console.log("res", res.data); + // let arr = [ + // { longitude: 121.597849, latitude: 29.904037 }, + // { longitude: 121.593864, latitude: 29.903234 }, + // { longitude: 121.594464, latitude: 29.905234 }, + // { longitude: 121.596364, latitude: 29.904434 }, + // ]; + let arr = res.data; + const new_line = arr.map((item) => ({ + longitude: item.longitude, + latitude: item.latitude, + })); + console.log("nnn", new_line); + this.$message.success("车辆轨迹查询中..."); + // 查看轨迹的点击事件是要重新创建地图的，以该车坐标为中心 + this.$refs.factorMap.cause_car_line_map(item, new_line); + } }, async get_car_point() { let res = await car_point(); console.log("resss", res); - if(res.code == 200) { + if (res.code == 200) { // this.car_list = res.data this.btn_car = `危化品车辆(${res.data.length})`; } else if (res.code == 500) { - this.$message.warning(res.msg) + this.$message.warning(res.msg); + } + }, + async get_camera_point() { + let res = await camera_point(); + console.log("resssc", res); + if (res.code == 200) { + // this.car_list = res.data + this.btn_camera = `感知设备(${res.data.length})`; + } else if (res.code == 500) { + this.$message.warning(res.msg); } }, // 点击跳转企业档案详情页面 @@ -472,7 +527,7 @@ export default { } .left_check { width: 13vw; - height: 18vh; + height: 23vh; border: 0.1px solid #28847e; background: #212f30; border-radius: 4px; @@ -491,7 +546,7 @@ export default { margin-top: 1vh; margin-left: 1vw; width: 11vw; - height: 13vh; + height: 18vh; display: flex; flex-direction: column; .el-button { diff --git a/src/views/realtimeWarning/components/warnMap.vue b/src/views/realtimeWarning/components/warnMap.vue index 3118b6b..33599ad 100644 --- a/src/views/realtimeWarning/components/warnMap.vue +++ b/src/views/realtimeWarning/components/warnMap.vue @@ -199,6 +199,7 @@ export default { function showBoundaryEx(city) { var paths = []; var list = city.geometry.coordinates; + console.log('city.geometry.coordinates',list[0]); var polygon = {}; if (list.length > 1) { for (let a = 0; a < list.length; a++) { @@ -219,9 +220,7 @@ export default { } } else { for (let i = 0; i < list[0].length; i++) { - let lat = list[0][i][1], - lng = list[0][i][0]; - paths.push(new BMap.Point(lng, lat)); + paths.push(new BMap.Point(list[0][i][0], list[0][i][1])); } polygon = new BMap.Polygon(paths, { fillColor: "#3b4c44", diff --git a/src/views/safetyIndex/anjian.vue b/src/views/safetyIndex/anjian.vue index c3705a8..c9bfe9e 100644 --- a/src/views/safetyIndex/anjian.vue +++ b/src/views/safetyIndex/anjian.vue @@ -193,13 +193,13 @@ export default { height: 23%; width: 100%; margin-bottom: 20px; - background: url("~@/assets/safetyIndex/主屏板块1.png") no-repeat; + background: url("~@/assets/safetyIndex/modelback.png") no-repeat; background-size: 100% 100%; .title { width: 100%; height: 33px; - background: url("~@/assets/safetyIndex/标题样式.png") no-repeat; + background: url("~@/assets/safetyIndex/titleback.png") no-repeat; background-size: 100% 100%; font-size: 16px; color: #d9e7ff; diff --git a/src/views/safetyIndex/cheliang.vue b/src/views/safetyIndex/cheliang.vue index e93c848..84e25db 100644 --- a/src/views/safetyIndex/cheliang.vue +++ b/src/views/safetyIndex/cheliang.vue @@ -335,13 +335,13 @@ export default { height: 23%; width: 100%; margin-bottom: 20px; - background: url("~@/assets/safetyIndex/主屏板块1.png") no-repeat; + background: url("~@/assets/safetyIndex/modelback.png") no-repeat; background-size: 100% 100%; .title { width: 100%; height: 33px; - background: url("~@/assets/safetyIndex/标题样式.png") no-repeat; + background: url("~@/assets/safetyIndex/titleback.png") no-repeat; background-size: 100% 100%; font-size: 16px; color: #d9e7ff; diff --git a/src/views/safetyIndex/index.vue b/src/views/safetyIndex/index.vue index dca3cad..2dc9c71 100644 --- a/src/views/safetyIndex/index.vue +++ b/src/views/safetyIndex/index.vue @@ -73,7 +73,7 @@ export default { height: 22.9%; width: 100%; margin-bottom: 20px; - background: url('~@/assets/safetyIndex/主屏板块1.png') no-repeat; + background: url('~@/assets/safetyIndex/modelback.png') no-repeat; background-size: 100% 100%; } @@ -81,7 +81,7 @@ export default { height: 37.56%; width: 100%; margin-bottom: 20px; - background: url('~@/assets/safetyIndex/主屏板块1.png') no-repeat; + background: url('~@/assets/safetyIndex/modelback.png') no-repeat; background-size: 100% 100%; } } diff --git a/src/views/safetyIndex/paiming.vue b/src/views/safetyIndex/paiming.vue index 0af1043..d57b36f 100644 --- a/src/views/safetyIndex/paiming.vue +++ b/src/views/safetyIndex/paiming.vue @@ -116,7 +116,7 @@ export default { height: 37.7%; width: 100%; margin-bottom: 20px; - background: url('~@/assets/safetyIndex/主屏板块5.png') no-repeat; + background: url('~@/assets/safetyIndex/modelback03.png') no-repeat; background-size: 100% 100%; margin-top: 20px; padding-top: 33px; diff --git a/src/views/safetyIndex/shuju.vue b/src/views/safetyIndex/shuju.vue index c101ffa..f0e5ef0 100644 --- a/src/views/safetyIndex/shuju.vue +++ b/src/views/safetyIndex/shuju.vue @@ -133,7 +133,7 @@ export default { height: 37.7%; width: 100%; margin-bottom: 20px; - background: url('~@/assets/safetyIndex/主屏板块1.png') no-repeat; + background: url('~@/assets/safetyIndex/modelback.png') no-repeat; background-size: 100% 100%; @@ -141,7 +141,7 @@ export default { .title { width: 100%; height: 33px; - background: url('~@/assets/safetyIndex/标题样式.png') no-repeat; + background: url('~@/assets/safetyIndex/titleback.png') no-repeat; background-size: 100% 100%; font-size: 16px; color: #D9E7FF; @@ -168,7 +168,7 @@ export default { box-sizing: border-box; width: 380px; height: 42px; - background: url('~@/assets/safetyIndex/编组 38备份21.png') no-repeat; + background: url('~@/assets/safetyIndex/back007.png') no-repeat; background-size: 100% 100%; display: flex; justify-content: space-evenly; @@ -215,7 +215,7 @@ export default { .green { width: 67px; height: 67px; - background: url('~@/assets/safetyIndex/绿色.png') no-repeat; + background: url('~@/assets/safetyIndex/greenicon.png') no-repeat; background-size: 100% 100%; margin: 0 auto; margin-bottom: 10px; @@ -244,7 +244,7 @@ export default { .blue { width: 67px; height: 67px; - background: url('~@/assets/safetyIndex/蓝色.png') no-repeat; + background: url('~@/assets/safetyIndex/blueicon.png') no-repeat; background-size: 100% 100%; margin: 0 auto; margin-bottom: 10px; @@ -270,7 +270,7 @@ export default { .yellow { width: 67px; height: 67px; - background: url('~@/assets/safetyIndex/黄色.png') no-repeat; + background: url('~@/assets/safetyIndex/yellowicon.png') no-repeat; background-size: 100% 100%; margin: 0 auto; margin-bottom: 10px; @@ -298,7 +298,7 @@ export default { .red { width: 67px; height: 67px; - background: url('~@/assets/safetyIndex/红色.png') no-repeat; + background: url('~@/assets/safetyIndex/redicon.png') no-repeat; background-size: 100% 100%; margin: 0 auto; margin-bottom: 10px; diff --git a/src/views/safetyIndex/toubu.vue b/src/views/safetyIndex/toubu.vue index cb02b4c..1792e0b 100644 --- a/src/views/safetyIndex/toubu.vue +++ b/src/views/safetyIndex/toubu.vue @@ -27,7 +27,7 @@
- +
{{ @@ -47,7 +47,7 @@
- +
{{ @@ -67,7 +67,7 @@
- +
{{ @@ -87,7 +87,7 @@
- +
{{ @@ -293,7 +293,7 @@ export default { .toubu { width: 100%; height: calc(58.84% + 20px); - background: url("~@/assets/safetyIndex/主屏板块4.png") no-repeat; + background: url("~@/assets/safetyIndex/modelback02.png") no-repeat; background-size: 100% 100%; padding: 35px 20px 20px; box-sizing: border-box; @@ -599,7 +599,7 @@ export default { .third { width: 31.34%; height: 80%; - background: url("~@/assets/safetyIndex/编组 352111.png") no-repeat; + background: url("~@/assets/safetyIndex/ranking03.png") no-repeat; background-size: 100% 100%; padding: 5px 10px 12px 27px; box-sizing: border-box; @@ -679,7 +679,7 @@ export default { left: 50%; top: 30px; margin-left: -20.5%; - background: url("~@/assets/safetyIndex/编组 3521.png") no-repeat; + background: url("~@/assets/safetyIndex/ranking01.png") no-repeat; background-size: 100% 100%; padding: 10px 16px 16px; text-align: center; diff --git a/src/views/safetyIndex/wupin.vue b/src/views/safetyIndex/wupin.vue index 56f6343..e7353ea 100644 --- a/src/views/safetyIndex/wupin.vue +++ b/src/views/safetyIndex/wupin.vue @@ -219,7 +219,7 @@ export default { height: 37.7%; width: 100%; margin-bottom: 20px; - background: url('~@/assets/safetyIndex/主屏板块1.png') no-repeat; + background: url('~@/assets/safetyIndex/modelback.png') no-repeat; background-size: 100% 100%; @@ -227,7 +227,7 @@ export default { .title { width: 100%; height: 33px; - background: url('~@/assets/safetyIndex/标题样式.png') no-repeat; + background: url('~@/assets/safetyIndex/titleback.png') no-repeat; background-size: 100% 100%; font-size: 16px; color: #D9E7FF; diff --git a/src/views/safetyIndex/yuangong.vue b/src/views/safetyIndex/yuangong.vue index d85a112..f501a71 100644 --- a/src/views/safetyIndex/yuangong.vue +++ b/src/views/safetyIndex/yuangong.vue @@ -511,13 +511,13 @@ export default { height: 35.84%; width: 100%; margin-bottom: 20px; - background: url("~@/assets/safetyIndex/主屏板块1.png") no-repeat; + background: url("~@/assets/safetyIndex/modelback.png") no-repeat; background-size: 100% 100%; .title { width: 100%; height: 33px; - background: url("~@/assets/safetyIndex/标题样式.png") no-repeat; + background: url("~@/assets/safetyIndex/titleback.png") no-repeat; background-size: 100% 100%; font-size: 16px; color: #d9e7ff; diff --git a/src/views/safetyIndex/yujing.vue b/src/views/safetyIndex/yujing.vue index 16b6559..78d248b 100644 --- a/src/views/safetyIndex/yujing.vue +++ b/src/views/safetyIndex/yujing.vue @@ -87,13 +87,13 @@ export default { height: 35.84%; width: 100%; margin-bottom: 20px; - background: url('~@/assets/safetyIndex/主屏板块1.png') no-repeat; + background: url('~@/assets/safetyIndex/modelback.png') no-repeat; background-size: 100% 100%; .title { width: 100%; height: 33px; - background: url('~@/assets/safetyIndex/标题样式.png') no-repeat; + background: url('~@/assets/safetyIndex/titleback.png') no-repeat; background-size: 100% 100%; font-size: 16px; color: #D9E7FF;