Merge branch 'release-sy-v1.0.0' into 'dev'

feat: 修改菜单页面显示

See merge request project/water/shuili-vue!88

src/views/system/menu/index.vue

@@ -46,16 +46,24 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
-      <el-table-column prop="icon" label="图标" align="center" width="100">
+      <!-- <el-table-column prop="icon" label="图标" align="center" width="100">
         <template slot-scope="scope">
           <svg-icon :icon-class="scope.row.icon" />
         </template>
+      </el-table-column> -->
+      <el-table-column prop="menuType" label="类型" align="center" width="100">
+        <template slot-scope="scope">
+          <span v-if="scope.row.menuType === 'M'">目录</span>
+          <span v-else-if="scope.row.menuType === 'C'">菜单</span>
+          <span v-else-if="scope.row.menuType === 'F'">按钮</span>
+        </template>
       </el-table-column>
       <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
+      <el-table-column prop="id" label="主键" width="60"></el-table-column>
       <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="status" label="状态" :formatter="statusFormat" width="80"></el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
+      <!-- <el-table-column label="创建时间" align="center" prop="createTime"> -->
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>