diff --git a/.env.dev b/.env.dev index baa8f98..f6c259c 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: zhp # @Date: 2024-04-28 13:42:51 - # @LastEditTime: 2024-06-17 09:01:32 + # @LastEditTime: 2024-06-19 16:05:46 # @LastEditors: DY # @Description: ### @@ -14,6 +14,10 @@ VUE_APP_TITLE = 发电玻璃智能管控平台 # 芋道管理系统/开发环境 # VUE_APP_BASE_API = 'http://192.168.1.70:30307' VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com' +# 闫阳 +# VUE_APP_BASE_API = 'http://192.168.1.81:48080' +# 徐 +# VUE_APP_BASE_API = 'http://192.168.1.56:48080' # 郭 # VUE_APP_BASE_API = 'http://192.168.1.61:48080' # sara diff --git a/src/api/produceData/index.js b/src/api/produceData/index.js index 04923bd..706fc36 100644 --- a/src/api/produceData/index.js +++ b/src/api/produceData/index.js @@ -1,7 +1,7 @@ /* * @Author: zhp * @Date: 2024-05-07 08:54:59 - * @LastEditTime: 2024-06-03 08:52:02 + * @LastEditTime: 2024-06-19 15:22:10 * @LastEditors: DY * @Description: */ @@ -10,23 +10,33 @@ import request from '@/utils/request' // 查询生产数据管理分页 export function getProduceDataPage(data) { return request({ - url: 'ip/prod-output/prodOutputDataPage', + url: '/ip/proddata/page', method: 'post', data: data }) } -export function getProduceDataDetail(id){ +// 查询图数据 +export function getproddata(data) { return request({ - url: '/ip/prod-output/get?id=' + id, - method: 'get' + url: '/ip/proddata/list', + method: 'post', + data: data + }) +} + +export function getProduceDataDetail(data){ + return request({ + url: '/ip/proddata/get', + method: 'post', + data: data }) } // 导出生产数据 export function exportOutPutExcel(data) { return request({ - url: '/ip/prod-output/output-export-excel', + url: '/ip/proddata/export-excel', method: 'post', data: data, responseType: 'blob' diff --git a/src/api/report/benchmarking.js b/src/api/report/benchmarking.js new file mode 100644 index 0000000..b863bbd --- /dev/null +++ b/src/api/report/benchmarking.js @@ -0,0 +1,127 @@ +// 对标报表的接口 +import request from '@/utils/request' + +// 产量对标FTO +export function fTOReportByDateRangePage(data) { + return request({ + url: '/ip/prod-output/queryOBFTOReportByDateRange', + method: 'post', + data: data + }) +} +// 产量对标FTO导出 +export function fTOReportByDateRangeExport(data) { + return request({ + url: '/ip/prod-output/queryOBFTOReportByDateRangeExcel', + method: 'post', + responseType: 'blob', + data: data + }) +} + +// 芯片产量对标 +export function cPReportByDateRangePage(data) { + return request({ + url: '/ip/prod-output/queryCPReportByDateRange', + method: 'post', + data: data + }) +} +// 芯片产量对标导出 +export function cPReportByDateRangeExport(data) { + return request({ + url: '/ip/prod-output/queryCPReportByDateRangeExport', + method: 'post', + responseType: 'blob', + data: data + }) +} + +// 标准组件产量对标 +export function sCPReportByDateRangePage(data) { + return request({ + url: '/ip/prod-output/querySCPReportByDateRange', + method: 'post', + data: data + }) +} +// 标准组件产量对标导出 +export function sCPReportByDateRangeExport(data) { + return request({ + url: '/ip/prod-output/querySCPReportByDateRangeExport', + method: 'post', + responseType: 'blob', + data: data + }) +} +// 稼动率对标 +export function utilzationComparePage(data) { + return request({ + url: '/ip/utilzation-compare/page', + method: 'post', + data: data + }) +} +// 稼动率对标导出 +export function utilzationCompareExport(data) { + return request({ + url: '/ip/utilzation-compare/export-excel', + method: 'post', + responseType: 'blob', + data: data + }) +} + +// 芯片OEE对标 +export function chipoeeComparePage(data) { + return request({ + url: '/ip/chipoee-compare/page', + method: 'post', + data: data + }) +} +// 芯片OEE对标导出 +export function chipoeeCompareExport(data) { + return request({ + url: '/ip/chipoee-compare/export-excel', + method: 'post', + responseType: 'blob', + data: data + }) +} + +// 封装OEE对标 +export function componentOEEPage(data) { + return request({ + url: '/ip/component-oee/page', + method: 'post', + data: data + }) +} +// 封装OEE对标导出 +export function componentOEEExport(data) { + return request({ + url: '/ip/component-oee/export', + method: 'post', + responseType: 'blob', + data: data + }) +} + +// 芯片人均产量 +export function chipAnnualAverageProductionPage(data) { + return request({ + url: '/ip/chip-annual-average-production/page', + method: 'post', + data: data + }) +} +// 芯片人均产量导出 +export function chipAnnualAverageProductionExport(data) { + return request({ + url: '/ip/chip-annual-average-production/export', + method: 'post', + responseType: 'blob', + data: data + }) +} \ No newline at end of file diff --git a/src/utils/constants.js b/src/utils/constants.js index bea0699..2daee2a 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -143,6 +143,8 @@ export const tyjxfactoryList =[ // 暂时只有瑞昌邯郸数据 export const factoryList =['瑞昌中建材光电材料有限公司', '邯郸中建材光电材料有限公司'] + +export const factoryListabbr =['瑞昌', '邯郸'] export const factoryArray =[ { name: '瑞昌中建材光电材料有限公司', diff --git a/src/views/produce/data/add-or-updata.vue b/src/views/produce/data/add-or-updata.vue index 46d2f4e..51ea5a5 100644 --- a/src/views/produce/data/add-or-updata.vue +++ b/src/views/produce/data/add-or-updata.vue @@ -1,12 +1,12 @@