guhongwei 4 years ago
parent
commit
b89f234a8b

+ 10 - 4
src/components/common/Home.vue

@@ -12,10 +12,14 @@
           <v-tags></v-tags>
           <div class="content">
             <transition name="move" mode="out-in">
-              <!-- <keep-alive :include="tagsList">
-                <router-view></router-view>
-              </keep-alive> -->
-              <router-view></router-view>
+              <el-row>
+                <el-col :span="24" class="main">
+                  <breadcrumb :breadcrumbTitle="this.$route.meta.title"></breadcrumb>
+                  <el-col :span="24" class="container">
+                    <router-view></router-view>
+                  </el-col>
+                </el-col>
+              </el-row>
             </transition>
             <el-backtop target=".content"></el-backtop>
           </div>
@@ -26,6 +30,7 @@
 </template>
 
 <script>
+import breadcrumb from '@c/common/breadcrumb.vue';
 import vHead from './Header.vue';
 import vSidebar from './Sidebar.vue';
 import vTags from './Tags.vue';
@@ -41,6 +46,7 @@ export default {
     vHead,
     vSidebar,
     vTags,
+    breadcrumb,
   },
   created() {
     bus.$on('collapse-content', msg => {

+ 2 - 2
src/components/common/Sidebar.vue

@@ -53,8 +53,8 @@ export default {
         },
         {
           icon: 'el-icon-s-home',
-          index: 'test',
-          title: '测试菜单',
+          index: 'gly',
+          title: '管理员管理',
         },
       ],
     };

+ 3 - 3
src/router/index.js

@@ -21,9 +21,9 @@ export default new Router({
           meta: { title: '系统首页' },
         },
         {
-          path: '/test',
-          component: () => import('../views/test/index.vue'),
-          meta: { title: '测试菜单' },
+          path: '/gly',
+          component: () => import('../views/gly/index.vue'),
+          meta: { title: '管理员管理' },
         },
       ],
     },

+ 3 - 3
src/views/test/detail.vue

@@ -1,8 +1,8 @@
 <template>
-  <div id="detail">
+  <div id="index">
     <el-row>
       <el-col :span="24">
-        <p>detail</p>
+        <p>index</p>
       </el-col>
     </el-row>
   </div>
@@ -14,7 +14,7 @@ export default {
   metaInfo() {
     return { title: this.$route.meta.title };
   },
-  name: 'detail',
+  name: 'index',
   props: {},
   components: {},
   data: function() {

+ 6 - 10
src/views/homeIndex.vue

@@ -1,27 +1,22 @@
 <template>
-  <div id="Dashboard">
+  <div id="homeIndex">
     <el-row>
-      <el-col :span="24" class="main">
-        <breadcrumb :breadcrumbTitle="this.$route.meta.title"></breadcrumb>
-        <el-col :span="24" class="container"> </el-col>
+      <el-col :span="24">
+        <p>homeIndex</p>
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-import breadcrumb from '@c/common/breadcrumb.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
-import bus from '@/components/common/bus';
 export default {
   metaInfo() {
     return { title: this.$route.meta.title };
   },
-  name: 'Dashboard',
+  name: 'homeIndex',
   props: {},
-  components: {
-    breadcrumb,
-  },
+  components: {},
   data: function() {
     return {};
   },
@@ -30,6 +25,7 @@ export default {
   computed: {
     ...mapState(['user']),
   },
+  watch: {},
 };
 </script>
 

+ 0 - 130
src/views/test/index.vue

@@ -1,130 +0,0 @@
-<template>
-  <div id="index">
-    <el-row>
-      <el-col :span="24" class="main">
-        <breadcrumb :breadcrumbTitle="this.$route.meta.title"></breadcrumb>
-        <el-col :span="24" class="container info">
-          <el-col :span="24" class="top">
-            <el-button type="primary" size="mini" @click="dialog = true">添加</el-button>
-          </el-col>
-          <el-col :span="24" class="list">
-            <data-table :fields="fields" :opera="opera" :data="list" :total="total" @edit="toEdit" @delete="toDelete" @query="search"></data-table>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-    <el-dialog :visible.sync="dialog" title="增加菜单" @close="toClose" :destroy-on-close="true" width="50%">
-      <data-form :data="form" :fields="formFields" :rules="rules" @save="turnSave">
-        <template #custom="{item}">
-          <template v-if="item.model == 'icon'">
-            <el-radio-group v-model="form.icon">
-              <el-radio v-for="(item, index) in iconlist" :key="index" :label="item.iconkey"><i :class="item.iconkey"></i></el-radio>
-            </el-radio-group>
-          </template>
-        </template>
-      </data-form>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { iconmenu } from '@/util/iconmenu';
-import breadcrumb from '@c/common/breadcrumb.vue';
-import dataTable from '@common/src/components/frame/filter-page-table.vue';
-import dataForm from '@common/src/components/frame/form.vue';
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: place } = createNamespacedHelpers('place');
-export default {
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-  name: 'index',
-  props: {},
-  components: {
-    breadcrumb,
-    dataTable,
-    dataForm,
-  },
-  data: function() {
-    return {
-      opera: [
-        {
-          label: '修改',
-          icon: 'el-icon-edit',
-          method: 'edit',
-        },
-        {
-          label: '删除',
-          icon: 'el-icon-delete',
-          method: 'delete',
-        },
-      ],
-      fields: [
-        { label: '菜单名称', prop: 'title' },
-        { label: '菜单地址', prop: 'index' },
-        { label: '菜单图标', prop: 'icon' },
-      ],
-      list: [],
-      total: 0,
-      // 增加菜单
-      dialog: false,
-      formFields: [
-        { label: '菜单名称', required: true, model: 'title' },
-        { label: '菜单地址', required: true, model: 'index' },
-        { label: '菜单图标', required: true, model: 'icon', custom: true },
-      ],
-      form: {},
-      rules: {
-        title: [{ required: true, message: '请输入菜单名称', trigger: 'blur' }],
-        index: [{ required: true, message: '请输入菜单地址', trigger: 'blur' }],
-        icon: [{ required: true, message: '请输入菜单图标', trigger: 'blur' }],
-      },
-      // 图标
-      iconlist: iconmenu,
-    };
-  },
-  created() {
-    this.search();
-  },
-  methods: {
-    ...place({ palcequery: 'query', palcefetch: 'fetch' }),
-    // 查询列表
-    async search({ skip = 0, limit = 10, ...info } = {}) {
-      let res = await this.palcequery({ level: 1 });
-      console.log(res.data);
-    },
-    // 修改
-    toEdit({ data }) {
-      console.log(data);
-    },
-    // 删除
-    toDelete({ data }) {
-      console.log(data);
-    },
-    // 增加菜单
-    // 保存
-    turnSave({ data }) {
-      console.log(data);
-    },
-    // 取消增加
-    toClose() {
-      this.form = {};
-      this.dialog = false;
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.main {
-  .info {
-    .top {
-      text-align: right;
-      margin: 15px 0;
-    }
-  }
-}
-</style>