统一样式调整

server/resource/template/web/form.vue.tpl

@@ -27,8 +27,8 @@
       </el-form-item>
     {{ end -}}
       <el-form-item>
-        <el-button type="primary" @click="save">保存</el-button>
-        <el-button type="primary" @click="back">返回</el-button>
+        <el-button size="mini" type="primary" @click="save">保存</el-button>
+        <el-button size="mini" type="primary" @click="back">返回</el-button>
       </el-form-item>
     </el-form>
 </div>

server/resource/template/web/table.vue.tpl

@@ -22,19 +22,15 @@
           <el-input placeholder="搜索条件" v-model="searchInfo.{{.FieldJson}}" />
         </el-form-item> {{ end }} {{ end }}  {{ end }}
         <el-form-item>
-          <el-button type="primary" @click="onSubmit">查询</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="openDialog">新增{{.Description}}</el-button>
-        </el-form-item>
-        <el-form-item>
+          <el-button size="mini" type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          <el-button size="mini" type="primary" icon="el-icon-plus" @click="openDialog">新增</el-button>
           <el-popover v-model="deleteVisible" placement="top" width="160">
             <p>确定要删除吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="deleteVisible = false">取消</el-button>
               <el-button size="mini" type="primary" @click="onDelete">确定</el-button>
             </div>
-            <el-button slot="reference" icon="el-icon-delete" size="mini" type="danger">批量删除</el-button>
+            <el-button slot="reference" icon="el-icon-delete" size="mini" type="danger" style="margin-left: 10px;">批量删除</el-button>
           </el-popover>
         </el-form-item>
       </el-form>

web/src/style/element_visiable.scss

@@ -1,6 +1,12 @@
 /* 改变主题色变量 */
 $--color-primary: #1890ff;
 
+#app{
+  .el-button{
+    font-weight: 400;
+    border-radius: 4px;
+  }
+}
 ///* 改变 icon 字体路径变量，必需 */
 //$--font-path: '~element-ui/lib/theme-chalk/fonts';
 //

web/src/style/main.scss

@@ -1212,7 +1212,7 @@ $mainHight: 100vh;
         line-height: $height-header;
         text-align: center;
         vertical-align: middle;
-        margin-right: 40px;
+        margin-right: 10px;
 
         img {
             vertical-align: middle;
@@ -1232,7 +1232,7 @@ $mainHight: 100vh;
             line-height: $height-header;
             display: inline-block;
             background-color: #fff;
-            padding: 0 24px;
+            padding: 0;
         }
 
         .fl-right {

web/src/style/mobile.scss

@@ -10,12 +10,12 @@
                     padding: 0 $padding-xs;
                 }
             }
-        } 
+        }
         .layout-cont{
             .right-box{
                 margin-right: $margin-xs;
             }
-        } 
+        }
         .search-component{
             width: 30px;
         }
@@ -44,7 +44,7 @@
                 }
             }
         }
-       
+
         .card .car-left,
         .card .car-right{
             width: 100%;
@@ -70,7 +70,7 @@
                 margin-bottom: 10px;
                 padding: 0;
             }
-        } 
+        }
         .el-dialog{
             width: 90%;
         }
@@ -83,7 +83,7 @@
                 padding: 0 5px;
                 display: inline-block;
             }
-           
+
         }
-       
-}
+
+}

web/src/view/example/breakpoint/breakpoint.vue

@@ -7,7 +7,7 @@
         <input v-show="false" id="file" ref="Input" multiple="multiple" type="file" @change="choseFile">
       </div>
     </form>
-    <el-button :disabled="limitFileSize" type="primary" size="medium" class="uploadBtn" @click="getFile">上传文件</el-button>
+    <el-button :disabled="limitFileSize" type="primary" size="mini" class="uploadBtn" @click="getFile">上传文件</el-button>
     <div class="el-upload__tip">请上传不超过5MB的文件</div>
     <div class="list">
       <transition name="list" tag="p">
@@ -186,7 +186,8 @@ a {
   display: inline-block;
 }
 .fileUpload{
-    padding: 4px 10px;
+    padding: 3px 10px;
+    font-size: 12px;
     height: 20px;
     line-height: 20px;
     position: relative;

web/src/view/example/excel/excel.vue

@@ -1,23 +1,18 @@
 <template>
   <div class="upload">
-    <el-row>
-      <el-col :span="2">
-        <el-upload
-          :action="`${path}/excel/importExcel`"
-          :headers="{'x-token':token}"
-          :on-success="loadExcel"
-          :show-file-list="false"
-        >
-          <el-button size="small" type="primary" icon="el-icon-upload2">导入</el-button>
-        </el-upload>
-      </el-col>
-      <el-col :span="2">
-        <el-button size="small" type="primary" icon="el-icon-download" @click="handleExcelExport('ExcelExport.xlsx')">导出</el-button>
-      </el-col>
-      <el-col :span="2">
-        <el-button size="small" type="success" icon="el-icon-download" @click="downloadExcelTemplate()">下载模板</el-button>
-      </el-col>
-    </el-row>
+    <div class="btn-list">
+      <el-upload
+        class="excel-btn"
+        :action="`${path}/excel/importExcel`"
+        :headers="{'x-token':token}"
+        :on-success="loadExcel"
+        :show-file-list="false"
+      >
+        <el-button size="small" type="primary" icon="el-icon-upload2">导入</el-button>
+      </el-upload>
+      <el-button class="excel-btn" size="small" type="primary" icon="el-icon-download" @click="handleExcelExport('ExcelExport.xlsx')">导出</el-button>
+      <el-button class="excel-btn" size="small" type="success" icon="el-icon-download" @click="downloadExcelTemplate()">下载模板</el-button>
+    </div>
     <el-table :data="tableData" border row-key="ID" stripe>
       <el-table-column label="ID" min-width="100" prop="ID" />
       <el-table-column label="路由Name" min-width="160" prop="name" />
@@ -73,3 +68,13 @@ export default {
   }
 }
 </script>
+
+<style lang="scss" scoped>
+.btn-list{
+  display: flex;
+  margin-bottom: 12px;
+  .excel-btn+.excel-btn{
+    margin-left: 12px;
+  }
+}
+</style>

web/src/view/layout/aside/index.vue

@@ -89,6 +89,16 @@ export default {
     color: inherit !important;
   }
 }
+
+.el-submenu__title:hover,.el-menu-item:hover{
+  i{
+    color: inherit !important;
+  }
+  span{
+    color: inherit !important;
+  }
+}
+
 .el-scrollbar {
   .el-scrollbar__view {
     height: 100%;

web/src/view/superAdmin/api/api.vue

@@ -22,19 +22,15 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="onSubmit">查询</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="openDialog('addApi')">新增api</el-button>
-        </el-form-item>
-        <el-form-item>
+          <el-button size="mini" type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          <el-button size="mini" type="primary" icon="el-icon-plus" @click="openDialog('addApi')">新增</el-button>
           <el-popover v-model="deleteVisible" placement="top" width="160">
             <p>确定要删除吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="deleteVisible = false">取消</el-button>
               <el-button size="mini" type="primary" @click="onDelete">确定</el-button>
             </div>
-            <el-button slot="reference" icon="el-icon-delete" size="mini" type="danger">批量删除</el-button>
+            <el-button slot="reference" icon="el-icon-delete" size="mini" type="danger" style="margin-left: 10px;">批量删除</el-button>
           </el-popover>
         </el-form-item>
       </el-form>

web/src/view/superAdmin/authority/authority.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="authority">
     <div class="button-box clearflex">
-      <el-button type="primary" @click="addAuthority('0')">新增角色</el-button>
+      <el-button size="mini" type="primary" icon="el-icon-plus" @click="addAuthority('0')">新增角色</el-button>
     </div>
     <el-table
       :data="tableData"
@@ -15,28 +15,28 @@
       <el-table-column label="角色名称" min-width="180" prop="authorityName" />
       <el-table-column fixed="right" label="操作" width="460">
         <template slot-scope="scope">
-          <el-button size="small" type="primary" @click="opdendrawer(scope.row)">设置权限</el-button>
+          <el-button size="mini" type="primary" @click="opdendrawer(scope.row)">设置权限</el-button>
           <el-button
             icon="el-icon-plus"
-            size="small"
+            size="mini"
             type="primary"
             @click="addAuthority(scope.row.authorityId)"
           >新增子角色</el-button>
           <el-button
             icon="el-icon-copy-document"
-            size="small"
+            size="mini"
             type="primary"
             @click="copyAuthority(scope.row)"
           >拷贝</el-button>
           <el-button
             icon="el-icon-edit"
-            size="small"
+            size="mini"
             type="primary"
             @click="editAuthority(scope.row)"
           >编辑</el-button>
           <el-button
             icon="el-icon-delete"
-            size="small"
+            size="mini"
             type="danger"
             @click="deleteAuth(scope.row)"
           >删除</el-button>

web/src/view/superAdmin/dictionary/sysDictionary.vue

@@ -18,10 +18,8 @@
           <el-input v-model="searchInfo.desc" placeholder="搜索条件" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="onSubmit">查询</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="openDialog">新增字典</el-button>
+          <el-button size="mini" type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          <el-button size="mini" type="primary" icon="el-icon-plus" @click="openDialog">新增</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -50,8 +48,8 @@
 
       <el-table-column label="按钮组">
         <template slot-scope="scope">
-          <el-button size="small" type="success" @click="toDetile(scope.row)">详情</el-button>
-          <el-button size="small" type="primary" @click="updateSysDictionary(scope.row)">变更</el-button>
+          <el-button size="mini" type="success" @click="toDetile(scope.row)">详情</el-button>
+          <el-button size="mini" type="primary" @click="updateSysDictionary(scope.row)">变更</el-button>
           <el-popover v-model="scope.row.visible" placement="top" width="160">
             <p>确定要删除吗？</p>
             <div style="text-align: right; margin: 0">

web/src/view/superAdmin/menu/menu.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="button-box clearflex">
-      <el-button type="primary" @click="addMenu('0')">新增根菜单</el-button>
+      <el-button size="mini" type="primary" icon="el-icon-plus" @click="addMenu('0')">新增根菜单</el-button>
     </div>
 
     <!-- 由于此处菜单跟左侧列表一一对应所以不需要分页 pageSize默认999 -->
@@ -31,19 +31,19 @@
       <el-table-column fixed="right" label="操作" width="300">
         <template slot-scope="scope">
           <el-button
-            size="small"
+            size="mini"
             type="primary"
             icon="el-icon-edit"
             @click="addMenu(scope.row.ID)"
           >添加子菜单</el-button>
           <el-button
-            size="small"
+            size="mini"
             type="primary"
             icon="el-icon-edit"
             @click="editMenu(scope.row.ID)"
           >编辑</el-button>
           <el-button
-            size="small"
+            size="mini"
             type="danger"
             icon="el-icon-delete"
             @click="deleteMenu(scope.row.ID)"

web/src/view/superAdmin/operation/sysOperationRecord.vue

@@ -12,16 +12,14 @@
           <el-input v-model="searchInfo.status" placeholder="搜索条件" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="onSubmit">查询</el-button>
-        </el-form-item>
-        <el-form-item>
+          <el-button size="mini" type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
           <el-popover v-model="deleteVisible" placement="top" width="160">
             <p>确定要删除吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="deleteVisible = false">取消</el-button>
               <el-button size="mini" type="primary" @click="onDelete">确定</el-button>
             </div>
-            <el-button slot="reference" icon="el-icon-delete" size="mini" type="danger">批量删除</el-button>
+            <el-button slot="reference" icon="el-icon-delete" size="mini" type="danger" style="margin-left: 10px;">批量删除</el-button>
           </el-popover>
         </el-form-item>
       </el-form>

web/src/view/superAdmin/user/user.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="button-box clearflex">
-      <el-button type="primary" @click="addUser">新增用户</el-button>
+      <el-button size="mini" type="primary" icon="el-icon-plus" @click="addUser">新增用户</el-button>
     </div>
     <el-table :data="tableData" border stripe>
       <el-table-column label="头像" min-width="50">
@@ -34,7 +34,7 @@
               <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
               <el-button type="primary" size="mini" @click="deleteUser(scope.row)">确定</el-button>
             </div>
-            <el-button slot="reference" type="danger" icon="el-icon-delete" size="small">删除</el-button>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini">删除</el-button>
           </el-popover>
         </template>
       </el-table-column>

web/src/view/systemTools/autoCode/component/fieldDialog.vue

@@ -13,7 +13,7 @@
           <el-input v-model="dialogMiddle.fieldName" autocomplete="off" />
         </el-col>
         <el-col :offset="1" :span="2">
-          <el-button @click="autoFill">自动填充</el-button>
+          <el-button size="mini" @click="autoFill">自动填充</el-button>
         </el-col>
       </el-form-item>
       <el-form-item label="Field中文名" prop="fieldDesc">

web/src/view/systemTools/autoCode/index.vue

@@ -36,7 +36,7 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="getColumn">使用此表创建</el-button>
+            <el-button size="mini" type="primary" @click="getColumn">使用此表创建</el-button>
           </el-form-item>
         </el-form>
       </el-collapse-item>
@@ -69,7 +69,7 @@
     </el-form>
     <!-- 组件列表 -->
     <div class="button-box clearflex">
-      <el-button type="primary" @click="editAndAddField()">新增Field</el-button>
+      <el-button size="mini" type="primary" @click="editAndAddField()">新增Field</el-button>
     </div>
     <el-table :data="form.fields" border stripe>
       <el-table-column type="index" label="序列" width="100" />
@@ -117,15 +117,15 @@
     <el-tag type="danger">id , created_at , updated_at , deleted_at 会自动生成请勿重复创建</el-tag>
     <!-- 组件列表 -->
     <div class="button-box clearflex">
-      <el-button type="primary" @click="enterForm(true)">预览代码</el-button>
-      <el-button type="primary" @click="enterForm(false)">生成代码</el-button>
+      <el-button size="mini" type="primary" @click="enterForm(true)">预览代码</el-button>
+      <el-button size="mini" type="primary" @click="enterForm(false)">生成代码</el-button>
     </div>
     <!-- 组件弹窗 -->
     <el-dialog title="组件内容" :visible.sync="dialogFlag">
       <FieldDialog v-if="dialogFlag" ref="fieldDialog" :dialog-middle="dialogMiddle" />
       <div slot="footer" class="dialog-footer">
-        <el-button @click="closeDialog">取 消</el-button>
-        <el-button type="primary" @click="enterDialog">确 定</el-button>
+        <el-button size="mini" @click="closeDialog">取 消</el-button>
+        <el-button size="mini" type="primary" @click="enterDialog">确 定</el-button>
       </div>
     </el-dialog>