From 14fa1823f2f1ec539c32e8344d79bab2582401bf Mon Sep 17 00:00:00 2001 From: helloDy <1615073571@qq.com> Date: Mon, 20 May 2024 14:55:36 +0800 Subject: [PATCH 1/2] =?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 +- src/api/produceData/index.js | 100 +- src/components/ButtonNav/index.vue | 2 + src/utils/constants.js | 39 + src/views/produce/data/add-or-updata.vue | 59 +- src/views/produce/data/index.vue | 295 +- src/views/produce/target/add-or-updata.vue | 421 +- src/views/produce/target/index.vue | 574 +- yarn.lock | 16318 ++++++++++--------- 9 files changed, 9132 insertions(+), 8684 deletions(-) diff --git a/.env.dev b/.env.dev index 4e87f52..5e22299 100644 --- a/.env.dev +++ b/.env.dev @@ -1,8 +1,8 @@ ### # @Author: zhp # @Date: 2024-04-28 13:42:51 - # @LastEditTime: 2024-05-08 08:57:33 - # @LastEditors: zhp + # @LastEditTime: 2024-05-16 17:05:10 + # @LastEditors: DY # @Description: ### # 开发环境配置 @@ -12,8 +12,8 @@ ENV = 'development' VUE_APP_TITLE = 芋道管理系统 # 芋道管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.1.61:48080' -# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com' +# VUE_APP_BASE_API = 'http://192.168.1.61:48080' +VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/api/produceData/index.js b/src/api/produceData/index.js index 3df70d9..083c39b 100644 --- a/src/api/produceData/index.js +++ b/src/api/produceData/index.js @@ -1,15 +1,8 @@ /* * @Author: zhp * @Date: 2024-05-07 08:54:59 - * @LastEditTime: 2024-05-07 09:34:17 - * @LastEditors: zhp - * @Description: - */ -/* - * @Author: zhp - * @Date: 2024-04-26 14:53:45 - * @LastEditTime: 2024-05-06 14:53:04 - * @LastEditors: zhp + * @LastEditTime: 2024-05-17 17:51:08 + * @LastEditors: DY * @Description: */ import request from '@/utils/request' @@ -23,10 +16,91 @@ export function getProduceDataPage(data) { }) } -export function getProduceDataDetail(data){ +export function getProduceDataDetail(id){ return request({ - url: '/ip/prod-output/get=' + id, - method: 'get', - query: data + url: '/ip/prod-output/get?id=' + id, + method: 'get' + }) +} + +// 导出生产数据 +export function exportOutPutExcel(data) { + return request({ + url: '/ip/prod-output/output-export-excel', + method: 'post', + data: data, + responseType: 'blob' + }) +} + +// 获取生产管理生产目标管理碲化镉工厂分页 +export function prodTargetDiPage(data) { + return request({ + url: '/ip/prod-target/prodTargetDiPage', + method: 'post', + data: data + }) +} + +// 获取生产管理生产目标管理铜铟镓硒工厂分页 +export function prodTargetToPage(data) { + return request({ + url: '/ip/prod-target/prodTargetToPage', + method: 'post', + data: data + }) +} + +// 创建生产目标 +export function createProduce(data) { + return request({ + url: '/ip/prod-target/create', + method: 'post', + data: data + }) +} + +// 获得生产目标 +export function getProduceTargetDetail(id){ + return request({ + url: '/ip/prod-target/get?id=' + id, + method: 'get' + }) +} + +// 修改生产目标 +export function updateProduceTarget(data) { + return request({ + url: '/ip/prod-target/update', + method: 'put', + data: data + }) +} + +// 导出碲化镉生产目标数据 +export function exportDiTargetExcel(data) { + return request({ + url: '/ip/prod-target/di-target-export-excel', + method: 'post', + data: data, + responseType: 'blob' + }) +} + +// 导出铜铟镓硒生产目标数据 +export function exportToTargetExcel(data) { + return request({ + url: '/ip/prod-target/to-target-export-excel', + method: 'post', + data: data, + responseType: 'blob' + }) +} + +// 删除生产目标 +export function delTarget(id) { + return request({ + url: '/ip/prod-target/delete?id=' + id, + method: 'delete' }) } diff --git a/src/components/ButtonNav/index.vue b/src/components/ButtonNav/index.vue index 7b6147f..feefbab 100644 --- a/src/components/ButtonNav/index.vue +++ b/src/components/ButtonNav/index.vue @@ -82,6 +82,8 @@ export default { border: none; background: #fff; border-radius: 8px; + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; padding: 20px; color: #888; letter-spacing: 2px; diff --git a/src/utils/constants.js b/src/utils/constants.js index 2ce6d00..9d47c2e 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -71,6 +71,45 @@ export const SystemDataScopeEnum = { DEPT_SELF: 5 // 仅本人数据权限 } +/** + * 工厂名称 + */ +export const factoryList =['瑞昌中建材光电材料有限公司', '邯郸中建材光电材料有限公司', '中建材株洲光电材料有限公司', '佳木斯中建材光电材料有限公司', '成都中建材光电材料有限公司', '凯盛光伏材料有限公司', '蚌埠兴科玻璃有限公司'] + +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: '凯盛光伏材料有限公司', + id: 5 + } +] + /** * 代码生成模板类型 */ diff --git a/src/views/produce/data/add-or-updata.vue b/src/views/produce/data/add-or-updata.vue index dd6cfe3..e2a640e 100644 --- a/src/views/produce/data/add-or-updata.vue +++ b/src/views/produce/data/add-or-updata.vue @@ -1,12 +1,12 @@