diff --git a/public/pbImg/marker_red_sprite.png b/public/pbImg/marker_red_sprite.png new file mode 100644 index 0000000..9aa486d Binary files /dev/null and b/public/pbImg/marker_red_sprite.png differ diff --git a/public/pbImg/企业.png b/public/pbImg/企业.png new file mode 100644 index 0000000..d3d6c39 Binary files /dev/null and b/public/pbImg/企业.png differ diff --git a/public/pbImg/企业icon（悬浮）.png b/public/pbImg/企业icon（悬浮）.png new file mode 100644 index 0000000..9aa486d Binary files /dev/null and b/public/pbImg/企业icon（悬浮）.png differ diff --git a/public/pbImg/企业备份.png b/public/pbImg/企业备份.png new file mode 100644 index 0000000..0fa458a Binary files /dev/null and b/public/pbImg/企业备份.png differ diff --git a/public/pbImg/关闭icon.png b/public/pbImg/关闭icon.png new file mode 100644 index 0000000..6aba9f5 Binary files /dev/null and b/public/pbImg/关闭icon.png differ diff --git a/public/pbImg/搜索2121.png b/public/pbImg/搜索2121.png new file mode 100644 index 0000000..4432574 Binary files /dev/null and b/public/pbImg/搜索2121.png differ diff --git a/public/pbImg/正确.png b/public/pbImg/正确.png new file mode 100644 index 0000000..7feaae1 Binary files /dev/null and b/public/pbImg/正确.png differ diff --git a/public/pbImg/消息.png b/public/pbImg/消息.png new file mode 100644 index 0000000..284a2a3 Binary files /dev/null and b/public/pbImg/消息.png differ diff --git a/public/pbImg/监控.png b/public/pbImg/监控.png new file mode 100644 index 0000000..5e416f3 Binary files /dev/null and b/public/pbImg/监控.png differ diff --git a/public/pbImg/监控icon（常态）.png b/public/pbImg/监控icon（常态）.png new file mode 100644 index 0000000..0fa458a Binary files /dev/null and b/public/pbImg/监控icon（常态）.png differ diff --git a/public/pbImg/监控icon（常态）备份.png b/public/pbImg/监控icon（常态）备份.png new file mode 100644 index 0000000..baf9f0e Binary files /dev/null and b/public/pbImg/监控icon（常态）备份.png differ diff --git a/public/pbImg/监控icon（悬浮）.png b/public/pbImg/监控icon（悬浮）.png new file mode 100644 index 0000000..3f47412 Binary files /dev/null and b/public/pbImg/监控icon（悬浮）.png differ diff --git a/public/pbImg/监控icon（悬浮）备份.png b/public/pbImg/监控icon（悬浮）备份.png new file mode 100644 index 0000000..3f47412 Binary files /dev/null and b/public/pbImg/监控icon（悬浮）备份.png differ diff --git a/public/pbImg/矩形.png b/public/pbImg/矩形.png new file mode 100644 index 0000000..23d2bea Binary files /dev/null and b/public/pbImg/矩形.png differ diff --git a/public/pbImg/矩形备份 18.png b/public/pbImg/矩形备份 18.png new file mode 100644 index 0000000..01a83f7 Binary files /dev/null and b/public/pbImg/矩形备份 18.png differ diff --git a/public/pbImg/编组 11991备份 29.png b/public/pbImg/编组 11991备份 29.png new file mode 100644 index 0000000..df339a6 Binary files /dev/null and b/public/pbImg/编组 11991备份 29.png differ diff --git a/public/pbImg/编组 11991备份 3.png b/public/pbImg/编组 11991备份 3.png new file mode 100644 index 0000000..ed5c7a2 Binary files /dev/null and b/public/pbImg/编组 11991备份 3.png differ diff --git a/public/pbImg/编组 18.png b/public/pbImg/编组 18.png new file mode 100644 index 0000000..e497093 Binary files /dev/null and b/public/pbImg/编组 18.png differ diff --git a/public/pbImg/编组 242221.png b/public/pbImg/编组 242221.png new file mode 100644 index 0000000..684f5f6 Binary files /dev/null and b/public/pbImg/编组 242221.png differ diff --git a/public/pbImg/背景.png b/public/pbImg/背景.png new file mode 100644 index 0000000..6da66d2 Binary files /dev/null and b/public/pbImg/背景.png differ diff --git a/public/pbImg/蒙版.png b/public/pbImg/蒙版.png new file mode 100644 index 0000000..f06d25b Binary files /dev/null and b/public/pbImg/蒙版.png differ diff --git a/public/pbImg/跳转icon.png b/public/pbImg/跳转icon.png new file mode 100644 index 0000000..a20d0cd Binary files /dev/null and b/public/pbImg/跳转icon.png differ diff --git a/src/api/factorResources/index.js b/src/api/factorResources/index.js new file mode 100644 index 0000000..2d72e41 --- /dev/null +++ b/src/api/factorResources/index.js @@ -0,0 +1,33 @@ +import request from '@/utils/request' +//查询企业数据 +export function queryCompany(params) { + return request({ + url: '/element/resource/queryCompany', + method: 'get', + params + }) +} +//查询监控数据 +export function queryVideo(params) { + return request({ + url: '/element/resource/queryVideo', + method: 'get', + params + }) +} +//根据企业id查询企业信息 +export function selectCompanyInfoById(params) { + return request({ + url: '/element/resource/selectCompanyInfoById', + method: 'get', + params + }) +} +//图层数据 +export function statistic(params) { + return request({ + url: '/element/resource/statistic', + method: 'get', + params + }) +} \ No newline at end of file diff --git a/src/components/offLineMap/index.vue b/src/components/offLineMap/index.vue index 6b5a79a..97944d0 100644 --- a/src/components/offLineMap/index.vue +++ b/src/components/offLineMap/index.vue @@ -45,7 +45,7 @@ export default { }); let that = this map.centerAndZoom(new BMap.Point(this.dongtaiPoint[0], this.dongtaiPoint[1]), 12); - // map.setMinZoom(11) + map.setMinZoom(12) map.setMaxZoom(19) map.enableScrollWheelZoom(true); // hjrequest({ @@ -196,7 +196,8 @@ export default { 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.companyName}

企业看板
${res.data.scoreMonth}
@@ -244,6 +245,11 @@ export default { `); map.addOverlay(label); let closebtn = document.querySelector('.closeBtn') + let closeBtn1 = document.querySelector('.closeBtn1') + closeBtn1.addEventListener('click', () => { + + map.removeOverlay(label); + }) //console.log(btn, 'btn'); closebtn.addEventListener('click', () => { that.$emit('toArchives', item) diff --git a/src/router/index.js b/src/router/index.js index 9ffb3ed..3c6b66e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -50,6 +50,14 @@ const routes = [ component: () => import('@/views/realtimeWarning'), }, + //要素资源 + { + path: 'factorResources', + name: 'factorResources', + component: () => import('@/views/factorResources'), + + }, + // 系统管理 { path: 'systemManagement', diff --git a/src/utils/request.js b/src/utils/request.js index 6136fee..2da54f2 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -5,7 +5,7 @@ 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.13:8080/zhapi', // 孙强 //baseURL: 'http://192.168.0.188:8888/zhapi', // baseURL: `http://${window.location.host}/zhapi`, timeout: 50000, diff --git a/src/views/archives/monitor.vue b/src/views/archives/monitor.vue index b2231a7..4963cac 100644 --- a/src/views/archives/monitor.vue +++ b/src/views/archives/monitor.vue @@ -15,7 +15,6 @@
- diff --git a/src/views/companyCanban/fangyi.vue b/src/views/companyCanban/fangyi.vue index bf2a20e..704f498 100644 --- a/src/views/companyCanban/fangyi.vue +++ b/src/views/companyCanban/fangyi.vue @@ -584,6 +584,8 @@ export default { background: url('~@/assets/companyCanban/09091.png') no-repeat; background-size: 100% 100%; position: relative; + box-sizing: border-box; + padding-top: 35px; .tjsjTitle { position: absolute; @@ -609,7 +611,9 @@ export default { .fxfqs { width: 100%; - height: 100%; + height: calc(100% - 30px); + + } } } diff --git a/src/views/companyCanban/renyuan.vue b/src/views/companyCanban/renyuan.vue index 9ef70bb..74ccec2 100644 --- a/src/views/companyCanban/renyuan.vue +++ b/src/views/companyCanban/renyuan.vue @@ -1,6 +1,6 @@ - +