From bc6d48f59bee34c1efde898dbba4a4500675eb45 Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Sun, 18 Aug 2024 10:29:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?= =?UTF-8?q?=201.=20=E5=A2=9E=E5=8A=A0=E5=8D=A1=E7=89=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=202.=20=E5=A2=9E=E5=8A=A0=E5=90=84=E7=A7=8D?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/kateLogin.js | 19 ++ src/api/login.js | 2 +- src/layout/eLocationTable.vue | 439 ++++++++++++++++------------ src/layout/pickTaskMonitor.vue | 502 +++++++++++++++++++-------------- src/layout/sortBoxs.vue | 2 +- src/layout/standSettings.vue | 350 +++++++++++------------ src/layout/stationConfig.vue | 350 +++++++++++------------ src/layout/workFlow.vue | 439 ++++++++++++++++------------ src/layout/workSummary.vue | 439 ++++++++++++++++------------ src/views/SystemCenter.vue | 29 -- src/views/login.vue | 98 ++++++- 11 files changed, 1532 insertions(+), 1137 deletions(-) create mode 100644 src/api/kateLogin.js diff --git a/src/api/kateLogin.js b/src/api/kateLogin.js new file mode 100644 index 0000000..66d853a --- /dev/null +++ b/src/api/kateLogin.js @@ -0,0 +1,19 @@ +import axios from "axios"; +axios.defaults.baseURL = 'https://login.microsoftonline.com/caterpillar.onmicrosoft.com' +axios.defaults.timeout = 5000; +// axios.defaults.withCredentials = true + +const postToGetToken = (params) => { + return axios({ + url: '/oauth2/v2.0/token', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + } + }) +} + +export { + postToGetToken +} \ No newline at end of file diff --git a/src/api/login.js b/src/api/login.js index 317af23..6b64b4f 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -18,7 +18,7 @@ const loginWithAuth = (params) => { const getUser = (params) => { return request({ - url: '/login/getUser', + url: '/user/getUser', method: 'post', data: params }) diff --git a/src/layout/eLocationTable.vue b/src/layout/eLocationTable.vue index 0317c1e..0981463 100644 --- a/src/layout/eLocationTable.vue +++ b/src/layout/eLocationTable.vue @@ -1,32 +1,52 @@ @@ -284,7 +360,6 @@ export default { .table-class { width: 100%; - /* font-size: 5px; */ } .el-row .el-form-item { @@ -303,4 +378,18 @@ export default { .el-row .el-form-item .el-button { margin: auto; } + +.title-area { + display: flex; + min-height: 10%; + max-height: max-content; + margin-bottom: 10px; + min-width: inherit; + border: solid 1px; + border-radius: 10px; + box-shadow: 0px 15px 10px -15px #000; + overflow: auto; + flex-direction: column; + padding: 10px; +} \ No newline at end of file diff --git a/src/layout/pickTaskMonitor.vue b/src/layout/pickTaskMonitor.vue index 93e115a..0981463 100644 --- a/src/layout/pickTaskMonitor.vue +++ b/src/layout/pickTaskMonitor.vue @@ -1,287 +1,348 @@ @@ -301,6 +362,11 @@ export default { width: 100%; } +.el-row .el-form-item { + width: 10% inherit; + justify-content: center; +} + .el-row .el-form-item .el-select-v2 { width: 100% !important; } @@ -312,4 +378,18 @@ export default { .el-row .el-form-item .el-button { margin: auto; } + +.title-area { + display: flex; + min-height: 10%; + max-height: max-content; + margin-bottom: 10px; + min-width: inherit; + border: solid 1px; + border-radius: 10px; + box-shadow: 0px 15px 10px -15px #000; + overflow: auto; + flex-direction: column; + padding: 10px; +} \ No newline at end of file diff --git a/src/layout/sortBoxs.vue b/src/layout/sortBoxs.vue index 23debf2..ba14264 100644 --- a/src/layout/sortBoxs.vue +++ b/src/layout/sortBoxs.vue @@ -114,7 +114,7 @@ export default { standId: this.standId, bigBoxNo: this.workFormEntity.bigBoxNo, // orderOfOrders: this.workFormEntity.orderOfOrders, - userName: store.getters.getUserName, + userName: store.getters.getUserName } requestSortBox(request).then(res => { const response = res.data diff --git a/src/layout/standSettings.vue b/src/layout/standSettings.vue index 8b613db..0981463 100644 --- a/src/layout/standSettings.vue +++ b/src/layout/standSettings.vue @@ -3,47 +3,50 @@
- + + 搜索 重置 导入 - 导出 + @click="openUploadDialog()">导入

- - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -52,102 +55,60 @@ :small="false" :disabled="false" :background="false" :default-page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search" @current-change="search" /> - -
- +
+ + + + + + + + + + + + + + + + + + - - - - - - + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -156,20 +117,37 @@ - +
- 导入物料 - + 上次更新 +
+
+
+
时间：
+ +
+
+
人员：
+ +
+
+
+
文件名：
+ + +
+
- 导入工站配置 - + 再次更新 +
@@ -178,34 +156,39 @@ diff --git a/src/layout/stationConfig.vue b/src/layout/stationConfig.vue index 8b613db..0981463 100644 --- a/src/layout/stationConfig.vue +++ b/src/layout/stationConfig.vue @@ -3,47 +3,50 @@
- + + 搜索 重置 导入 - 导出 + @click="openUploadDialog()">导入

- - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -52,102 +55,60 @@ :small="false" :disabled="false" :background="false" :default-page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search" @current-change="search" /> - -
- +
+ + + + + + + + + + + + + + + + + + - - - - - - + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -156,20 +117,37 @@ - +
- 导入物料 - + 上次更新 +
+
+
+
时间：
+ +
+
+
人员：
+ +
+
+
+
文件名：
+ + +
+
- 导入工站配置 - + 再次更新 +
@@ -178,34 +156,39 @@ diff --git a/src/layout/workFlow.vue b/src/layout/workFlow.vue index 0317c1e..0981463 100644 --- a/src/layout/workFlow.vue +++ b/src/layout/workFlow.vue @@ -1,32 +1,52 @@ @@ -284,7 +360,6 @@ export default { .table-class { width: 100%; - /* font-size: 5px; */ } .el-row .el-form-item { @@ -303,4 +378,18 @@ export default { .el-row .el-form-item .el-button { margin: auto; } + +.title-area { + display: flex; + min-height: 10%; + max-height: max-content; + margin-bottom: 10px; + min-width: inherit; + border: solid 1px; + border-radius: 10px; + box-shadow: 0px 15px 10px -15px #000; + overflow: auto; + flex-direction: column; + padding: 10px; +} \ No newline at end of file diff --git a/src/layout/workSummary.vue b/src/layout/workSummary.vue index 0317c1e..0981463 100644 --- a/src/layout/workSummary.vue +++ b/src/layout/workSummary.vue @@ -1,32 +1,52 @@ @@ -284,7 +360,6 @@ export default { .table-class { width: 100%; - /* font-size: 5px; */ } .el-row .el-form-item { @@ -303,4 +378,18 @@ export default { .el-row .el-form-item .el-button { margin: auto; } + +.title-area { + display: flex; + min-height: 10%; + max-height: max-content; + margin-bottom: 10px; + min-width: inherit; + border: solid 1px; + border-radius: 10px; + box-shadow: 0px 15px 10px -15px #000; + overflow: auto; + flex-direction: column; + padding: 10px; +} \ No newline at end of file diff --git a/src/views/SystemCenter.vue b/src/views/SystemCenter.vue index f038db2..6339fee 100644 --- a/src/views/SystemCenter.vue +++ b/src/views/SystemCenter.vue @@ -42,35 +42,6 @@ const loginToMonitor = () => { const mpnitorUrl = `https://cxlasrs.ecorp.cat.com?user=${user}&token=${token}` window.location.href = mpnitorUrl// 当前窗口跳转 } - -onMounted(() => { - if (router.currentRoute.value.query.code != undefined) { - console.log(router.currentRoute.value.query.code) - const loading = ElLoading.service({ - lock: true, - text: 'Loading', - background: 'rgba(0, 0, 0, 0.7)', - }) - const codeInfo = { - code: router.currentRoute.value.query.code, - state: router.currentRoute.value.query.state - } - getUser(codeInfo).then(res => { - loading.close() - if (res.data.code == 0) { - store.commit('mutationUser', res.data.returnData.user)// 用户信息 - store.commit('mutationMenu', res.data.returnData.menuList)// 菜单信息 - router.replace({ path: '/' }) - } else { - ElMessage.error(res.data.message) - } - }).catch(err => { - console.log(err) - loading.close() - ElMessage.error('登录失败！') - }) - } -})