From 61fa3dcc61cf9a3cf3a969bd1db064d3a9204639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88?= <2960252003@qq.com>
Date: Wed, 20 Mar 2024 16:03:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ticket.ts                             |  26 +-
 src/api/user.ts                               |   2 +
 src/components/navbar/index.vue               |  16 -
 src/directive/permission/index.ts             |   6 +-
 src/locale/en-US.ts                           |   2 +-
 src/locale/zh-CN.ts                           |   2 +-
 src/router/routes/modules/user.ts             |  20 +-
 src/router/routes/modules/visualization.ts    |   1 -
 src/store/modules/ticket/index.ts             |  16 +-
 src/store/modules/ticket/type.ts              |   1 +
 src/store/modules/user/index.ts               |   5 +-
 .../workplace/components/data-panel.vue       | 105 ++--
 src/views/dashboard/workplace/index.vue       | 201 +++-----
 src/views/dashboard/workplace/locale/en-US.ts |   5 +
 src/views/dashboard/workplace/locale/zh-CN.ts |   4 +
 src/views/login/components/login-form.vue     |   5 +-
 .../system/user/components/user-edit.vue      |  32 +-
 src/views/system/user/locale/en-US.ts         |   1 +
 src/views/system/user/locale/zh-CN.ts         |   1 +
 .../ticket/manage/components/form-edit.vue    |  27 +-
 .../ticket/manage/components/ticket-edit.vue  |  42 +-
 src/views/ticket/manage/index.vue             |  32 +-
 .../components/data-overview.vue              | 487 +++++++++---------
 23 files changed, 503 insertions(+), 536 deletions(-)

diff --git a/src/api/ticket.ts b/src/api/ticket.ts
index 1372174..7efac5e 100644
--- a/src/api/ticket.ts
+++ b/src/api/ticket.ts
@@ -11,6 +11,7 @@ export interface TicketCreateRecord {
   auditorId: string;
   submit: boolean;
   userId: undefined;
+  comment: string;
 }
 
 export interface TicketRecord extends TicketCreateRecord {
@@ -18,12 +19,7 @@ export interface TicketRecord extends TicketCreateRecord {
   id: undefined;
   status: string
 }
-export interface auditRecord {
-  auditorId: string;
-  comment: string;
-  result: string;
-  ticketId: string;
-}
+
 
 // 票据列表
 export function queryTicket(data: any) {
@@ -62,20 +58,10 @@ export function uploadFile(file: any) {
 
 // 获取附件信息
 export function attachment(id:string){
-  return axios.get(`/api/rest/attachment/find/${id}`)
+  return axios.get(`/api/rest/attachment/find/${id}`);
 }
 
-// 审核
-export function audit(ticketId: string, params: auditRecord) {
-  return axios.patch(`/api/rest/bill/audit/${ticketId}`, params); 
+// 首页数据
+export function home(data: any){
+  return axios.get('/api/rest/bill/home',data);
 }
-
-// 审核员管理的票据列表
-export function auditTickctList(data: any){
-  return axios({
-    url: '/api/rest/bill/audit/list', // 路径
-    method: 'get',
-    params: data, // 参数
-  });
-}
-
diff --git a/src/api/user.ts b/src/api/user.ts
index ea213fb..87b5538 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -160,6 +160,8 @@ export function deptAudit(id: string,roleId:string){
   }); 
 }
 
+
+
 export function switchRole(roleId: number) {
   return axios.patch<UserState>(`/api/user/self/switch-role/${roleId}`);
 }
diff --git a/src/components/navbar/index.vue b/src/components/navbar/index.vue
index 0fefe3b..e254742 100644
--- a/src/components/navbar/index.vue
+++ b/src/components/navbar/index.vue
@@ -154,22 +154,6 @@
             <img alt="avatar" :src="avatar" />
           </a-avatar>
           <template #content>
-            <!--            <a-doption>-->
-            <!--              <a-space @click="switchRoles">-->
-            <!--                <icon-tag />-->
-            <!--                <span>-->
-            <!--                  {{ $t('messageBox.switchRoles') }}-->
-            <!--                </span>-->
-            <!--              </a-space>-->
-            <!--            </a-doption>-->
-            <a-doption>
-              <a-space @click="$router.push({ name: 'Info' })">
-                <icon-user />
-                <span>
-                  {{ $t('messageBox.userCenter') }}
-                </span>
-              </a-space>
-            </a-doption>
             <a-doption>
               <a-space @click="$router.push({ name: 'Setting' })">
                 <icon-settings />
diff --git a/src/directive/permission/index.ts b/src/directive/permission/index.ts
index 279067c..3bf0499 100644
--- a/src/directive/permission/index.ts
+++ b/src/directive/permission/index.ts
@@ -5,11 +5,13 @@ import { intersection } from 'lodash';
 function checkPermission(el: HTMLElement, binding: DirectiveBinding) {
   const { value } = binding;
   const userStore = useUserStore();
-  const { permissions } = userStore;
+  const { authorities } = userStore;
 
   if (Array.isArray(value)) {
+    
     if (value.length > 0) {
-      const hasPermission = intersection(value, permissions).length > 0;
+      const hasPermission = intersection(value, authorities).length > 0;
+      
       if (!hasPermission && el.parentNode) {
         el.parentNode.removeChild(el);
       }
diff --git a/src/locale/en-US.ts b/src/locale/en-US.ts
index 6739e32..5829caa 100644
--- a/src/locale/en-US.ts
+++ b/src/locale/en-US.ts
@@ -36,7 +36,7 @@ import localeSettings from './en-US/settings';
 
 export default {
   'ticket.manage.system':'Ticket Manage System',
-  'menu.dashboard': 'Dashboard',
+  'menu.dashboard': 'Home',
   'menu.server.dashboard': 'Dashboard-Server',
   'menu.server.workplace': 'Workplace-Server',
   'menu.server.monitor': 'Monitor-Server',
diff --git a/src/locale/zh-CN.ts b/src/locale/zh-CN.ts
index 8ed7c78..05aaf08 100644
--- a/src/locale/zh-CN.ts
+++ b/src/locale/zh-CN.ts
@@ -36,7 +36,7 @@ import localeSettings from './zh-CN/settings';
 
 export default {
   'ticket.manage.system':'票据管理系统',
-  'menu.dashboard': '仪表盘',
+  'menu.dashboard': '首页',
   'menu.server.dashboard': '仪表盘-服务端',
   'menu.server.workplace': '工作台-服务端',
   'menu.server.monitor': '实时监控-服务端',
diff --git a/src/router/routes/modules/user.ts b/src/router/routes/modules/user.ts
index 3ceb49d..371519d 100644
--- a/src/router/routes/modules/user.ts
+++ b/src/router/routes/modules/user.ts
@@ -12,16 +12,16 @@ const USER: AppRouteRecordRaw = {
     order: 7,
   },
   children: [
-    {
-      path: 'info',
-      name: 'Info',
-      component: () => import('@/views/user/info/index.vue'),
-      meta: {
-        locale: 'menu.user.info',
-        requiresAuth: true,
-        permissions: ['*'],
-      },
-    },
+    // {
+    //   path: 'info',
+    //   name: 'Info',
+    //   component: () => import('@/views/user/info/index.vue'),
+    //   meta: {
+    //     locale: 'menu.user.info',
+    //     requiresAuth: true,
+    //     permissions: ['*'],
+    //   },
+    // },
     {
       path: 'setting',
       name: 'Setting',
diff --git a/src/router/routes/modules/visualization.ts b/src/router/routes/modules/visualization.ts
index 67e3cc4..2122fc8 100644
--- a/src/router/routes/modules/visualization.ts
+++ b/src/router/routes/modules/visualization.ts
@@ -35,5 +35,4 @@ const VISUALIZATION: AppRouteRecordRaw = {
     },
   ],
 };
-
 // export default VISUALIZATION;
diff --git a/src/store/modules/ticket/index.ts b/src/store/modules/ticket/index.ts
index 3831281..5c4907b 100644
--- a/src/store/modules/ticket/index.ts
+++ b/src/store/modules/ticket/index.ts
@@ -2,7 +2,6 @@ import { defineStore } from 'pinia';
 import {
   TicketRecord,
   TicketCreateRecord,
-  auditRecord,
   queryTicket,
   remove,
   getDetail,
@@ -10,9 +9,7 @@ import {
   update,
   uploadFile,
   attachment,
-  audit,
-  auditTickctList,
-
+  home
 } from '@/api/ticket';
 import { ticketStore } from './type';
 
@@ -29,6 +26,7 @@ const useTicketStore = defineStore('ticket', {
     contactEmail: undefined,
     companyName: undefined,
     userId: undefined,
+    submit: undefined
   }),
 
   getters: {
@@ -65,13 +63,9 @@ const useTicketStore = defineStore('ticket', {
       return attachment(id);
     },
 
-    async auditTicket(ticketId: string, data: auditRecord) {
-      return audit(ticketId, data);
-    },
-
-    async auditTickctList(data:any){
-      return auditTickctList(data);
-    }
+    async getHome(data: any){
+      return home(data);
+    } 
   },
 });
 
diff --git a/src/store/modules/ticket/type.ts b/src/store/modules/ticket/type.ts
index ac34918..db2ac83 100644
--- a/src/store/modules/ticket/type.ts
+++ b/src/store/modules/ticket/type.ts
@@ -10,4 +10,5 @@ export interface ticketStore {
   contactEmail?: string;
   companyName?: string;
   userId?: undefined;
+  submit?: undefined 
 }
diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts
index cabf6f0..70afbe2 100644
--- a/src/store/modules/user/index.ts
+++ b/src/store/modules/user/index.ts
@@ -56,8 +56,9 @@ const useUserStore = defineStore('user', {
 
     async info() {
       const res = await getUserInfo();
-      res.data.user.permissions = res.data.permissions
-      this.setInfo(res.data.user);
+      res.data.user.permissions = res.data.permissions;
+      res.data.user.authorities = res.data.authorities;
+      this.setInfo(res.data.user); 
     },
 
     // Get user's crsf
diff --git a/src/views/dashboard/workplace/components/data-panel.vue b/src/views/dashboard/workplace/components/data-panel.vue
index 43d8999..b5e476a 100644
--- a/src/views/dashboard/workplace/components/data-panel.vue
+++ b/src/views/dashboard/workplace/components/data-panel.vue
@@ -12,15 +12,14 @@
           />
         </a-avatar>
         <a-statistic
-          :title="$t('workplace.onlineContent')"
-          :value="373.5"
-          :precision="1"
+          :title="$t('workplace.pass')"
+          :value="formData.pass"
           :value-from="0"
           animation
           show-group-separator
         >
           <template #suffix>
-            W+ <span class="unit">{{ $t('workplace.pecs') }}</span>
+            <span class="unit">{{ $t('workplace.pecs') }}</span>
           </template>
         </a-statistic>
       </a-space>
@@ -37,8 +36,8 @@
           />
         </a-avatar>
         <a-statistic
-          :title="$t('workplace.putIn')"
-          :value="368"
+          :title="$t('workplace.notPass')"
+          :value="formData.notPass"
           :value-from="0"
           animation
           show-group-separator
@@ -61,8 +60,8 @@
           />
         </a-avatar>
         <a-statistic
-          :title="$t('workplace.newDay')"
-          :value="8874"
+          :title="$t('workplace.notAudit')"
+          :value="formData.notAudit"
           :value-from="0"
           animation
           show-group-separator
@@ -86,13 +85,16 @@
           />
         </a-avatar>
         <a-statistic
-          :title="$t('workplace.newFromYesterday')"
-          :value="2.8"
-          :precision="1"
+          v-model="formData.notFiled"
+          :title="$t('workplace.notFiled')"
+          :value="formData.notFiled || 0"
           :value-from="0"
           animation
+          show-group-separator
         >
-          <template #suffix> % <icon-caret-up class="up-icon" /> </template>
+          <template #suffix>
+            <span class="unit">{{ $t('workplace.pecs') }}</span>
+          </template>
         </a-statistic>
       </a-space>
     </a-grid-item>
@@ -102,30 +104,61 @@
   </a-grid>
 </template>
 
-<script lang="ts" setup></script>
+
+<script lang="ts" setup>
+import { useTicketStore, useUserStore } from '@/store';
+import { ref } from 'vue';
+
+const ticketStore = useTicketStore();
+const userStore = useUserStore();
+const formData = ref({
+  notAudit: undefined,
+  notFiled: undefined,
+  notPass: undefined,
+  pass: undefined,
+});
+
+const getHomeData = async (params: {
+  auditorId: number | undefined;
+  userId: number | string | undefined;
+}) => {
+  if (userStore.permissions === 'admin') {
+    params.userId = '';
+  } else if (userStore.permissions === 'auditor') {
+    params.auditorId = userStore.id;
+  } else if (userStore.permissions === 'user') {
+    params.userId = userStore.id;
+  }
+
+  ticketStore.getHome(params).then((res) => {
+    formData.value = res.data;
+  });
+};
+getHomeData({});
+</script>
 
 <style lang="less" scoped>
-  .arco-grid.panel {
-    margin-bottom: 0;
-    padding: 16px 20px 0 20px;
-  }
-  .panel-col {
-    padding-left: 43px;
-    border-right: 1px solid rgb(var(--gray-2));
-  }
-  .col-avatar {
-    margin-right: 12px;
-    background-color: var(--color-fill-2);
-  }
-  .up-icon {
-    color: rgb(var(--red-6));
-  }
-  .unit {
-    margin-left: 8px;
-    color: rgb(var(--gray-8));
-    font-size: 12px;
-  }
-  :deep(.panel-border) {
-    margin: 4px 0 0 0;
-  }
+.arco-grid.panel {
+  margin-bottom: 0;
+  padding: 16px 20px 0 20px;
+}
+.panel-col {
+  padding-left: 43px;
+  border-right: 1px solid rgb(var(--gray-2));
+}
+.col-avatar {
+  margin-right: 12px;
+  background-color: var(--color-fill-2);
+}
+.up-icon {
+  color: rgb(var(--red-6));
+}
+.unit {
+  margin-left: 8px;
+  color: rgb(var(--gray-8));
+  font-size: 12px;
+}
+:deep(.panel-border) {
+  margin: 4px 0 0 0;
+}
 </style>
diff --git a/src/views/dashboard/workplace/index.vue b/src/views/dashboard/workplace/index.vue
index 379e5ce..2eb930a 100644
--- a/src/views/dashboard/workplace/index.vue
+++ b/src/views/dashboard/workplace/index.vue
@@ -1,148 +1,105 @@
 <template>
   <div class="container">
     <div class="left-side">
-      <div class="panel">
-        <Banner />
-        <DataPanel />
-        <ContentChart />
-      </div>
-      <a-grid :cols="24" :col-gap="16" :row-gap="16" style="margin-top: 16px">
-        <a-grid-item
-          :span="{ xs: 24, sm: 24, md: 24, lg: 12, xl: 12, xxl: 12 }"
-        >
-          <PopularContent />
-        </a-grid-item>
-        <a-grid-item
-          :span="{ xs: 24, sm: 24, md: 24, lg: 12, xl: 12, xxl: 12 }"
-        >
-          <CategoriesPercent />
-        </a-grid-item>
-      </a-grid>
-    </div>
-    <div class="right-side">
-      <a-grid :cols="24" :row-gap="16">
-        <a-grid-item :span="24">
-          <div class="panel moduler-wrap">
-            <QuickOperation />
-            <RecentlyVisited />
-          </div>
-        </a-grid-item>
-        <a-grid-item class="panel" :span="24">
-          <Carousel />
-        </a-grid-item>
-        <a-grid-item class="panel" :span="24">
-          <Announcement />
-        </a-grid-item>
-        <a-grid-item class="panel" :span="24">
-          <Docs />
-        </a-grid-item>
-      </a-grid>
+      <div class="panel"> <Banner /> <DataPanel /></div>
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
-  import Banner from './components/banner.vue';
-  import DataPanel from './components/data-panel.vue';
-  import ContentChart from './components/content-chart.vue';
-  import PopularContent from './components/popular-content.vue';
-  import CategoriesPercent from './components/categories-percent.vue';
-  import RecentlyVisited from './components/recently-visited.vue';
-  import QuickOperation from './components/quick-operation.vue';
-  import Announcement from './components/announcement.vue';
-  import Carousel from './components/carousel.vue';
-  import Docs from './components/docs.vue';
+import Banner from './components/banner.vue';
+import DataPanel from './components/data-panel.vue';
 </script>
 
 <script lang="ts">
-  export default {
-    name: 'Dashboard', // If you want the include property of keep-alive to take effect, you must name the component
-  };
+export default {
+  name: 'Dashboard', // If you want the include property of keep-alive to take effect, you must name the component
+};
 </script>
 
 <style lang="less" scoped>
-  .container {
-    background-color: var(--color-fill-2);
-    padding: 16px 20px;
-    padding-bottom: 0;
-    display: flex;
+.container {
+  background-color: var(--color-fill-2);
+  padding: 16px 20px;
+  padding-bottom: 0;
+  display: flex;
+}
+
+.left-side {
+  flex: 1;
+  overflow: auto;
+}
+
+.right-side {
+  width: 280px;
+  margin-left: 16px;
+}
+
+.panel {
+  background-color: var(--color-bg-2);
+  border-radius: 4px;
+  overflow: auto;
+}
+:deep(.panel-border) {
+  margin-bottom: 0;
+  border-bottom: 1px solid rgb(var(--gray-2));
+}
+.moduler-wrap {
+  border-radius: 4px;
+  background-color: var(--color-bg-2);
+  :deep(.text) {
+    font-size: 12px;
+    text-align: center;
+    color: rgb(var(--gray-8));
   }
 
-  .left-side {
-    flex: 1;
-    overflow: auto;
-  }
+  :deep(.wrapper) {
+    margin-bottom: 8px;
+    text-align: center;
+    cursor: pointer;
 
-  .right-side {
-    width: 280px;
-    margin-left: 16px;
-  }
-
-  .panel {
-    background-color: var(--color-bg-2);
-    border-radius: 4px;
-    overflow: auto;
-  }
-  :deep(.panel-border) {
-    margin-bottom: 0;
-    border-bottom: 1px solid rgb(var(--gray-2));
-  }
-  .moduler-wrap {
-    border-radius: 4px;
-    background-color: var(--color-bg-2);
-    :deep(.text) {
-      font-size: 12px;
-      text-align: center;
-      color: rgb(var(--gray-8));
-    }
-
-    :deep(.wrapper) {
-      margin-bottom: 8px;
-      text-align: center;
-      cursor: pointer;
-
-      &:last-child {
-        .text {
-          margin-bottom: 0;
-        }
-      }
-      &:hover {
-        .icon {
-          color: rgb(var(--arcoblue-6));
-          background-color: #e8f3ff;
-        }
-        .text {
-          color: rgb(var(--arcoblue-6));
-        }
+    &:last-child {
+      .text {
+        margin-bottom: 0;
       }
     }
-
-    :deep(.icon) {
-      display: inline-block;
-      width: 32px;
-      height: 32px;
-      margin-bottom: 4px;
-      color: rgb(var(--dark-gray-1));
-      line-height: 32px;
-      font-size: 16px;
-      text-align: center;
-      background-color: rgb(var(--gray-1));
-      border-radius: 4px;
+    &:hover {
+      .icon {
+        color: rgb(var(--arcoblue-6));
+        background-color: #e8f3ff;
+      }
+      .text {
+        color: rgb(var(--arcoblue-6));
+      }
     }
   }
+
+  :deep(.icon) {
+    display: inline-block;
+    width: 32px;
+    height: 32px;
+    margin-bottom: 4px;
+    color: rgb(var(--dark-gray-1));
+    line-height: 32px;
+    font-size: 16px;
+    text-align: center;
+    background-color: rgb(var(--gray-1));
+    border-radius: 4px;
+  }
+}
 </style>
 
 <style lang="less" scoped>
-  // responsive
-  .mobile {
-    .container {
-      display: block;
-    }
-    .right-side {
-      // display: none;
-      width: 100%;
-      margin-left: 0;
-      margin-top: 16px;
-    }
+// responsive
+.mobile {
+  .container {
+    display: block;
   }
+  .right-side {
+    // display: none;
+    width: 100%;
+    margin-left: 0;
+    margin-top: 16px;
+  }
+}
 </style>
diff --git a/src/views/dashboard/workplace/locale/en-US.ts b/src/views/dashboard/workplace/locale/en-US.ts
index 5eef6ad..718ea4e 100644
--- a/src/views/dashboard/workplace/locale/en-US.ts
+++ b/src/views/dashboard/workplace/locale/en-US.ts
@@ -35,4 +35,9 @@ export default {
   'workplace.popularContent.video': 'video',
   'workplace.categoriesPercent': 'Categories Percent',
   'workplace.pecs': 'pecs',
+
+  'workplace.pass': 'pass',
+  'workplace.notPass': 'notPass',
+  'workplace.notAudit': 'notAudit',
+  'workplace.notFiled': 'notFiled',
 };
diff --git a/src/views/dashboard/workplace/locale/zh-CN.ts b/src/views/dashboard/workplace/locale/zh-CN.ts
index 4eebcc8..077194d 100644
--- a/src/views/dashboard/workplace/locale/zh-CN.ts
+++ b/src/views/dashboard/workplace/locale/zh-CN.ts
@@ -34,4 +34,8 @@ export default {
   'workplace.popularContent.video': '视频',
   'workplace.categoriesPercent': '内容类型占比',
   'workplace.pecs': '个',
+  'workplace.pass': '审核通过',
+  'workplace.notPass': '审核不通过',
+  'workplace.notAudit': '待审核',
+  'workplace.notFiled': '待提交',
 };
diff --git a/src/views/login/components/login-form.vue b/src/views/login/components/login-form.vue
index d271e8f..70f8b56 100644
--- a/src/views/login/components/login-form.vue
+++ b/src/views/login/components/login-form.vue
@@ -208,7 +208,10 @@ const formData = ref<CreateRecord>({
 });
 const deptOptions = computedAsync(async () => {
   const { data } = await deptList();
-  return data;
+  const deptData = data.filter((item: any) => {
+    return item.enabled !== false;
+  });
+  return deptData;
 });
 const loginConfig = useStorage('login-config', {
   // 使用 useStorage 创建一个响应式变量，存储登录相关配置
diff --git a/src/views/system/user/components/user-edit.vue b/src/views/system/user/components/user-edit.vue
index bcfbc34..ac1a9d7 100644
--- a/src/views/system/user/components/user-edit.vue
+++ b/src/views/system/user/components/user-edit.vue
@@ -115,14 +115,21 @@
         />
       </a-form-item>
 
-      <a-form-item field="roleId" :label="$t('user.info.role')">
-        <a-radio-group
-          v-for="i in roleOptions"
-          :key="i.id"
+      <a-form-item
+        field="roleId"
+        :label="$t('user.info.role')"
+        :rules="[{ required: true, message: t('user.info.dept.required') }]"
+        :validate-trigger="['change']"
+      >
+        <a-select
           v-model="formData.roleId"
-        >
-          <a-radio :value="i.id">{{ i.name }}</a-radio>
-        </a-radio-group>
+          :options="roleOptions"
+          :field-names="{
+            value: 'id',
+            label: 'name',
+          }"
+          :placeholder="$t('user.info.role.placeholder')"
+        />
       </a-form-item>
     </a-form>
   </a-modal>
@@ -137,7 +144,6 @@ import { FormInstance } from '@arco-design/web-vue/es/form';
 import { queryRoleList } from '@/api/role';
 import { deptList } from '@/api/dept';
 import { computedAsync } from '@vueuse/core';
-import { SelectOptionData } from '@arco-design/web-vue/es/select/interface';
 import { Message } from '@arco-design/web-vue';
 import { useUserStore } from '@/store';
 
@@ -176,13 +182,19 @@ const userStore = useUserStore();
 // 部门数据
 const deptOptions = computedAsync(async () => {
   const { data } = await deptList();
-  return data;
+  const deptData = data.filter((item: any) => {
+    return item.enabled !== false;
+  });
+  return deptData;
 });
 
 // 角色数据
 const roleOptions = computedAsync(async () => {
   const res = await queryRoleList();
-  return res.data;
+  const roleData = res.data.filter((item: any) => {
+    return item.enabled !== false;
+  });
+  return roleData;
 });
 
 const emit = defineEmits(['refresh']);
diff --git a/src/views/system/user/locale/en-US.ts b/src/views/system/user/locale/en-US.ts
index bc46e57..3f3b9f5 100644
--- a/src/views/system/user/locale/en-US.ts
+++ b/src/views/system/user/locale/en-US.ts
@@ -62,6 +62,7 @@ export default {
   'user.info.dept.placeholder':'Please select Dept',
   'user.info.dept.required': 'Dept is required',
   'user.info.role':'Role',
+  'user.info.role.placeholder': 'Please select Role',
   'user.info.role.required': 'Role is required',
 
 };
diff --git a/src/views/system/user/locale/zh-CN.ts b/src/views/system/user/locale/zh-CN.ts
index fcdc0b6..2d8ded8 100644
--- a/src/views/system/user/locale/zh-CN.ts
+++ b/src/views/system/user/locale/zh-CN.ts
@@ -62,6 +62,7 @@ export default {
   'user.info.dept.placeholder':'请选择部门',
   'user.info.dept.required': '部门不能为空',
   'user.info.role':'角色',
+  'user.info.role.placeholder': '请选择角色',
   'user.info.role.required': '请选择一个',
 
 }
\ No newline at end of file
diff --git a/src/views/ticket/manage/components/form-edit.vue b/src/views/ticket/manage/components/form-edit.vue
index c439165..b11672c 100644
--- a/src/views/ticket/manage/components/form-edit.vue
+++ b/src/views/ticket/manage/components/form-edit.vue
@@ -1,5 +1,6 @@
 <template>
   <a-button
+    v-permission="['BILL_QUERY']"
     v-if="props.isCreate"
     type="primary"
     size="small"
@@ -10,6 +11,7 @@
   </a-button>
 
   <a-button
+    v-permission="['BILL_UPDATE']"
     v-if="!props.isCreate"
     size="small"
     type="primary"
@@ -161,9 +163,9 @@
       <a-form-item
         field="comment"
         :label="$t('ticket.info.comment')"
-        v-if="auditData.comment"
+        v-if="formData.comment"
       >
-        {{ auditData.comment }}
+        {{ formData.comment }}
       </a-form-item>
       <a-form-item>
         <a-button type="dashed" @click="handleCancel">
@@ -193,7 +195,7 @@ import { FormInstance } from '@arco-design/web-vue/es/form';
 import { SelectOptionData } from '@arco-design/web-vue/es/select/interface';
 import { Message } from '@arco-design/web-vue';
 import { useTicketStore, useUserStore, useRoleStore } from '@/store';
-import { TicketRecord, auditRecord } from '@/api/ticket';
+import { TicketRecord } from '@/api/ticket';
 import { deptList } from '@/api/dept';
 
 const props = defineProps({
@@ -228,12 +230,7 @@ const formData = ref<TicketRecord>({
   submit: '',
   comment: '',
 });
-const auditData = ref<auditRecord>({
-  auditorId: '',
-  comment: '',
-  result: '',
-  ticketId: '',
-});
+
 const emit = defineEmits(['refresh']);
 
 const deptOptions = computedAsync(async () => {
@@ -336,10 +333,10 @@ const handleClick = () => {
     ticketStore
       .getDetail(ticketId)
       .then(async (res) => {
+        console.log('res', res);
+
         // 票据数据
-        formData.value = res.data.bill;
-        // 审核数据
-        auditData.value = res.data.audit;
+        formData.value = res.data;
 
         // 附件内容
         if (formData.value.attachId) {
@@ -349,12 +346,12 @@ const handleClick = () => {
         }
         // 审核员信息
         const auditInfo = await userStore.getUserDetail(
-          auditData.value.auditorId
+          formData.value.auditorId
         );
         formData.value.deptId = auditInfo.data.deptId;
-        formData.value.auditorId = auditData.value.auditorId;
+        // formData.value.auditorId = formData.value.auditorId;
 
-        formDifer = { ...res.data.bill };
+        formDifer = { ...res.data };
       })
       .then(() => {
         optionDept(false).then(() => {
diff --git a/src/views/ticket/manage/components/ticket-edit.vue b/src/views/ticket/manage/components/ticket-edit.vue
index 4efafe8..5937321 100644
--- a/src/views/ticket/manage/components/ticket-edit.vue
+++ b/src/views/ticket/manage/components/ticket-edit.vue
@@ -1,5 +1,6 @@
 <template>
   <a-button
+    v-permission="['BILL_QUERY']"
     v-if="props.isDetail"
     type="outline"
     size="small"
@@ -10,6 +11,7 @@
   </a-button>
 
   <a-button
+    v-permission="['BILL_AUDIT']"
     v-if="!props.isDetail"
     size="small"
     type="primary"
@@ -112,23 +114,25 @@
       </a-form-item>
 
       <a-form-item
-        v-else
         field="status"
+        v-else
         :label="$t('ticket.info.status')"
         :disabled="props.isDetail"
         :validate-trigger="['change', 'input']"
         :rules="[{ required: true, message: t('ticket.info.status.required') }]"
       >
-        <a-select
+        <a-radio-group
+          v-for="i in statusOptions"
+          :key="i.value"
           v-model="formData.status"
-          :options="statusOptions"
-          :placeholder="$t('ticket.info.status.placeholder')"
-        />
+        >
+          <a-radio :value="i.value">{{ i.label }}</a-radio>
+        </a-radio-group>
       </a-form-item>
 
       <a-form-item field="comment" :label="$t('ticket.info.comment')">
-        <a-textarea v-model="auditData.comment" v-if="!props.isDetail" />
-        <div v-else>{{ auditData.comment }} </div>
+        <a-textarea v-model="formData.comment" v-if="!props.isDetail" />
+        <div v-else>{{ formData.comment }} </div>
       </a-form-item>
     </a-form>
   </a-modal>
@@ -174,14 +178,10 @@ const formData = ref<TicketRecord>({
   companyName: '',
   attachId: '',
   auditorId: '',
-  submit: '',
-});
-const auditData = ref<auditRecord>({
-  auditorId: '',
+  submit: undefined,
   comment: '',
-  result: '',
-  ticketId: '',
 });
+
 const emit = defineEmits(['refresh']);
 const deptOptions = computedAsync(async () => {
   const { data } = await deptList();
@@ -233,9 +233,9 @@ const handleClick = async () => {
   // 获取票据数据
   const res = await ticketStore.getDetail(ticketId);
   // 票据数据
-  formData.value = res.data.bill;
+  formData.value = res.data;
 
-  // 将票据状态转化未反显的格式
+  // 将票据状态转化为反显的格式
   if (!props.isDetail) {
     if (formData.value.status === '审核通过') {
       formData.value.status = 'PASS';
@@ -243,8 +243,6 @@ const handleClick = async () => {
       formData.value.status = 'FAILED';
     }
   }
-  // 附件数据
-  auditData.value = res.data.audit;
 
   // 附件内容
   if (formData.value.attachId) {
@@ -254,9 +252,8 @@ const handleClick = async () => {
   }
 
   // 审核员信息
-  const auditInfo = await userStore.getUserDetail(auditData.value.auditorId);
+  const auditInfo = await userStore.getUserDetail(formData.value.auditorId);
   formData.value.deptId = auditInfo.data.deptId;
-  formData.value.auditorId = auditData.value.auditorId;
   optionDept().then(() => {
     setVisible(true);
   });
@@ -271,11 +268,8 @@ const handleSubmit = async () => {
       createEditRef.value?.resetFields();
     } else {
       // 审核
-      auditData.value.result = formData.value.status;
-      const res = await ticketStore.auditTicket(
-        formData.value.id,
-        auditData.value
-      );
+      const { type, ...auditDate } = formData.value;
+      const res = await ticketStore.updateTicket(auditDate);
       if (res.status === 200) {
         Message.success({
           content: t('audit.sucess'),
diff --git a/src/views/ticket/manage/index.vue b/src/views/ticket/manage/index.vue
index 152c18d..f8af059 100644
--- a/src/views/ticket/manage/index.vue
+++ b/src/views/ticket/manage/index.vue
@@ -92,7 +92,6 @@
               :prem="ticketItem"
               :is-create="true"
               @refresh="search"
-              v-if="userStore.permissions !== 'auditor'"
             />
           </a-space>
         </a-col>
@@ -188,26 +187,15 @@
             :prem="record"
             :is-detail="true"
             @refresh="search"
-            v-if="
-              userStore.permissions === 'admin' ||
-              (userStore.permissions === 'user' &&
-                (record.status == '审核未通过' || record.status == '待提交'
-                  ? false
-                  : true))
-            "
           />
+
           <!-- 修改 -->
           <TicketForm
             ref="createEditRef"
             :prem="record"
             :is-create="false"
             @refresh="search"
-            v-if="
-              userStore.permissions == 'user' &&
-              (record.status == '审核未通过' || record.status == '待提交'
-                ? true
-                : false)
-            "
+            v-if="record.status === '待提交' || record.status === '审核未通过'"
           />
 
           <!-- 审核 -->
@@ -216,16 +204,20 @@
             :prem="record"
             :is-detail="false"
             @refresh="search"
-            v-if="userStore.permissions === 'auditor'"
+            v-if="record.status === '待审核'"
           />
 
           <a-popconfirm
             :content="t('Confirm the deletion of this ticket')"
             type="error"
             @ok="handleDelete(record)"
-            v-if="userStore.permissions === 'admin'"
           >
-            <a-button type="primary" size="small" status="danger">
+            <a-button
+              type="primary"
+              size="small"
+              status="danger"
+              v-permission="['BILL_DELETE']"
+            >
               {{ $t('delete') }}
             </a-button>
           </a-popconfirm>
@@ -364,6 +356,7 @@ const onPageChange = (current: number) => {
 
 // 获取数据
 const fetchData = async (params: {
+  auditorId: number | undefined;
   userId: number | undefined;
   page: 1;
   current: 1;
@@ -373,11 +366,12 @@ const fetchData = async (params: {
   try {
     let res = {};
 
-    // 根据用户角色，调用不同接口获取票据列表
+    // 根据用户角色，传相应的字段id获取票据列表
     if (userStore.permissions === 'admin') {
       res = await ticketStore.getTicketList(params);
     } else if (userStore.permissions === 'auditor') {
-      res = await ticketStore.auditTickctList(params);
+      params.auditorId = userStore.id;
+      res = await ticketStore.getTicketList(params);
     } else if (userStore.permissions === 'user') {
       params.userId = userStore.id;
       res = await ticketStore.getTicketList(params);
diff --git a/src/views/visualization/multi-dimension-data-analysis/components/data-overview.vue b/src/views/visualization/multi-dimension-data-analysis/components/data-overview.vue
index 1ee3f2d..436a582 100644
--- a/src/views/visualization/multi-dimension-data-analysis/components/data-overview.vue
+++ b/src/views/visualization/multi-dimension-data-analysis/components/data-overview.vue
@@ -30,22 +30,24 @@
       <Chart style="height: 328px; margin-top: 20px" :option="chartOption" />
     </a-card>
   </a-spin>
+
+  123456
 </template>
 
 <script lang="ts" setup>
-  import { computed, ref } from 'vue';
-  import { useI18n } from 'vue-i18n';
-  import { LineSeriesOption } from 'echarts';
-  import { queryDataOverview } from '@/api/visualization';
-  import useLoading from '@/hooks/loading';
-  import { ToolTipFormatterParams } from '@/types/echarts';
-  import useThemes from '@/hooks/themes';
-  import useChartOption from '@/hooks/chart-option';
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { LineSeriesOption } from 'echarts';
+import { queryDataOverview } from '@/api/visualization';
+import useLoading from '@/hooks/loading';
+import { ToolTipFormatterParams } from '@/types/echarts';
+import useThemes from '@/hooks/themes';
+import useChartOption from '@/hooks/chart-option';
 
-  const tooltipItemsHtmlString = (items: ToolTipFormatterParams[]) => {
-    return items
-      .map(
-        (el) => `<div class="content-panel">
+const tooltipItemsHtmlString = (items: ToolTipFormatterParams[]) => {
+  return items
+    .map(
+      (el) => `<div class="content-panel">
         <p>
           <span style="background-color: ${
             el.color
@@ -53,258 +55,253 @@
         </p>
         <span class="tooltip-value">${el.value.toLocaleString()}</span>
       </div>`
-      )
-      .reverse()
-      .join('');
-  };
+    )
+    .reverse()
+    .join('');
+};
 
-  const generateSeries = (
-    name: string,
-    lineColor: string,
-    itemBorderColor: string,
-    data: number[]
-  ): LineSeriesOption => {
-    return {
-      name,
-      data,
-      stack: 'Total',
-      type: 'line',
-      smooth: true,
-      symbol: 'circle',
-      symbolSize: 10,
+const generateSeries = (
+  name: string,
+  lineColor: string,
+  itemBorderColor: string,
+  data: number[]
+): LineSeriesOption => {
+  return {
+    name,
+    data,
+    stack: 'Total',
+    type: 'line',
+    smooth: true,
+    symbol: 'circle',
+    symbolSize: 10,
+    itemStyle: {
+      color: lineColor,
+    },
+    emphasis: {
+      focus: 'series',
       itemStyle: {
         color: lineColor,
+        borderWidth: 2,
+        borderColor: itemBorderColor,
       },
-      emphasis: {
-        focus: 'series',
-        itemStyle: {
-          color: lineColor,
-          borderWidth: 2,
-          borderColor: itemBorderColor,
-        },
-      },
-      lineStyle: {
-        width: 2,
-        color: lineColor,
-      },
-      showSymbol: false,
-      areaStyle: {
-        opacity: 0.1,
-        color: lineColor,
-      },
-    };
+    },
+    lineStyle: {
+      width: 2,
+      color: lineColor,
+    },
+    showSymbol: false,
+    areaStyle: {
+      opacity: 0.1,
+      color: lineColor,
+    },
   };
-  const { t } = useI18n();
-  const { loading, setLoading } = useLoading(true);
-  const { isDark } = useThemes();
-  const renderData = computed(() => [
-    {
-      title: t('multiDAnalysis.dataOverview.contentProduction'),
-      value: 1902,
-      prefix: {
-        icon: 'icon-components',
-        background: isDark.value ? '#593E2F' : '#FFE4BA',
-        iconColor: isDark.value ? '#F29A43' : '#F77234',
+};
+const { t } = useI18n();
+const { loading, setLoading } = useLoading(true);
+const { isDark } = useThemes();
+const renderData = computed(() => [
+  {
+    title: t('multiDAnalysis.dataOverview.contentProduction'),
+    value: 1902,
+    prefix: {
+      icon: 'icon-components',
+      background: isDark.value ? '#593E2F' : '#FFE4BA',
+      iconColor: isDark.value ? '#F29A43' : '#F77234',
+    },
+  },
+  {
+    title: t('multiDAnalysis.dataOverview.contentClick'),
+    value: 2445,
+    prefix: {
+      icon: 'icon-thumb-up',
+      background: isDark.value ? '#3D5A62' : '#E8FFFB',
+      iconColor: isDark.value ? '#6ED1CE' : '#33D1C9',
+    },
+  },
+  {
+    title: t('multiDAnalysis.dataOverview.contentExposure'),
+    value: 3034,
+    prefix: {
+      icon: 'icon-heart',
+      background: isDark.value ? '#354276' : '#E8F3FF',
+      iconColor: isDark.value ? '#4A7FF7' : '#165DFF',
+    },
+  },
+  {
+    title: t('multiDAnalysis.dataOverview.activeUsers'),
+    value: 1275,
+    prefix: {
+      icon: 'icon-user',
+      background: isDark.value ? '#3F385E' : '#F5E8FF',
+      iconColor: isDark.value ? '#8558D3' : '#722ED1',
+    },
+  },
+]);
+const xAxis = ref<string[]>([]);
+const contentProductionData = ref<number[]>([]);
+const contentClickData = ref<number[]>([]);
+const contentExposureData = ref<number[]>([]);
+const activeUsersData = ref<number[]>([]);
+const { chartOption } = useChartOption((dark) => {
+  return {
+    grid: {
+      left: '2.6%',
+      right: '4',
+      top: '40',
+      bottom: '40',
+    },
+    xAxis: {
+      type: 'category',
+      offset: 2,
+      data: xAxis.value,
+      boundaryGap: false,
+      axisLabel: {
+        color: '#4E5969',
+        formatter(value: number, idx: number) {
+          if (idx === 0) return '';
+          if (idx === xAxis.value.length - 1) return '';
+          return `${value}`;
+        },
+      },
+      axisLine: {
+        show: false,
+      },
+      axisTick: {
+        show: false,
+      },
+      splitLine: {
+        show: false,
+      },
+      axisPointer: {
+        show: true,
+        lineStyle: {
+          color: '#23ADFF',
+          width: 2,
+        },
       },
     },
-    {
-      title: t('multiDAnalysis.dataOverview.contentClick'),
-      value: 2445,
-      prefix: {
-        icon: 'icon-thumb-up',
-        background: isDark.value ? '#3D5A62' : '#E8FFFB',
-        iconColor: isDark.value ? '#6ED1CE' : '#33D1C9',
+    yAxis: {
+      type: 'value',
+      axisLine: {
+        show: false,
+      },
+      axisLabel: {
+        formatter(value: number, idx: number) {
+          if (idx === 0) return String(value);
+          return `${value / 1000}k`;
+        },
+      },
+      splitLine: {
+        lineStyle: {
+          color: dark ? '#2E2E30' : '#F2F3F5',
+        },
       },
     },
-    {
-      title: t('multiDAnalysis.dataOverview.contentExposure'),
-      value: 3034,
-      prefix: {
-        icon: 'icon-heart',
-        background: isDark.value ? '#354276' : '#E8F3FF',
-        iconColor: isDark.value ? '#4A7FF7' : '#165DFF',
-      },
-    },
-    {
-      title: t('multiDAnalysis.dataOverview.activeUsers'),
-      value: 1275,
-      prefix: {
-        icon: 'icon-user',
-        background: isDark.value ? '#3F385E' : '#F5E8FF',
-        iconColor: isDark.value ? '#8558D3' : '#722ED1',
-      },
-    },
-  ]);
-  const xAxis = ref<string[]>([]);
-  const contentProductionData = ref<number[]>([]);
-  const contentClickData = ref<number[]>([]);
-  const contentExposureData = ref<number[]>([]);
-  const activeUsersData = ref<number[]>([]);
-  const { chartOption } = useChartOption((dark) => {
-    return {
-      grid: {
-        left: '2.6%',
-        right: '4',
-        top: '40',
-        bottom: '40',
-      },
-      xAxis: {
-        type: 'category',
-        offset: 2,
-        data: xAxis.value,
-        boundaryGap: false,
-        axisLabel: {
-          color: '#4E5969',
-          formatter(value: number, idx: number) {
-            if (idx === 0) return '';
-            if (idx === xAxis.value.length - 1) return '';
-            return `${value}`;
-          },
-        },
-        axisLine: {
-          show: false,
-        },
-        axisTick: {
-          show: false,
-        },
-        splitLine: {
-          show: false,
-        },
-        axisPointer: {
-          show: true,
-          lineStyle: {
-            color: '#23ADFF',
-            width: 2,
-          },
-        },
-      },
-      yAxis: {
-        type: 'value',
-        axisLine: {
-          show: false,
-        },
-        axisLabel: {
-          formatter(value: number, idx: number) {
-            if (idx === 0) return String(value);
-            return `${value / 1000}k`;
-          },
-        },
-        splitLine: {
-          lineStyle: {
-            color: dark ? '#2E2E30' : '#F2F3F5',
-          },
-        },
-      },
-      tooltip: {
-        trigger: 'axis',
-        formatter(params) {
-          const [firstElement] = params as ToolTipFormatterParams[];
-          return `<div>
+    tooltip: {
+      trigger: 'axis',
+      formatter(params) {
+        const [firstElement] = params as ToolTipFormatterParams[];
+        return `<div>
             <p class="tooltip-title">${firstElement.axisValueLabel}</p>
             ${tooltipItemsHtmlString(params as ToolTipFormatterParams[])}
           </div>`;
+      },
+      className: 'echarts-tooltip-diy',
+    },
+    graphic: {
+      elements: [
+        {
+          type: 'text',
+          left: '2.6%',
+          bottom: '18',
+          style: {
+            text: '12.10',
+            textAlign: 'center',
+            fill: '#4E5969',
+            fontSize: 12,
+          },
         },
-        className: 'echarts-tooltip-diy',
-      },
-      graphic: {
-        elements: [
-          {
-            type: 'text',
-            left: '2.6%',
-            bottom: '18',
-            style: {
-              text: '12.10',
-              textAlign: 'center',
-              fill: '#4E5969',
-              fontSize: 12,
-            },
+        {
+          type: 'text',
+          right: '0',
+          bottom: '18',
+          style: {
+            text: '12.17',
+            textAlign: 'center',
+            fill: '#4E5969',
+            fontSize: 12,
           },
-          {
-            type: 'text',
-            right: '0',
-            bottom: '18',
-            style: {
-              text: '12.17',
-              textAlign: 'center',
-              fill: '#4E5969',
-              fontSize: 12,
-            },
-          },
-        ],
-      },
-      series: [
-        generateSeries(
-          '内容生产量',
-          '#722ED1',
-          '#F5E8FF',
-          contentProductionData.value
-        ),
-        generateSeries(
-          '内容点击量',
-          '#F77234',
-          '#FFE4BA',
-          contentClickData.value
-        ),
-        generateSeries(
-          '内容曝光量',
-          '#33D1C9',
-          '#E8FFFB',
-          contentExposureData.value
-        ),
-        generateSeries(
-          '活跃用户数',
-          '#3469FF',
-          '#E8F3FF',
-          activeUsersData.value
-        ),
+        },
       ],
-    };
-  });
-  const fetchData = async () => {
-    setLoading(true);
-    try {
-      const { data } = await queryDataOverview();
-      xAxis.value = data.xAxis;
-      data.data.forEach((el) => {
-        if (el.name === '内容生产量') {
-          contentProductionData.value = el.value;
-        } else if (el.name === '内容点击量') {
-          contentClickData.value = el.value;
-        } else if (el.name === '内容曝光量') {
-          contentExposureData.value = el.value;
-        }
-        activeUsersData.value = el.value;
-      });
-    } catch (err) {
-      // you can report use errorHandler or other
-    } finally {
-      setLoading(false);
-    }
+    },
+    series: [
+      generateSeries(
+        '内容生产量',
+        '#722ED1',
+        '#F5E8FF',
+        contentProductionData.value
+      ),
+      generateSeries(
+        '内容点击量',
+        '#F77234',
+        '#FFE4BA',
+        contentClickData.value
+      ),
+      generateSeries(
+        '内容曝光量',
+        '#33D1C9',
+        '#E8FFFB',
+        contentExposureData.value
+      ),
+      generateSeries('活跃用户数', '#3469FF', '#E8F3FF', activeUsersData.value),
+    ],
   };
-  fetchData();
+});
+const fetchData = async () => {
+  setLoading(true);
+  try {
+    const { data } = await queryDataOverview();
+    xAxis.value = data.xAxis;
+    data.data.forEach((el) => {
+      if (el.name === '内容生产量') {
+        contentProductionData.value = el.value;
+      } else if (el.name === '内容点击量') {
+        contentClickData.value = el.value;
+      } else if (el.name === '内容曝光量') {
+        contentExposureData.value = el.value;
+      }
+      activeUsersData.value = el.value;
+    });
+  } catch (err) {
+    // you can report use errorHandler or other
+  } finally {
+    setLoading(false);
+  }
+};
+fetchData();
 </script>
 
 <style scoped lang="less">
-  :deep(.arco-statistic) {
-    .arco-statistic-title {
-      color: rgb(var(--gray-10));
-      font-weight: bold;
-    }
-    .arco-statistic-value {
-      display: flex;
-      align-items: center;
-    }
+:deep(.arco-statistic) {
+  .arco-statistic-title {
+    color: rgb(var(--gray-10));
+    font-weight: bold;
   }
-  .statistic-prefix {
-    display: inline-block;
-    width: 32px;
-    height: 32px;
-    margin-right: 8px;
-    color: var(--color-white);
-    font-size: 16px;
-    line-height: 32px;
-    text-align: center;
-    vertical-align: middle;
-    border-radius: 6px;
+  .arco-statistic-value {
+    display: flex;
+    align-items: center;
   }
+}
+.statistic-prefix {
+  display: inline-block;
+  width: 32px;
+  height: 32px;
+  margin-right: 8px;
+  color: var(--color-white);
+  font-size: 16px;
+  line-height: 32px;
+  text-align: center;
+  vertical-align: middle;
+  border-radius: 6px;
+}
 </style>