From 76e8ed0c11f4732a4ef5d9110372ae7f57d0c38e Mon Sep 17 00:00:00 2001 From: "liulujia@meswork.com" Date: Mon, 10 Feb 2020 17:55:17 +0800 Subject: [PATCH] 20200210llj --- src/styles/element-ui.scss | 10 +- src/styles/index.scss | 21 +- .../EquipmentMonitoring/index.vue | 2 +- .../PurchaseTaskAllocate/index.vue | 227 ++++++++++-------- .../NewArrivalList/index.vue | 2 +- src/views/login/index.vue | 2 +- 6 files changed, 151 insertions(+), 113 deletions(-) diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index b6a6d57b..f5d9be3b 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -41,13 +41,19 @@ } //单击表格行变色 .el-table__body tr.current-row>td{ - background-color: rgb(216,229,245) !important; + background-color: #d8e5f6 !important; /* color: #f19944; */ /* 设置文字颜色，可以选择不设置 */ } //聚焦表格行变色 .hover-row td{ - background: RGB(236 245 255)!important; + //background: RGB(236 245 255)!important; + background: red!important; + } + .el-table--enable-row-hover .el-table__body tr:hover>td{ + background-color: #d8e5f6 !important; + } + //.el-table tbody tr:hover>td { background-color: RED } //表格行颜色9745 //.el-table td, .is-leaf{ // background-color: rgb(255, 255, 255); diff --git a/src/styles/index.scss b/src/styles/index.scss index 8187b825..396bd891 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -140,6 +140,13 @@ el-card{ .el-table{ margin: 3px 0px; } +.el-table td.gutter,.el-table th.gutter{ + width: 15px; + border-right-width: 0; + border-bottom-width: 0; + padding: 0; + background: white; +}s .block{ margin-bottom: 3px; } @@ -198,10 +205,16 @@ el-card{ } } //登录页login输入框上串所以屏蔽 -//.el-input__inner:focus { -// border: 1px solid #1b55a0!important; -// height: 29px; -//} +.el-input__inner:focus { + border: 1px solid #2A71CB!important; + //height: 29px; +} +.el-input__inner{ + border: 1px solid red +} +.el-textarea__inner, .el-radio__inner, .el-input__inner{ + border: 1px solid #676767 !important +} //.el-input--small .el-input__inner { // height: 29px; //} diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue index 383d006c..2973c522 100644 --- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue +++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue @@ -553,7 +553,7 @@
-
设备开机
电流计正常工作
工控机关机
+
设备开机
电流计正常工作
工控机关机
电脑关机
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue index ff1732ee..017c40fa 100644 --- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue +++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue @@ -1,11 +1,11 @@ - + - + - + - + - + @@ -1144,4 +1147,20 @@ export default { line-height: 46px; } } + /*.el-table td.gutter,.el-table th.gutter{*/ + /*width: 15px;*/ + /*border-right-width: 0;*/ + /*border-bottom-width: 0;*/ + /*padding: 0;*/ + /*background: red;*/ + /*}*/ + + diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue index 46cdd120..8d440fcb 100644 --- a/src/views/WorkshopProcurement/NewArrivalList/index.vue +++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue @@ -947,10 +947,10 @@ export default { }) }, searchTable5(row) { + console.log(row) this.excle_row = row console.log(this.userId, this.id) this.disable = row.是否关联 - console.log(this.disable) this.tableData6 = [] this.到货单流水号 = row.到货单流水号 this.ArrivalOrderNumber = row.到货单流水号 diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 2d85fa83..785e224f 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -235,7 +235,7 @@ export default { } input { background: transparent; - border: 0; + border: 1px; -webkit-appearance: none; border-radius: 0; padding: 12px 5px 12px 15px;