diff --git a/src/pages/Login.vue b/src/pages/Login.vue index 63cfb0d..9277ea9 100644 --- a/src/pages/Login.vue +++ b/src/pages/Login.vue @@ -152,7 +152,7 @@ export default { let res = await handLogin(this.loginname, encrypt(this.password)) this.$store.dispatch('saveUserInfo', JSON.stringify(res.user.user)) this.$store.dispatch('saveToken', res.token) - this.$router.push('/home') + this.$router.push('/workorderassignment') this.disabled = false } catch (e) { this.disabled = false diff --git a/src/pages/assignment/workordermanage.vue b/src/pages/assignment/workordermanage.vue index 150309c..9f2e39c 100644 --- a/src/pages/assignment/workordermanage.vue +++ b/src/pages/assignment/workordermanage.vue @@ -5,7 +5,7 @@
工单日期
-
+
关键字
-
+
diff --git a/src/pages/homeset/Home.vue b/src/pages/homeset/Home.vue index 50fe3cf..76ea0a6 100644 --- a/src/pages/homeset/Home.vue +++ b/src/pages/homeset/Home.vue @@ -45,12 +45,12 @@ export default { data () { return { timer: null, - dataList: [] + dataList: [{device_code: '1', is_run: '1'}] } }, mounted () { - this.getList() - this.refresh() + // this.getList() + // this.refresh() }, methods: { refresh () { diff --git a/src/pages/modules/workorder/index.vue b/src/pages/modules/workorder/index.vue new file mode 100644 index 0000000..80ed21d --- /dev/null +++ b/src/pages/modules/workorder/index.vue @@ -0,0 +1,181 @@ + + + + + diff --git a/src/pages/modules/workorder/work-order-assignment.vue b/src/pages/modules/workorder/work-order-assignment.vue new file mode 100644 index 0000000..24c1b19 --- /dev/null +++ b/src/pages/modules/workorder/work-order-assignment.vue @@ -0,0 +1,114 @@ + + + + + diff --git a/src/pages/modules/workorder/work-order-query.vue b/src/pages/modules/workorder/work-order-query.vue new file mode 100644 index 0000000..73c3997 --- /dev/null +++ b/src/pages/modules/workorder/work-order-query.vue @@ -0,0 +1,140 @@ + + + + + diff --git a/src/pages/modules/workorder/work-report-query.vue b/src/pages/modules/workorder/work-report-query.vue new file mode 100644 index 0000000..19cd166 --- /dev/null +++ b/src/pages/modules/workorder/work-report-query.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index fa4e159..1323977 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,6 +2,11 @@ import Vue from 'vue' import Router from 'vue-router' const Login = r => require.ensure([], () => r(require('@page/Login')), 'Login') +const modulesIndex = r => require.ensure([], () => r(require('@page/modules/workorder/index')), 'modules') +const workOrderAssignment = r => require.ensure([], () => r(require('@page/modules/workorder/work-order-assignment')), 'modules') +const workReportQuery = r => require.ensure([], () => r(require('@page/modules/workorder/work-report-query')), 'modules') +const workOrderQuery = r => require.ensure([], () => r(require('@page/modules/workorder/work-order-query')), 'modules') + const Homeset = r => require.ensure([], () => r(require('@page/homeset/index')), 'Homeset') const Home = r => require.ensure([], () => r(require('@page/homeset/Home')), 'Home') const IfWork = r => require.ensure([], () => r(require('@page/homeset/IfWork')), 'IfWork') @@ -26,6 +31,20 @@ export default new Router({ path: '/login', component: Login }, + { + path: '/modulesindex', + component: modulesIndex, + children: [{ + path: '/workorderassignment', // 工单作业 + component: workOrderAssignment + }, { + path: '/workreportquery', // 报工查询 + component: workReportQuery + }, { + path: '/workorderquery', // 工单查询 + component: workOrderQuery + }] + }, { path: '/workordermanage', component: workordermanage diff --git a/src/style/iconfont.styl b/src/style/iconfont.styl index c7dd455..f70d305 100644 --- a/src/style/iconfont.styl +++ b/src/style/iconfont.styl @@ -10,4 +10,21 @@ .close_icon::before content '\e60f' .selected_icon::before - content '\e608' \ No newline at end of file + content '\e608' + +// new +[class*=" icon_"],[class^=icon_] + font-family: "iconfont" !important; + speak: none; + font-style: normal; + font-weight: 400; + font-variant: normal; + text-transform: none; + line-height: 1; + vertical-align: middle; + display: inline-block; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +.icon_dropdown + &::before + content: '\e626' diff --git a/src/style/layout.styl b/src/style/layout.styl index 4aafc83..b18fdd6 100644 --- a/src/style/layout.styl +++ b/src/style/layout.styl @@ -10,28 +10,55 @@ url('iconfont/iconfont.svg#iconfont') format('svg'); /**日历*/ -[class*=" el-icon-"], [class^=el-icon-] - color #c0c4cc -.el-date-range-picker__header div - color #606266 -.el-date-table td span - color #606266 -.el-date-editor .el-range__close-icon - line-height 24px -.el-date-range-picker - width 5.5rem -.el-date-table td span - width .2rem - height .2rem - line-height .2rem - font-size .14rem -.el-date-table td div - height .24rem -.el-date-table td - padding 0 - height .28rem -.el-date-range-picker__content - padding .06rem +// [class*=" el-icon-"], [class^=el-icon-] +// color #c0c4cc +// .el-date-range-picker__header div +// color #606266 +// .el-date-table td span +// color #606266 +// .el-date-editor .el-range__close-icon +// line-height 24px +// .el-date-range-picker +// width 5.5rem +// .el-date-table td span +// width .2rem +// height .2rem +// line-height .2rem +// font-size .14rem +// .el-date-table td div +// height .24rem +// .el-date-table td +// padding 0 +// height .28rem +// .el-date-range-picker__content +// padding .06rem +.el-input__inner + height 30px + line-height 30px +.el-range-editor.el-input__inner + padding 0 5px +.el-date-editor .el-range__icon + font-size 12px + line-height 30px +.el-date-editor .el-range-input + font-size 12px +.el-date-editor .el-range-separator + line-height 30px + font-size 12px +// 选择器 +.el-select + width 100% +.el-input + line-height 30px + font-size 12px +.el-input__icon + line-height 30px +.el-select-dropdown__item + line-height 30px + font-size 12px + height 30px + span + font-size 12px /**icon*/ .iconfont @@ -99,8 +126,8 @@ font-size: 14px; border-radius: 4px; .button--primary - background-color #67c23a - border-color #67c23a + background-color #008f8f + border-color #008f8f .button--defalut color #fff border 1px solid #c9c9c9 @@ -121,71 +148,82 @@ header color #fff /**nav*/ -.tabs - width 100% - height 34px - margin-bottom 10px - li - float left - line-height 32px - text-align center - a - display inline-block - color #fff - width 100% - font-size 14px - padding 0 20px - .router-link-active - border-bottom 1px solid #15347b - box-shadow 0 2px 0 rgba(228, 243, 244, 0.5) +// .tabs +// width 100% +// height 34px +// margin-bottom 10px +// li +// float left +// line-height 32px +// text-align center +// a +// display inline-block +// color #fff +// width 100% +// font-size 14px +// padding 0 20px +// .router-link-active +// border-bottom 1px solid #15347b +// box-shadow 0 2px 0 rgba(228, 243, 244, 0.5) /**content*/ -.wrap +.order-wraper width 100% - height calc(100% - 46px) - padding 15px + height 100% .wrap-filter-buttons + display flex + justify-content space-between + align-items center width 100% + height 30px margin-bottom 15px .wrap-filters display flex - justify-content space-between - width 100% - height 40px + justify-content flex-start + align-items center + width 60% + height 30px .wrap-buttons - width 100% + width 40% height 100% - margin 10px 0 text-align right .filter_item - width 49% + width calc(50% - 10px) display flex justify-content space-between + align-items center + +.filter_item + margin-left 10px .filter_label - _font(14px, 40px, #fff,,) - width 70px -.filter_input + _font(12px, 30px, #fff,,) + width 50px +.filter-input-wrap position relative - width calc(100% - 70px) - height 40px - line-height 40px + width calc(100% - 55px) + height 30px + line-height 30px + display flex + justify-content center + align-items center .filter-input - _wh(100%, 40px) - _font(14px, 34px, #606266,,) - padding 3px 10px + _wh(100%, 29px) + _font(12px, 30px, #606266,,) + padding 0 10px border-radius 4px + background-color #fff .grid_wraper - _wh(100%, calc(100% - 95px)) + _wh(100%, calc(100% - 45px)) overflow-y auto .filter-table width 100% text-align center + border 1px solid #8B90A6 th position: sticky; top -1px z-index 1 color #606266 - background-color #8B90A6 + border-left 1px solid #8B90A6 th,td line-height 18px font-size 12px