Commit 7b0f5b1d authored by xd's avatar xd

Merge branch 'master' of http://114.67.93.201/xulili/ybf

parents 17c80965 7b4cdea9
......@@ -132,7 +132,7 @@
<el-dialog
title="创建任务"
:visible.sync="cache.status.createDialog"
width="50%"
width="40%"
:before-close="dialogCreateBeforeClose"
>
<div class="dialogMain">
......
......@@ -106,12 +106,11 @@
:total="400"
></el-pagination>
</div>
<div class="ztask-dialogs">
<el-dialog
title="创建集团任务"
:visible.sync="cache.status.createDialog"
width="60%"
width="40%"
:before-close="dialogCreateBeforeClose"
>
<div class="dialogMain">
......@@ -487,7 +486,6 @@
flex-direction: row;
justify-content: space-between;
}
.ztask-searchs-items {
/*border: 2px solid #00c561;*/
......@@ -499,7 +497,6 @@
justify-content: flex-start;
align-items: center;
}
.ztask-searchs-forms {
/*border: 2px solid #f900ff;*/
height: 30px;
......@@ -522,7 +519,6 @@
justify-content: flex-end;
align-items: flex-end;
}
.ztask-page {
/*border: 2px solid red;*/
position: relative;
......@@ -532,7 +528,6 @@
.buttonTextNormal {
color: #666666;
}
.buttonTextWarning {
color: #D0021B;
}
......
This diff is collapsed.
......@@ -43,7 +43,7 @@ export default {
.mains {
/*border: 1px solid red;*/
height: calc((100vh - 140px) * 1.0);
min-width: 1000px;
min-width: 1280px;
margin: 10px 20px 10px 10px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment