Merge branch 'master' of http://101.43.194.146:10101/root/supervision-ui

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -1665,7 +1665,7 @@ export default {
 /* 左侧树状盒子 */
 .app-container .box-lfet {
   width: 15%;
-  height: 740px;
+  min-height: 740px;
   /* background: #003156; */
   /* padding: 10px; */
   margin-right: 10px;

src/views/peopleManage/people/index.vue

@@ -2020,7 +2020,7 @@ export default {
   /* background-color: #003156 !important; */
 }
 ::v-deep .tree .el-tree {
-  height: 81vh;
+  min-height: 740px;
 }
 ::v-deep .el-tree-node__content {
   height: 32px;

src/views/workingArrangements/planTask/index.vue

@@ -1405,7 +1405,7 @@ export default {
   top: 5px;
 }
 /* 表格 */
-.tabless .el-table__row {
+ .tabless .el-table__row {
   background-color: #004d86;
 }
 .tabless table {
@@ -1414,11 +1414,11 @@ export default {
 .has-gutter {
   background-color: #004d86;
 }
-.el-table tr:nth-child(odd) {
-  background-color: #004d86;
+.el-dialog__body .el-table tr:nth-child(odd) {
+  background-color: #004d86 !important;
 }
-.el-table tr:nth-child(even) {
-  background-color: #004d86;
+.el-dialog__body .el-table tr:nth-child(even) {
+  background-color: #004d86 !important;
 }
 /* 下载按钮 */
 .downloadfile {

src/views/workingArrangements/workTask/index.vue

@@ -886,6 +886,7 @@ export default {
     },
     zidainType(item) {
       this.queryParams.type = item.dictValue;
+       this.getList();
       // console.log(item)
     },
     // 发布单位选中触发
@@ -896,6 +897,7 @@ export default {
       });
       this.queryParams.adminId = val.id;
       this.getZhuChi(this.queryParams.adminId);
+      this.getList()
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -1379,13 +1381,11 @@ export default {
 }
 .has-gutter {
   background-color: #004d86;
+} 
+.el-dialog__body .el-table tr:nth-child(odd) {
+  background-color: #004d86 !important;
 }
-.el-table tr:nth-child(odd) {
-  background-color: #004d86;
-}
-.el-table tr:nth-child(even) {
-  background-color: #004d86;
-}
+
 /* 下载按钮 */
 .downloadfile {
   border: 1px solid white;