From 5b108d78b79275b54032913218caeb74a93b6d52 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Mon, 15 Aug 2022 11:46:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8C=89=E9=92=AE=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/views/dev_tools/code/index.vue      | 30 ++++++++++++-------
 .../views/organization/department/index.vue   |  8 ++---
 admin/src/views/organization/post/index.vue   |  6 ++--
 admin/src/views/permission/admin/edit.vue     | 16 ++++------
 admin/src/views/permission/admin/index.vue    |  7 ++---
 admin/src/views/setting/dict/data/index.vue   |  4 +--
 admin/src/views/setting/storage/index.vue     |  2 +-
 admin/src/views/setting/system/journal.vue    |  8 ++---
 .../src/views/setting/website/information.vue | 10 ++-----
 admin/src/views/setting/website/protocol.vue  |  2 +-
 admin/src/views/template/index.vue            |  3 +-
 11 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/admin/src/views/dev_tools/code/index.vue b/admin/src/views/dev_tools/code/index.vue
index c6f273c8..54454632 100644
--- a/admin/src/views/dev_tools/code/index.vue
+++ b/admin/src/views/dev_tools/code/index.vue
@@ -17,7 +17,7 @@
         <el-card class="!border-none mt-4" shadow="never" v-loading="pager.loading">
             <div class="flex">
                 <data-table
-                    v-perms="['tools.generator/selectTable']"
+                    v-perms="['gen:importTable']"
                     class="inline-block mr-[10px]"
                     @success="getLists"
                 >
@@ -29,7 +29,7 @@
                     </el-button>
                 </data-table>
                 <el-button
-                    v-perms="['tools.generator/delete']"
+                    v-perms="['gen:delTable']"
                     :disabled="!selectData.length"
                     @click="handleDelete(selectData)"
                     type="danger"
@@ -40,7 +40,7 @@
                     删除
                 </el-button>
                 <el-button
-                    v-perms="['tools.generator/generate']"
+                    v-perms="['gen:genCode', 'gen:downloadCode']"
                     :disabled="!selectData.length"
                     @click="handleGenerate(selectData)"
                 >
@@ -58,11 +58,11 @@
                     <el-table-column label="表描述" prop="tableComment" min-width="180" />
                     <el-table-column label="创建时间" prop="createTime" min-width="180" />
                     <el-table-column label="更新时间" prop="updateTime" min-width="180" />
-                    <el-table-column label="操作" width="150" fixed="right">
+                    <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
                             <div class="flex items-center">
                                 <el-button
-                                    v-perms="['tools.generator/preview']"
+                                    v-perms="['gen:previewCode']"
                                     type="primary"
                                     link
                                     @click="handlePreview(row.id)"
@@ -70,9 +70,8 @@
                                     预览
                                 </el-button>
 
-                                <el-button type="primary" link>
+                                <el-button type="primary" link v-perms="['gen:editTable']">
                                     <router-link
-                                        v-perms="['tools.generator/edit']"
                                         :to="{
                                             path: '/dev_tools/code/edit',
                                             query: {
@@ -83,7 +82,16 @@
                                         编辑
                                     </router-link></el-button
                                 >
-                                <el-dropdown class="ml-2" @command="handleCommand($event, row)">
+                                <el-dropdown
+                                    class="ml-2"
+                                    @command="handleCommand($event, row)"
+                                    v-perms="[
+                                        'gen:genCode',
+                                        'gen:downloadCode',
+                                        'gen:syncTable',
+                                        'gen:delTable'
+                                    ]"
+                                >
                                     <el-button type="primary" link>
                                         更多
                                         <icon name="el-icon-ArrowDown" :size="14" />
@@ -91,21 +99,21 @@
 
                                     <template #dropdown>
                                         <el-dropdown-menu>
-                                            <div v-perms="['tools.generator/']">
+                                            <div v-perms="['gen:genCode', 'gen:downloadCode']">
                                                 <el-dropdown-item command="generate">
                                                     <el-button type="primary" link>
                                                         生成代码
                                                     </el-button>
                                                 </el-dropdown-item>
                                             </div>
-                                            <div v-perms="['tools.generator/']">
+                                            <div v-perms="['gen:syncTable']">
                                                 <el-dropdown-item command="sync">
                                                     <el-button type="primary" link>
                                                         同步
                                                     </el-button>
                                                 </el-dropdown-item>
                                             </div>
-                                            <div v-perms="['tools.generator/']">
+                                            <div v-perms="['gen:delTable']">
                                                 <el-dropdown-item command="delete">
                                                     <el-button type="danger" link> 删除 </el-button>
                                                 </el-dropdown-item>
diff --git a/admin/src/views/organization/department/index.vue b/admin/src/views/organization/department/index.vue
index 01eb3419..1eddc73d 100644
--- a/admin/src/views/organization/department/index.vue
+++ b/admin/src/views/organization/department/index.vue
@@ -20,7 +20,7 @@
         </el-card>
         <el-card class="!border-none mt-4" shadow="never">
             <div>
-                <el-button v-perms="['dept.dept/add']" type="primary" @click="handleAdd()">
+                <el-button v-perms="['system:dept:add']" type="primary" @click="handleAdd()">
                     <template #icon>
                         <icon name="el-icon-Plus" />
                     </template>
@@ -55,7 +55,7 @@
                 <el-table-column label="操作" width="160" fixed="right">
                     <template #default="{ row }">
                         <el-button
-                            v-perms="['dept.dept/add']"
+                            v-perms="['system:dept:add']"
                             type="primary"
                             link
                             @click="handleAdd(row.id)"
@@ -63,7 +63,7 @@
                             新增
                         </el-button>
                         <el-button
-                            v-perms="['dept.dept/edit']"
+                            v-perms="['system:dept:edit']"
                             type="primary"
                             link
                             @click="handleEdit(row)"
@@ -72,7 +72,7 @@
                         </el-button>
                         <el-button
                             v-if="row.pid !== 0"
-                            v-perms="['dept.dept/delete']"
+                            v-perms="['system:dept:del']"
                             type="danger"
                             link
                             @click="handleDelete(row.id)"
diff --git a/admin/src/views/organization/post/index.vue b/admin/src/views/organization/post/index.vue
index 760ca61c..39592a61 100644
--- a/admin/src/views/organization/post/index.vue
+++ b/admin/src/views/organization/post/index.vue
@@ -23,7 +23,7 @@
         </el-card>
         <el-card class="!border-none mt-4" shadow="never">
             <div>
-                <el-button v-perms="['dept.jobs/add']" type="primary" @click="handleAdd()">
+                <el-button v-perms="['system:post:add']" type="primary" @click="handleAdd()">
                     <template #icon>
                         <icon name="el-icon-Plus" />
                     </template>
@@ -45,7 +45,7 @@
                 <el-table-column label="操作" width="120" fixed="right">
                     <template #default="{ row }">
                         <el-button
-                            v-perms="['dept.jobs/edit']"
+                            v-perms="['system:post:edit']"
                             type="primary"
                             link
                             @click="handleEdit(row)"
@@ -53,7 +53,7 @@
                             编辑
                         </el-button>
                         <el-button
-                            v-perms="['dept.jobs/delete']"
+                            v-perms="['system:post:del']"
                             type="danger"
                             link
                             @click="handleDelete(row.id)"
diff --git a/admin/src/views/permission/admin/edit.vue b/admin/src/views/permission/admin/edit.vue
index b4093246..dec66532 100644
--- a/admin/src/views/permission/admin/edit.vue
+++ b/admin/src/views/permission/admin/edit.vue
@@ -15,7 +15,7 @@
                         v-model="formData.username"
                         :disabled="isRoot"
                         placeholder="请输入账号"
-                    ></el-input>
+                    />
                 </el-form-item>
                 <el-form-item label="头像">
                     <div>
@@ -54,7 +54,7 @@
                             :key="index"
                             :label="item.name"
                             :value="item.id"
-                        ></el-option>
+                        />
                     </el-select>
                 </el-form-item>
 
@@ -65,22 +65,18 @@
                         class="flex-1"
                         placeholder="请选择角色"
                     >
-                        <el-option v-if="isRoot" label="系统管理员" value="0"></el-option>
+                        <el-option v-if="isRoot" label="系统管理员" value="0" />
                         <el-option
                             v-for="(item, index) in optionsData.role"
                             :key="index"
                             :label="item.name"
                             :value="String(item.id)"
-                        ></el-option>
+                        />
                     </el-select>
                 </el-form-item>
 
                 <el-form-item label="密码" prop="password">
-                    <el-input
-                        v-model="formData.password"
-                        show-password
-                        placeholder="请输入密码"
-                    ></el-input>
+                    <el-input v-model="formData.password" show-password placeholder="请输入密码" />
                 </el-form-item>
 
                 <el-form-item label="确认密码" prop="passwordConfirm">
@@ -88,7 +84,7 @@
                         v-model="formData.passwordConfirm"
                         show-password
                         placeholder="请输入确认密码"
-                    ></el-input>
+                    />
                 </el-form-item>
 
                 <el-form-item label="管理员状态" v-if="!isRoot">
diff --git a/admin/src/views/permission/admin/index.vue b/admin/src/views/permission/admin/index.vue
index 3519fee5..fe79e935 100644
--- a/admin/src/views/permission/admin/index.vue
+++ b/admin/src/views/permission/admin/index.vue
@@ -47,13 +47,10 @@
                     <el-table-column label="创建时间" prop="createTime" min-width="180" />
                     <el-table-column label="最近登录时间" prop="lastLoginTime" min-width="180" />
                     <el-table-column label="最近登录IP" prop="lastLoginIp" min-width="120" />
-                    <el-table-column
-                        label="状态"
-                        min-width="100"
-                        v-perms="['system:admin:disable']"
-                    >
+                    <el-table-column label="状态" min-width="100">
                         <template #default="{ row }">
                             <el-switch
+                                v-perms="['system:admin:disable']"
                                 v-if="row.id != 1"
                                 :model-value="row.isDisable"
                                 :active-value="0"
diff --git a/admin/src/views/setting/dict/data/index.vue b/admin/src/views/setting/dict/data/index.vue
index 63202b88..de23ee7c 100644
--- a/admin/src/views/setting/dict/data/index.vue
+++ b/admin/src/views/setting/dict/data/index.vue
@@ -71,7 +71,7 @@
                         <el-table-column label="操作" width="120" fixed="right">
                             <template #default="{ row }">
                                 <el-button
-                                    v-perms="['setting.dict.dict_data/edit']"
+                                    v-perms="['setting:dict:data:edit']"
                                     link
                                     type="primary"
                                     @click="handleEdit(row)"
@@ -79,7 +79,7 @@
                                     编辑
                                 </el-button>
                                 <el-button
-                                    v-perms="['setting.dict.dict_data/delete']"
+                                    v-perms="['setting:dict:data:del']"
                                     link
                                     type="danger"
                                     @click="handleDelete(row.id)"
diff --git a/admin/src/views/setting/storage/index.vue b/admin/src/views/setting/storage/index.vue
index cf9d10cb..df683e45 100644
--- a/admin/src/views/setting/storage/index.vue
+++ b/admin/src/views/setting/storage/index.vue
@@ -21,7 +21,7 @@
                 <el-table-column label="操作" min-width="80" fixed="right">
                     <template #default="{ row }">
                         <el-button
-                            v-perms="['setting.storage/setup']"
+                            v-perms="['setting:storage:edit']"
                             type="primary"
                             link
                             @click="handleSet(row.alias)"
diff --git a/admin/src/views/setting/system/journal.vue b/admin/src/views/setting/system/journal.vue
index 73c75818..32700993 100644
--- a/admin/src/views/setting/system/journal.vue
+++ b/admin/src/views/setting/system/journal.vue
@@ -23,10 +23,10 @@
                 </el-form-item>
 
                 <el-form-item label="访问时间">
-                    <data-picker
-                        v-model:start_time="formData.startTime"
-                        v-model:end_time="formData.endTime"
-                    ></data-picker>
+                    <daterange-picker
+                        v-model:startTime="formData.startTime"
+                        v-model:endTime="formData.endTime"
+                    />
                 </el-form-item>
 
                 <el-form-item label="访问链接">
diff --git a/admin/src/views/setting/website/information.vue b/admin/src/views/setting/website/information.vue
index 282a88d4..6ad05c17 100644
--- a/admin/src/views/setting/website/information.vue
+++ b/admin/src/views/setting/website/information.vue
@@ -2,13 +2,7 @@
 <template>
     <div class="website-information">
         <el-card shadow="never" class="!border-none">
-            <el-form
-                ref="formRef"
-                :rules="rules"
-                class="ls-form"
-                :model="formData"
-                label-width="120px"
-            >
+            <el-form ref="formRef" :rules="rules" :model="formData" label-width="120px">
                 <el-form-item label="网站名称" prop="name">
                     <div class="w-80">
                         <el-input
@@ -40,7 +34,7 @@
             </el-form>
         </el-card>
 
-        <footer-btns v-perms="['setting.web.web_setting/setWebsite']">
+        <footer-btns v-perms="['setting:website:save']">
             <el-button type="primary" @click="handleSubmit">保存</el-button>
         </footer-btns>
     </div>
diff --git a/admin/src/views/setting/website/protocol.vue b/admin/src/views/setting/website/protocol.vue
index 5fecdffe..618ab97f 100644
--- a/admin/src/views/setting/website/protocol.vue
+++ b/admin/src/views/setting/website/protocol.vue
@@ -25,7 +25,7 @@
             <editor class="mb-10" v-model="formData.privacy.content" height="500"></editor>
         </el-card>
     </div>
-    <footer-btns v-perms="['setting.web.web_setting/setAgreement']">
+    <footer-btns v-perms="['setting:protocol:save']">
         <el-button type="primary" @click="handelSave">保存</el-button>
     </footer-btns>
 </template>
diff --git a/admin/src/views/template/index.vue b/admin/src/views/template/index.vue
index 982d8ef1..a5727a3e 100644
--- a/admin/src/views/template/index.vue
+++ b/admin/src/views/template/index.vue
@@ -97,7 +97,8 @@ const { pager, getLists, resetPage, resetParams } = usePaging({
 // 获取字典类型数据，需要替换
 const { dictData } = useDictData<{
     dict_sex: any[]
-}>(['dict_sex'])
+    dict_1: any[]
+}>(['dict_sex', 'dict_1'])
 
 const handleAdd = async () => {
     showEdit.value = true