Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

frontend/.env

@@ -9,3 +9,6 @@ VITE_OPEN=true
 
 # 打包后是否生成包分析文件
 VITE_REPORT=false
+
+# 浏览器是否显示vue的告警信息
+VUE_APP_SILENCE_WARNINGS=true

frontend/src/api/role/interface/index.ts

@@ -0,0 +1,52 @@
+import type { ReqPage } from '@/api/interface'
+
+// 角色管理模块
+export namespace Role {
+
+    export interface Permission{
+        id: string;             //权限名称
+        name: string;           //权限ID
+        havePermission:boolean; //是否拥有该权限
+    }
+
+    // 角色列表
+    export interface ResRoleList {
+        id: string;     //角色类型ID
+        rolename: string;   //角色类型名称
+        status: number;  //角色类型状态
+        describe:string;                //角色描述
+        permissionList?:Permission[];   //角色权限列表
+    }
+  
+    // 角色参数
+    export interface ReqRoleParams extends ReqPage {
+        id: string;     //角色类型ID
+        rolename: string;   //角色类型名称
+        status: number;  //角色类型状态
+        describe:string;                //角色描述
+        permissionList?:Permission[];   //角色权限列表
+    }
+    // 角色字典
+    export interface ResStatus {
+      roleLabel: string;
+      roleValue: number;
+    }
+  
+    // export interface ResGender {
+    //   genderLabel: string;
+    //   genderValue: number;
+    // }
+  
+    //角色权限列表
+    export interface ResPermissionList {
+      id: string;
+      name: string;
+      permissionList?: Permission[];
+    }
+  
+    // export interface ResRole {
+    //   id: string;
+    //   name: string;
+    //   children?: ResDepartment[];
+    // }
+  }

frontend/src/api/role/role.ts

@@ -0,0 +1,72 @@
+import { ResPage } from '@/api/interface'
+import { Role } from './interface'
+import { ADMIN as rePrefix } from '@/api/config/serviceName'
+import http from '@/api'
+
+/**
+ * @name 角色管理模块
+ */
+// 获取角色列表
+export const getRoleList = (params: Role.ReqRoleParams) => {
+  return http.post<ResPage<Role.ResRoleList>>(`${rePrefix}/role/list`, params)
+}
+
+// // 获取树形用户列表
+// export const getRoleTreeList = (params: Role.ReqRoleParams) => {
+//   return http.post<ResPage<Role.ResRoleList>>(`${rePrefix}/role/tree/list`, params)
+// }
+
+// 新增角色
+export const addRole = (params: { id: string }) => {
+  return http.post(`${rePrefix}/role/add`, params)
+}
+
+// 批量添加角色
+export const BatchAddRole = (params: FormData) => {
+  return http.post(`${rePrefix}/role/import`, params)
+}
+
+// 编辑角色
+export const editRole = (params: { id: string }) => {
+  return http.post(`${rePrefix}/role/edit`, params)
+}
+
+// 删除角色
+export const deleteRole = (params: { id: string[] }) => {
+  return http.post(`${rePrefix}/role/delete`, params)
+}
+
+// 切换角色状态
+export const changeRoleStatus = (params: { id: string; status: number }) => {
+  return http.post(`${rePrefix}/role/change`, params)
+}
+
+// 重置用户密码
+// export const resetUserPassWord = (params: { id: string }) => {
+//   return http.post(`${rePrefix}/role/rest_password`, params)
+// }
+
+// 导出角色数据
+export const exportRoleInfo = (params: Role.ReqRoleParams) => {
+  return http.download(`${rePrefix}/role/export`, params)
+}
+
+// 获取角色状态字典
+export const getRoleStatus = () => {
+  return http.get<Role.ResStatus[]>(`${rePrefix}/role/status`)
+}
+
+// 获取用户性别字典
+// export const getUserGender = () => {
+//   return http.get<User.ResGender[]>(`${rePrefix}/user/gender`)
+// }
+
+// 获取角色权限列表
+export const getRoleDepartment = () => {
+  return http.get<Role.ResPermissionList[]>(`${rePrefix}/role/permission`)
+}
+
+// 获取用户角色字典
+// export const getUserRole = () => {
+//   return http.get<User.ResRole[]>(`${rePrefix}/user/role`)
+// }

frontend/src/api/role/roleData.ts

@@ -0,0 +1,70 @@
+const data = [
+    {
+      rolename:"操作员",
+      id: 'operator_role',
+      status:1,
+      describe:"可以对待检设备的台账进行操作并执行检测功能",
+      permissionList: [
+        {
+          name: "台账管理",
+          id: "dataManager",
+          havePermission: false,
+        },
+        {
+          name: "系统配置",
+          id: "sysManager",
+          havePermission: false,
+        },
+        {
+          name: "设备检测",
+          id: "devTest",
+          havePermission: true,
+        },
+      ]},
+      {
+        rolename:"管理员",
+        id: 'manager_role',
+        status:1,
+        describe:"可以设置检测脚本、误差体系、新增操作人员",
+        permissionList: [
+        {
+          name: "台账管理",
+          id: "dataManager",
+          havePermission: true,
+        },
+        {
+          name: "系统配置",
+          id: "sysManager",
+          havePermission: false,
+        },
+        {
+          name: "设备检测",
+          id: "devTest",
+          havePermission: true,
+        },
+      ]},
+      {
+        rolename:"超级管理员",
+        id: 'superManager_role',
+        status:0,
+        describe:"可以修改程序的底层配置，例如检测指标的具体类型",
+        permissionList: [
+        {
+          name: "台账管理",
+          id: "dataManager",
+          havePermission: true,
+        },
+        {
+          name: "系统配置",
+          id: "sysManager",
+          havePermission: true,
+        },
+        {
+          name: "设备检测",
+          id: "devTest",
+          havePermission: true,
+        },
+      ]},
+    ]
+  
+  export default data

frontend/src/hooks/useAuthButtons.ts

@@ -1,22 +1,22 @@
-import { computed } from "vue";
+import { computed } from 'vue'
-import { useRoute } from "vue-router";
+import { useRoute } from 'vue-router'
-import { useAuthStore } from "@/stores/modules/auth";
+import { useAuthStore } from '@/stores/modules/auth'
 
 /**
  * @description 页面按钮权限
  * */
 export const useAuthButtons = () => {
-  const route = useRoute();
+    const route = useRoute()
-  const authStore = useAuthStore();
+    const authStore = useAuthStore()
-  const authButtons = authStore.authButtonListGet[route.name as string] || [];
+    const authButtons = authStore.authButtonListGet[route.name as string] || []
-
     const BUTTONS = computed(() => {
-    let currentPageAuthButton: { [key: string]: boolean } = {};
+        let currentPageAuthButton: { [key: string]: boolean } = {}
-    authButtons.forEach(item => (currentPageAuthButton[item] = true));
+        authButtons.forEach(item => (currentPageAuthButton[item] = true))
-    return currentPageAuthButton;
+        // currentPageAuthButton.status = true
-  });
+        return currentPageAuthButton
+    })
 
     return {
-    BUTTONS
+        BUTTONS,
-  };
+    }
-};
+}

frontend/src/layouts/components/Header/components/Avatar.vue

@@ -2,7 +2,7 @@
   <el-dropdown trigger="click">
     <div class="userInfo">  
       <div class="icon">
-        <Icon><Avatar /></Icon>
+        <Avatar />
       </div>
       <div class="username">
         {{ username }}

frontend/src/main.ts

@@ -35,8 +35,14 @@ import errorHandler from "@/utils/errorHandler";
 
 import registerGlobComp from '@/components'
 
+
 const app = createApp(App);
 
+// 自定义警告处理程序，忽略所有警告
+if (import.meta.env.VUE_APP_SILENCE_WARNINGS === true) {
+  app.config.warnHandler = () => {};
+}
+
 app.config.errorHandler = errorHandler;
 
 // register the element Icons component

frontend/src/types/env.d.ts

@@ -16,6 +16,7 @@ declare type Recordable<T = any> = Record<string, T>;
 declare interface ViteEnv {
   VITE_USER_NODE_ENV: 'development' | 'production' | 'test';
   VITE_GLOB_APP_TITLE: string;
+  VUE_APP_SILENCE_WARNINGS: boolean;
   VITE_PORT: number;
   VITE_OPEN: boolean;
   VITE_REPORT: boolean;

frontend/src/views/authority/role/index.vue

@@ -0,0 +1,242 @@
+<template>
+    <div class='table-box'>
+      <ProTable
+        ref='proTable'
+        :columns='columns'
+        :data='roleData'
+      >
+        <!-- 表格 header 按钮 -->
+        <template #tableHeader='scope'>
+          <el-button type='primary' :icon='CirclePlus' @click="openDrawer('新增')">新增角色类型</el-button>
+          <el-button type='primary' :icon='Download' plain @click='downloadFile'>导出角色类型数据</el-button>
+          <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
+                     @click='batchDelete(scope.selectedListIds)'>
+            批量删除角色
+          </el-button>
+        </template>
+        <!-- 表格操作 -->
+        <template #operation='scope'>
+          <el-button type='primary' link :icon='View' @click="openDrawer('编辑', scope.row)">编辑</el-button>
+          <el-button type='primary' link :icon='Delete' @click='deleteAccount(scope.row)'>删除</el-button>
+          <!-- <el-button type='primary' link :icon='EditPen' @click='resetPass(scope.row)'>设置权限</el-button> -->
+      </template>
+
+      </ProTable>
+    </div>
+
+      <!-- 弹出的对话框 -->
+  <el-dialog v-model="dialogVisible" :title="dialogType ==='add' ? '新增角色类型' : '修改角色类型'"  width="500" draggable>
+    <div>
+        <el-form :model="dialogForm">
+        <el-form-item label="角色类型名称" :label-width="100">
+          <el-input v-model="dialogForm.rolename" placeholder="请输入类型名称" autocomplete="off" />
+        </el-form-item>
+        <el-form-item label="角色类型编码" :label-width="100">
+          <el-input v-model="dialogForm.id" placeholder="请输入角色类型编码" autocomplete="off" />
+        </el-form-item>
+        <el-form-item label="角色类型状态" :label-width="100">
+          <el-input v-model="dialogForm.status" placeholder="请输入状态" autocomplete="off" />
+        </el-form-item>
+        <el-form-item label="角色类型备注" :label-width="100">
+          <el-input v-model="dialogForm.describe" placeholder="请输入备注" autocomplete="off" />
+        </el-form-item>
+        <!-- <el-form-item label="权限" :label-width="60">
+          <el-input v-model="drawerForm.rolePermission" placeholder="请输入地址" autocomplete="off" />
+        </el-form-item> -->
+      </el-form>
+      </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">
+          保存
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+  </template>
+
+  <script setup lang='tsx' name='useRole'>
+  import { Role } from '@/api/role/interface'
+  import { useHandleData } from '@/hooks/useHandleData'
+  import { useDownload } from '@/hooks/useDownload'
+  import { useAuthButtons } from '@/hooks/useAuthButtons'
+  import ProTable from '@/components/ProTable/index.vue'
+  import ImportExcel from '@/components/ImportExcel/index.vue'
+  import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
+  import { CirclePlus, Delete, EditPen, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
+  import roleDataList from '@/api/role/roleData'
+  import { useDictStore } from '@/stores/modules/dict'
+
+  const {dialogVisible,dialogType,dialogForm} = useCount();
+  function useCount() {
+    const dialogVisible = ref(false)
+    const dialogType = ref('新增')
+
+    const dialogForm = ref({
+      rolename:"",
+      id: "",
+      status: 0,
+      describe:"",
+    })
+    //const dialogForm = ref<Role.ReqRoleParams>({
+    //   rolename:"",
+    //   id: "",
+    //   status: 0,
+    //   describe:"",
+    // })
+
+    return {dialogVisible,dialogType,dialogForm};
+  }
+
+  const dictStore = useDictStore()
+
+  import {
+    getRoleList,
+    addRole,
+    BatchAddRole,
+    editRole,
+    deleteRole,
+    changeRoleStatus,
+    exportRoleInfo,
+    getRoleDepartment,
+    // deleteUser,
+    // changeUserStatus,
+    // exportUserInfo,
+    // BatchAddUser,
+    getRoleStatus,
+  } from '@/api/role/role'
+import { describe } from 'node:test'
+
+  const roleData = roleDataList
+
+  // ProTable 实例
+  const proTable = ref<ProTableInstance>()
+
+  // 如果表格需要初始化请求参数，直接定义传给 ProTable (之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
+  const initParam = reactive({ type: 1 })
+
+  // dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total 这些字段，可以在这里进行处理成这些字段
+  // 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
+  const dataCallback = (data: any) => {
+    return {
+      list: data.list,
+      total: data.total,
+    }
+  }
+
+  // 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
+  // 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
+  const getTableList = (params: any) => {
+    let newParams = JSON.parse(JSON.stringify(params))
+    newParams.createTime && (newParams.startTime = newParams.createTime[0])
+    newParams.createTime && (newParams.endTime = newParams.createTime[1])
+    delete newParams.createTime
+    return getRoleList(newParams)
+  }
+
+  // 页面按钮权限（按钮权限既可以使用 hooks，也可以直接使用 v-auth 指令，指令适合直接绑定在按钮上，hooks 适合根据按钮权限显示不同的内容）
+  const { BUTTONS } = useAuthButtons()
+
+  // 表格配置项
+  const columns = reactive<ColumnProps<Role.ResRoleList>[]>([
+    { type: 'selection', fixed: 'left', width: 70 },
+    { type: 'index', fixed: 'left', width: 70, label: '序号' },
+    {
+      prop: 'rolename',
+      label: '角色名称',
+      search: { el: 'input' },
+    },
+    {
+      prop: 'id',
+      label: '角色编码',
+      search: { el: 'input' },
+    },
+    {
+      prop: 'status',
+      label: '角色状态',
+      enum: dictStore.getDictData('status'),
+      search: { el: 'tree-select', props: { filterable: true } },
+      fieldNames: { label: 'roleLabel', value: 'roleStatus' },
+      render: scope => {
+        return (
+          <>
+            {BUTTONS.value.status ? (
+              <el-switch
+                model-value={scope.row.status}
+                active-text={scope.row.status ? '启用' : '禁用'}
+                active-value={1}
+                inactive-value={0}
+                onClick={() => changeStatus(scope.row)}
+              />
+            ) : (
+              <el-tag type={scope.row.status ? 'success' : 'danger'}>{scope.row.status ? '启用' : '禁用'}</el-tag>
+            )}
+          </>
+        )
+      },
+    },
+    {
+      prop: 'describe',
+      label: '角色描述',
+    },
+    { prop: 'operation', label: '操作', fixed: 'right', width: 330 },
+  ])
+
+  // 删除角色信息
+  const deleteAccount = async (params: Role.ResRoleList) => {
+    await useHandleData(deleteRole, { id: [params.id] }, `删除【${params.rolename}】角色`)
+    proTable.value?.getTableList()
+  }
+
+  // 批量删除角色信息
+  const batchDelete = async (id: string[]) => {
+    await useHandleData(deleteRole, { id }, '删除所选角色信息')
+    proTable.value?.clearSelection()
+    proTable.value?.getTableList()
+  }
+
+  // 重置用户密码
+  // const resetPass = async (params: User.ResUserList) => {
+  //   await useHandleData(resetUserPassWord, { id: params.id }, `重置【${params.username}】用户密码`)
+  //   proTable.value?.getTableList()
+  // }
+
+  // 切换角色状态
+  const changeStatus = async (row: Role.ResRoleList) => {
+    await useHandleData(changeRoleStatus, {
+      id: row.id,
+      status: row.status == 1 ? 0 : 1,
+    }, `切换【${row.rolename}】角色状态`)
+    proTable.value?.getTableList()
+  }
+
+  // 导出角色列表
+  const downloadFile = async () => {
+    ElMessageBox.confirm('确认导出角色数据?', '温馨提示', { type: 'warning' }).then(() =>
+      useDownload(exportRoleInfo, '角色列表', proTable.value?.searchParam),
+    )
+  }
+
+  // 批量添加角色
+  const dialogRef = ref<InstanceType<typeof ImportExcel> | null>(null)
+  const batchAdd = () => {
+    const params = {
+      title: '角色',
+      tempApi: exportRoleInfo,
+      importApi: BatchAddRole,
+      getTableList: proTable.value?.getTableList,
+    }
+    dialogRef.value?.acceptParams(params)
+  }
+
+  // 打开 drawer(新增、查看、编辑)
+  const openDrawer = (title: string, row: Partial<Role.ResRoleList> = {}) => {
+    dialogVisible.value = true
+    dialogType.value = title
+    // dialogForm = row
+  }
+
+
+  </script>
+  

frontend/src/views/demo/proTable/index.vue

@@ -17,7 +17,7 @@
       </template>
       <!-- 表格操作 -->
       <template #operation='scope'>
-        <el-button v-if='scope.row.status === 1' type='primary' link :icon='View'
+        <el-button type='primary' link :icon='View'
                    @click="openDrawer('查看', scope.row)">查看
         </el-button>
         <el-button type='primary' link :icon='EditPen' @click="openDrawer('编辑', scope.row)">编辑</el-button>
@@ -80,8 +80,9 @@ const columns = reactive<ColumnProps<User.ResUserList>[]>([
   { type: 'index', fixed: 'left', width: 70, label: '序号' },
   {
     prop: 'username',
-    label: '用户姓名',
+    label: '姓名',
-    search: { el: 'input', tooltip: '我是搜索提示' },
+    width: 120,
+    search: { el: 'input'},
   },
   {
     prop: 'gender',
@@ -109,10 +110,10 @@ const columns = reactive<ColumnProps<User.ResUserList>[]>([
   },
   { prop: 'idCard', label: '身份证号', search: { el: 'input' } },
   { prop: 'email', label: '邮箱' },
-  { prop: 'address', label: '居住地址' },
+  { prop: 'address', label: '居住地址', width: 120 },
   {
     prop: 'status',
-    label: '用户状态',
+    label: '状态',
     enum: dictStore.getDictData('status'),
     search: { el: 'tree-select', props: { filterable: true } },
     fieldNames: { label: 'userLabel', value: 'userStatus' },