From fe7013887057903963146d881200e70a978ee148 Mon Sep 17 00:00:00 2001 From: helloDy <1615073571@qq.com> Date: Mon, 3 Jun 2024 08:37:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 8 +- package.json | 7 +- src/api/produceData/index.js | 17 +- src/api/produceData/order.js | 52 ++ src/utils/constants.js | 59 +- src/views/produce/data/index.vue | 246 ++++--- src/views/produce/data/lineChart.vue | 2 +- src/views/produce/target/add-or-updata.vue | 127 ++-- src/views/produce/target/index.vue | 138 ++-- src/views/produce/workOrder/SmallTitle.vue | 65 ++ src/views/produce/workOrder/add-or-updata.vue | 399 ++++++++++++ src/views/produce/workOrder/index.vue | 320 ++++++++++ src/views/produce/workOrder/lineChart.vue | 169 +++++ yarn.lock | 598 +++++++++++++++++- 14 files changed, 1917 insertions(+), 290 deletions(-) create mode 100644 src/api/produceData/order.js create mode 100644 src/views/produce/workOrder/SmallTitle.vue create mode 100644 src/views/produce/workOrder/add-or-updata.vue create mode 100644 src/views/produce/workOrder/index.vue create mode 100644 src/views/produce/workOrder/lineChart.vue diff --git a/.env.dev b/.env.dev index 326077f..be00ebe 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: zhp # @Date: 2024-04-28 13:42:51 - # @LastEditTime: 2024-05-22 16:29:35 + # @LastEditTime: 2024-05-31 17:09:48 # @LastEditors: DY # @Description: ### @@ -13,7 +13,11 @@ 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://glass.kszny.picaiba.com' +# sara +# VUE_APP_BASE_API = 'http://192.168.1.63:48080' +# 张一丁 +VUE_APP_BASE_API = 'http://192.168.4.139:48080' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/package.json b/package.json index 4809466..d2e519b 100644 --- a/package.json +++ b/package.json @@ -51,10 +51,14 @@ "crypto-js": "^4.0.0", "echarts": "5.4.0", "element-ui": "2.15.12", + "exceljs": "^4.4.0", + "file-saver": "^2.0.5", "fuse.js": "6.6.2", "highlight.js": "^11.9.0", + "html2canvas": "^1.4.1", "js-beautify": "^1.15.1", "jsencrypt": "3.3.1", + "jspdf": "^2.5.1", "lodash": "^4.17.21", "mockjs": "^1.1.0", "moment": "^2.30.1", @@ -69,7 +73,8 @@ "vue-quill-editor": "^3.0.6", "vue-router": "3.4.9", "vuedraggable": "2.24.3", - "vuex": "3.6.2" + "vuex": "3.6.2", + "xlsx": "^0.18.5" }, "devDependencies": { "@vue/cli-plugin-babel": "4.5.18", diff --git a/src/api/produceData/index.js b/src/api/produceData/index.js index 155b7e2..e9a070f 100644 --- a/src/api/produceData/index.js +++ b/src/api/produceData/index.js @@ -1,13 +1,13 @@ /* * @Author: zhp * @Date: 2024-05-07 08:54:59 - * @LastEditTime: 2024-05-22 16:31:08 + * @LastEditTime: 2024-05-31 10:25:55 * @LastEditors: DY * @Description: */ import request from '@/utils/request' -// 查询部门列表 +// 查询生产数据管理分页 export function getProduceDataPage(data) { return request({ url: 'ip/prod-output/prodOutputDataPage', @@ -33,6 +33,15 @@ export function exportOutPutExcel(data) { }) } +// 获取生产数据管理列表 +export function prodOutputDataList(data) { + return request({ + url: '/ip/prod-output/prodOutputDataList', + method: 'post', + data: data + }) +} + // 获取生产管理生产目标管理碲化镉工厂分页 export function prodTargetDiPage(data) { return request({ @@ -110,7 +119,7 @@ export function importToTarget(data) { return request({ url: '/ip/prod-target/to-target-import-excel', method: 'post', - data + data: data }) } @@ -119,7 +128,7 @@ export function importDiTarget(data) { return request({ url: '/ip/prod-target/di-target-import-excel', method: 'post', - data + data: data }) } diff --git a/src/api/produceData/order.js b/src/api/produceData/order.js new file mode 100644 index 0000000..138d8d6 --- /dev/null +++ b/src/api/produceData/order.js @@ -0,0 +1,52 @@ +/* + * @Author: zhp + * @Date: 2024-05-07 08:54:59 + * @LastEditTime: 2024-05-31 15:08:27 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 查询工单分页 +export function getWorkOrderPage(data) { + return request({ + url: '/ip/prod-work-order/page', + method: 'post', + data: data + }) +} + +// 查询工单趋势数据 +export function getDailyTrend(data) { + return request({ + url: '/ip/prod-work-order/getDailyTrend', + method: 'post', + data: data + }) +} + +// 获得工单 +export function getWorkOrderDetail(id){ + return request({ + url: '/ip/prod-work-order/get?id=' + id, + method: 'get' + }) +} + +// 获得工单设备加工数量 +export function getEqNum(id){ + return request({ + url: '/ip/prod-work-order/getEqNum?workOrderId=' + id, + method: 'get' + }) +} + +// 导出工单数据 +export function exportExcel(data) { + return request({ + url: '/ip/prod-work-order/export-excel', + method: 'post', + data: data, + responseType: 'blob' + }) +} diff --git a/src/utils/constants.js b/src/utils/constants.js index 9d47c2e..bea0699 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -74,9 +74,9 @@ export const SystemDataScopeEnum = { /** * 工厂名称 */ -export const factoryList =['瑞昌中建材光电材料有限公司', '邯郸中建材光电材料有限公司', '中建材株洲光电材料有限公司', '佳木斯中建材光电材料有限公司', '成都中建材光电材料有限公司', '凯盛光伏材料有限公司', '蚌埠兴科玻璃有限公司'] +// export const factoryList =['瑞昌中建材光电材料有限公司', '邯郸中建材光电材料有限公司', '中建材株洲光电材料有限公司', '佳木斯中建材光电材料有限公司', '成都中建材光电材料有限公司', '凯盛光伏材料有限公司', '蚌埠兴科玻璃有限公司'] -export const dhgfactoryList =[ +export const factoryArray1 =[ { name: '瑞昌中建材光电材料有限公司', id: 0 @@ -97,12 +97,43 @@ export const dhgfactoryList =[ name: '成都中建材光电材料有限公司', id: 4 }, + { + name: '凯盛光伏材料有限公司', + id: 5 + }, { name: '蚌埠兴科玻璃有限公司', id: 6 } ] +// export const dhgfactoryList =[ +// { +// name: '瑞昌中建材光电材料有限公司', +// id: 0 +// }, +// { +// name: '邯郸中建材光电材料有限公司', +// id: 1 +// }, +// { +// name: '中建材株洲光电材料有限公司', +// id: 2 +// }, +// { +// name: '佳木斯中建材光电材料有限公司', +// id: 3 +// }, +// { +// name: '成都中建材光电材料有限公司', +// id: 4 +// }, +// { +// name: '蚌埠兴科玻璃有限公司', +// id: 6 +// } +// ] + export const tyjxfactoryList =[ { name: '凯盛光伏材料有限公司', @@ -110,6 +141,30 @@ export const tyjxfactoryList =[ } ] +// 暂时只有瑞昌邯郸数据 +export const factoryList =['瑞昌中建材光电材料有限公司', '邯郸中建材光电材料有限公司'] +export const factoryArray =[ + { + name: '瑞昌中建材光电材料有限公司', + id: 0 + }, + { + name: '邯郸中建材光电材料有限公司', + id: 1 + } +] + +export const dhgfactoryList =[ + { + name: '瑞昌中建材光电材料有限公司', + id: 0 + }, + { + name: '邯郸中建材光电材料有限公司', + id: 1 + } +] + /** * 代码生成模板类型 */ diff --git a/src/views/produce/data/index.vue b/src/views/produce/data/index.vue index 92fa0e4..0727797 100644 --- a/src/views/produce/data/index.vue +++ b/src/views/produce/data/index.vue @@ -1,7 +1,7 @@ @@ -10,17 +10,17 @@
- + - + + start-placeholder="开始日期" value-format="timestamp" format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期"> - + @@ -32,12 +32,12 @@ {{ date1 }} 至 {{ date2 }},共 {{ weekNum }} 周 - + - + @@ -48,7 +48,7 @@ - + @@ -59,7 +59,7 @@ --> - + @@ -94,7 +94,7 @@ @pagination="getDataList" />
- +