diff --git a/.env b/.env index 7afe3f1..5831efc 100644 --- a/.env +++ b/.env @@ -1,3 +1,4 @@ NODE_ENV=production VUE_APP_PREVIEW=true -VUE_APP_API_BASE_URL=http://localhost:82 \ No newline at end of file +VUE_APP_API_BASE_URL=http://localhost:82 +VUE_APP_API_BASE_URL_PSPACE=https://c3abc956bca5.ngrok-free.app \ No newline at end of file diff --git a/src/api/modular/largeScreen/productionCommandCenterManage.js b/src/api/modular/largeScreen/productionCommandCenterManage.js index a0e29c4..e60dc53 100644 --- a/src/api/modular/largeScreen/productionCommandCenterManage.js +++ b/src/api/modular/largeScreen/productionCommandCenterManage.js @@ -14,35 +14,46 @@ export function productionCommandCenterPage (parameter) { }) } -const commonParams = { - charset: 'utf-8', - archived: 0 -} - /** - * 炉温 + * 产品数据:本月累计产量、回收率、单位单耗 */ -export function getFurnaceTemperature (parameter) { +export function getProductData (parameter) { return axios({ - url: '/HistAtTime', - method: 'post', - params: { - ...parameter, - ...commonParams - } - }) -} - -/** - * 功率因数(每月和每小时功率因数,用这个平均值调整时间) - */ -export function getHistAggreData (parameter) { - return axios({ - url: '/HistAggreData', + url: 'scrProduction/driQuery', method: 'get', - params: { - ...parameter, - ...commonParams - } + params: parameter + }) +} + +/** + * 安全与异常事件 + */ +export function getSafetyExceptionEvent (parameter) { + return axios({ + url: '/scrSecurity/driQuery', + method: 'get', + params: parameter + }) +} + +/** + * 各炉号产量贡献 + */ +export function getProductContribution (parameter) { + return axios({ + url: 'scrProduction/driQhQuery', + method: 'get', + params: parameter + }) +} + +/** + * 各产品合计产量 + */ +export function getProductTotalProduction (parameter) { + return axios({ + url: 'scrProduction/driMaterQuery', + method: 'get', + params: parameter }) } diff --git a/src/views/largeScreen/ProductionCommandCenter3.vue b/src/views/largeScreen/ProductionCommandCenter3.vue index f4dfc36..ca03221 100644 --- a/src/views/largeScreen/ProductionCommandCenter3.vue +++ b/src/views/largeScreen/ProductionCommandCenter3.vue @@ -1,5 +1,6 @@