diff --git a/src/assets/scss/modules/management/edit-main.scss b/src/assets/scss/modules/management/edit-main.scss index f181050a6..1e11def0d 100644 --- a/src/assets/scss/modules/management/edit-main.scss +++ b/src/assets/scss/modules/management/edit-main.scss @@ -41,7 +41,7 @@ } -.div_btn { +.div_edit_btn { display: flex; margin-top: 20px; margin-right:16px; diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss index 747ec9b0b..c51798644 100644 --- a/src/assets/scss/modules/management/list-main.scss +++ b/src/assets/scss/modules/management/list-main.scss @@ -5,6 +5,7 @@ .marginl-20{ margin-left: 16px; } + .div_search { padding: 10px; @@ -13,6 +14,8 @@ box-shadow: 0px 6px 16px 0px rgba(0,0,0,0.08), 0px 3px 6px -4px rgba(0,0,0,0.12); margin:7px 7px; + overflow:hidden; + /deep/ .el-form-item{ margin-bottom:14px; } @@ -68,6 +71,18 @@ position: relative; padding:24px 16px 10px; + // /deep/ .el-table th>.cell{ + // margin-left:24px; + // } + + // /deep/ .el-table .cell, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell{ + // margin-left:24px; + // } + + /deep/ .el-table th, .el-table tr{ + height:54px; + } + .div_btn { display: flex; // margin-top: 10px; diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue index fbecaf644..655050a24 100644 --- a/src/views/components/resiChangeTransfer.vue +++ b/src/views/components/resiChangeTransfer.vue @@ -146,7 +146,7 @@ -
+
取 消
-
+
取 消
-
+
取 消
-
+
取 消
-
+
取 消
-
+
取 消 保 存
diff --git a/src/views/modules/workSys/dataOpenConfig.vue b/src/views/modules/workSys/dataOpenConfig.vue index 54bcfba5a..a5e979db5 100644 --- a/src/views/modules/workSys/dataOpenConfig.vue +++ b/src/views/modules/workSys/dataOpenConfig.vue @@ -1,66 +1,65 @@