Merge branch 'master' of http://218.59.175.43:3000/zhangzl/rongxin.dashboard

src/views/system/dept/index.vue

@@ -145,7 +145,7 @@
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-left" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 先清空当前系统中的行政区划
+            <el-checkbox v-model="upload.updateSupport" /> 先清空当前系统中的行政区划（慎重！！！）
           </div>
           <p style="color: red">1、仅允许导入xls、xlsx格式文件；</p>
           <p style="color: red">2、“导入级联代码”是行政单位上下级联关系的标识；</p>

src/views/system/dict/index.vue

@@ -110,8 +110,8 @@
     <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典编号" align="center" prop="dictId" />
-      <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
+      <el-table-column label="字典名称" align="left" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="字典类型" align="left" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
             <span>{{ scope.row.dictType }}</span>