From c23718c42a2b16461e3539fa505e9c7b5c7278cf Mon Sep 17 00:00:00 2001 From: tzy Date: Wed, 15 Apr 2026 19:43:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=9D=B6=E5=B7=A5=E5=BA=8F=E8=AE=A1?= =?UTF-8?q?=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/operationPlanningMain.js | 16 +++ src/router/index.js | 18 +-- src/views/login.vue | 18 ++- .../system/operationPlanningMain/index.vue | 118 +++++++++++++++--- src/views/workbench/index.vue | 52 +------- 5 files changed, 133 insertions(+), 89 deletions(-) diff --git a/src/api/system/operationPlanningMain.js b/src/api/system/operationPlanningMain.js index 85a15db..f6838c8 100644 --- a/src/api/system/operationPlanningMain.js +++ b/src/api/system/operationPlanningMain.js @@ -58,3 +58,19 @@ export function updateOperationPlanningMainOperators(data) { data: data }) } + +export function syncOperationPlanningMain(data) { + return request({ + url: '/system/operationPlanningMain/sync', + method: 'post', + data: data + }) +} + +export function queryFromK3OperationPlanningMain(query) { + return request({ + url: '/system/operationPlanningMain/queryFromK3', + method: 'get', + params: query + }) +} diff --git a/src/router/index.js b/src/router/index.js index 0fa1544..1b7df62 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -34,13 +34,13 @@ export const constantRoutes = [ path: '/', component: Layout, hidden: false, - redirect: '/home' + redirect: '/workbench/index' }, { path: '/home', component: Layout, hidden: true, - redirect: '/system/productionPlan', + redirect: '/workbench/index', children: [ { path: '/system/productionPlan', @@ -48,20 +48,6 @@ export const constantRoutes = [ } ] }, - { - path: '/system/operationPlanningMain', - component: Layout, - hidden: false, - redirect: to => ({ path: '/system/operationPlanningMain/index', query: to.query }), - children: [ - { - path: 'index', - component: () => import('@/views/system/operationPlanningMain'), - name: 'OperationPlanningMain', - meta: { title: '生产计划', icon: 'table' } - } - ] - }, { path: '/workbench', component: Layout, diff --git a/src/views/login.vue b/src/views/login.vue index 31f36bb..83e7c3e 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -72,7 +72,7 @@ export default { return { codeUrl: "", loginForm: { - username: "admin", + username: "", password: "", rememberMe: false, code: "", @@ -121,11 +121,17 @@ export default { const username = Cookies.get("username"); const password = Cookies.get("password"); const rememberMe = Cookies.get('rememberMe') - this.loginForm = { - username: username === undefined ? this.loginForm.username : username, - password: password === undefined ? this.loginForm.password : decrypt(password), - rememberMe: rememberMe === undefined ? false : Boolean(rememberMe) - }; + const remember = rememberMe === true || rememberMe === 'true' + + if (!remember) { + Cookies.remove("username"); + Cookies.remove("password"); + Cookies.remove('rememberMe'); + } + + this.loginForm.username = remember ? (username || '') : '' + this.loginForm.password = remember ? (password ? decrypt(password) : '') : '' + this.loginForm.rememberMe = remember }, handleLogin() { this.$refs.loginForm.validate(valid => { diff --git a/src/views/system/operationPlanningMain/index.vue b/src/views/system/operationPlanningMain/index.vue index 43947ae..43ab5af 100644 --- a/src/views/system/operationPlanningMain/index.vue +++ b/src/views/system/operationPlanningMain/index.vue @@ -49,6 +49,8 @@ + + - -
-
- 出货订单数据 - - 上月 - 本月 - 近6个月 - -
-
- -
-
- @@ -67,14 +50,12 @@ import OverviewCards from './components/OverviewCards' import WorkOrderBar from './components/WorkOrderBar' import ProcessDefectRank from './components/ProcessDefectRank' import WorkOrderProgress from './components/WorkOrderProgress' -import ShipOrderData from './components/ShipOrderData' import { getOverview, getWorkOrderBar, getProcessDefectRank, - getWorkOrderProgress, - getShipOrderData + getWorkOrderProgress } from '@/api/system/workbench' export default { @@ -83,8 +64,7 @@ export default { OverviewCards, WorkOrderBar, ProcessDefectRank, - WorkOrderProgress, - ShipOrderData + WorkOrderProgress }, data() { return { @@ -96,9 +76,7 @@ export default { ], workOrderData: { xAxis: [], series: [] }, defectRankList: [], - workOrderProgressList: [], - shipOrderTimeRange: 'lastMonth', - shipOrderList: [] + workOrderProgressList: [] } }, created() { @@ -149,20 +127,6 @@ export default { }).catch(() => { this.mockWorkOrderProgress() }) - - // 获取出货订单 - this.fetchShipOrderData() - }, - fetchShipOrderData() { - getShipOrderData({ range: this.shipOrderTimeRange }).then(res => { - if (res && res.data && res.data.items) { - this.shipOrderList = res.data.items - } else { - this.mockShipOrderData() - } - }).catch(() => { - this.mockShipOrderData() - }) }, mockOverview() { this.overviewList = [ @@ -203,16 +167,6 @@ export default { { workOrderNo: 'MO202112160004', status: '已开工', progress: 67, totalQty: 233 }, { workOrderNo: 'MO202112160005', status: '已开工', progress: 55, totalQty: 983 } ] - }, - mockShipOrderData() { - this.shipOrderList = [ - { customerName: '松下电器(中国)有限公司', yoy: 0.61, orderQty: 3261 }, - { customerName: '苹果科技有限公司', yoy: -0.38, orderQty: 3664 }, - { customerName: '华为技术有限公司', yoy: 0.47, orderQty: 2735 }, - { customerName: '小米科技有限责任公司', yoy: 0.05, orderQty: 3718 }, - { customerName: '联想集团', yoy: -0.62, orderQty: 3299 }, - { customerName: '广东移动通信有限公司', yoy: -0.18, orderQty: 7058 } - ] } } }