zhengnaiwen_citu 7 mesi fa
parent
commit
adf782d9ee

+ 7 - 2
src/layout/index.vue

@@ -6,7 +6,11 @@
         <span :class="`mdi pr-5 mdi-menu-${collapse ? 'close' : 'open'}`" @click="handleChange"></span>
         <div class="layout-body-header-main py-5">
           <el-breadcrumb separator="/" separator-class="el-icon-arrow-right" class="layout-body-header-breadcrumb">
-            <el-breadcrumb-item v-for="(breadcrumb, index) in breadcrumbs" :key="index" :to="{ path: breadcrumb.path }">{{ breadcrumb.name }}</el-breadcrumb-item>
+            <el-breadcrumb-item
+              v-for="(breadcrumb, index) in breadcrumbs"
+              :key="index"
+              :to="breadcrumb.disable ? undefined : { path: breadcrumb.path }"
+            >{{ breadcrumb.name }} {{ breadcrumb.type }}</el-breadcrumb-item>
           </el-breadcrumb>
         </div>
         <div class="layout-body-header-right">
@@ -76,7 +80,8 @@ export default {
       return this.$route.matched.map(e => {
         return {
           path: e.path,
-          name: e.meta.title
+          name: e.meta.title,
+          disable: e.meta.type === 0
         }
       })
     }

+ 2 - 0
src/permission.js

@@ -103,6 +103,8 @@ function chooseFirst (item) {
 // 递归路由 转换为组件对象和路径
 function mapASyncRoutes (data) {
   return data.map(item => {
+    item.meta.title = item.label
+    item.meta.type = item.type
     item.component = item.component === 'Layout' ? Layout : loadView(item.component)
     if (item.children && item.children.length > 0) {
       item.children = mapASyncRoutes(item.children)

+ 4 - 4
src/views/systemManage/safety/index.vue

@@ -5,8 +5,8 @@
         <div class="box">
           <m-form ref="form" :items="formItems" v-model="formValue">
             <el-form-item>
-              <m-button type="primary" @click="handleSubmit">保存</m-button>
-              <m-button @click="handleReset">重置</m-button>
+              <m-button type="primary" @click="onSubmit">保存</m-button>
+              <m-button @click="onReset">重置</m-button>
             </el-form-item>
           </m-form>
         </div>
@@ -83,10 +83,10 @@ export default {
     }
   },
   methods: {
-    handleReset () {
+    onReset () {
       this.$refs.form.resetFields()
     },
-    async handleSubmit () {
+    async onSubmit () {
       this.$refs.form.validate(valid => {
         if (!valid) {
           return

+ 25 - 10
src/views/systemManage/user/index.vue

@@ -7,6 +7,24 @@
         </m-button>
       </template>
     </m-search>
+    <MTable
+      v-loading="loading"
+      :items="items"
+      :headers="headers"
+      :page-size="pageInfo.size"
+      :page-current="pageInfo.current"
+      :total="pageInfo.total"
+      @page-change="handlePageChange"
+    >
+      <template #createTime="scope">
+        {{ dateFormat(scope.row.createTime) }}
+      </template>
+      <template #actions="scope">
+        <m-button type="primary" text @click="onEdit(scope.row)">编辑</m-button>
+        <m-button type="warning" text @click="onMenu(scope.row)">重置密码</m-button>
+        <m-button type="danger" text @click="onDelete(scope.row)">删除</m-button>
+      </template>
+    </MTable>
   </div>
 </template>
 
@@ -20,16 +38,13 @@ export default {
   components: { },
   data () {
     return {
-      filter: {
-        list: [
-          {
-            type: 'textField',
-            key: 'searchKey',
-            value: null,
-            label: '用户名'
-          }
-        ]
-      },
+      searchItems: [
+        {
+          label: '用户名称',
+          prop: 'username',
+          type: 'input'
+        }
+      ],
       query: {
         name: null,
         username: null