From b2554d05ac3c834430fbbddbfd730998feb6667a Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Wed, 26 Jul 2023 15:50:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=BB=E5=AD=97=E5=B7=A5=E5=BA=8F=E5=88=BB?= =?UTF-8?q?=E5=AD=97=E6=9C=BA=E9=80=89=E6=8B=A9=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/http.js | 2 +- src/pages/modules/lettering/index.vue | 25 +- .../lettering/lettering-machine-select.vue | 149 ++++++++++ .../modules/lettering/lettering-process.vue | 238 ++++++++++++++++ .../modules/lettering/lettering-task-list.vue | 255 ++++++++++++++++++ src/router/index.js | 15 ++ 6 files changed, 679 insertions(+), 5 deletions(-) create mode 100644 src/pages/modules/lettering/lettering-machine-select.vue create mode 100644 src/pages/modules/lettering/lettering-process.vue create mode 100644 src/pages/modules/lettering/lettering-task-list.vue diff --git a/src/config/http.js b/src/config/http.js index 7ac5793..2f069ef 100644 --- a/src/config/http.js +++ b/src/config/http.js @@ -3,7 +3,7 @@ import { Dialog } from './utils.js' import store from '../vuex/store' import router from '@/router' -axios.defaults.timeout = 5000 +axios.defaults.timeout = 50000 axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8' axios.interceptors.request.use( diff --git a/src/pages/modules/lettering/index.vue b/src/pages/modules/lettering/index.vue index 1658979..9322270 100644 --- a/src/pages/modules/lettering/index.vue +++ b/src/pages/modules/lettering/index.vue @@ -7,7 +7,10 @@
@@ -30,7 +33,7 @@ export default { }, data () { return { - menus: [ + menus1: [ { label: '刻字上料', router: '/letteringload' @@ -40,15 +43,29 @@ export default { router: '/letteringclimb' }, { - label: '临时人工刻字上料', + label: '临时人工上料', router: '/temporaryletteringload' } + ], + menus2: [ + { + label: '刻字工序', + router: '/letteringprocess' + }, + { + label: '刻字机选择', + router: '/letteringmachineselect' + }, + { + label: '任务列表', + router: '/letteringtasklist' + } ] } }, computed: { title () { - let res = ['刻字上料', '刻字爬坡', '临时人工刻字上料'][Number(this.$route.meta.guidePath) - 1] + let res = ['刻字上料', '刻字爬坡', '临时人工上料', '刻字工序', '刻字机选择', '任务列表'][Number(this.$route.meta.guidePath) - 1] return res }, ...mapGetters(['keepAlive']) diff --git a/src/pages/modules/lettering/lettering-machine-select.vue b/src/pages/modules/lettering/lettering-machine-select.vue new file mode 100644 index 0000000..17758d6 --- /dev/null +++ b/src/pages/modules/lettering/lettering-machine-select.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/src/pages/modules/lettering/lettering-process.vue b/src/pages/modules/lettering/lettering-process.vue new file mode 100644 index 0000000..037b87e --- /dev/null +++ b/src/pages/modules/lettering/lettering-process.vue @@ -0,0 +1,238 @@ + + + + + diff --git a/src/pages/modules/lettering/lettering-task-list.vue b/src/pages/modules/lettering/lettering-task-list.vue new file mode 100644 index 0000000..9486d95 --- /dev/null +++ b/src/pages/modules/lettering/lettering-task-list.vue @@ -0,0 +1,255 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 5186e8d..8dac9d9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -28,6 +28,9 @@ const letteringIndex = r => require.ensure([], () => r(require('@page/modules/le const letteringLoad = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-load')), 'lettering') const letteringClimb = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-climb')), 'lettering') const TemporaryLetteringLoad = r => require.ensure([], () => r(require('@page/modules/lettering/temporary-lettering-load')), 'lettering') +const letteringProcess = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-process')), 'lettering') +const letteringMachineSelect = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-machine-select')), 'lettering') +const letteringTaskList = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-task-list')), 'lettering') const cleanIndex = r => require.ensure([], () => r(require('@page/modules/clean/index')), 'clean') const cleaningLoading = r => require.ensure([], () => r(require('@page/modules/clean/cleaning-loading')), 'clean') @@ -154,6 +157,18 @@ export default new Router({ path: '/temporaryletteringload', component: TemporaryLetteringLoad, meta: {guidePath: '3'} + }, { + path: '/letteringprocess', + component: letteringProcess, + meta: {guidePath: '4'} + }, { + path: '/letteringmachineselect', + component: letteringMachineSelect, + meta: {guidePath: '5'} + }, { + path: '/letteringtasklist', + component: letteringTaskList, + meta: {guidePath: '6'} } ] },