Browse Source

搜索和功能按钮

GuoYuFu123 5 years ago
parent
commit
3651727e7d

+ 1 - 1
src/components/ledger/handsontables/assets.vue

@@ -15,7 +15,7 @@
         <el-button size="small" style="width: 80px;" @click="reset" icon="iconfont icon-shuaxin">刷新</el-button>
         <el-button size="small" style="width: 80px;" @click="undo" icon="iconfont icon-undo">撤销</el-button>
       </div>
-      <div style="width:200px;color:gray;float:right;font-size:10px;">
+      <div style="width:200px;color:gray;float:right;font-size:12px;">
         <span v-if="!onlyRead">隐藏自动填充的信息点:</span>
         <el-tooltip v-if="!onlyRead" :content="'' + (isWatch ? '隐藏' : '不隐藏')" placement="top">
           <el-switch

+ 1 - 1
src/components/ledger/handsontables/device.vue

@@ -14,7 +14,7 @@
         <el-button size="small" style='width: 80px;' @click="reset" icon="iconfont icon-shuaxin">刷新</el-button>
         <el-button size="small" style='width: 80px;' @click="undo" icon="iconfont icon-undo">撤销</el-button>
       </div>
-      <div style="width:200px;color:gray;float:right;font-size:10px;">
+      <div style="width:200px;color:gray;float:right;font-size:12px;">
         <span v-if="!onlyRead">隐藏自动填充的信息点:</span>
         <el-tooltip v-if="!onlyRead" :content="'' + (isWatch ? '隐藏' : '不隐藏')" placement="top">
           <el-switch

+ 1 - 1
src/components/ledger/handsontables/system.vue

@@ -28,7 +28,7 @@
         </el-tooltip>
       </div>
       <div
-        style="width:90px;cursor: pointer;color:gray;float:right; font-size:10px;"
+        style="width:90px;cursor: pointer;color:gray;float:right; font-size:12px;"
       >
         <p v-if="onlyRead" @click="changeRead">
           <i class="iconfont icon-yulan"></i>

+ 10 - 5
src/views/data_admin/buildLog/index.vue

@@ -23,12 +23,15 @@
                     @change='dateChange'
                     value-format='yyyy-MM-dd'
                 ></el-date-picker>
-                <el-button style="width: 96px" @click='action'>动作说明</el-button>
-                <el-button style="width: 96px" @click='refresh'>刷新</el-button>
-                <el-button style="width: 96px" @click='downExcel'>导出到Excel</el-button>
+                
             </div>
-            <el-table
-                slot='table'
+            <div slot='table' style="border: 1px solid #dfe6ec">
+                <p style="text-align: right; padding: 10px">
+                    <el-button style="width: 96px" @click='action'>动作说明</el-button>
+                    <el-button style="width: 96px" @click='refresh'>刷新</el-button>
+                    <el-button style="width: 96px" @click='downExcel'>导出到Excel</el-button>
+                </p>
+                <el-table                
                 :data='tableData'
                 border
                 tooltip-effect='dark'
@@ -48,6 +51,8 @@
                     </template>
                 </el-table-column>
             </el-table>
+            </div>
+            
             <base-pagination :currentPages='pageNum' :total='total' @pageChanged='pageChanged' slot='pagination'></base-pagination>
         </table-page-template>
         <saga-action ref='action'></saga-action>

+ 22 - 12
src/views/data_admin/buildUser/index.vue

@@ -2,20 +2,28 @@
     <div style='display: flex; flex-direction: column;flex-grow: 1; flex-shrink: 1;'>
         <table-page-template>
             <div slot='form' class='condition'>
-                <el-input
-                    v-model.trim='searchValue'
-                    class='margin-right'
-                    style='width: 300px; margin-right: 10px;'
-                    placeholder='姓名、联系电话、登录名、备注'
-                    @change='searchChange'
-                ></el-input>
+                <p>
+                    <el-input
+                        v-model.trim='searchValue'
+                        class='margin-right'
+                        style='width: 300px; margin-right: 10px;'
+                        placeholder='姓名、联系电话、登录名、备注'
+                        @change='searchChange'
+                    ></el-input>
+                </p>
+                
                 <!-- <el-button @click='refresh' style="margin-left: 10px;">&nbsp;&nbsp;&nbsp;刷新&nbsp;&nbsp;&nbsp;</el-button> -->
-                <el-button  @click='addUser'>添加</el-button>                
+                        
                 <!-- <el-button type='danger' @click='someDel'>批量删除</el-button> -->
             </div>
-            <el-table
+              
+                <div slot='table' style="border: 1px solid #dfe6ec">
+                    <p style="overflow: hidden;">
+                        <el-button style="margin: 10px;float: right;"  @click='addUser'>添加</el-button>         
+                    </p> 
+                    <el-table
                 height="600"
-                slot='table'
+                
                 :data='tableData'
                 border
                 tooltip-effect='dark'
@@ -34,6 +42,8 @@
                     </template>
                 </el-table-column>
             </el-table>
+                </div>
+            
             <base-pagination :currentPages='pageNum' :total='total' @pageChanged='pageChanged' slot='pagination'></base-pagination>
         </table-page-template>
         <saga-edit ref='edit' @refresh='refresh'></saga-edit>
@@ -161,7 +171,7 @@ export default {
 <style scoped lang='less'>
 .condition {
     margin: 10px;
-    display: flex;
-    justify-content: space-between;
+    // display: flex;
+    // justify-content: space-between;
 }
 </style>