Merge branch 'dev-liveSix-20200817' of...

Merge branch 'dev-liveSix-20200817' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-liveSix-20200817

src/views/system/role.vue

@@ -3,28 +3,24 @@
     <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
     <div class="component-content screenSet" id="screenSet">
       <div class="header-title">查询条件</div>
-      <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;">
+      <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;" align='middle' justify='space-around'>
         <el-form ref="formInline" :model="formInline" label-width="75px" style="width:100%;">
           <el-col :span="6">
             <el-form-item label="项目名称：">
               <el-input v-model="formInline.projectName" size="small" placeholder="请输入项目名称"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col style="width: 600px">
             <el-form-item label="项目时间：">
-              <el-date-picker
+               <el-date-picker
                 v-model="formInline.projectBegintime"
                 size="small"
                 type="datetime"
                 placeholder="请选择开始时间"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 :picker-options="pickerOptions0"
-              ></el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label="~">
-              <el-date-picker
+              ></el-date-picker> ~
+             <el-date-picker
                 v-model="formInline.projectEndtime"
                 size="small"
                 type="datetime"
@@ -35,7 +31,7 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8" style="padding:0;text-align:right;padding-right:15px;">
+          <el-col :span="5" style="padding:0;text-align:right;padding-right:15px; float: right">
             <el-button type="primary" size="small" @click="searchList">查询</el-button>
             <el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
           </el-col>