diff --git a/public/pbImg/bz49.png b/public/pbImg/bz49.png new file mode 100644 index 0000000..52323de Binary files /dev/null and b/public/pbImg/bz49.png differ diff --git a/public/pbImg/hong_00004.png b/public/pbImg/hong_00004.png new file mode 100644 index 0000000..ad18364 Binary files /dev/null and b/public/pbImg/hong_00004.png differ diff --git a/public/pbImg/绿色_00004.png b/public/pbImg/绿色_00004.png new file mode 100644 index 0000000..77dd1c9 Binary files /dev/null and b/public/pbImg/绿色_00004.png differ diff --git a/public/pbImg/编组.png b/public/pbImg/编组.png new file mode 100644 index 0000000..1cb663a Binary files /dev/null and b/public/pbImg/编组.png differ diff --git a/public/pbImg/蓝色_00001.png b/public/pbImg/蓝色_00001.png new file mode 100644 index 0000000..8075ba1 Binary files /dev/null and b/public/pbImg/蓝色_00001.png differ diff --git a/public/pbImg/跳转.png b/public/pbImg/跳转.png new file mode 100644 index 0000000..a20d0cd Binary files /dev/null and b/public/pbImg/跳转.png differ diff --git a/public/pbImg/黄色_00004.png b/public/pbImg/黄色_00004.png new file mode 100644 index 0000000..e2d2c7f Binary files /dev/null and b/public/pbImg/黄色_00004.png differ diff --git a/src/api/realtimeWarning/index.js b/src/api/realtimeWarning/index.js index fe58dc0..0ccdd41 100644 --- a/src/api/realtimeWarning/index.js +++ b/src/api/realtimeWarning/index.js @@ -7,3 +7,19 @@ export function mapList(params) { params }) } +//部门信息列表 +export function deptList(params) { + return request({ + url: '/system/dept/list', + method: 'get', + params + }) +} +//处置请求 +export function addCommonApprovalProcess(data) { + return request({ + url: '/closedloopdisposal/workflow/addCommonApprovalProcess', + method: 'post', + data + }) +} diff --git a/src/components/offLineMap/index.vue b/src/components/offLineMap/index.vue index 4714693..6b5a79a 100644 --- a/src/components/offLineMap/index.vue +++ b/src/components/offLineMap/index.vue @@ -27,7 +27,6 @@ export default { this.companyList = res.data this.initMap() }) - topMapOne({ companyId: 4, companyName: '宁波顺帆净水剂有限公司' }) }, methods: { @@ -181,8 +180,76 @@ export default { label.setStyle({ backgroundColor: ' rgba(0, 0, 0, 0)', border: '0', color: '#0060ce', fontSize: '16px' }) map.addOverlay(label); marker.addEventListener("click", function () { - // Cookies.set('village_current', item.villageCode) - // window.open(window.location.origin + '/#/communityShow', '_blank'); + topMapOne({ companyId: item.companyId, companyName: item.companyName }).then(res => { + var label = new BMap.Label(); + label.setStyle({ + color: 'blue', + borderRadius: '5px', + borderColor: '#ccc', + padding: '10px', + fontSize: '16px', + fontFamily: '微软雅黑', + transform: 'translateX(-50%) translateY(calc(-100% - 10px))' + }); + + label.setPosition(new BMap.Point(item.longitude, item.latitude)); + label.setOffset(new BMap.Size(130, -10)) + label.setStyle({ width: '372px', height: '242px', background: 'url(pbImg/bz49.png) no-repeat', backgroundSize: '100% 100%', border: '0', color: '#fff', padding: '13px 20px' }) + label.setContent(` +

${res.data.companyName}

企业看板
+
+
+
${res.data.scoreMonth}
+
月度得分
+
+
+
${res.data.scoreSeason}
+
季度得分
+
+
+
${res.data.scoreYear}
+
年度得分
+
+
+
+
+
+
+
+ ${res.data.alarmRed} +
+
+
+
+
+
+ ${res.data.alarmYellow} +
+
+
+
+
+
+ ${res.data.alarmBlue} +
+
+
+
+
+
+ ${res.data.alarmGreen} +
+
+
+ `); + map.addOverlay(label); + let closebtn = document.querySelector('.closeBtn') + //console.log(btn, 'btn'); + closebtn.addEventListener('click', () => { + that.$emit('toArchives', item) + map.removeOverlay(label); + }) + }) }); }) polygon.removeEventListener('mousemove') diff --git a/src/router/index.js b/src/router/index.js index 856ff41..9ffb3ed 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,9 +2,7 @@ import Vue from 'vue' import VueRouter from 'vue-router' import box from '../components/box' // import Home from '../views/Home.vue' - Vue.use(VueRouter) - const routes = [ { path: '/', @@ -52,7 +50,6 @@ const routes = [ component: () => import('@/views/realtimeWarning'), }, - // 系统管理 { path: 'systemManagement', diff --git a/src/utils/request.js b/src/utils/request.js index 17c8c35..6136fee 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,10 +4,10 @@ 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.13:8080/zhapi', // 孙强 + baseURL: 'http://172.18.113.50:8080/zhapi', + // baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强 //baseURL: 'http://192.168.0.188:8888/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/factorResources/index.vue b/src/views/factorResources/index.vue new file mode 100644 index 0000000..8c0cd1c --- /dev/null +++ b/src/views/factorResources/index.vue @@ -0,0 +1,468 @@ + + + + + \ No newline at end of file diff --git a/src/views/realtimeWarning/index.vue b/src/views/realtimeWarning/index.vue index b8e8c97..8c0cd1c 100644 --- a/src/views/realtimeWarning/index.vue +++ b/src/views/realtimeWarning/index.vue @@ -3,7 +3,8 @@
实时预警
- + +
@@ -35,11 +36,16 @@
可选择多个部门联合处置：
-
+
+ + {{ city.deptName + }} + +
- 取 消 + 取 消 - 确 定 + 确 定
@@ -47,7 +53,7 @@