diff --git a/src/api/gd36524/allData.js b/src/api/gd36524/allData.js index 7b8d8d5..f1a4322 100644 --- a/src/api/gd36524/allData.js +++ b/src/api/gd36524/allData.js @@ -1,66 +1,74 @@ import request from '@/utils/request' export default { - - // 左侧数据总览 - getProjectDaily: function(data) { - return request({ - url: '/datacenter/getProjectDailyNew', - method: 'post', - data: data - }); - }, - - // 库存分析图 , - getReportInventory: function(data) { - return request({ - url: '/datacenter/getReportInventoryNew', - method: 'post', - data: data - }); - }, - - // 获取基础信息 , - getProjectBySid: function(data) { - return request({ - url: '/datacenter/getProjectBySid?projectSid='+data, - method: 'get', - data: data - }); - }, - - // 获取仓库sid, - getProjectIsJk: function(data) { - return request({ - url: '/datacenter/getProjectIsJk?projectSid='+data, - method: 'get' - }); - }, - - // 获取摄像头 设备列表, - getOtherList: function(data) { - return request({ - url: '/datacenter/getOtherList?type=1&ckId='+data, - method: 'get' - }); - }, - - - // 实时监控 , - getVedioPcLiveById: function(data) { - return request({ - url: '/datacenter/getVedioPcLiveByIdNew?id=' + data, - method: 'get' - }); - }, - - - // 回放监控 , - getVedioPcRecById: function(data) { - return request({ - url: '/datacenter/getVedioPcRecByIdNew?id=' + data, - method: 'get' - }); - }, - + + // 左侧数据总览 + getProjectDaily: function(data) { + return request({ + url: '/datacenter/getProjectDailyNew', + method: 'post', + data: data + }); + }, + + // 库存分析图 , + getReportInventory: function(data) { + return request({ + url: '/datacenter/getReportInventoryNew', + method: 'post', + data: data + }); + }, + + // 获取基础信息 , + getProjectBySid: function(data) { + return request({ + url: '/datacenter/getProjectBySid?projectSid=' + data, + method: 'get', + data: data + }); + }, + + // 获取仓库sid, + getProjectIsJk: function(data) { + return request({ + url: '/datacenter/getProjectIsJk?projectSid=' + data, + method: 'get' + }); + }, + + // 获取摄像头 设备列表, + getOtherList: function(data) { + return request({ + url: '/datacenter/getOtherList?type=1&ckId=' + data, + method: 'get' + }); + }, + + + // 实时监控 , + getVedioPcLiveById: function(data) { + return request({ + url: '/datacenter/getVedioPcLiveByIdNew?id=' + data, + method: 'get' + }); + }, + + + // 回放监控 , + getVedioPcRecById: function(data) { + return request({ + url: '/datacenter/getVedioPcRecByIdNew?id=' + data, + method: 'get' + }); + }, + // 仓库分布 + getPos: function(data) { + return request({ + url: '/datacenter/getWarehouseAddress', + method: 'post', + data: data + }); + }, + } \ No newline at end of file diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 3c11392..824a917 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -1,8 +1,8 @@ diff --git a/src/views/map/index.vue b/src/views/map/index.vue index 37d0e10..1bce5b9 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -1,365 +1,359 @@ + .chartsa { + position: absolute; + top: 20px; + right: 15px; + width: 300px; + } + \ No newline at end of file diff --git a/src/views/mortgage/allData.vue b/src/views/mortgage/allData.vue index d780f69..c4d32ae 100644 --- a/src/views/mortgage/allData.vue +++ b/src/views/mortgage/allData.vue @@ -1,109 +1,113 @@ \ No newline at end of file diff --git a/src/views/mortgage/yqpb-原始.vue b/src/views/mortgage/yqpb-原始.vue index 29abf9a..4904d2d 100644 --- a/src/views/mortgage/yqpb-原始.vue +++ b/src/views/mortgage/yqpb-原始.vue @@ -1,7 +1,7 @@