diff --git a/src/config/getData2.js b/src/config/getData2.js index 6a3f2aa..fa97d95 100644 --- a/src/config/getData2.js +++ b/src/config/getData2.js @@ -7,7 +7,7 @@ export const handLogin = (user, password) => post('mobile/auth/login', { }) // 1.首页-查询人员所属的设备信息 -export const getDevice = () => post('api/produceshiftorder/getDevice', { +export const getDevice = () => post('api/produceshiftorder/getDeviceList', { }) // 2.工单管理 diff --git a/src/pages/Login.vue b/src/pages/Login.vue index 2a50267..2aa3f8c 100644 --- a/src/pages/Login.vue +++ b/src/pages/Login.vue @@ -304,4 +304,6 @@ select border none padding 0 .1rem font-size .16rem +.el-select-dropdown__item span + color #606266 diff --git a/src/pages/homeset/Home.vue b/src/pages/homeset/Home.vue index c677630..f2be97e 100644 --- a/src/pages/homeset/Home.vue +++ b/src/pages/homeset/Home.vue @@ -123,6 +123,7 @@ export default { line-height .4rem margin-left .11rem float right + color #fff .list-box padding-bottom .2rem // height 4.6rem diff --git a/src/pages/homeset/index.vue b/src/pages/homeset/index.vue index e4a8fcc..bbd18a8 100644 --- a/src/pages/homeset/index.vue +++ b/src/pages/homeset/index.vue @@ -73,6 +73,7 @@ export default { line-height .6rem font-size .2rem background none + color #fff .dropdown-ul position absolute background #3157a3 @@ -86,6 +87,7 @@ export default { text-align center line-height .5rem font-size .15rem + color #fff border-bottom 1px solid #767a82 &:last-child border-bottom none @@ -98,10 +100,12 @@ export default { line-height .24rem margin-top .09rem text-align right + color #fff .date font-size .14rem line-height .2rem text-align right + color #fff .week font-size .14rem .drift diff --git a/src/style/layout.styl b/src/style/layout.styl index 99771b9..10f39c7 100644 --- a/src/style/layout.styl +++ b/src/style/layout.styl @@ -129,6 +129,7 @@ header .wrap-filter width 100% height .5rem + color #fff .filter-table width 100% border 1px solid #fff @@ -139,6 +140,7 @@ header font-size .13rem padding .05rem .01rem border 1px solid #fff + color #fff .input width 1.8rem height .3rem @@ -211,4 +213,6 @@ input::-webkit-input-placeholder display inline-block line-height .16rem color #606266 - font-size .13rem \ No newline at end of file + font-size .13rem +.el-date-editor--daterange.el-input__inner + width 260px \ No newline at end of file