From 3e47cfe0936430a9f87c1bd1e510194c1370ac98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=B4=87=E6=A0=8B?= <786631302qq.com>
Date: Tue, 18 Aug 2020 11:06:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/the-header.vue       |   2 +-
 src/views/application/api/app-api.js       |  27 -
 src/views/application/index.vue            |  15 -
 src/views/application/router/app-router.js |  19 -
 src/views/application/web/list.vue         | 213 --------
 src/views/application/web/web/detail.vue   | 192 --------
 src/views/application/web/web/index.vue    |  17 -
 src/views/center.vue                       |  12 +
 src/views/center/api/center-api.js         |   7 -
 src/views/center/index.vue                 |  15 -
 src/views/center/router/center-router.js   |  18 -
 src/views/center/web/editPwd.vue           | 128 -----
 src/views/center/web/list.vue              | 242 ---------
 src/views/guide.vue                        |  12 +
 src/views/history/api/history-api.js       |   0
 src/views/history/index.vue                |  10 +
 src/views/realTime/api/realTime-api.js     |   1 +
 src/views/realTime/index.vue               |  10 +
 src/views/role/api/role-api.js             |  67 ---
 src/views/role/index.vue                   |  15 -
 src/views/role/router/role-router.js       |  19 -
 src/views/role/web/list.vue                | 271 ----------
 src/views/role/web/web/detail.vue          | 543 ---------------------
 src/views/role/web/web/index.vue           |  17 -
 src/views/user/api/user-api.js             |  47 --
 src/views/user/index.vue                   |  16 -
 src/views/user/router/user-router.js       |  27 -
 src/views/user/web/list.vue                | 353 --------------
 src/views/user/web/web/detail.vue          | 371 --------------
 src/views/user/web/web/editPwd.vue         | 131 -----
 src/views/user/web/web/index.vue           |  16 -
 31 files changed, 46 insertions(+), 2787 deletions(-)
 delete mode 100644 src/views/application/api/app-api.js
 delete mode 100644 src/views/application/index.vue
 delete mode 100644 src/views/application/router/app-router.js
 delete mode 100644 src/views/application/web/list.vue
 delete mode 100644 src/views/application/web/web/detail.vue
 delete mode 100644 src/views/application/web/web/index.vue
 create mode 100644 src/views/center.vue
 delete mode 100644 src/views/center/api/center-api.js
 delete mode 100644 src/views/center/index.vue
 delete mode 100644 src/views/center/router/center-router.js
 delete mode 100644 src/views/center/web/editPwd.vue
 delete mode 100644 src/views/center/web/list.vue
 create mode 100644 src/views/guide.vue
 create mode 100644 src/views/history/api/history-api.js
 create mode 100644 src/views/history/index.vue
 create mode 100644 src/views/realTime/api/realTime-api.js
 create mode 100644 src/views/realTime/index.vue
 delete mode 100644 src/views/role/api/role-api.js
 delete mode 100644 src/views/role/index.vue
 delete mode 100644 src/views/role/router/role-router.js
 delete mode 100644 src/views/role/web/list.vue
 delete mode 100644 src/views/role/web/web/detail.vue
 delete mode 100644 src/views/role/web/web/index.vue
 delete mode 100644 src/views/user/api/user-api.js
 delete mode 100644 src/views/user/index.vue
 delete mode 100644 src/views/user/router/user-router.js
 delete mode 100644 src/views/user/web/list.vue
 delete mode 100644 src/views/user/web/web/detail.vue
 delete mode 100644 src/views/user/web/web/editPwd.vue
 delete mode 100644 src/views/user/web/web/index.vue

diff --git a/src/components/common/the-header.vue b/src/components/common/the-header.vue
index 8abace6..9f8c3ec 100644
--- a/src/components/common/the-header.vue
+++ b/src/components/common/the-header.vue
@@ -13,7 +13,7 @@
                         <a
                             class="block mb16"
                             href="javascript:;"
-                            @click="visible = false;$router.push({name: 'centerIndex'})"
+                            @click="visible = false;$router.push({name: 'center'})"
                         >个人中心</a>
                         <a href="javascript:;" @click="logout">退出登录</a>
                     </div>
diff --git a/src/views/application/api/app-api.js b/src/views/application/api/app-api.js
deleted file mode 100644
index ae96ab8..0000000
--- a/src/views/application/api/app-api.js
+++ /dev/null
@@ -1,27 +0,0 @@
-export default {
-    appList: {
-        url: '/app/list',
-        name: '查询应用集合',
-        method: 'POST'
-    },
-    addApp: {
-        url: '/app/save',
-        name: '添加应用',
-        method: 'POST'
-    },
-    removeApp: {
-        url: '/app/del/{id}',
-        name: '删除应用',
-        method: 'DELETE'
-    },
-    getApp: {
-        url: '/app/{id}',
-        name: '应用详情',
-        method: 'GET'
-    },
-    editApp: {
-        url: '/app/modify',
-        name: '修改应用',
-        method: 'PUT'
-    }
-}
diff --git a/src/views/application/index.vue b/src/views/application/index.vue
deleted file mode 100644
index bef2399..0000000
--- a/src/views/application/index.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
-    <list v-if="$route.name === 'appIndex'"></list>
-    <router-view v-else></router-view>
-</template>
-
-<script>
-import list from "./web/list";
-export default {
-    name: "appIndex",
-    components: { list }
-};
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/views/application/router/app-router.js b/src/views/application/router/app-router.js
deleted file mode 100644
index 85182a9..0000000
--- a/src/views/application/router/app-router.js
+++ /dev/null
@@ -1,19 +0,0 @@
-export default [{
-    path: 'app',
-    name: 'appIndex',
-    meta: {
-        name: '应用管理',
-        icon: 'appstore',
-        unfold: false,
-        sort: 3
-    },
-    component: () => import('@/views/application/index'),
-    children: [{
-        path: 'detail',
-        name: 'appDetailIndex',
-        meta: {
-            name: '应用详情',
-        },
-        component: () => import('@/views/application/web/web/index'),
-    }]
-}]
diff --git a/src/views/application/web/list.vue b/src/views/application/web/list.vue
deleted file mode 100644
index b0862a4..0000000
--- a/src/views/application/web/list.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<template>
-    <content-view>
-        <div class="roleList">
-            <reset-search ref="form" :form.sync="searchObj">
-                <table class="table-form">
-                    <tr>
-                        <td width="78">应用名称：</td>
-                        <td>
-                            <a-input placeholder="请输入应用名称" v-model="searchObj.name"></a-input>
-                        </td>
-
-                        <td width="70">应用KEY：</td>
-                        <td>
-                            <a-input placeholder="请输入应用KEY" v-model="searchObj.key"></a-input>
-                        </td>
-
-                        <td>
-                            <a-button type="primary" class="mr8" @click="query">查询</a-button>
-                            <a-button @click="reset">重置</a-button>
-                        </td>
-                    </tr>
-                </table>
-            </reset-search>
-
-            <p class="mt24 mb16">
-                <a-button type="primary" @click="add" :disabled="addAuth">
-                    <a-icon type="plus"></a-icon>
-                    <span>新增</span>
-                </a-button>
-            </p>
-
-            <!-- modal -->
-            <a-modal
-                v-model="visible"
-                title="新增应用"
-                @ok="modalOk"
-                @cancel="modalCancel"
-                cancelText="取消"
-                okText="确定"
-            >
-                <a-form :form="formModal" :label-col="{ span: 7 }" :wrapper-col="{ span: 12 }">
-                    <a-form-item label="应用名">
-                        <a-input
-                            autocomplete="off"
-                            placeholder="请输入应用名"
-                            v-decorator="['name', { rules: [{ required: true, min:2, max: 10, message: '请输入2-10位应用名称' }] }]"
-                        ></a-input>
-                    </a-form-item>
-                </a-form>
-            </a-modal>
-
-            <!-- table -->
-            <a-table :columns="columns" :dataSource="dataSource">
-                <template slot="action" slot-scope="text, record">
-                    <a
-                        :disabled="detailAuth"
-                        href="javascript:;"
-                        class="mr8"
-                        @click="$router.push({name: 'appDetailIndex', query: {id: record.id}})"
-                    >查看详情</a>
-                    <a-popconfirm
-                        title="确认是否删除该应用"
-                        ok-text="确定"
-                        cancel-text="取消"
-                        @confirm="deleteConfirm(record)"
-                        @cancel="deleteCancel(record)"
-                    >
-                        <a-icon slot="icon" type="close-circle" style="color: red" />
-                        <a href="#" :disabled="removeAuth">删除</a>
-                    </a-popconfirm>
-                </template>
-            </a-table>
-        </div>
-    </content-view>
-</template>
-
-<script>
-export default {
-    name: "appList",
-    data() {
-        return {
-            searchObj: {
-                name: "",
-                key: ""
-            },
-            // add
-            visible: false,
-            formModal: this.$form.createForm(this),
-            // table
-            columns: [
-                {
-                    title: "序号",
-                    customRender: (text, record, index) => {
-                        return index + 1;
-                    }
-                },
-                {
-                    title: "应用名",
-                    dataIndex: "name"
-                },
-                {
-                    title: "应用KEY",
-                    dataIndex: "key"
-                },
-                {
-                    title: "应用secret",
-                    dataIndex: "secret"
-                },
-                {
-                    title: "操作",
-                    dataIndex: "action",
-                    scopedSlots: {
-                        customRender: "action"
-                    }
-                }
-            ],
-            dataSource: []
-        };
-    },
-    computed: {
-        addAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "addApp"
-            )
-                ? false
-                : true;
-        },
-        detailAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "appDetailIndex"
-            )
-                ? false
-                : true;
-        },
-        removeAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "removeApp"
-            )
-                ? false
-                : true;
-        }
-    },
-    methods: {
-        query() {
-            this.getList();
-        },
-        reset() {
-            this.searchObj = this.$utils.cleanData(this.searchObj);
-            this.query();
-        },
-        // 应用列表
-        getList() {
-            this.$api.appApi
-                .appList({
-                    data: {
-                        ...this.searchObj
-                    }
-                })
-                .then(res => {
-                    this.dataSource = res.data;
-                });
-        },
-        // 新增
-        add() {
-            this.visible = true;
-        },
-        modalOk() {
-            this.formModal.validateFields((err, values) => {
-                console.log(err, values);
-                if (!err) {
-                    this.$api.appApi
-                        .addApp({
-                            data: values
-                        })
-                        .then(res => {
-                            console.log(res);
-                            this.$message.success("新增成功");
-                            this.query();
-                            this.modalCancel();
-                        });
-                }
-            });
-        },
-        modalCancel() {
-            this.formModal.resetFields();
-            this.visible = false;
-        },
-        // 是否删除
-        deleteConfirm(record) {
-            console.log(record);
-            this.$api.appApi
-                .removeApp({
-                    path: {
-                        id: record.id
-                    }
-                })
-                .then(res => {
-                    console.log(res);
-                    this.$message.success("操作成功");
-                    this.reset();
-                });
-        },
-        deleteCancel(record) {
-            console.log(record);
-        }
-    },
-    mounted() {
-        this.getList();
-    }
-};
-</script>
-
-<style lang="scss"></style>
diff --git a/src/views/application/web/web/detail.vue b/src/views/application/web/web/detail.vue
deleted file mode 100644
index 0d36d78..0000000
--- a/src/views/application/web/web/detail.vue
+++ /dev/null
@@ -1,192 +0,0 @@
-<template>
-    <content-view>
-        <div class="roleDetail">
-            <div class="roleDetail-box">
-                <div class="roleDetail-box-title mb16">基础信息</div>
-                <div class="roleDetail-box-con flex flex-space-between flex-align-center">
-                    <div class="roleDetail-box-con-item flex flex-start">
-                        <div
-                            class="roleDetail-box-con-item-block flex flex-start flex-align-center mr24"
-                        >
-                            <div class="roleDetail-box-con-item-block-label">应用名：</div>
-                            <div class="roleDetail-box-con-item-block-value">
-                                <span v-if="!isEdit">{{detail.name ? detail.name : '-'}}</span>
-                                <a-input v-else placeholder="请输入与角色名称" v-model="tempName"></a-input>
-                            </div>
-                        </div>
-                        <div
-                            class="roleDetail-box-con-item-block flex flex-start flex-align-center mr24"
-                        >
-                            <div class="roleDetail-box-con-item-block-label">应用KEY：</div>
-                            <div class="roleDetail-box-con-item-block-value flex">
-                                <span>{{detail.key ? detail.key : '-'}}</span>
-                            </div>
-                        </div>
-                        <div
-                            class="roleDetail-box-con-item-block flex flex-start flex-align-center"
-                        >
-                            <div class="roleDetail-box-con-item-block-label">应用secret：</div>
-                            <div class="roleDetail-box-con-item-block-value flex">
-                                <span>{{detail.secret ? detail.secret : '-'}}</span>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="roleDetail-box-con-item flex flex-start flex-align-center">
-                        <a-button
-                            type="primary"
-                            v-if="!isEdit"
-                            @click="tempName = detail.name; isEdit = !isEdit"
-                            :disabled="editAuth"
-                        >编辑</a-button>
-                        <template v-else>
-                            <a-button class="mr8" type="primary" @click="saveEdit">保存</a-button>
-                            <a-button @click="isEdit = false">取消</a-button>
-                        </template>
-                    </div>
-                </div>
-            </div>
-            <div class="roleDetail-box">
-                <div class="roleDetail-box-title flex flex-start flex-align-center mb8">
-                    <span>应用权限列表</span>
-                </div>
-                <div class="roleDetail-box-con">
-                    <a-tree
-                        :replace-fields="replaceFields"
-                        :auto-expand-parent="true"
-                        :tree-data="treeData"
-                        v-model="checkedKeys"
-                    />
-                </div>
-            </div>
-        </div>
-    </content-view>
-</template>
-
-<script>
-import mixins from "@/plugins/mixins";
-export default {
-    name: "appDetail",
-    mixins: [mixins],
-    data() {
-        return {
-            detail: {},
-            // 编辑信息
-            isEdit: false,
-            tempName: "",
-            // 权限列表
-            treeData: [],
-            replaceFields: {
-                children: "children",
-                title: "description",
-                key: "rights"
-            },
-            checkedKeys: []
-        };
-    },
-    computed: {
-        editAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "editApp"
-            )
-                ? false
-                : true;
-        }
-    },
-    methods: {
-        // 获取角色信息
-        getDetail() {
-            this.$api.appApi
-                .getApp({
-                    path: {
-                        id: this.$route.query.id
-                    }
-                })
-                .then(res => {
-                    this.detail = res.data;
-                    this.translateDataToTree(this.detail.permissions);
-                });
-        },
-        // 组合tree
-        translateDataToTree(data) {
-            let parents = data.filter(value => value.parentId === 0);
-            let children = data.filter(value => value.parentId !== 0);
-            let translator = (parents, children) => {
-                parents.forEach(parent => {
-                    children.forEach((current, index) => {
-                        if (current.parentId === parent.id) {
-                            // 深拷贝
-                            let temp = JSON.parse(JSON.stringify(children));
-                            // 减少递归时节点数
-                            temp.splice(index, 1);
-                            // 加入父节点的children
-                            parent.children && parent.children.length
-                                ? parent.children.push(current)
-                                : (parent.children = [current]);
-                            // 将匹配的子节点作为下一次的父节点开始滚雪球
-                            translator([current], temp);
-                        }
-                    });
-                });
-            };
-
-            translator(parents, children);
-            this.treeData = parents;
-        },
-        // 保存编辑
-        saveEdit() {
-            if (this.tempName.length < 2 || this.tempName.length > 10) {
-                this.$message.info("2-10位角色名称");
-                return;
-            }
-            this.$api.appApi
-                .editApp({
-                    data: {
-                        id: this.$route.query.id,
-                        name: this.tempName
-                    }
-                })
-                .then(res => {
-                    console.log(res);
-                    this.$set(this.detail, "name", this.tempName);
-                    this.isEdit = false;
-                    this.$message.success("操作成功");
-                });
-        }
-    },
-    mounted() {
-        this.getDetail();
-    }
-};
-</script>
-
-<style lang='scss'>
-.roleDetail {
-    .circle {
-        width: 8px;
-        height: 8px;
-        border-radius: 50%;
-        background-color: rgba(0, 168, 84, 1);
-        margin-right: 4px;
-    }
-    .red {
-        background-color: rgba(240, 65, 52, 1);
-    }
-    &-box {
-        border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-        padding-bottom: 24px;
-        margin-bottom: 24px;
-        &-title {
-            font-size: 16px;
-            font-family: PingFangSC, PingFangSC-Medium;
-            font-weight: 500;
-            text-align: left;
-            color: rgba(0, 0, 0, 0.85);
-        }
-    }
-    &-box:last-child {
-        border-bottom: none;
-        margin-bottom: 0;
-        padding-bottom: 0;
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/application/web/web/index.vue b/src/views/application/web/web/index.vue
deleted file mode 100644
index 22657e6..0000000
--- a/src/views/application/web/web/index.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-    <detail v-if="$route.name === 'appDetailIndex'"></detail>
-    <router-view v-else></router-view>
-</template>
-
-<script>
-import detail from "./detail";
-export default {
-    name: "appDetailIndex",
-    components: {
-        detail
-    }
-};
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/views/center.vue b/src/views/center.vue
new file mode 100644
index 0000000..a6e88f0
--- /dev/null
+++ b/src/views/center.vue
@@ -0,0 +1,12 @@
+<template>
+    <div class="center"></div>
+</template>
+
+<script>
+export default {
+    name: "center"
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/center/api/center-api.js b/src/views/center/api/center-api.js
deleted file mode 100644
index 21a8fd8..0000000
--- a/src/views/center/api/center-api.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export default {
-    editPwd: {
-        url: '/account/users/password',
-        name: '修改用户密码',
-        method: 'PUT'
-    }
-}
diff --git a/src/views/center/index.vue b/src/views/center/index.vue
deleted file mode 100644
index 7a6dfb5..0000000
--- a/src/views/center/index.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
-    <list v-if="$route.name === 'centerIndex'"></list>
-    <router-view v-else></router-view>
-</template>
-
-<script>
-import list from "./web/list.vue";
-export default {
-    name: "centerIndex",
-    components: { list }
-};
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/views/center/router/center-router.js b/src/views/center/router/center-router.js
deleted file mode 100644
index 7f198cd..0000000
--- a/src/views/center/router/center-router.js
+++ /dev/null
@@ -1,18 +0,0 @@
-export default [{
-    path: 'center',
-    name: 'centerIndex',
-    meta: {
-        name: '个人中心',
-        unfold: false,
-        sort: 99
-    },
-    component: () => import('@/views/center/index'),
-    children: [{
-        path: 'edit',
-        name: 'centerPwd',
-        meta: {
-            name: '修改密码',
-        },
-        component: () => import('@/views/center/web/editPwd'),
-    }]
-}]
diff --git a/src/views/center/web/editPwd.vue b/src/views/center/web/editPwd.vue
deleted file mode 100644
index 39ba09d..0000000
--- a/src/views/center/web/editPwd.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-    <content-view>
-        <div class="userPwd">
-            <div class="userPwd-pwd pb24">
-                <a-form :form="form" :label-col="{ span: 8 }" :wrapper-col="{ span: 7 }">
-                    <a-form-item label="原始密码">
-                        <a-input
-                            autocomplete="off"
-                            placeholder="请输入原始密码"
-                            v-decorator="['oldPwd', { rules: [{ required: true, pattern: /(?!^[0-9]+$)(?!^[A-z]+$)(?!^[^A-z0-9]+$)^.{6,16}$/, message: '6-16个字符，包含数字、字母或符号组成，至少两种' }] }]"
-                        ></a-input>
-                    </a-form-item>
-                    <a-form-item label="新密码">
-                        <a-input
-                            autocomplete="off"
-                            placeholder="请输入新密码"
-                            v-decorator="['password', { rules: [{ required: true, pattern: /(?!^[0-9]+$)(?!^[A-z]+$)(?!^[^A-z0-9]+$)^.{6,16}$/, message: '6-16个字符，包含数字、字母或符号组成，至少两种' }] }]"
-                        ></a-input>
-                    </a-form-item>
-                    <a-form-item label="确认密码">
-                        <a-input
-                            autocomplete="off"
-                            placeholder="请输入确认密码"
-                            v-decorator="['againPwd', { rules: [{ required: true, validator: validatorPwd }] }]"
-                        ></a-input>
-                    </a-form-item>
-                </a-form>
-                <a-row class="mt24">
-                    <a-col span="22" align="center">
-                        <a-button type="primary" class="mr8" @click="sure">确定</a-button>
-                        <a-button @click="cancel">取消</a-button>
-                    </a-col>
-                </a-row>
-            </div>
-        </div>
-    </content-view>
-</template>
-
-<script>
-export default {
-    name: "centerPwd",
-    data() {
-        return {
-            detail: {},
-            form: this.$form.createForm(this)
-        };
-    },
-    methods: {
-        sure() {
-            if (
-                !this.form.getFieldValue("oldPwd") ||
-                !this.form.getFieldValue("password") ||
-                !this.form.getFieldValue("againPwd")
-            ) {
-                this.$message.info("请输入密码");
-                return;
-            }
-            this.$api.centerApi
-                .editPwd({
-                    data: {
-                        oldPassword: this.form.getFieldValue("oldPwd"),
-                        newPassword: this.form.getFieldValue("password")
-                    }
-                })
-                .then(res => {
-                    console.log(res);
-                    this.$message.success("操作成功");
-                    this.cancel();
-                });
-        },
-        cancel() {
-            sessionStorage.removeItem("userDetail");
-            this.$router.go(-1);
-        },
-        validatorPwd(rule, value, callback) {
-            if (this.form.getFieldValue("password") === value) {
-                callback();
-            } else {
-                callback("两次密码输入不一致");
-            }
-        }
-    },
-    created() {
-        this.detail = sessionStorage.getItem("userDetail")
-            ? JSON.parse(sessionStorage.getItem("userDetail"))
-            : {};
-    }
-};
-</script>
-
-<style lang='scss'>
-.userPwd {
-    &-title {
-        font-size: 16px;
-        font-family: PingFangSC, PingFangSC-Medium;
-        font-weight: 500;
-        text-align: left;
-        color: rgba(0, 0, 0, 0.85);
-    }
-    &-current {
-        display: flex;
-        flex-direction: column;
-        padding-bottom: 27px;
-        border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-        margin-bottom: 30px;
-        &-desc {
-            width: 70%;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            .status {
-                display: flex;
-                align-items: center;
-                &-circle {
-                    width: 8px;
-                    height: 8px;
-                    border-radius: 50%;
-                    background-color: rgba(0, 168, 84, 1);
-                    margin-right: 4px;
-                }
-                &-red {
-                    background-color: rgba(240, 65, 52, 1);
-                }
-            }
-        }
-    }
-}
-</style>
diff --git a/src/views/center/web/list.vue b/src/views/center/web/list.vue
deleted file mode 100644
index 98ff7d9..0000000
--- a/src/views/center/web/list.vue
+++ /dev/null
@@ -1,242 +0,0 @@
- <template>
-    <content-view>
-        <div class="userDetail">
-            <!-- 1 -->
-            <div class="userDetail-current">
-                <p class="userDetail-title">基本信息</p>
-                <div class="userDetail-current-desc">
-                    <div class="userDetail-current-desc-left">
-                        <div class="flex flex-start mr16">
-                            <span style="display: inline-block;width: 46px;">姓名：</span>
-                            <a-input
-                                style="width: 50%;"
-                                v-if="isEdit"
-                                placeholder="请输入姓名"
-                                v-model="tempInfo.name"
-                            ></a-input>
-                            <span v-else>{{detail.name}}</span>
-                        </div>
-                        <div class="flex flex-start">
-                            <span style="display: inline-block;width: 60px;">手机号：</span>
-                            <a-input
-                                style="width: 50%;"
-                                v-if="isEdit"
-                                placeholder="请输入手机号"
-                                v-model="tempInfo.account"
-                            ></a-input>
-                            <span v-else>{{detail.account}}</span>
-                        </div>
-                    </div>
-                    <div class="userDetail-current-desc-right">
-                        <template v-if="isEdit">
-                            <a-button type="primary" class="mr8" @click="sureEdit">保存</a-button>
-                            <a-button @click="cancelEdit">取消</a-button>
-                        </template>
-                        <template v-else>
-                            <a-button type="primary" class="mr8" @click="showEdit">编辑</a-button>
-                            <a-button @click="go('centerPwd')">修改密码</a-button>
-                        </template>
-                    </div>
-                </div>
-            </div>
-            <!-- 2 -->
-            <div class="userDetail-list">
-                <div class="userDetail-list-top flex flex-start">
-                    <span class="userDetail-title">所属角色列表</span>
-                </div>
-                <a-table
-                    :columns="columns"
-                    :dataSource="detail.roles"
-                    :rowKey="record => record.id"
-                >
-                    <template slot="action" slot-scope="text, record">
-                        <a
-                            href="javascript:;"
-                            class="mr8"
-                            @click="go('roleDetailIndex', record)"
-                        >角色详情</a>
-                        <a-popconfirm
-                            class="mr8"
-                            title="确认是否退出该角色"
-                            ok-text="确定"
-                            cancel-text="取消"
-                            @confirm="quit(record)"
-                        >
-                            <a-icon slot="icon" type="close-circle" style="color: red" />
-                            <a href="javascript:;">退出</a>
-                        </a-popconfirm>
-                    </template>
-                </a-table>
-            </div>
-        </div>
-    </content-view>
-</template>
-
-<script>
-import { mapState, mapMutations } from "vuex";
-export default {
-    name: "centerList",
-    data() {
-        return {
-            detail: {},
-            // isEdit 是否编辑
-            isEdit: false,
-            // 临时储存用
-            tempInfo: {},
-            columns: [
-                {
-                    title: "序号",
-                    customRender: (text, record, index) => {
-                        return index + 1;
-                    }
-                },
-                {
-                    title: "角色",
-                    dataIndex: "roleName"
-                },
-                {
-                    title: "操作",
-                    dataIndex: "action",
-                    scopedSlots: {
-                        customRender: "action"
-                    }
-                }
-            ],
-            visible: false,
-            formModal: this.$form.createForm(this)
-        };
-    },
-    computed: {
-        ...mapState(["userInfo"])
-    },
-    methods: {
-        ...mapMutations(["setState"]),
-        // 跳转
-        go(name, record = null) {
-            if (name === "centerPwd") {
-                sessionStorage.setItem(
-                    "userDetail",
-                    JSON.stringify(this.detail)
-                );
-            }
-            let obj = {
-                name: name,
-                query: record ? { id: record.roleId } : null
-            };
-            this.$router.push(obj);
-        },
-        // 解绑角色
-        quit(record) {
-            console.log(record);
-            this.$api.userApi
-                .quitRole({
-                    path: {
-                        id: record.id
-                    }
-                })
-                .then(res => {
-                    console.log(res);
-                    this.detail.roles.map((item, index) => {
-                        if (item.id === record.id) {
-                            this.detail.roles.splice(index, 1);
-                            this.$message.success("操作成功");
-                        }
-                    });
-                });
-        },
-        // 编辑用户
-        showEdit() {
-            this.tempInfo = JSON.parse(JSON.stringify(this.detail));
-            this.isEdit = !this.isEdit;
-        },
-        sureEdit() {
-            this.$api.userApi
-                .editUser({
-                    data: {
-                        id: this.$route.query.id,
-                        account: this.tempInfo.account,
-                        name: this.tempInfo.name
-                    }
-                })
-                .then(res => {
-                    this.detail.name = res.data.name;
-                    this.detail.account = res.data.account;
-
-                    // 同步自身数据
-                    this.setState({ userInfo: this.detail });
-
-                    this.$message.success("操作成功");
-                    this.cancelEdit();
-                });
-        },
-        cancelEdit() {
-            this.isEdit = false;
-        },
-        // 获取用户详情
-        getDetail(id) {
-            this.$api.userApi.userDetail({ path: { id: id } }).then(res => {
-                this.detail = res.data;
-            });
-        }
-    },
-    mounted() {
-        this.getDetail(this.userInfo.id);
-    }
-};
-</script>
-
-<style lang='scss'>
-.userDetail {
-    &-title {
-        font-size: 16px;
-        font-family: PingFangSC, PingFangSC-Medium;
-        font-weight: 500;
-        text-align: left;
-        color: rgba(0, 0, 0, 0.85);
-    }
-    &-current {
-        display: flex;
-        flex-direction: column;
-        padding-bottom: 27px;
-        border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-        margin-bottom: 30px;
-        &-desc {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            &-left {
-                display: flex;
-                align-items: center;
-                flex: 1;
-                > div {
-                    width: 33%;
-                }
-                .status {
-                    display: flex;
-                    align-items: center;
-                    &-circle {
-                        width: 8px;
-                        height: 8px;
-                        border-radius: 50%;
-                        background-color: rgba(0, 168, 84, 1);
-                        margin-right: 4px;
-                    }
-                    &-red {
-                        background-color: rgba(240, 65, 52, 1);
-                    }
-                }
-            }
-            &-right {
-                width: 20%;
-                display: flex;
-                justify-content: flex-end;
-            }
-        }
-    }
-    &-list {
-        &-top {
-            margin-bottom: 8px;
-        }
-    }
-}
-</style>
diff --git a/src/views/guide.vue b/src/views/guide.vue
new file mode 100644
index 0000000..d4b0e57
--- /dev/null
+++ b/src/views/guide.vue
@@ -0,0 +1,12 @@
+<template>
+    <div class="guide"></div>
+</template>
+
+<script>
+export default {
+    name: "guide"
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/history/api/history-api.js b/src/views/history/api/history-api.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/history/index.vue b/src/views/history/index.vue
new file mode 100644
index 0000000..508fc13
--- /dev/null
+++ b/src/views/history/index.vue
@@ -0,0 +1,10 @@
+<template></template>
+
+<script>
+export default {
+    name: "history"
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/realTime/api/realTime-api.js b/src/views/realTime/api/realTime-api.js
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/views/realTime/api/realTime-api.js
@@ -0,0 +1 @@
+
diff --git a/src/views/realTime/index.vue b/src/views/realTime/index.vue
new file mode 100644
index 0000000..af356ac
--- /dev/null
+++ b/src/views/realTime/index.vue
@@ -0,0 +1,10 @@
+<template></template>
+
+<script>
+export default {
+    name: "realTime"
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/role/api/role-api.js b/src/views/role/api/role-api.js
deleted file mode 100644
index 8f2936a..0000000
--- a/src/views/role/api/role-api.js
+++ /dev/null
@@ -1,67 +0,0 @@
-export default {
-    roleAll: {
-        url: '/role/role/',
-        name: '角色列表不分页',
-        method: 'GET'
-    },
-    roleList: {
-        url: '/role/role/page',
-        name: '角色列表分页',
-        method: 'POST'
-    },
-    roleUserList: {
-        url: '/role/role/user',
-        name: '获取角色下所有用户列表',
-        method: 'POST'
-    },
-    roleAddUserList: {
-        url: '/role/role/user',
-        name: '获取角色下可新增用户列表',
-        method: 'GET'
-    },
-    addRole: {
-        url: '/role/role/save',
-        name: '新增角色',
-        method: 'POST'
-    },
-    editRole: {
-        url: '/role/role/upd',
-        name: '修改角色',
-        method: 'PUT'
-    },
-    enableRole: {
-        url: '/role/role/del/{id}',
-        name: '更改状态，删除',
-        method: 'DELETE'
-    },
-    getRole: {
-        url: '/role/role/{id}',
-        name: '查询角色',
-        method: 'GET'
-    },
-    roleDelUser: {
-        url: '/role/role/delUser',
-        name: '角色下删除用户',
-        method: 'POST'
-    },
-    roleAppList: {
-        url: '/role/role/application',
-        name: '查询角色下可新增的应用',
-        method: 'GET'
-    },
-    roleAddUser: {
-        url: '/role/role/addUser',
-        name: '角色下新增用户',
-        method: 'POST'
-    },
-    appAuthList: {
-        url: '/role/permission/application',
-        name: '获取应用下的权限列表',
-        method: 'GET'
-    },
-    editAuth: {
-        url: '/role/role/updRolePermission',
-        name: '角色下修改权限',
-        method: 'PUT'
-    }
-}
diff --git a/src/views/role/index.vue b/src/views/role/index.vue
deleted file mode 100644
index ad0542a..0000000
--- a/src/views/role/index.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
-    <list v-if="$route.name === 'roleIndex'"></list>
-    <router-view v-else></router-view>
-</template>
-
-<script>
-import list from "./web/list";
-export default {
-    name: "roleIndex",
-    components: { list }
-};
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/views/role/router/role-router.js b/src/views/role/router/role-router.js
deleted file mode 100644
index 89fd294..0000000
--- a/src/views/role/router/role-router.js
+++ /dev/null
@@ -1,19 +0,0 @@
-export default [{
-    path: 'role',
-    name: 'roleIndex',
-    meta: {
-        name: '角色管理',
-        icon: 'form',
-        unfold: false,
-        sort: 2
-    },
-    component: () => import('@/views/role/index'),
-    children: [{
-        path: 'detail',
-        name: 'roleDetailIndex',
-        meta: {
-            name: '角色详情',
-        },
-        component: () => import('@/views/role/web/web/index'),
-    }]
-}]
diff --git a/src/views/role/web/list.vue b/src/views/role/web/list.vue
deleted file mode 100644
index 35af269..0000000
--- a/src/views/role/web/list.vue
+++ /dev/null
@@ -1,271 +0,0 @@
-<template>
-    <content-view>
-        <div class="roleList">
-            <reset-search ref="form" :form.sync="searchObj">
-                <table class="table-form">
-                    <tr>
-                        <td width="78">角色名称：</td>
-                        <td>
-                            <a-input placeholder="请输入角色名称" v-model="searchObj.roleName"></a-input>
-                        </td>
-
-                        <td width="47">状态：</td>
-                        <td>
-                            <a-select placeholder="请选择状态" v-model="searchObj.state">
-                                <a-select-option :value="0">启用</a-select-option>
-                                <a-select-option :value="1">停用</a-select-option>
-                            </a-select>
-                        </td>
-
-                        <td>
-                            <a-button type="primary" class="mr8" @click="query">查询</a-button>
-                            <a-button @click="reset">重置</a-button>
-                        </td>
-                    </tr>
-                </table>
-            </reset-search>
-
-            <p class="mt24 mb16">
-                <a-button type="primary" @click="add" :disabled="addAuth">
-                    <a-icon type="plus"></a-icon>
-                    <span>新增</span>
-                </a-button>
-            </p>
-
-            <!-- modal -->
-            <a-modal
-                v-model="visible"
-                title="新增角色"
-                @ok="modalOk"
-                @cancel="modalCancel"
-                cancelText="取消"
-                okText="确定"
-            >
-                <a-form :form="formModal" :label-col="{ span: 7 }" :wrapper-col="{ span: 12 }">
-                    <a-form-item label="角色名称">
-                        <a-input
-                            autocomplete="off"
-                            placeholder="请输入角色名称"
-                            v-decorator="['roleName', { rules: [{ required: true, min:2, max: 10, message: '请输入2-10位角色名称' }] }]"
-                        ></a-input>
-                    </a-form-item>
-                </a-form>
-            </a-modal>
-
-            <!-- table -->
-            <a-table
-                :rowKey="record => record.id"
-                :columns="columns"
-                :dataSource="dataSource"
-                :pagination="pagination"
-                @change="paginationChange"
-            >
-                <div class="state flex flex-start" slot="state" slot-scope="text, record">
-                    <div
-                        class="state-circle mr8"
-                        :style="{
-                            'width': '8px', 
-                            'height': '8px', 
-                            'border-radius': '50%', 
-                            'background-color': record.state === 0 ? 'rgba(0,168,84,1)' : 'rgba(240,65,52,1)'
-                        }"
-                    ></div>
-                    <span>{{record.state === 0 ? '启用' : '停用'}}</span>
-                </div>
-                <template slot="action" slot-scope="text, record">
-                    <a
-                        :disabled="detailAuth"
-                        href="javascript:;"
-                        class="mr8"
-                        @click="$router.push({name: 'roleDetailIndex', query: {id: record.id}})"
-                    >角色详情</a>
-                    <a
-                        :disabled="enableAuth"
-                        href="javascript:;"
-                        class="mr8"
-                        @click="enable(record)"
-                    >{{record.state === 0 ? '停用' : '启用'}}</a>
-                    <a-popconfirm
-                        title="确认是否删除该角色"
-                        ok-text="确定"
-                        cancel-text="取消"
-                        @confirm="deleteConfirm(record)"
-                        @cancel="deleteCancel(record)"
-                    >
-                        <a-icon slot="icon" type="close-circle" style="color: red" />
-                        <a href="#" :disabled="removeAuth">删除</a>
-                    </a-popconfirm>
-                </template>
-            </a-table>
-        </div>
-    </content-view>
-</template>
-
-<script>
-import mixins from "@/plugins/mixins";
-export default {
-    name: "roleList",
-    mixins: [mixins],
-    data() {
-        return {
-            searchObj: {
-                roleName: "",
-                state: undefined
-            },
-            // add
-            visible: false,
-            formModal: this.$form.createForm(this),
-            // table
-            columns: [
-                {
-                    title: "序号",
-                    customRender: (text, record, index) => {
-                        return (
-                            (this.pagination.current - 1) *
-                                this.pagination.pageSize +
-                            (index + 1)
-                        );
-                    }
-                },
-                {
-                    title: "角色名称",
-                    dataIndex: "roleName"
-                },
-                {
-                    title: "状态",
-                    dataIndex: "state",
-                    scopedSlots: {
-                        customRender: "state"
-                    }
-                },
-                {
-                    title: "操作",
-                    dataIndex: "action",
-                    scopedSlots: {
-                        customRender: "action"
-                    }
-                }
-            ],
-            dataSource: []
-        };
-    },
-    computed: {
-        // 权限列表
-        addAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "addRole"
-            )
-                ? false
-                : true;
-        },
-        detailAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "roleDetailIndex"
-            )
-                ? false
-                : true;
-        },
-        enableAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "enableRole"
-            )
-                ? false
-                : true;
-        },
-        removeAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "removeRole"
-            )
-                ? false
-                : true;
-        }
-    },
-    methods: {
-        // 角色列表
-        getList() {
-            this.$api.roleApi
-                .roleList({
-                    data: {
-                        pageNum: this.pagination.current,
-                        pageSize: this.pagination.pageSize,
-                        roleName: this.searchObj.roleName,
-                        state: this.searchObj.state
-                    }
-                })
-                .then(res => {
-                    this.dataSource = res.data.list;
-                    this.pagination.total = res.data.total;
-                });
-        },
-        // 新增
-        add() {
-            this.visible = true;
-        },
-        modalOk() {
-            this.formModal.validateFields((err, values) => {
-                console.log(err, values);
-                if (!err) {
-                    this.$api.roleApi
-                        .addRole({
-                            data: values
-                        })
-                        .then(res => {
-                            console.log(res);
-                            this.$message.success("新增成功");
-                            this.modalCancel();
-                            this.query();
-                        });
-                }
-            });
-        },
-        modalCancel() {
-            this.formModal.resetFields();
-            this.visible = false;
-        },
-        // 是否删除
-        deleteConfirm(record) {
-            console.log(record);
-            this.$api.roleApi
-                .enableRole({
-                    path: {
-                        id: record.id
-                    },
-                    params: {
-                        state: 2
-                    }
-                })
-                .then(res => {
-                    console.log(res);
-                    this.$message.success("操作成功");
-                    this.reset();
-                });
-        },
-        deleteCancel(record) {
-            console.log(record);
-        },
-        // 启用禁用
-        enable(record) {
-            console.log(record);
-            this.$api.roleApi
-                .enableRole({
-                    path: {
-                        id: record.id
-                    },
-                    params: {
-                        state: record.state === 0 ? 1 : 0
-                    }
-                })
-                .then(res => {
-                    console.log(res);
-                    this.query();
-                    this.$message.success("操作成功");
-                });
-        }
-    },
-    mounted() {
-        this.getList();
-    }
-};
-</script>
-
-<style lang="scss"></style>
diff --git a/src/views/role/web/web/detail.vue b/src/views/role/web/web/detail.vue
deleted file mode 100644
index f09172a..0000000
--- a/src/views/role/web/web/detail.vue
+++ /dev/null
@@ -1,543 +0,0 @@
-<template>
-    <content-view>
-        <div class="roleDetail">
-            <!-- 1 -->
-            <div class="roleDetail-box">
-                <div class="roleDetail-box-title mb16">基础信息</div>
-                <div class="roleDetail-box-con flex flex-space-between flex-align-center">
-                    <div class="roleDetail-box-con-item flex flex-start">
-                        <div
-                            class="roleDetail-box-con-item-block flex flex-start flex-align-center mr24"
-                        >
-                            <div class="roleDetail-box-con-item-block-label">角色名称：</div>
-                            <div class="roleDetail-box-con-item-block-value">
-                                <span v-if="!isEdit">{{detail.roleName ? detail.roleName : '-'}}</span>
-                                <a-input v-else placeholder="请输入与角色名称" v-model="tempName"></a-input>
-                            </div>
-                        </div>
-                        <div
-                            class="roleDetail-box-con-item-block flex flex-start flex-align-center"
-                        >
-                            <div class="roleDetail-box-con-item-block-label">状态：</div>
-                            <div class="roleDetail-box-con-item-block-value flex">
-                                <div :class="{'circle' : true, 'red': detail.state !== 0}"></div>
-                                <span>{{detail.state === 0 ? '启用': '停用'}}</span>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="roleDetail-box-con-item">
-                        <a-button
-                            type="primary"
-                            v-if="!isEdit"
-                            @click="tempName = detail.roleName; isEdit = !isEdit"
-                            :disabled="editAuth"
-                        >编辑</a-button>
-                        <template v-else>
-                            <a-button class="mr8" type="primary" @click="saveEdit">保存</a-button>
-                            <a-button @click="isEdit = false">取消</a-button>
-                        </template>
-                    </div>
-                </div>
-            </div>
-            <!-- 2 -->
-            <div class="roleDetail-box">
-                <div class="roleDetail-box-title flex flex-space-between flex-align-center mb8">
-                    <span>下属权限列表</span>
-                    <div>
-                        <a-button
-                            type="primary"
-                            @click="type = 0; visible = true"
-                            :disabled="addAppAuth"
-                            class="mr8"
-                        >
-                            <a-icon type="plus"></a-icon>新增
-                        </a-button>
-                        <a-button @click="handleEditAuth">{{isDisabled ? '编辑' : '保存'}}</a-button>
-                    </div>
-                </div>
-                <div class="roleDetail-box-con flex flex-start">
-                    <div
-                        class="roleDetail-box-con-item"
-                        v-for="(item, index) in detail.appPermissions"
-                        :key="index"
-                    >
-                        <span class="text-center">{{item.applicationName}}</span>
-                        <a-tree
-                            checkable
-                            :auto-expand-parent="true"
-                            :tree-data="item.treeData"
-                            :replace-fields="replaceFields"
-                            v-model="item.checkedKeys"
-                            @check="onCheck"
-                            :disabled="isDisabled"
-                        />
-                    </div>
-                </div>
-            </div>
-            <!-- 2 -->
-            <div class="roleDetail-box">
-                <div class="roleDetail-box-title flex flex-space-between flex-align-center mb8">
-                    <span>下属用户列表</span>
-                    <a-button
-                        type="primary"
-                        @click="type = 1; visible = true"
-                        :disabled="bindUserAuth"
-                    >
-                        <a-icon type="plus"></a-icon>新增
-                    </a-button>
-                </div>
-                <div class="roleDetail-box-con">
-                    <a-table
-                        :rowKey="record => record.id"
-                        :columns="columns"
-                        :dataSource="dataSource"
-                        :pagination="pagination"
-                        @change="paginationChange"
-                    >
-                        <div
-                            class="flex flex-start flex-align-center"
-                            slot="state"
-                            slot-scope="text, record"
-                        >
-                            <div :class="{'circle' : true, 'red': record.state !== 0}"></div>
-                            <span>{{record.state === 0 ? '启用': '停用'}}</span>
-                        </div>
-                        <template slot="action" slot-scope="text, record">
-                            <a
-                                :disabled="userDetailAuth"
-                                href="javascript:;"
-                                class="mr8"
-                                @click="$router.push({name: 'userDetailIndex', query: {id: record.id}})"
-                            >用户详情</a>
-                            <a-popconfirm
-                                title="确认是否删除该用户"
-                                ok-text="确定"
-                                cancel-text="取消"
-                                @confirm="deleteConfirm(record)"
-                            >
-                                <a-icon slot="icon" type="close-circle" style="color: red" />
-                                <a href="#" :disabled="unbindUserAuth">删除</a>
-                            </a-popconfirm>
-                        </template>
-                    </a-table>
-                </div>
-            </div>
-            <!-- 4 -->
-            <a-modal
-                v-model="visible"
-                :title="title"
-                okText="确定"
-                cancelText="取消"
-                @ok="handleOk"
-                @cancel="handleCancel"
-            >
-                <a-row type="flex" align="middle">
-                    <a-col span="7" align="right">{{type === 0 ? '应用' : '选择用户'}}：</a-col>
-                    <a-col span="12">
-                        <a-select
-                            style="width: 100%;"
-                            v-if="type === 0"
-                            placeholder="请选择应用"
-                            v-model="modalObj.appId"
-                            @change="getAppAuth"
-                        >
-                            <a-select-option
-                                v-for="(item, index) in appList"
-                                :key="index"
-                                :value="item.id"
-                            >{{item.name}}</a-select-option>
-                        </a-select>
-                        <a-select
-                            v-else
-                            style="width: 100%;"
-                            mode="multiple"
-                            placeholder="请选择用户"
-                            v-model="modalObj.userIds"
-                        >
-                            <a-select-option
-                                v-for="(item, index) in addUserList"
-                                :key="index"
-                                :value="item.id"
-                            >{{item.name}}</a-select-option>
-                        </a-select>
-                    </a-col>
-                </a-row>
-            </a-modal>
-        </div>
-    </content-view>
-</template>
-
-<script>
-import mixins from "@/plugins/mixins";
-export default {
-    name: "roleDetail",
-    mixins: [mixins],
-    data() {
-        return {
-            detail: {},
-            // 编辑信息
-            isEdit: false,
-            tempName: "",
-            // 可新增的应用列表
-            appList: [],
-            // 可新增用户列表
-            addUserList: [],
-            // 权限列表
-            replaceFields: {
-                children: "children",
-                title: "description",
-                key: "id"
-            },
-            // 是否修改权限
-            isDisabled: true,
-            // 角色下所有用户列表
-            columns: [
-                {
-                    title: "序号",
-                    customRender: (text, record, index) => {
-                        return (
-                            (this.pagination.current - 1) *
-                                this.pagination.pageSize +
-                            (index + 1)
-                        );
-                    }
-                },
-                {
-                    title: "姓名",
-                    dataIndex: "name"
-                },
-                {
-                    title: "手机号",
-                    dataIndex: "account"
-                },
-                {
-                    title: "状态",
-                    dataIndex: "state",
-                    scopedSlots: {
-                        customRender: "state"
-                    }
-                },
-                {
-                    title: "操作",
-                    dataIndex: "action",
-                    scopedSlots: {
-                        customRender: "action"
-                    }
-                }
-            ],
-            dataSource: [],
-            // modal弹窗
-            visible: false,
-            type: 0, // 0 新增权限   1 新增用户
-            modalObj: {
-                appId: undefined,
-                permissionIds: "",
-                userIds: []
-            }
-        };
-    },
-    computed: {
-        title() {
-            if (this.type === 0) {
-                return "新增角色下所属应用权限";
-            } else {
-                return "新增角色下所属用户";
-            }
-        },
-        // 权限列表
-        editAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "editRole"
-            )
-                ? false
-                : true;
-        },
-        addAppAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "addAppAuth"
-            )
-                ? false
-                : true;
-        },
-        bindUserAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "bindUser"
-            )
-                ? false
-                : true;
-        },
-        userDetailAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "userDetailIndex"
-            )
-                ? false
-                : true;
-        },
-        unbindUserAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "unbindUser"
-            )
-                ? false
-                : true;
-        }
-    },
-    methods: {
-        // 获取角色信息
-        getDetail() {
-            this.$api.roleApi
-                .getRole({
-                    path: {
-                        id: this.$route.query.id
-                    }
-                })
-                .then(res => {
-                    this.detail = res.data;
-                    this.detail.appPermissions.map(item => {
-                        const obj = this.translateDataToTree(item.permissions);
-                        item.treeData = obj.parents;
-                        item.checkedKeys = obj.checked;
-                        this.$forceUpdate();
-                    });
-                    console.log("detail", this.detail);
-                });
-        },
-        // 组合tree
-        translateDataToTree(list) {
-            const data = JSON.parse(JSON.stringify(list));
-            let checked = [];
-            data.map(item => item.isPoint === 1 && checked.push(item.id));
-            let parents = data.filter(value => value.parentId === 0);
-            let children = data.filter(value => value.parentId !== 0);
-            let translator = (parents, children) => {
-                parents.forEach(parent => {
-                    children.forEach((current, index) => {
-                        if (current.parentId === parent.id) {
-                            // 深拷贝
-                            let temp = JSON.parse(JSON.stringify(children));
-                            // 减少递归时节点数
-                            temp.splice(index, 1);
-                            // 加入父节点的children
-                            parent.children && parent.children.length
-                                ? parent.children.push(current)
-                                : (parent.children = [current]);
-                            // 将匹配的子节点作为下一次的父节点开始滚雪球
-                            translator([current], temp);
-                        }
-                    });
-                });
-            };
-
-            translator(parents, children);
-
-            return {
-                parents: parents,
-                checked: checked
-            };
-        },
-        // tree复选框选择
-        onCheck(checkedKeys, e) {
-            console.log("onCheck", checkedKeys, "e", e);
-            this.$forceUpdate();
-        },
-        // 获取可新增的应用
-        getApp() {
-            this.$api.roleApi
-                .roleAppList({ params: { id: this.$route.query.id } })
-                .then(res => {
-                    this.appList = res.data;
-                });
-        },
-        // 获取应用下的权限列表
-        getAppAuth(id) {
-            this.$api.roleApi
-                .appAuthList({ params: { applicationId: id } })
-                .then(res => {
-                    let arr = [];
-                    res.data.map(item => {
-                        arr.push(item.id);
-                    });
-                    this.modalObj.permissionIds = arr.join(",");
-                });
-        },
-        // 获取可新增的用户
-        getUser() {
-            this.$api.roleApi
-                .roleAddUserList({ params: { roleId: this.$route.query.id } })
-                .then(res => {
-                    this.addUserList = res.data;
-                });
-        },
-        // 保存编辑基础信息
-        saveEdit() {
-            if (this.tempName.length < 2 || this.tempName.length > 10) {
-                this.$message.info("2-10位角色名称");
-                return;
-            }
-            this.$api.roleApi
-                .editRole({
-                    data: {
-                        id: this.$route.query.id,
-                        roleName: this.tempName
-                    }
-                })
-                .then(res => {
-                    console.log(res);
-                    this.$set(this.detail, "roleName", res.data.roleName);
-                    this.isEdit = false;
-                    this.$message.success("操作成功");
-                });
-        },
-        // 编辑保存权限列表
-        handleEditAuth() {
-            let temp = [];
-            if (this.isDisabled) {
-                // 编辑状态
-                this.isDisabled = false;
-                temp = JSON.parse(JSON.stringify(this.detail.appPermissions));
-            } else {
-                // 保存状态
-                console.log(this.detail.appPermissions);
-                let ids = [];
-                this.detail.appPermissions.map(item => {
-                    ids = ids.concat(item.checkedKeys);
-                });
-                this.$api.roleApi
-                    .editAuth({
-                        data: {
-                            id: this.$route.query.id,
-                            permissionIds: ids.join(",")
-                        }
-                    })
-                    .then(res => {
-                        console.log(res);
-                        this.getDetail();
-                        this.isDisabled = true;
-                        this.$message.success("操作成功");
-                    })
-                    .catch(err => {
-                        console.log(err);
-                        this.detail.appPermissions = temp;
-                        this.$forceUpdate();
-                        this.isDisabled = true;
-                    });
-            }
-        },
-        // 角色所属用户列表
-        getList() {
-            this.$api.roleApi
-                .roleUserList({
-                    data: {
-                        pageNum: this.pagination.current,
-                        pageSize: this.pagination.pageSize,
-                        roleId: this.$route.query.id
-                    }
-                })
-                .then(res => {
-                    this.dataSource = res.data.list;
-                });
-        },
-        // 删除用户
-        deleteConfirm(record) {
-            console.log(record);
-            this.$api.roleApi
-                .roleDelUser({
-                    data: {
-                        roleId: this.$route.query.id,
-                        userId: record.id
-                    }
-                })
-                .then(res => {
-                    console.log(res);
-                    this.$message.success("操作成功");
-                    this.pagination.current = 1;
-                    this.pagination.pageSize = 10;
-                    this.getList();
-                    this.getUser();
-                });
-        },
-        // modal
-        handleOk() {
-            if (this.type === 0) {
-                if (!this.modalObj.appId) {
-                    this.$message.info("请选择应用");
-                    return;
-                }
-                this.$api.roleApi
-                    .editRole({
-                        data: {
-                            id: this.$route.query.id,
-                            permissionIds: this.modalObj.permissionIds
-                        }
-                    })
-                    .then(res => {
-                        console.log(res);
-                        this.getDetail();
-                        this.$message.success("操作成功");
-                        this.handleCancel();
-                    });
-            } else {
-                if (!this.modalObj.userIds.length) {
-                    this.$message.info("请选择用户");
-                    return;
-                }
-                this.$api.roleApi
-                    .roleAddUser({
-                        data: {
-                            roleId: this.$route.query.id,
-                            userIds: this.modalObj.userIds
-                        }
-                    })
-                    .then(res => {
-                        console.log(res);
-                        this.getList(); // 刷新已绑定的用户列表
-                        this.getUser(); // 刷新可新增的用户列表
-                        this.$message.success("操作成功");
-                        this.handleCancel();
-                    });
-            }
-        },
-        handleCancel() {
-            this.visible = false;
-            this.modalObj = this.$utils.cleanData(this.modalObj);
-        }
-    },
-    mounted() {
-        this.getDetail();
-        this.getList();
-        this.getApp();
-        this.getUser();
-    }
-};
-</script>
-
-<style lang='scss'>
-.roleDetail {
-    .circle {
-        width: 8px;
-        height: 8px;
-        border-radius: 50%;
-        background-color: rgba(0, 168, 84, 1);
-        margin-right: 4px;
-    }
-    .red {
-        background-color: rgba(240, 65, 52, 1);
-    }
-    &-box {
-        border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-        padding-bottom: 24px;
-        margin-bottom: 24px;
-        &-title {
-            font-size: 16px;
-            font-family: PingFangSC, PingFangSC-Medium;
-            font-weight: 500;
-            text-align: left;
-            color: rgba(0, 0, 0, 0.85);
-        }
-    }
-    &-box:last-child {
-        border-bottom: none;
-        margin-bottom: 0;
-        padding-bottom: 0;
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/role/web/web/index.vue b/src/views/role/web/web/index.vue
deleted file mode 100644
index fcf2ae4..0000000
--- a/src/views/role/web/web/index.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-    <detail v-if="$route.name === 'roleDetailIndex'"></detail>
-    <router-view v-else></router-view>
-</template>
-
-<script>
-import detail from "./detail";
-export default {
-    name: "roleDetailIndex",
-    components: {
-        detail
-    }
-};
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/views/user/api/user-api.js b/src/views/user/api/user-api.js
deleted file mode 100644
index 6cff6fa..0000000
--- a/src/views/user/api/user-api.js
+++ /dev/null
@@ -1,47 +0,0 @@
-export default {
-    login: {
-        url: '/account/login',
-        name: '登录',
-        method: 'POST'
-    },
-    userList: {
-        url: '/account/users/list',
-        name: '用户列表',
-        method: 'POST'
-    },
-    addUser: {
-        url: '/account/users/save',
-        name: '新增用户',
-        method: 'POST'
-    },
-    addUserRole: {
-        url: '/account/users/addRole',
-        name: '用户新增角色',
-        method: 'POST'
-    },
-    editUser: {
-        url: '/account/users/upd',
-        name: '编辑用户',
-        method: 'PUT'
-    },
-    userDetail: {
-        url: '/account/users/{id}',
-        name: '用户详情',
-        method: 'GET'
-    },
-    enableUser: {
-        url: '/account/users/del/{id}',
-        name: '启用禁用，删除',
-        method: 'DELETE'
-    },
-    quitRole: {
-        url: '/account/users/delRole/{id}',
-        name: '用户退出角色',
-        method: 'DELETE'
-    },
-    updUserPwd: {
-        url: '/account/users/updPassword',
-        name: '修改用户密码',
-        method: 'PUT'
-    }
-}
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
deleted file mode 100644
index 0a502e1..0000000
--- a/src/views/user/index.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<template>
-    <list v-if="$route.name === 'userIndex'"></list>
-    <router-view v-else></router-view>
-</template>
-
-<script>
-import list from "./web/list";
-export default {
-    name: "userIndex",
-    components: {
-        list
-    }
-};
-</script>
-
-<style></style>
diff --git a/src/views/user/router/user-router.js b/src/views/user/router/user-router.js
deleted file mode 100644
index e08cb56..0000000
--- a/src/views/user/router/user-router.js
+++ /dev/null
@@ -1,27 +0,0 @@
-export default [{
-    path: 'user',
-    name: 'userIndex',
-    meta: {
-        name: '用户管理',
-        icon: 'lock',
-        unfold: false,
-        sort: 1
-    },
-    component: () => import('@/views/user/index'),
-    children: [{
-        path: 'detail',
-        name: 'userDetailIndex',
-        meta: {
-            name: '用户详情',
-        },
-        component: () => import('@/views/user/web/web/index'),
-        children: [{
-            path: 'edit',
-            name: 'editUserPwd',
-            meta: {
-                name: '修改密码',
-            },
-            component: () => import('@/views/user/web/web/editPwd'),
-        }]
-    }]
-}]
diff --git a/src/views/user/web/list.vue b/src/views/user/web/list.vue
deleted file mode 100644
index 4005553..0000000
--- a/src/views/user/web/list.vue
+++ /dev/null
@@ -1,353 +0,0 @@
-<template>
-    <content-view>
-        <div class="userList">
-            <reset-search ref="form" :form.sync="searchObj">
-                <table class="table-form">
-                    <tr>
-                        <td width="47">姓名：</td>
-                        <td>
-                            <a-input placeholder="请输入姓名" v-model="searchObj.name"></a-input>
-                        </td>
-
-                        <td width="60">手机号：</td>
-                        <td>
-                            <a-input placeholder="请输入手机号" v-model="searchObj.account"></a-input>
-                        </td>
-
-                        <td width="47">角色：</td>
-                        <td>
-                            <a-select mode="multiple" placeholder="请选择角色" v-model="searchObj.role">
-                                <a-select-option
-                                    v-for="(item, index) in roleList"
-                                    :key="index"
-                                    :value="item.id"
-                                >{{item.roleName}}</a-select-option>
-                            </a-select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td width="47">状态：</td>
-                        <td>
-                            <a-select placeholder="请选择状态" v-model="searchObj.state">
-                                <a-select-option :value="0">启用</a-select-option>
-                                <a-select-option :value="1">停用</a-select-option>
-                            </a-select>
-                        </td>
-
-                        <td colspan="2">
-                            <a-button type="primary" class="mr8" @click="query">查询</a-button>
-                            <a-button @click="reset">重置</a-button>
-                        </td>
-                    </tr>
-                </table>
-            </reset-search>
-
-            <p class="mt24 mb16">
-                <a-button type="primary" @click="add" :disabled="addAuth">
-                    <a-icon type="plus"></a-icon>
-                    <span>新增</span>
-                </a-button>
-            </p>
-
-            <!-- modal -->
-            <a-modal
-                v-model="visible"
-                title="新增用户"
-                @ok="modalOk"
-                @cancel="modalCancel"
-                cancelText="取消"
-                okText="确定"
-            >
-                <a-form :form="formModal" :label-col="{ span: 7 }" :wrapper-col="{ span: 12 }">
-                    <a-form-item label="姓名">
-                        <a-input
-                            autocomplete="off"
-                            placeholder="请输入姓名"
-                            v-decorator="['name', { rules: [{ required: true, min:2, max: 10, message: '请输入姓名' }] }]"
-                        ></a-input>
-                    </a-form-item>
-                    <a-form-item label="手机号">
-                        <a-input
-                            autocomplete="off"
-                            placeholder="请输入手机号"
-                            v-decorator="['account', { rules: [{ required: true, pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号' }] }]"
-                        ></a-input>
-                    </a-form-item>
-                    <a-form-item label="所属角色">
-                        <a-select
-                            style="width: 100%;"
-                            mode="multiple"
-                            placeholder="请选择角色"
-                            v-decorator="['roleIds', { rules: [{ required: true, message: '请选择角色' }] }]"
-                        >
-                            <a-select-option
-                                v-for="(item, index) in roleList"
-                                :key="index"
-                                :value="item.id"
-                            >{{item.roleName}}</a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-form>
-            </a-modal>
-
-            <!-- table -->
-            <a-table
-                :rowKey="record => record.id"
-                :columns="columns"
-                :dataSource="dataSource"
-                :pagination="pagination"
-                @change="paginationChange"
-            >
-                <div
-                    class="state flex flex-start flex-align-center"
-                    slot="state"
-                    slot-scope="text, record"
-                >
-                    <div
-                        class="state-circle mr8"
-                        :style="{
-                            'width': '8px', 
-                            'height': '8px', 
-                            'border-radius': '50%', 
-                            'background-color': record.state === 0 ? 'rgba(0,168,84,1)' : 'rgba(240,65,52,1)'
-                        }"
-                    ></div>
-                    <span>{{record.state === 0 ? '启用' : '停用'}}</span>
-                </div>
-                <a-tooltip slot="roleName" slot-scope="text, record">
-                    <template
-                        slot="title"
-                        v-if="record.roleName && record.roleName.length > 15"
-                    >{{record.roleName}}</template>
-                    {{record.roleName ? (record.roleName.length > 15 ? record.roleName.subString(0, 15) + '...' : record.roleName) : '-'}}
-                </a-tooltip>
-                <template slot="action" slot-scope="text, record">
-                    <a
-                        :disabled="detailAuth"
-                        href="javascript:;"
-                        class="mr8"
-                        @click="$router.push({name: 'userDetailIndex', query: {id: record.id}})"
-                    >用户详情</a>
-                    <a
-                        :disabled="enableAuth"
-                        href="javascript:;"
-                        class="mr8"
-                        @click="enable(record)"
-                    >{{record.state === 0 ? '停用' : '启用'}}</a>
-                    <a-popconfirm
-                        class="mr8"
-                        title="确认是否删除该用户"
-                        ok-text="确定"
-                        cancel-text="取消"
-                        @confirm="deleteConfirm(record)"
-                        @cancel="deleteCancel(record)"
-                    >
-                        <a-icon slot="icon" type="close-circle" style="color: red" />
-                        <a href="#" :disabled="removeAuth">删除</a>
-                    </a-popconfirm>
-                </template>
-            </a-table>
-        </div>
-    </content-view>
-</template>
-
-<script>
-import mixins from "@/plugins/mixins";
-export default {
-    name: "userList",
-    mixins: [mixins],
-    data() {
-        return {
-            searchObj: {
-                name: "",
-                account: "",
-                role: [],
-                state: undefined
-            },
-            roleList: [],
-            // add
-            visible: false,
-            formModal: this.$form.createForm(this),
-            // table
-            columns: [
-                {
-                    title: "序号",
-                    customRender: (text, record, index) => {
-                        return (
-                            (this.pagination.current - 1) *
-                                this.pagination.pageSize +
-                            (index + 1)
-                        );
-                    }
-                },
-                {
-                    title: "姓名",
-                    dataIndex: "name"
-                },
-                {
-                    title: "手机号",
-                    dataIndex: "account"
-                },
-                {
-                    title: "所属角色",
-                    dataIndex: "roleName",
-                    scopedSlots: {
-                        customRender: "roleName"
-                    }
-                },
-                {
-                    title: "状态",
-                    dataIndex: "state",
-                    scopedSlots: {
-                        customRender: "state"
-                    }
-                },
-                {
-                    title: "操作",
-                    dataIndex: "action",
-                    scopedSlots: {
-                        customRender: "action"
-                    }
-                }
-            ],
-            dataSource: []
-        };
-    },
-    computed: {
-        // 权限列表
-        addAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "addUser"
-            )
-                ? false
-                : true;
-        },
-        detailAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "userDetailIndex"
-            )
-                ? false
-                : true;
-        },
-        enableAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "enableUser"
-            )
-                ? false
-                : true;
-        },
-        removeAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "removeUser"
-            )
-                ? false
-                : true;
-        }
-    },
-    methods: {
-        // 用户列表
-        getList() {
-            this.$api.userApi
-                .userList({
-                    data: {
-                        pageNum: this.pagination.current,
-                        pageSize: this.pagination.pageSize,
-                        roleId: this.searchObj.role,
-                        name: this.searchObj.name,
-                        account: this.searchObj.account
-                    }
-                })
-                .then(res => {
-                    res.data.list.map(item => {
-                        item.roleName = "";
-                        if (item.roles && item.roles.length) {
-                            item.roles.map((v, i) => {
-                                item.roleName += v.roleName;
-                                if (i !== item.roles.length - 1)
-                                    item.roleName += ",";
-                            });
-                        }
-                    });
-                    this.dataSource = res.data.list;
-                    this.pagination.total = res.data.total;
-                });
-        },
-        // 角色列表
-        getRoleList() {
-            this.$api.roleApi.roleAll().then(res => {
-                this.roleList = res.data;
-            });
-        },
-        // 新增
-        add() {
-            this.visible = true;
-        },
-        modalOk() {
-            this.formModal.validateFields((err, values) => {
-                console.log(err, values);
-                if (!err) {
-                    this.$api.userApi
-                        .addUser({
-                            data: values
-                        })
-                        .then(res => {
-                            console.log(res);
-                            this.$message.success("新增成功");
-                            this.modalCancel();
-                            this.reset();
-                        });
-                }
-            });
-        },
-        modalCancel() {
-            this.formModal.resetFields();
-            this.visible = false;
-        },
-        // 是否删除
-        deleteConfirm(record) {
-            console.log(record);
-            this.$api.userApi
-                .enableUser({
-                    path: {
-                        id: record.id
-                    },
-                    params: {
-                        state: 2
-                    }
-                })
-                .then(res => {
-                    console.log(res);
-                    this.$message.success("操作成功");
-                    this.reset();
-                });
-        },
-        deleteCancel(record) {
-            console.log(record);
-        },
-        // 启用禁用
-        enable(record) {
-            console.log(record);
-            this.$api.userApi
-                .enableUser({
-                    path: {
-                        id: record.id
-                    },
-                    params: {
-                        state: record.state === 0 ? 1 : 0
-                    }
-                })
-                .then(res => {
-                    console.log(res);
-                    this.query();
-                    this.$message.success("操作成功");
-                });
-        }
-    },
-    mounted() {
-        this.getList();
-        this.getRoleList();
-    }
-};
-</script>
-
-<style lang="scss"></style>
diff --git a/src/views/user/web/web/detail.vue b/src/views/user/web/web/detail.vue
deleted file mode 100644
index c2c479f..0000000
--- a/src/views/user/web/web/detail.vue
+++ /dev/null
@@ -1,371 +0,0 @@
- <template>
-    <content-view>
-        <div class="userDetail">
-            <!-- 1 -->
-            <div class="userDetail-current">
-                <p class="userDetail-title">基本信息</p>
-                <div class="userDetail-current-desc">
-                    <div class="userDetail-current-desc-left">
-                        <div class="flex flex-start">
-                            <span style="display: inline-block;width: 46px;">姓名：</span>
-                            <a-input
-                                style="width: 50%;"
-                                v-if="isEdit"
-                                placeholder="请输入姓名"
-                                v-model="tempInfo.name"
-                            ></a-input>
-                            <span v-else>{{detail.name}}</span>
-                        </div>
-                        <div class="flex flex-start">
-                            <span style="display: inline-block;width: 60px;">手机号：</span>
-                            <a-input
-                                style="width: 50%;"
-                                v-if="isEdit"
-                                placeholder="请输入手机号"
-                                v-model="tempInfo.account"
-                            ></a-input>
-                            <span v-else>{{detail.account}}</span>
-                        </div>
-                        <div class="status flex">
-                            <span style="display: inline-block;width: 48px;">状态：</span>
-                            <div :class="{'status-circle': true, 'status-red': detail.state !== 0}"></div>
-                            <span>{{detail.state === 0 ? '启用' : '停用'}}</span>
-                        </div>
-                    </div>
-                    <div class="userDetail-current-desc-right">
-                        <template v-if="isEdit">
-                            <a-button type="primary" class="mr8" @click="sureEdit">保存</a-button>
-                            <a-button @click="cancelEdit">取消</a-button>
-                        </template>
-                        <template v-else>
-                            <a-button
-                                type="primary"
-                                class="mr8"
-                                @click="showEdit"
-                                :disabled="editAuth"
-                            >编辑</a-button>
-                            <a-button @click="go('editUserPwd')" :disabled="pwdAuth">修改密码</a-button>
-                        </template>
-                    </div>
-                </div>
-            </div>
-            <!-- 2 -->
-            <div class="userDetail-list">
-                <div class="userDetail-list-top flex flex-space-between flex-align-center">
-                    <span class="userDetail-title">所属角色列表</span>
-                    <a-button type="primary" @click="showModal" :disabled="bindRoleAuth">
-                        <a-icon type="plus"></a-icon>
-                        <span>新增</span>
-                    </a-button>
-                </div>
-                <a-table
-                    :columns="columns"
-                    :dataSource="detail.roles"
-                    :rowKey="record => record.id"
-                >
-                    <template slot="action" slot-scope="text, record">
-                        <a
-                            href="javascript:;"
-                            class="mr8"
-                            @click="go('roleDetailIndex', record)"
-                            :disabled="roleDetailAuth"
-                        >角色详情</a>
-                        <a-popconfirm
-                            class="mr8"
-                            title="确认是否退出该角色"
-                            ok-text="确定"
-                            cancel-text="取消"
-                            @confirm="quit(record)"
-                            @cancel="deleteCancel(record)"
-                        >
-                            <a-icon slot="icon" type="close-circle" style="color: red" />
-                            <a href="javascript:;" :disabled="unbindRoleAuth">退出</a>
-                        </a-popconfirm>
-                    </template>
-                </a-table>
-            </div>
-            <!-- 3 -->
-            <a-modal
-                title="新增用户所属角色"
-                v-model="visible"
-                @ok="modalOk"
-                @cancel="modalCancel"
-                cancelText="取消"
-                okText="确定"
-            >
-                <a-form :form="formModal" :label-col="{ span: 7 }" :wrapper-col="{ span: 12 }">
-                    <a-form-item label="所属角色">
-                        <a-select
-                            style="width: 100%;"
-                            mode="multiple"
-                            placeholder="请选择角色"
-                            v-decorator="['roleIds', { rules: [{ required: true, message: '请选择角色' }] }]"
-                        >
-                            <a-select-option
-                                v-for="(item, index) in roleList"
-                                :key="index"
-                                :value="item.id"
-                            >{{item.roleName}}</a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-form>
-            </a-modal>
-        </div>
-    </content-view>
-</template>
-
-<script>
-export default {
-    name: "userDetail",
-    data() {
-        return {
-            detail: {},
-            // isEdit 是否编辑
-            isEdit: false,
-            // 临时储存用
-            tempInfo: {},
-            // 角色相关
-            roleList: [],
-            columns: [
-                {
-                    title: "序号",
-                    customRender: (text, record, index) => {
-                        return index + 1;
-                    }
-                },
-                {
-                    title: "角色",
-                    dataIndex: "roleName"
-                },
-                {
-                    title: "操作",
-                    dataIndex: "action",
-                    scopedSlots: {
-                        customRender: "action"
-                    }
-                }
-            ],
-            visible: false,
-            formModal: this.$form.createForm(this)
-        };
-    },
-    computed: {
-        editAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "editUser"
-            )
-                ? false
-                : true;
-        },
-        pwdAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "editUserPwd"
-            ) &&
-                (
-                    JSON.parse(sessionStorage.getItem("userInfo")).roleIds || []
-                ).some(item => item === 1) // 只有超级管理员才能修改密码
-                ? false
-                : true;
-        },
-        bindRoleAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "bindRole"
-            )
-                ? false
-                : true;
-        },
-        unbindRoleAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "unbindRole"
-            )
-                ? false
-                : true;
-        },
-        roleDetailAuth() {
-            return this.$store.state.userInfo.permissionList.some(
-                item => item.rights === "roleDetailIndex"
-            )
-                ? false
-                : true;
-        }
-    },
-    methods: {
-        // 获取详情
-        getDetail() {
-            this.$api.userApi
-                .userDetail({
-                    path: {
-                        id: this.$route.query.id
-                    }
-                })
-                .then(res => {
-                    this.detail = res.data;
-                });
-        },
-        // 角色列表
-        getRoleList() {
-            this.$api.roleApi.roleAll().then(res => {
-                this.roleList = res.data;
-            });
-        },
-        // 跳转
-        go(name, record) {
-            if (name === "editUserPwd") {
-                sessionStorage.setItem(
-                    "userDetail",
-                    JSON.stringify(this.detail)
-                );
-                if (
-                    this.detail.id ===
-                    JSON.parse(sessionStorage.getItem("userInfo")).id
-                ) {
-                    this.$router.push({ name: "centerPwd" });
-                    return;
-                }
-            }
-            let obj = {
-                name: name,
-                query: record ? { id: record.roleId } : null
-            };
-            this.$router.push(obj);
-        },
-        // 解绑角色
-        quit(record) {
-            console.log(record);
-            this.$api.userApi
-                .quitRole({
-                    path: {
-                        id: record.id
-                    }
-                })
-                .then(res => {
-                    console.log(res);
-                    this.detail.roles.map((item, index) => {
-                        if (item.id === record.id) {
-                            this.detail.roles.splice(index, 1);
-                            this.$message.success("操作成功");
-                        }
-                    });
-                });
-        },
-        // 编辑用户
-        showEdit() {
-            this.tempInfo = JSON.parse(JSON.stringify(this.detail));
-            this.isEdit = !this.isEdit;
-        },
-        sureEdit() {
-            this.$api.userApi
-                .editUser({
-                    data: {
-                        id: this.$route.query.id,
-                        account: this.tempInfo.account,
-                        name: this.tempInfo.name
-                    }
-                })
-                .then(res => {
-                    this.detail.name = res.data.name;
-                    this.detail.account = res.data.account;
-
-                    // 同步自身数据
-                    if (this.detail.id === this.userInfo.id) {
-                        this.setState({ userInfo: this.detail });
-                    }
-
-                    this.$message.success("操作成功");
-                    this.cancelEdit();
-                });
-        },
-        cancelEdit() {
-            this.isEdit = false;
-        },
-        // 新增所属角色
-        showModal() {
-            this.visible = true;
-        },
-        modalOk() {
-            this.formModal.validateFields((err, values) => {
-                console.log(err, values);
-                if (!err) {
-                    this.$api.userApi
-                        .addUserRole({
-                            data: {
-                                userId: this.$route.query.id,
-                                ...values
-                            }
-                        })
-                        .then(res => {
-                            console.log(res);
-                            this.getDetail();
-                            this.$message.success("操作成功");
-                            this.modalCancel();
-                        });
-                }
-            });
-        },
-        modalCancel() {
-            this.formModal.resetFields();
-            this.visible = false;
-        }
-    },
-    mounted() {
-        this.getDetail();
-        this.getRoleList();
-    }
-};
-</script>
-
-<style lang='scss'>
-.userDetail {
-    &-title {
-        font-size: 16px;
-        font-family: PingFangSC, PingFangSC-Medium;
-        font-weight: 500;
-        text-align: left;
-        color: rgba(0, 0, 0, 0.85);
-    }
-    &-current {
-        display: flex;
-        flex-direction: column;
-        padding-bottom: 27px;
-        border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-        margin-bottom: 30px;
-        &-desc {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            &-left {
-                display: flex;
-                align-items: center;
-                flex: 1;
-                > div {
-                    width: 33%;
-                }
-                .status {
-                    display: flex;
-                    align-items: center;
-                    &-circle {
-                        width: 8px;
-                        height: 8px;
-                        border-radius: 50%;
-                        background-color: rgba(0, 168, 84, 1);
-                        margin-right: 4px;
-                    }
-                    &-red {
-                        background-color: rgba(240, 65, 52, 1);
-                    }
-                }
-            }
-            &-right {
-                width: 20%;
-                display: flex;
-                justify-content: flex-end;
-            }
-        }
-    }
-    &-list {
-        &-top {
-            margin-bottom: 8px;
-        }
-    }
-}
-</style>
diff --git a/src/views/user/web/web/editPwd.vue b/src/views/user/web/web/editPwd.vue
deleted file mode 100644
index c10eddc..0000000
--- a/src/views/user/web/web/editPwd.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-    <content-view>
-        <div class="userPwd">
-            <div class="userPwd-current">
-                <p class="userPwd-title">用户信息</p>
-                <div class="userPwd-current-desc">
-                    <span>姓名：{{detail.name}}</span>
-                    <span>手机号：{{detail.account}}</span>
-                    <div class="status">
-                        <span>状态：</span>
-                        <div :class="{'status-circle': true, 'status-red': detail.state !== 0}"></div>
-                        <span>{{detail.state === 0 ? '启用' : '停用'}}</span>
-                    </div>
-                </div>
-            </div>
-            <div class="userPwd-pwd pb24">
-                <a-form :form="form" :label-col="{ span: 8 }" :wrapper-col="{ span: 7 }">
-                    <a-form-item label="新密码">
-                        <a-input
-                            autocomplete="off"
-                            placeholder="请输入新密码"
-                            v-decorator="['password', { rules: [{ required: true, pattern: /(?!^[0-9]+$)(?!^[A-z]+$)(?!^[^A-z0-9]+$)^.{6,16}$/, message: '6-16个字符，包含数字、字母或符号组成，至少两种' }] }]"
-                        ></a-input>
-                    </a-form-item>
-                    <a-form-item label="确认密码">
-                        <a-input
-                            autocomplete="off"
-                            placeholder="请输入确认密码"
-                            v-decorator="['againPwd', { rules: [{ required: true, validator: validatorPwd }] }]"
-                        ></a-input>
-                    </a-form-item>
-                </a-form>
-                <a-row class="mt24">
-                    <a-col span="22" align="center">
-                        <a-button type="primary" class="mr8" @click="sure">确定</a-button>
-                        <a-button @click="cancel">取消</a-button>
-                    </a-col>
-                </a-row>
-            </div>
-        </div>
-    </content-view>
-</template>
-
-<script>
-export default {
-    name: "editUserPwd",
-    data() {
-        return {
-            detail: {},
-            form: this.$form.createForm(this)
-        };
-    },
-    methods: {
-        sure() {
-            if (
-                !this.form.getFieldValue("password") ||
-                !this.form.getFieldValue("againPwd")
-            ) {
-                this.$message.info("请输入密码");
-                return;
-            }
-            this.$api.userApi
-                .updUserPwd({
-                    data: {
-                        userId: this.detail.id,
-                        password: this.form.getFieldValue("password")
-                    }
-                })
-                .then(res => {
-                    console.log(res);
-                    this.cancel();
-                });
-        },
-        cancel() {
-            sessionStorage.removeItem("userDetail");
-            this.$router.go(-1);
-        },
-        validatorPwd(rule, value, callback) {
-            if (this.form.getFieldValue("password") === value) {
-                callback();
-            } else {
-                callback("两次密码输入不一致");
-            }
-        }
-    },
-    created() {
-        this.detail = sessionStorage.getItem("userDetail")
-            ? JSON.parse(sessionStorage.getItem("userDetail"))
-            : {};
-    }
-};
-</script>
-
-<style lang='scss'>
-.userPwd {
-    &-title {
-        font-size: 16px;
-        font-family: PingFangSC, PingFangSC-Medium;
-        font-weight: 500;
-        text-align: left;
-        color: rgba(0, 0, 0, 0.85);
-    }
-    &-current {
-        display: flex;
-        flex-direction: column;
-        padding-bottom: 27px;
-        border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-        margin-bottom: 30px;
-        &-desc {
-            width: 70%;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            .status {
-                display: flex;
-                align-items: center;
-                &-circle {
-                    width: 8px;
-                    height: 8px;
-                    border-radius: 50%;
-                    background-color: rgba(0, 168, 84, 1);
-                    margin-right: 4px;
-                }
-                &-red {
-                    background-color: rgba(240, 65, 52, 1);
-                }
-            }
-        }
-    }
-}
-</style>
diff --git a/src/views/user/web/web/index.vue b/src/views/user/web/web/index.vue
deleted file mode 100644
index 0d6ed7f..0000000
--- a/src/views/user/web/web/index.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<template>
-    <detail v-if="$route.name === 'userDetailIndex'"></detail>
-    <router-view v-else></router-view>
-</template>
-
-<script>
-import detail from "./detail";
-export default {
-    name: "userDetailIndex",
-    components: {
-        detail
-    }
-};
-</script>
-
-<style></style>