diff --git a/common/style/layout.css b/common/style/layout.css index 845b297..194dff1 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -373,24 +373,27 @@ uni-button:after { .grid_new { width: 100%; display: flex; - justify-content: space-between; + justify-content: flex-start; align-items: flex-start; } .grid_l { - -webkit-box-flex: 0; + /* -webkit-box-flex: 0; -ms-flex: 0 0 100rpx; - flex: 0 0 100rpx; + flex: 0 0 100rpx; */ + width: 200rpx; } .grid_r { - -webkit-box-flex: 1; + /* -webkit-box-flex: 1; -ms-flex: 1; - flex: 1; + flex: 1; */ + width: calc(100% - 200rpx); overflow-x: scroll; } .grid_l table, .grid_r table { border-collapse: separate; border-spacing: 0; border: 0; + width: 100%; } .grid_l table th, .grid_r table th { background: #d7d7d7; @@ -408,12 +411,13 @@ uni-button:after { .grid_l table td, .grid_r table td { font-size: 28rpx; line-height: 76rpx; + height: 108rpx; color: #323232; background: #fff; white-space: nowrap; text-overflow: ellipsis; white-space: nowrap; - padding: 11rpx 20rpx; + padding: 0 20rpx; border-bottom: 10rpx solid #f5f5f5; text-align: center; } \ No newline at end of file diff --git a/pages/device/RepairWork.vue b/pages/device/RepairWork.vue index fcceca9..dde3d72 100644 --- a/pages/device/RepairWork.vue +++ b/pages/device/RepairWork.vue @@ -70,6 +70,9 @@ disabled: false }; }, + onShow () { + this._deviceRepairGetAllQuery(this.val1) + }, methods: { handleChange (e) { this._deviceRepairGetAllQuery(e) diff --git a/pages/device/WorkManage.vue b/pages/device/WorkManage.vue index 366ca8d..2759578 100644 --- a/pages/device/WorkManage.vue +++ b/pages/device/WorkManage.vue @@ -77,9 +77,15 @@ disabled: false }; }, + created () { + this._deviceManageGetAllQuery(this.val1) + }, methods: { selectChange (e) { this.index = e + if (e) { + this._deviceManageGetAllQuery(this.val1) + } }, handleChange (e) { this._deviceManageGetAllQuery(e) diff --git a/pages/home/home.vue b/pages/home/home.vue index 966024b..7f65e67 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -4,7 +4,7 @@ {{userName}} - 欢迎进入海亮智能一线扩产LMS手持系统! + 欢迎进入海亮智能一线扩产LMS系统! diff --git a/pages/login/login.vue b/pages/login/login.vue index 3bd136b..c3a85ad 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,7 +1,7 @@