diff --git a/src/config/getData1.js b/src/config/getData1.js
index 46541f5..499dda2 100644
--- a/src/config/getData1.js
+++ b/src/config/getData1.js
@@ -32,10 +32,8 @@ export const authority = () => {
path: 'RF04',
name: '刻字管理',
sonTree: [
- {menu_id: '1', name: '人工倒料', path: '/manpouring'},
- {menu_id: '2', name: '刻字工序', path: '/letteringprocess'},
- {menu_id: '3', name: '刻字上料', path: '/letteringload'},
- {menu_id: '4', name: '临时人工刻字上料', path: '/temporaryletteringload'}
+ {menu_id: '1', name: '刻字工序', path: '/letteringprocess'},
+ {menu_id: '2', name: '人工刻字上料', path: '/letteringload'}
]
},
{menu_id: '5',
@@ -50,7 +48,7 @@ export const authority = () => {
path: 'RF06',
name: '专机管理',
sonTree: [
- // {menu_id: '1', name: '专机管理', path: '/operation'}
+ {menu_id: '1', name: '人工倒料', path: '/manpouring'}
]
},
{menu_id: '7',
diff --git a/src/pages/404.vue b/src/pages/404.vue
index 72e35c8..55cc1e1 100644
--- a/src/pages/404.vue
+++ b/src/pages/404.vue
@@ -31,8 +31,10 @@ export default {
text-align center
.error-icon
font-size 1rem
+ color #fff
.error
line-height .3rem
+ color #fff
.error-button
padding 0 .2rem
line-height .3rem
@@ -41,4 +43,5 @@ export default {
background none
margin-top .2rem
border-radius 5px
+ color #fff
diff --git a/src/pages/modules/lettering/index.vue b/src/pages/modules/lettering/index.vue
index 3bd65a1..1658979 100644
--- a/src/pages/modules/lettering/index.vue
+++ b/src/pages/modules/lettering/index.vue
@@ -5,11 +5,18 @@
@switchColor="switchColor"
/>
@@ -22,11 +29,26 @@ export default {
jxHeader
},
data () {
- return {}
+ return {
+ menus: [
+ {
+ label: '刻字上料',
+ router: '/letteringload'
+ },
+ {
+ label: '刻字爬坡',
+ router: '/letteringclimb'
+ },
+ {
+ label: '临时人工刻字上料',
+ router: '/temporaryletteringload'
+ }
+ ]
+ }
},
computed: {
title () {
- let res = ['人工倒料', '刻字工序', '刻字上料', '临时人工刻字上料'][Number(this.$route.meta.guidePath) - 1]
+ let res = ['刻字上料', '刻字爬坡', '临时人工刻字上料'][Number(this.$route.meta.guidePath) - 1]
return res
},
...mapGetters(['keepAlive'])
@@ -58,6 +80,26 @@ export default {
margin 0 auto 10px
padding 5px
border 1px solid #484cce
+.tabs_wrap
+ height 34px
+.tabs
+ height 34px
+ li
+ float left
+ line-height 32px
+ text-align center
+ padding-right 10px
+ a
+ display inline-block
+ color #fff
+ width 100%
+ padding 0 10px
+ font-size 14px
+ border-bottom 1px solid #2aa6f9
+ .router-link-active
+ background linear-gradient(#0de0ff 0%,#2aa6f9 100%)
+ border-top-left-radius 12px
+ border-top-right-radius 12px
.main-container
- _wh(100%, 100%)
+ _wh(100%, calc(100% - 34px))
diff --git a/src/pages/modules/lettering/lettering-process.vue b/src/pages/modules/lettering/lettering-climb.vue
similarity index 80%
rename from src/pages/modules/lettering/lettering-process.vue
rename to src/pages/modules/lettering/lettering-climb.vue
index b519a70..2e60892 100644
--- a/src/pages/modules/lettering/lettering-process.vue
+++ b/src/pages/modules/lettering/lettering-climb.vue
@@ -35,8 +35,8 @@
-
-
+
+
@@ -44,7 +44,7 @@
+
+
diff --git a/src/pages/modules/lettering/man-pouring.vue b/src/pages/modules/special/man-pouring.vue
similarity index 100%
rename from src/pages/modules/lettering/man-pouring.vue
rename to src/pages/modules/special/man-pouring.vue
diff --git a/src/router/index.js b/src/router/index.js
index 43fc958..5186e8d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,6 +6,7 @@ const workorderIndex = r => require.ensure([], () => r(require('@page/modules/wo
const workOrderAssignment = r => require.ensure([], () => r(require('@page/modules/workorder/work-order-assignment')), 'workorder')
const workReportQuery = r => require.ensure([], () => r(require('@page/modules/workorder/work-report-query')), 'workorder')
const workOrderQuery = r => require.ensure([], () => r(require('@page/modules/workorder/work-order-query')), 'workorder')
+
const finishedIndex = r => require.ensure([], () => r(require('@page/modules/finished/index')), 'finished')
const finishedInstore = r => require.ensure([], () => r(require('@page/modules/finished/finished-instore')), 'finished')
const selectFinishedMater = r => require.ensure([], () => r(require('@page/modules/finished/select-finished-mater')), 'finished')
@@ -22,17 +23,21 @@ const semiFinishedComposeSearch = r => require.ensure([], () => r(require('@page
const semiFinishedInmaterSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-in-mater-search')), 'semifinished')
const semiFinishedOutMaterSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-out-mater-search')), 'semifinished')
const structMaterSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/struct-mater-search')), 'semifinished')
+
const letteringIndex = r => require.ensure([], () => r(require('@page/modules/lettering/index')), 'lettering')
-const manPouring = r => require.ensure([], () => r(require('@page/modules/lettering/man-pouring')), 'lettering')
-const letteringProcess = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-process')), 'lettering')
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 cleanIndex = r => require.ensure([], () => r(require('@page/modules/clean/index')), 'clean')
const cleaningLoading = r => require.ensure([], () => r(require('@page/modules/clean/cleaning-loading')), 'clean')
const cleaningCutting = r => require.ensure([], () => r(require('@page/modules/clean/cleaning-cutting')), 'clean')
const manPour = r => require.ensure([], () => r(require('@page/modules/clean/man-pour')), 'clean')
const selectMater = r => require.ensure([], () => r(require('@page/modules/clean/select-mater')), 'clean')
+const specialIndex = r => require.ensure([], () => r(require('@page/modules/special/index')), 'special')
+const manPouring = r => require.ensure([], () => r(require('@page/modules/special/man-pouring')), 'special')
+
const Homeset = r => require.ensure([], () => r(require('@page/homeset/index')), 'Homeset')
const Home = r => require.ensure([], () => r(require('@page/homeset/HomePage')), 'HomePage')
const IfWork = r => require.ensure([], () => r(require('@page/homeset/IfWork')), 'IfWork')
@@ -138,21 +143,17 @@ export default new Router({
component: letteringIndex,
children: [
{
- path: '/manpouring',
- component: manPouring,
- meta: {guidePath: '1'}
- }, {
- path: '/letteringprocess',
- component: letteringProcess,
- meta: {guidePath: '2'}
- }, {
path: '/letteringload',
component: letteringLoad,
- meta: {guidePath: '3'}
+ meta: {guidePath: '1'}
+ }, {
+ path: '/letteringclimb',
+ component: letteringClimb,
+ meta: {guidePath: '2'}
}, {
path: '/temporaryletteringload',
component: TemporaryLetteringLoad,
- meta: {guidePath: '4'}
+ meta: {guidePath: '3'}
}
]
},
@@ -177,6 +178,15 @@ export default new Router({
meta: {guidePath: '4'}
}]
},
+ {
+ path: '/specialindex',
+ component: specialIndex,
+ children: [{
+ path: '/manpouring',
+ component: manPouring,
+ meta: {guidePath: '1'}
+ }]
+ },
{
path: '/workordermanage',
component: workordermanage