diff --git a/public/static/map.html b/public/static/map.html index 34d3751..14abdef 100644 --- a/public/static/map.html +++ b/public/static/map.html @@ -26,26 +26,142 @@ 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/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/utils/request.js b/src/utils/request.js index 91bbdcc..2f75ad2 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,12 +4,12 @@ import vm from "../main"; import { getToken } from '@/utils/auth' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const request = axios.create({ - //baseURL: 'http://172.18.113.50:8080/zhapi', + baseURL: 'http://172.18.113.50:8080/zhapi', //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强 //baseURL: 'http://172.18.100.57:8080/zhapi', // 刘建 //baseURL: 'http://192.168.0.188:8888/zhapi', //baseURL: 'http://121.41.91.94:12002/zhapi', - baseURL: `http://${window.location.host}/zhapi`, + //baseURL: `http://${window.location.host}/zhapi`, timeout: 50000, headers: { 'content-type': 'application/json' }, }) diff --git a/src/views/companyCanban/xiaofang.vue b/src/views/companyCanban/xiaofang.vue index 8ec0663..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/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..ca4cb04 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,16 @@ 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 c9a15d4..a6e48d1 100644 --- a/src/views/factor/components/factorMap.vue +++ b/src/views/factor/components/factorMap.vue @@ -24,6 +24,11 @@ export default { type: Array, default: () => [], }, + // 车辆轨迹 + new_line: { + type: Array, + default: () => [], + }, }, data() { return { @@ -206,7 +211,7 @@ export default { }, }); //let that = this; // 不改指向后面很多函数无法执行 - //let label = new BMap.Label(); + let label = new BMap.Label(); setTimeout(() => { var point = new BMap.Point(item.longitude, item.latitude); // 自定义图标; @@ -220,34 +225,86 @@ export default { ); var marker = new BMap.Marker(point, { icon: myIcon }); // 创建点位 map.addOverlay(marker); - // 车辆轨迹绘画 - let line_point = []; + + // 车辆轨迹绘画 + 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) ); } console.log("line_point", line_point); - let pl = new BMap.Polyline(line_point, { - strokeColor: "blue", + var polyline = new BMap.Polyline(line_point, { + strokeColor: "red", strokeWeight: 6, - strokeOpacity: 0.5, + strokeOpacity: 1, }); - console.log("pl", pl); - map.addOverlay(pl); + console.log("pl", polyline); + map.addOverlay(polyline); }, 500); map.centerAndZoom(new BMap.Point(item.longitude, item.latitude), 16); // 创建点坐标 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"); + }); + } }, }, };