提交首页

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) {
+export function home(data: any){
-  return axios.patch(`/api/rest/bill/audit/${ticketId}`, params); 
+  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, // 参数
-  });
-}
-

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}`);
 }

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 />

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);
       }

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',

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': '实时监控-服务端',

src/router/routes/modules/user.ts

@@ -12,16 +12,16 @@ const USER: AppRouteRecordRaw = {
     order: 7,
   },
   children: [
-    {
+    // {
-      path: 'info',
+    //   path: 'info',
-      name: 'Info',
+    //   name: 'Info',
-      component: () => import('@/views/user/info/index.vue'),
+    //   component: () => import('@/views/user/info/index.vue'),
-      meta: {
+    //   meta: {
-        locale: 'menu.user.info',
+    //     locale: 'menu.user.info',
-        requiresAuth: true,
+    //     requiresAuth: true,
-        permissions: ['*'],
+    //     permissions: ['*'],
-      },
+    //   },
-    },
+    // },
     {
       path: 'setting',
       name: 'Setting',

src/router/routes/modules/visualization.ts

@@ -35,5 +35,4 @@ const VISUALIZATION: AppRouteRecordRaw = {
     },
   ],
 };
-
 // export default VISUALIZATION;

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,
+  home
-  auditTickctList,
-
 } 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,12 +63,8 @@ const useTicketStore = defineStore('ticket', {
       return attachment(id);
     },
 
-    async auditTicket(ticketId: string, data: auditRecord) {
+    async getHome(data: any){
-      return audit(ticketId, data);
+      return home(data);
-    },
-
-    async auditTickctList(data:any){
-      return auditTickctList(data);
     } 
   },
 });

src/store/modules/ticket/type.ts

@@ -10,4 +10,5 @@ export interface ticketStore {
   contactEmail?: string;
   companyName?: string;
   userId?: undefined;
+  submit?: undefined 
 }

src/store/modules/user/index.ts

@@ -56,7 +56,8 @@ const useUserStore = defineStore('user', {
 
     async info() {
       const res = await getUserInfo();
-      res.data.user.permissions = res.data.permissions
+      res.data.user.permissions = res.data.permissions;
+      res.data.user.authorities = res.data.authorities;
       this.setInfo(res.data.user); 
     },
 

src/views/dashboard/workplace/components/data-panel.vue

@@ -12,15 +12,14 @@
           />
         </a-avatar>
         <a-statistic
-          :title="$t('workplace.onlineContent')"
+          :title="$t('workplace.pass')"
-          :value="373.5"
+          :value="formData.pass"
-          :precision="1"
           :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')"
+          :title="$t('workplace.notPass')"
-          :value="368"
+          :value="formData.notPass"
           :value-from="0"
           animation
           show-group-separator
@@ -61,8 +60,8 @@
           />
         </a-avatar>
         <a-statistic
-          :title="$t('workplace.newDay')"
+          :title="$t('workplace.notAudit')"
-          :value="8874"
+          :value="formData.notAudit"
           :value-from="0"
           animation
           show-group-separator
@@ -86,13 +85,16 @@
           />
         </a-avatar>
         <a-statistic
-          :title="$t('workplace.newFromYesterday')"
+          v-model="formData.notFiled"
-          :value="2.8"
+          :title="$t('workplace.notFiled')"
-          :precision="1"
+          :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,7 +104,38 @@
   </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 {

src/views/dashboard/workplace/index.vue

@@ -1,42 +1,7 @@
 <template>
   <div class="container">
     <div class="left-side">
-      <div class="panel">
+      <div class="panel"> <Banner /> <DataPanel /></div>
-        <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>
   </div>
 </template>
@@ -44,14 +9,6 @@
 <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';
 </script>
 
 <script lang="ts">

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',
 };

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': '待提交',
 };

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 创建一个响应式变量，存储登录相关配置

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-form-item
-        <a-radio-group
+        field="roleId"
-          v-for="i in roleOptions"
+        :label="$t('user.info.role')"
-          :key="i.id"
+        :rules="[{ required: true, message: t('user.info.dept.required') }]"
-          v-model="formData.roleId"
+        :validate-trigger="['change']"
       >
-          <a-radio :value="i.id">{{ i.name }}</a-radio>
+        <a-select
-        </a-radio-group>
+          v-model="formData.roleId"
+          :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']);

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',
 
 };

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': '请选择一个',
 
 }

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;
+        formData.value = res.data;
-        // 审核数据
-        auditData.value = res.data.audit;
 
         // 附件内容
         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(() => {

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" />
+        <a-textarea v-model="formData.comment" v-if="!props.isDetail" />
-        <div v-else>{{ auditData.comment }} </div>
+        <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: '',
+  submit: undefined,
-});
-const auditData = ref<auditRecord>({
-  auditorId: '',
   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 { type, ...auditDate } = formData.value;
-      const res = await ticketStore.auditTicket(
+      const res = await ticketStore.updateTicket(auditDate);
-        formData.value.id,
-        auditData.value
-      );
       if (res.status === 200) {
         Message.success({
           content: t('audit.sucess'),

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="
+            v-if="record.status === '待提交' || record.status === '审核未通过'"
-              userStore.permissions == 'user' &&
-              (record.status == '审核未通过' || record.status == '待提交'
-                ? true
-                : false)
-            "
           />
 
           <!-- 审核 -->
@@ -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);

src/views/visualization/multi-dimension-data-analysis/components/data-overview.vue

@@ -30,6 +30,8 @@
       <Chart style="height: 328px; margin-top: 20px" :option="chartOption" />
     </a-card>
   </a-spin>
+
+  123456
 </template>
 
 <script lang="ts" setup>
@@ -251,12 +253,7 @@
         '#E8FFFB',
         contentExposureData.value
       ),
-        generateSeries(
+      generateSeries('活跃用户数', '#3469FF', '#E8F3FF', activeUsersData.value),
-          '活跃用户数',
-          '#3469FF',
-          '#E8F3FF',
-          activeUsersData.value
-        ),
     ],
   };
 });