Merge branch 'master' into demo1

src/layout/components/AppMain.vue

@@ -47,7 +47,7 @@ export default {
 // fix css style bug in open el-dialog
 .el-popup-parent--hidden {
   .fixed-header {
-    padding-right: 15px;
+    // padding-right: 15px;
   }
 }
 </style>

src/views/system/dict/data.vue

@@ -47,17 +47,6 @@
         >新增
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['sys:dict:update']"
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改
-        </el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['sys:dict:delete']"

src/views/system/dict/index.vue

@@ -61,7 +61,7 @@
             v-hasPermi="['sys:dict:add']"
             type="primary"
             icon="el-icon-plus"
-            size="small"
+            size="mini"
             @click="handleAdd"
           >新增</el-button>
         </el-col>
@@ -92,7 +92,7 @@
             v-hasPermi="['sys:dict:export']"
             type="success"
             icon="el-icon-download"
-            size="small"
+            size="mini"
             @click="handleExport"
           >导出</el-button>
         </el-col>