+
-
-
- 搜索
- 重置
-
-
+
+
+
+ 搜索
+ 重置
+
+
+ 导入
+ 导出
+
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 编辑
- 删除
+ 编辑
+ 删除
@@ -31,107 +52,161 @@
: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" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -239,7 +378,6 @@ export default {
.table-class {
width: 100%;
- /* font-size: 5px; */
}
.el-row .el-form-item {
@@ -258,4 +396,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/stationConfig.vue b/src/layout/stationConfig.vue
new file mode 100644
index 0000000..8b613db
--- /dev/null
+++ b/src/layout/stationConfig.vue
@@ -0,0 +1,413 @@
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+ 导入
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/layout/workFlow.vue b/src/layout/workFlow.vue
new file mode 100644
index 0000000..0317c1e
--- /dev/null
+++ b/src/layout/workFlow.vue
@@ -0,0 +1,306 @@
+
+
+
+
+
+
+
+ 搜索
+ 重置
+ 导出信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/layout/workSummary.vue b/src/layout/workSummary.vue
new file mode 100644
index 0000000..0317c1e
--- /dev/null
+++ b/src/layout/workSummary.vue
@@ -0,0 +1,306 @@
+
+
+
+
+
+
+
+ 搜索
+ 重置
+ 导出信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 6dba0b4..ce9a9bf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -29,8 +29,8 @@ const routes = [
{ path: '/testFinishKitting', component: () => import('@/layout/finishKitting.vue') },// 备料完成
{ path: '/testCallEmptyVehicle', component: () => import('@/layout/callEmptyVehicle.vue') },// 呼叫空箱
{ path: '/testSortBoxs', component: () => import('@/layout/sortBoxs.vue') },// 整理盒子
- { path: '/uploadDbs', component: () => import('@/layout/uploadDbs.vue') },// 上传DBS
- { path: '/uploadOrders', component: () => import('@/layout/uploadOrders.vue') },// 上传工单
+ { path: '/uploadDbs', component: () => import('@/layout/dbsTable.vue') },// 上传DBS
+ { path: '/uploadOrders', component: () => import('@/layout/kateOrdersTable.vue') },// 上传工单
]
},
{
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index e719634..ee35f7f 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -77,10 +77,18 @@ export default {
},
methods: {
handleCommand: (command) => {
- const param = store.getters.getUser
+ const param = {
+ roleId: store.getters.getUser.roleId,
+ userName: store.getters.getUser.userName
+ }
if (command == 1) {
restartSystem(param).then(res => {
- if (res.data.code != 0) {
+ if (res.data.code == 0) {
+ ElMessage({
+ message: '重启系统成功',
+ type: 'success',
+ })
+ } else {
ElMessage.error(res.data.message)
}
}).catch(err => {