chao 3 роки тому
батько
коміт
54005fad63
3 змінених файлів з 10 додано та 26 видалено
  1. 1 1
      src/api/menu.js
  2. 7 1
      src/views/sys/menus/form.vue
  3. 2 24
      src/views/sys/menus/list.vue

+ 1 - 1
src/api/menu.js

@@ -25,7 +25,7 @@ export function updateMenu(id, data) {
 
 export function createMenu(data) {
   return request({
-    url: '/sys/menu/create/',
+    url: '/sys/menu/create',
     method: 'post',
     data: data
   })

+ 7 - 1
src/views/sys/menus/form.vue

@@ -15,7 +15,10 @@
         </el-form-item>
         <el-form-item label="前端图标:" prop="icon">
           <el-input v-model="menu.icon" style="width: 80%" />
-          <svg-icon style="margin-left: 8px" :icon-class="menu.icon" />
+          <template>
+            <i v-if="isElementIcon(menu.icon)" :class="menu.icon" />
+            <svg-icon v-else-if="menu.icon" :icon-class="menu.icon" />
+          </template>
         </el-form-item>
         <el-form-item label="状态:">
           <el-radio-group v-model="menu.status">
@@ -65,6 +68,9 @@ export default {
     this.getFormData()
   },
   methods: {
+    isElementIcon(value) {
+      return value && value.substr(0, 7) === 'el-icon'
+    },
     resetParentId() {
       if (this.$route.query.parentId != null) {
         this.menu.parentId = this.$route.query.parentId

+ 2 - 24
src/views/sys/menus/list.vue

@@ -2,9 +2,6 @@
   <div class="app-container">
     <el-page-header v-if="parentTitle" :content="parentTitle + ' 下的子菜单'" @back="goBack" />
     <div class="filter-container">
-      <el-select v-model="listQuery.level" style="width: 140px" class="filter-item" @change="handleFilter">
-        <el-option v-for="item in levelOptions" :key="item.key" :label="item.label" :value="item.key" />
-      </el-select>
       <el-select v-model="listQuery.status" style="width: 140px" class="filter-item" @change="handleFilter">
         <el-option v-for="item in statusOptions" :key="item.key" :label="item.label" :value="item.key" />
       </el-select>
@@ -19,9 +16,6 @@
       <el-table-column label="菜单名称" align="center">
         <template slot-scope="{row}">{{ row.title }}</template>
       </el-table-column>
-      <el-table-column label="菜单级数" width="100" align="center">
-        <template slot-scope="{row}">{{ row.level | levelFilter }}</template>
-      </el-table-column>
       <el-table-column label="路由名称" align="center">
         <template slot-scope="{row}">{{ row.name }}</template>
       </el-table-column>
@@ -62,15 +56,6 @@ export default {
   name: 'MenuList',
   components: { Pagination },
   filters: {
-    levelFilter(value) {
-      if (value === 0) {
-        return '一级'
-      } else if (value === 1) {
-        return '二级'
-      } else if (value === 2) {
-        return '三级'
-      }
-    },
     statusFilter(value) {
       if (value === 0) {
         return '启用'
@@ -107,15 +92,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         parentId: '',
-        level: '',
         status: ''
       },
-      levelOptions: [
-        { label: '菜单级数', key: '' },
-        { label: '一级菜单', key: '0' },
-        { label: '二级菜单', key: '1' },
-        { label: '三级菜单', key: '2' }
-      ],
       statusOptions: [
         { label: '状态', key: '' },
         { label: '启用', key: '0' },
@@ -167,10 +145,10 @@ export default {
       this.$router.push({ path: '/sys/menus/list' })
     },
     handleShowNextLevel(row) {
-      this.$router.push({ path: '/sys/menus/list', query: { parentId: row.id, title: row.title }})
+      this.$router.push({ path: '/sys/menus/list', query: { parentId: row.id, title: row.title } })
     },
     handleUpdate(row) {
-      this.$router.push({ path: '/sys/menus/form', query: { id: row.id }})
+      this.$router.push({ path: '/sys/menus/form', query: { id: row.id } })
     },
     handleCreate() {
       this.$router.push({ path: '/sys/menus/form' })