feat: 新增工作文档、应用管理和培训绩效模块

feat(用户管理): 添加团队协作功能

feat(考勤记录): 增加班组和科室名称查询条件

feat(上岗记录): 优化离岗时间显示和查询逻辑

feat(检查记录): 添加日期范围查询功能

feat(违禁品记录): 增加流程状态显示和日期范围查询

feat(文件上传): 支持拖拽上传和限制上传数量

fix(编辑器): 修正图片上传路径问题

fix(登录页): 移除默认账号密码

style(用户选择组件): 优化样式和回显逻辑

chore: 添加Vite插件配置和依赖

refactor(请求): 添加请求头标识

docs: 更新相关API文档

src/api/examManage/trainingPerformance.js

@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+// 查询培训绩效列表
+export function getGrowthList(query) {
+  return request({
+    url: '/system/growth/list',
+    method: 'get',
+    params: query
+  })
+}
+
+///导入数据
+export function importData(data) {
+  return request({
+    url: '/system/growth/importData',
+    method: 'post',
+    data: data
+  })
+}
+
+//下载模板
+export function downloadTemplate() {
+  return request({
+    url: '/system/growth/importTemplate',
+    method: 'get',
+    responseType: 'blob'
+  })
+}

src/api/system/app.js

@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+
+// 查询应用列表
+export function listApp(query) {
+    return request({
+        url: '/system/app/list',
+        method: 'get',
+        params: query
+    })
+}
+//获取应用详细信息
+export function getApp(id) {
+    return request({
+        url: '/system/app/' + id,
+        method: 'get'
+    })
+}
+//新增应用
+export function addApp(data) {
+    return request({
+        url: '/system/app',
+        method: 'post',
+        data: data
+    })
+}
+//修改应用
+export function updateApp(data) {
+    return request({
+        url: '/system/app',
+        method: 'put',
+        data: data
+    })
+}
+//删除应用
+export function deleteApp(id) {
+    return request({
+        url: '/system/app/' + id,
+        method: 'delete'
+    })
+}
+
+
+

src/api/system/role.js

@@ -117,3 +117,18 @@ export function deptTreeSelect(roleId) {
     method: 'get'
   })
 }
+
+//查询全部应用列表
+export function listAllApp() {
+  return request({
+    url: '/system/app/listAll',
+    method: 'get'
+  })
+}
+//根据角色ID查询应用列表
+export function listAppByRoleId(roleId) {
+  return request({
+    url: '/system/app/roleAppSelect/' + roleId,
+    method: 'get'
+  })
+}

src/api/system/user.js

@@ -36,6 +36,15 @@ export function updateUser(data) {
   })
 }
 
+// 查询所有用户
+export function listAllUser(query) {
+  return request({
+    url: '/system/user/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
 // 删除用户
 export function delUser(userId) {
   return request({

src/api/system/workDocu.js

@@ -0,0 +1,41 @@
+import request from '@/utils/request'
+
+// 查询工作文档列表
+export function listWorkDocu(query) {
+    return request({
+        url: '/system/workingDocument/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 新增工作文档
+export function addWorkDocu(data) {
+    return request({
+        url: '/system/workingDocument',
+        method: 'post',
+        data: data
+    })
+}
+//修改工作文档
+export function updateWorkDocu(data) {
+    return request({
+        url: '/system/workingDocument',
+        method: 'put',
+        data: data
+    })
+}
+//删除工作文档
+export function deleteWorkDocu(id) {
+    return request({
+        url: '/system/workingDocument/' + id,
+        method: 'delete'
+    })
+}
+//获取工作文档详细信息
+export function getWorkDocu(id) {
+    return request({
+        url: '/system/workingDocument/' + id,
+        method: 'get'
+    })
+}

src/components/Editor/index.vue

@@ -158,7 +158,8 @@ function handleUploadSuccess(res, file) {
     // 获取光标位置
     let length = quill.selection.savedRange.index
     // 插入图片，res.url为服务器返回的图片链接地址
-    quill.insertEmbed(length, "image", import.meta.env.VITE_APP_BASE_API + res.fileName)
+    // quill.insertEmbed(length, "image", import.meta.env.VITE_APP_BASE_API + res.fileName)
+    quill.insertEmbed(length, "image", res.url)
     // 调整光标到最后
     quill.setSelection(length + 1)
   } else {

src/components/FileUpload/index.vue

@@ -15,9 +15,18 @@
       class="upload-file-uploader"
       ref="fileUpload"
       v-if="!disabled"
+      :drag="drag"
     >
-      <!-- 上传按钮 -->
-      <el-button type="primary">选取文件</el-button>
+      <!-- 根据drag属性条件渲染不同的上传界面 -->
+      <template v-if="drag">
+        <!-- <div class="el-upload-dragger"> -->
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <!-- </div> -->
+      </template>
+      <template v-else>
+        <el-button type="primary">选取文件</el-button>
+      </template>
     </el-upload>
     <!-- 上传提示 -->
     <div class="el-upload__tip" v-if="showTip && !disabled">
@@ -83,7 +92,7 @@ const props = defineProps({
   // 拖动排序
   drag: {
     type: Boolean,
-    default: true
+    default: false
   }
 })
 

src/components/UserSelect/index.vue

@@ -1,24 +1,9 @@
 <template>
   <div class="flex flex-wrap">
-    <el-select
-      v-model="selectedValue"
-      filterable
-      remote
-      reserve-keyword
-      placeholder="请输入用户名"
-      :remote-method="debouncedRemoteMethod"
-      :loading="loading"
-      :multiple="multiple"
-      :disabled="disabled"
-      :style="{ width: width }"
-      clearable
-    >
-      <el-option
-        v-for="item in options"
-        :key="item.value"
-        :label="item.label"
-        :value="item.value"
-      />
+    <el-select v-model="selectedValue" filterable remote reserve-keyword :placeholder="placeholder"
+      :remote-method="debouncedRemoteMethod" :loading="loading" :multiple="multiple" :disabled="disabled"
+      :style="{ width: width }" :multiple-limit="max" clearable>
+      <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
     </el-select>
   </div>
 </template>
@@ -26,7 +11,8 @@
 <script lang="ts" setup>
 import { onMounted, ref, watch, defineProps, defineEmits, onUnmounted } from 'vue'
 import { debounce } from 'lodash-es'
-import { listUser } from "@/api/system/user"
+import { listUser, getUser } from "@/api/system/user"
+import { unref } from 'vue'
 
 interface ListItem {
   value: string
@@ -39,6 +25,8 @@ const props = defineProps<{
   multiple?: boolean
   disabled?: boolean
   width?: string
+  max?: number
+  placeholder?: string
 }>()
 
 // 定义组件事件
@@ -48,15 +36,33 @@ const options = ref<ListItem[]>([])
 const loading = ref(false)
 const selectedValue = ref<string | string[]>(props.modelValue)
 
+// 根据用户ID列表获取用户信息
+const fetchUsersByIds = async (userIds: string[]) => {
+  if (!userIds || userIds.length === 0) return []
+  try {
+    // 使用Promise.all并行获取每个用户的信息
+    const userPromises = userIds.map(userId => getUser(userId))
+    const userResponses = await Promise.all(userPromises)
+
+    return userResponses.map((response: any) => ({
+      value: response.data.userId,
+      label: response.data.nickName
+    }))
+  } catch (error) {
+    console.error('获取用户信息失败:', error)
+    return []
+  }
+}
+
 // 远程搜索方法
 const remoteMethod = async (query: string) => {
   if (query) {
     loading.value = true
     try {
       // 调用远程接口获取数据
-      const response = await listUser({ nickName: query }) 
+      const response = await listUser({ nickName: query })
       // 假设接口返回的数据结构为 { data: [...] }，根据实际情况调整
-      options.value = response.rows.map((item) => ({ 
+      options.value = response.rows.map((item) => ({
         value: item.userId, // 根据实际接口返回字段调整
         label: item.nickName // 根据实际接口返回字段调整
       }))
@@ -73,9 +79,33 @@ const remoteMethod = async (query: string) => {
 // 防抖处理远程搜索
 const debouncedRemoteMethod = debounce(remoteMethod, 300)
 
+// 标记是否正在初始化回显，避免循环更新
+const isInitializing = ref(false)
+
+// 监听modelValue变化，有值时执行回显逻辑
+watch(() => props.modelValue, async (newValue, oldValue) => {
+  // 只有当值从无到有或值发生变化时才执行回显
+  if (newValue && newValue.length > 0 && newValue !== oldValue) {
+    isInitializing.value = true
+    try {
+      const userIds = Array.isArray(newValue) ? newValue : [newValue]
+      const userOptions = await fetchUsersByIds(userIds)
+      options.value = userOptions
+      
+      // 设置选中值，但不触发更新事件
+      selectedValue.value = newValue
+    } finally {
+      isInitializing.value = false
+    }
+  }
+}, { immediate: true })
+
 // 监听选中值变化并触发更新事件
 watch(selectedValue, (newValue) => {
-  emits('update:modelValue', newValue)
+  // 只有在非初始化状态下才触发更新事件
+  if (!isInitializing.value) {
+    emits('update:modelValue', newValue)
+  }
 })
 
 // 组件销毁时清空数据
@@ -84,4 +114,10 @@ onUnmounted(() => {
   selectedValue.value = props.multiple ? [] : ''
   emits('update:modelValue', selectedValue.value)
 })
-</script>
+</script>
+
+<style scoped lang="scss">
+.flex {
+  width: 100%;
+}
+</style>

src/utils/request.js

@@ -11,7 +11,8 @@ let downloadLoadingInstance
 // 是否显示重新登录
 export let isRelogin = { show: false }
 
-axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
+axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8';
+axios.defaults.headers['X-Request-Source'] = 'web';
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分

src/views/attendance/checkRecord/index.vue

@@ -9,6 +9,22 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="班组名称" prop="teamName">
+        <el-input
+          v-model="queryParams.teamName"
+          placeholder="请输入班组名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="科室名称" prop="departmentName">
+        <el-input
+          v-model="queryParams.departmentName"
+          placeholder="请输入科室名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="打卡日期">
         <el-date-picker
           clearable
@@ -56,6 +72,8 @@
 
     <el-table v-loading="loading" :data="checkRecordList" @selection-change="handleSelectionChange">
       <el-table-column label="打卡人姓名" align="center" prop="userName" />
+      <el-table-column label="班组名称" align="center" prop="teamName" />
+      <el-table-column label="科室名称" align="center" prop="departmentName" />
       <el-table-column label="打卡类型" align="center" prop="checkInTypeDesc" />
       <el-table-column label="打卡时间" align="center" prop="checkInTime" />
       <el-table-column label="备注" align="center" prop="remark" />

src/views/attendance/postRecord/index.vue

@@ -60,14 +60,14 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="岗位名称" prop="positionName">
+      <!-- <el-form-item label="岗位名称" prop="positionName">
         <el-input
           v-model="queryParams.positionName"
           placeholder="请输入岗位名称"
           clearable
           @keyup.enter="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -116,12 +116,17 @@
       <el-table-column label="科室名称" align="center" prop="attendanceDepartmentName" width="80" />
       <el-table-column label="考勤日期" align="center" prop="attendanceDate" width="100" />
       <el-table-column label="上岗时间" align="center" prop="checkInTime" width="155" />
-      <el-table-column label="离岗时间" align="center" prop="checkOutTime" width="155" />
+      <el-table-column label="离岗时间" align="center" prop="checkOutTime" width="155" >
+        <template #default="scope">
+          {{ scope.row.checkOutTime=='2000-01-01 00:00:00'?'':scope.row.checkOutTime }}
+        </template>
+      </el-table-column>
       <el-table-column label="工作时长(分钟)" align="center" prop="workDuration" width="115" />
       <el-table-column label="航站楼名称" align="center" prop="terminlName" width="110" />
       <el-table-column label="区域名称" align="center" prop="regionalName" width="110" />
       <el-table-column label="通道名称" align="center" prop="channelName" width="110" />
-      <el-table-column label="岗位名称" align="center" prop="positionName" width="110" />
+
+      <!-- <el-table-column label="岗位名称" align="center" prop="positionName" width="110" /> -->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
         <template #default="scope">
@@ -392,7 +397,13 @@ const { queryParams, form, rules } = toRefs(data)
 /** 查询上岗记录列表 */
 function getList() {
   loading.value = true
-  listPostRecord(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
+  let params = {
+    ...queryParams.value,
+    beginTime: dateRange.value[0],
+    endTime: dateRange.value[1],
+    // ...proxy.addDateRange(queryParams.value, dateRange.value)
+  }
+  listPostRecord(params).then(response => {
     postRecordList.value = response.rows
     total.value = response.total
     loading.value = false

src/views/check/checkCorrection/index.vue

@@ -2,28 +2,29 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="100px">
       <el-row :gutter="16">
-        <el-col :span="8">
-          <el-form-item label="任务标题" prop="taskName">
-            <el-input v-model="queryParams.taskName" placeholder="请输入任务标题" clearable style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="检查人" prop="checkerName">
-            <el-input v-model="queryParams.checkerName" placeholder="请输入检查人" clearable style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="检查时间" prop="checkTime">
-            <el-date-picker v-model="queryParams.checkTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择检查时间"
-              style="width: 200px;" clearable />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-col>
+
+        <el-form-item label="任务标题" prop="taskName">
+          <el-input v-model="queryParams.taskName" placeholder="请输入任务标题" clearable style="width: 200px;" />
+        </el-form-item>
+
+
+        <el-form-item label="检查人" prop="checkerName">
+          <el-input v-model="queryParams.checkerName" placeholder="请输入检查人" clearable style="width: 200px;" />
+        </el-form-item>
+
+
+        <el-form-item label="检查时间" prop="checkTime">
+          <el-date-picker clearable v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+            start-placeholder="开始日期" end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+
+
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+
       </el-row>
     </el-form>
 
@@ -32,34 +33,33 @@
       <el-table-column label="任务标题" align="center" prop="taskName" />
       <el-table-column label="检查人" align="center" prop="checkerName" width="100" />
       <el-table-column label="检查时间" align="center" prop="checkTime" width="180">
-        <template #default=" scope ">
-          <span>{{ parseTime( scope.row.checkTime, '{y}-{m}-{d}' ) }}</span>
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="被检查级别" align="center" prop="checkedLevel" width="100">
-        <template #default=" scope ">
+        <template #default="scope">
           <dict-tag :options="check_checked_level" :value="scope.row.checkedLevel" />
         </template>
       </el-table-column>
       <el-table-column label="被检查人/班组/科" align="center" prop="checkedLevel">
-        <template #default=" scope ">
-          <div v-if=" scope.row.checkedLevel === 'DEPARTMENT_LEVEL' ">{{ scope.row.checkedDepartmentName }}</div>
-          <div v-if=" scope.row.checkedLevel === 'TEAM_LEVEL' ">{{ scope.row.checkedTeamName }}</div>
-          <div v-if=" scope.row.checkedLevel === 'PERSONNEL_LEVEL' ">{{ scope.row.checkedPersonnelName }}</div>
+        <template #default="scope">
+          <div v-if="scope.row.checkedLevel === 'DEPARTMENT_LEVEL'">{{ scope.row.checkedDepartmentName }}</div>
+          <div v-if="scope.row.checkedLevel === 'TEAM_LEVEL'">{{ scope.row.checkedTeamName }}</div>
+          <div v-if="scope.row.checkedLevel === 'PERSONNEL_LEVEL'">{{ scope.row.checkedPersonnelName }}</div>
         </template>
       </el-table-column>
       <el-table-column label="整改状态" align="center" prop="statusDesc" width="100" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
-        <template #default=" scope ">
-          <el-button link type="info" icon="View" @click="handleDetail( scope.row )"
-            v-hasPermi="[ 'check:checkRecord:query' ]">详情</el-button>
+        <template #default="scope">
+          <el-button link type="info" icon="View" @click="handleDetail(scope.row)"
+            v-hasPermi="['check:checkRecord:query']">详情</el-button>
         </template>
       </el-table-column>
     </el-table>
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
-    <Details v-model:show="show" :id="cellRecord.id"/>
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <Details v-model:show="show" :id="cellRecord.id" />
   </div>
 </template>
 
@@ -73,6 +73,7 @@ const { check_checked_level } = useDict('check_checked_level')
 const checkRecordList = ref([])
 const loading = ref(false)
 const total = ref(0)
+const dateRange = ref([])
 const queryParams = ref({
   taskName: undefined,
   checkerName: undefined,
@@ -82,9 +83,15 @@ const queryParams = ref({
 })
 
 /** 查询检查记录列表 */
-function getList () {
+function getList() {
   loading.value = true
-  checkCorrection(queryParams.value).then(response => {
+  let params = {
+    ...queryParams.value,
+    startDate: dateRange.value[0],
+    endDate: dateRange.value[1]
+  }
+
+  checkCorrection(params).then(response => {
     checkRecordList.value = response.rows
     total.value = response.total
   }).finally(() => {

src/views/check/checkRecord/index.vue

@@ -33,8 +33,11 @@
       </el-form-item>
 
       <el-form-item label="检查时间" prop="checkTime">
-        <el-date-picker v-model="queryParams.checkTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择检查时间"
-          style="width: 200px;" clearable />
+        <!-- <el-date-picker v-model="queryParams.checkTime" type="daterange" value-format="YYYY-MM-DD" placeholder="请选择检查时间"
+          style="width: 200px;" clearable /> -->
+        <el-date-picker clearable v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期">
+        </el-date-picker>
       </el-form-item>
       <!-- <el-form-item label="检查结果" prop="checkResult">
          <el-select v-model="queryParams.checkResult" placeholder="请选择检查结果" clearable style="width: 120px">
@@ -96,9 +99,9 @@
 
     <el-table v-loading="loading" :data="checkRecordList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务编号" align="center" prop="taskCode" width="180"/>
+      <el-table-column label="任务编号" align="center" prop="taskCode" width="180" />
       <el-table-column label="任务标题" align="center" prop="taskName" />
-      <el-table-column label="检查人" align="center" prop="checkerName" width="100"/>
+      <el-table-column label="检查人" align="center" prop="checkerName" width="100" />
       <el-table-column label="检查时间" align="center" prop="checkTime" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d}') }}</span>
@@ -111,10 +114,10 @@
       </el-table-column>
       <el-table-column label="被检查人/班组/科" align="center" prop="checkedLevel">
         <template #default="scope">
-          <div v-if="scope.row.checkedLevel === 'DEPARTMENT_LEVEL'">{{ scope.row.checkedDepartmentName  }}</div>
+          <div v-if="scope.row.checkedLevel === 'DEPARTMENT_LEVEL'">{{ scope.row.checkedDepartmentName }}</div>
           <div v-if="scope.row.checkedLevel === 'TEAM_LEVEL'">{{ scope.row.checkedTeamName }}</div>
           <div v-if="scope.row.checkedLevel === 'PERSONNEL_LEVEL'">{{ scope.row.checkedPersonnelName }}</div>
-        </template>  
+        </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template #default="scope">
@@ -161,6 +164,7 @@ const total = ref(0)
 const title = ref("")
 const positiveList = ref([])
 const negativeList = ref([])
+const dateRange = ref([])
 
 const data = reactive({
   form: {},
@@ -200,7 +204,13 @@ const { queryParams, form } = toRefs(data)
 /** 查询检查记录列表 */
 function getList() {
   loading.value = true
-  listCheckRecord(queryParams.value).then(response => {
+  let params = {
+    ...queryParams.value,
+    startDate: dateRange.value[0],
+    endDate: dateRange.value[1]
+  }
+
+  listCheckRecord(params).then(response => {
     checkRecordList.value = response.rows
     total.value = response.total
     loading.value = false

src/views/examManage/trainingPerformance/index.vue

@@ -0,0 +1,188 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="考试编号" prop="examCode">
+        <el-input v-model="queryParams.examCode" placeholder="请输入考试编号" clearable style="width: 200px" />
+      </el-form-item>
+      <el-form-item label="考试名称" prop="examName">
+        <el-input v-model="queryParams.examName" placeholder="请输入考试名称" clearable style="width: 200px" />
+      </el-form-item>
+      <el-form-item label="考试人姓名" prop="userName">
+        <el-input v-model="queryParams.userName" placeholder="请输入考试人姓名" clearable style="width: 200px" />
+      </el-form-item>
+      <el-form-item label="考试时间" prop="examTime">
+        <el-date-picker v-model="queryParams.examTime" type="daterange" range-separator="至" start-placeholder="开始日期"
+          end-placeholder="结束日期" value-format="YYYY-MM-DD" style="width: 240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="Upload" @click="handleImport">导入</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="trainingPerformanceList" >
+      <el-table-column label="考试编号" align="center" prop="examCode"  />
+      <el-table-column label="考试名称" align="center" prop="examName"  />
+      <el-table-column label="考试人编号" align="center" prop="userCode" />
+      <el-table-column label="考试人姓名" align="center" prop="userName" />
+      <el-table-column label="考试时间" align="center" prop="examTime" >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.examTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="考试成绩" align="center" prop="examScore"  />
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 导入对话框 -->
+    <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+              <span>仅允许导入xls、xlsx格式文件。</span>
+              <el-link type="primary" :underline="false" style="font-size:16px;vertical-align: baseline;" @click="handleDownloadTemplate">下载模板</el-link>
+            </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="TrainingPerformance">
+import { getGrowthList, importData, downloadTemplate } from "@/api/examManage/trainingPerformance"
+import { getToken } from "@/utils/auth"
+import { addDateRange, parseTime } from "@/utils/ruoyi"
+import { UploadFilled } from '@element-plus/icons-vue'
+
+const { proxy } = getCurrentInstance()
+
+const trainingPerformanceList = ref([])
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const dateRange = ref([])
+
+// 导入参数
+const upload = reactive({
+  // 是否显示弹出层
+  open: false,
+  // 弹出层标题
+  title: "",
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的用户数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: { Authorization: "Bearer " + getToken() },
+  // 上传的地址
+  url: import.meta.env.VITE_APP_BASE_API + "/system/growth/importData"
+})
+
+const data = reactive({
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    examCode: undefined,
+    examName: undefined,
+    userName: undefined,
+    examTime: []
+  }
+})
+
+const { queryParams } = toRefs(data)
+
+/** 查询培训绩效列表 */
+function getList() {
+  loading.value = true;
+  let params = {
+    ...queryParams.value,
+    startTime: queryParams.value.examTime.length > 0 ? queryParams.value.examTime[0] : undefined,
+    endTime: queryParams.value.examTime.length > 0 ? queryParams.value.examTime[1] : undefined
+  }
+  delete params.examTime
+  getGrowthList(params).then(response => {
+    trainingPerformanceList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  dateRange.value = []
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+/** 多选框选中数据 */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 导入按钮操作 */
+function handleImport() {
+  upload.title = "导入"
+  upload.open = true
+}
+
+/** 下载模板操作 */
+function handleDownloadTemplate() {
+
+  proxy.download("/system/growth/importTemplate", {}, `record_template_${new Date().getTime()}.xlsx`)
+}
+
+/**文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true
+}
+
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.open = false
+  upload.isUploading = false
+  proxy.$refs["uploadRef"].handleRemove(file)
+  if (response.code === 200) {
+    proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+    getList()
+  } else {
+    proxy.$modal.msgError(response.msg)
+  }
+}
+
+/** 提交上传文件 */
+function submitFileForm() {
+  proxy.$refs["uploadRef"].submit()
+}
+
+getList()
+</script>

src/views/item/record/index.vue

@@ -7,8 +7,11 @@
       </el-form-item>
 
       <el-form-item label="查获时间" prop="seizureTime">
-        <el-date-picker clearable v-model="queryParams.seizureTime" type="date" value-format="YYYY-MM-DD"
-          placeholder="请选择查获时间">
+        <!-- <el-date-picker clearable v-model="queryParams.seizureTime" type="date" value-format="YYYY-MM-DD"
+          placeholder="请选择查获时间"> 
+        </el-date-picker>-->
+        <el-date-picker clearable v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
 
@@ -77,6 +80,11 @@
       <el-table-column label="安检岗位" align="center" prop="checkMethodDesc" />
       <el-table-column label="查获班组" align="center" prop="inspectTeamName" />
       <el-table-column label="上报班组" align="center" prop="attendanceTeamName" />
+      <el-table-column label="流程状态" align="center" prop="processStatus" >
+        <template #default="scope">
+          <dict-tag :options="process_status" :value="scope.row.processStatus" />
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="违禁品类型" align="center" prop="categoryNameTwo" />
       <el-table-column label="数量" align="center" prop="quantity" />
       <el-table-column label="查获部位" align="center" prop="customLocation" />
@@ -103,7 +111,9 @@
     <el-dialog :title="title" v-model="open" width="800px" append-to-body>
       <el-form ref="recordRef" :model="form" :rules="rules" label-width="9em" disabled>
         <el-form-item label="违禁品类别/类型" prop="channelCode">
-          <el-input :value="`${form.itemSeizureItemsList[0].categoryNameOne} / ${form.itemSeizureItemsList[0].categoryNameTwo}`" placeholder="- -" />
+          <el-input
+            :value="`${form.itemSeizureItemsList[0].categoryNameOne} / ${form.itemSeizureItemsList[0].categoryNameTwo}`"
+            placeholder="- -" />
         </el-form-item>
         <!-- <el-form-item label="违禁品名称" prop="channelCode">
           <el-input v-model="form.itemSeizureItemsList[0].itemName" placeholder="" />
@@ -112,11 +122,13 @@
         <el-form-item label="数量" prop="channelCode">
           <el-input v-model="form.itemSeizureItemsList[0].quantity" placeholder="-" />
         </el-form-item>
-         <!-- <el-form-item label="查获部位" prop="channelCode">
+        <!-- <el-form-item label="查获部位" prop="channelCode">
           <el-input v-model="form.itemSeizureItemsList[0].checkPositionNameOne" placeholder="" />
         </el-form-item> -->
-           <el-form-item label="部位类别/类型" prop="channelCode">
-          <el-input :value="`${form.itemSeizureItemsList[0].checkPositionNameOne} / ${form.itemSeizureItemsList[0].checkPositionNameTwo}`" placeholder="- -" />
+        <el-form-item label="部位类别/类型" prop="channelCode">
+          <el-input
+            :value="`${form.itemSeizureItemsList[0].checkPositionNameOne} / ${form.itemSeizureItemsList[0].checkPositionNameTwo}`"
+            placeholder="- -" />
         </el-form-item>
         <!-- <el-form-item label="具体位置" prop="channelCode">
           <el-input v-model="form.itemSeizureItemsList[0].checkPositionSpecific" placeholder="" />
@@ -125,7 +137,7 @@
           <el-input v-model="form.itemSeizureItemsList[0].handlingMethodDesc" placeholder="-" />
         </el-form-item>
         <el-form-item label="是否隐匿夹带" prop="channelCode">
-          <el-select v-model="form.itemSeizureItemsList[0].isActiveConcealment"  placeholder="-">
+          <el-select v-model="form.itemSeizureItemsList[0].isActiveConcealment" placeholder="-">
             <el-option label="否" :value="0" />
             <el-option label="是" :value="1" />
           </el-select>
@@ -139,7 +151,7 @@
         <el-form-item label="航班号" prop="passengerFlight">
           <el-input v-model="form.passengerFlight" placeholder="-" />
         </el-form-item> -->
-        
+
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -154,7 +166,7 @@
 <script setup name="Record">
 import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/item/record"
 import { onMounted } from 'vue'
-
+import { useDict } from '@/utils/dict'
 const { proxy } = getCurrentInstance()
 
 const recordList = ref([])
@@ -166,7 +178,8 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 const title = ref("")
-
+const dateRange = ref([])
+const { process_status } = useDict('process_status')
 const data = reactive({
   form: {},
   queryParams: {
@@ -276,8 +289,13 @@ const { queryParams, form, rules } = toRefs(data)
 
 /** 查询查获记录列表 */
 function getList() {
-  loading.value = true
-  listRecord(queryParams.value).then(response => {
+  loading.value = true;
+  let params = {
+    ...queryParams.value,
+    beginTime: dateRange.value[0],
+    endTime: dateRange.value[1]
+  }
+  listRecord(params).then(response => {
     recordList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -319,7 +337,7 @@ function reset() {
     terminlName: null,
     passengerName: null,
     passengerGender: null,
-     itemSeizureItemsList: [{}],
+    itemSeizureItemsList: [{}],
     passengerCard: null,
     passengerFlight: null,
     inspectTeamId: null,

src/views/login.vue

@@ -77,8 +77,8 @@ const router = useRouter()
 const { proxy } = getCurrentInstance()
 
 const loginForm = ref({
-  username: "admin",
-  password: "admin123",
+  username: "",
+  password: "",
   rememberMe: false,
   code: "",
   uuid: ""
@@ -160,7 +160,7 @@ function getCookie() {
 }
 
 getCode()
-getCookie()
+// getCookie()
 </script>
 
 <style lang='scss' scoped>

src/views/system/app/index.vue

@@ -0,0 +1,482 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form-item label="应用名称" prop="appName">
+                <el-input v-model="queryParams.appName" placeholder="请输入应用名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+
+            <el-form-item label="创建者" prop="createBy">
+                <el-input v-model="queryParams.createBy" placeholder="请输入创建者" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+
+            <el-form-item label="状态" prop="status">
+                <el-select v-model="queryParams.status" placeholder="请选择状态" clearable style="width: 200px;">
+                    <el-option label="正常" :value="1" />
+                    <el-option label="关闭" :value="0" />
+                </el-select>
+            </el-form-item>
+
+            <el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="Plus" @click="handleAdd"
+                    v-hasPermi="['system:app:add']">新增</el-button>
+            </el-col>
+
+            <el-col :span="1.5">
+                <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+                    v-hasPermi="['system:app:remove']">删除</el-button>
+            </el-col>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="docList" @selection-change="handleSelectionChange" :row-key="getRowKey">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column type="index" label="序号" align="center" width="80" />
+            <el-table-column label="应用名称" align="center" prop="appName" />
+            <el-table-column label="显示顺序" align="center" prop="appSort" width="100" />
+            <el-table-column label="状态" align="center" prop="status">
+                <template #default="scope">
+                    <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+                </template>
+            </el-table-column>
+            <el-table-column label="创建者" align="center" prop="createBy" />
+            <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+                <template #default="scope">
+                    <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+                <template #default="scope">
+                    <el-tooltip content="修改" placement="top" v-hasPermi="['system:app:edit']">
+                        <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+                    </el-tooltip>
+                    <el-tooltip content="删除" placement="top" v-hasPermi="['system:app:remove']">
+                        <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+                    </el-tooltip>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+        <!-- 添加或修改应用管理对话框 -->
+        <el-dialog :title="title" v-model="open" width="700px" append-to-body destroy-on-close>
+            <el-form ref="docRef" :model="form" :rules="rules" label-width="9em">
+                <el-form-item label="应用名称" prop="appName">
+                    <el-input v-model="form.appName" placeholder="请输入应用名称" />
+                </el-form-item>
+                <el-form-item label="角色" prop="roleIds">
+                    <el-select v-model="form.roleIds" multiple placeholder="请选择角色" style="width: 100%;">
+                        <el-option v-for="role in roleOptions" :key="role.roleId" :label="role.roleName"
+                            :value="role.roleId" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="链接" prop="appUrl">
+                    <el-input v-model="form.appUrl" placeholder="请输入应用链接" />
+                </el-form-item>
+                <el-form-item label="状态" prop="status">
+                    <el-radio-group v-model="form.status">
+                        <el-radio :label="'1'">正常</el-radio>
+                        <el-radio :label="'0'">关闭</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <!-- <el-form-item label="是否为首页应用" prop="homePage">
+                    <el-radio-group v-model="form.homePage">
+                        <el-radio :label="'1'">是</el-radio>
+                        <el-radio :label="'0'">否</el-radio>
+                    </el-radio-group>
+                </el-form-item> -->
+                <el-form-item label="首页角色" prop="homeRoleIds">
+                    <el-select v-model="form.homeRoleIds" multiple placeholder="请选择角色" style="width: 100%;">
+                        <el-option v-for="role in roleOptions" :key="role.roleId" :label="role.roleName"
+                            :value="role.roleId" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="显示顺序" prop="appSort">
+                    <el-input-number v-model="form.appSort" :min="1" :max="999" controls-position="right"
+                        placeholder="请输入显示顺序" />
+                </el-form-item>
+                <el-form-item label="图标" prop="workbenchIcon">
+                    <el-upload ref="iconUploadRef" :limit="1" accept="image/*" :headers="upload.headers"
+                        :action="upload.url" :file-list="upload.iconFileList" :disabled="false"
+                        :on-success="handleIconSuccess" :on-remove="handleIconRemove" :auto-upload="true"
+                        list-type="picture-card">
+                        <el-icon class="avatar-uploader-icon">
+                            <plus />
+                        </el-icon>
+                        <template #tip>
+                            <div class="el-upload__tip">请上传图标，建议尺寸 64x64px</div>
+                        </template>
+                    </el-upload>
+                </el-form-item>
+
+
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="cancel">取 消</el-button>
+                    <el-button type="primary" @click="submitForm">确 定</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="App">
+import { onMounted, ref, reactive, toRefs, computed } from 'vue'
+import { ElMessage } from 'element-plus'
+import { UploadFilled, Plus } from '@element-plus/icons-vue'
+import Pagination from '@/components/Pagination/index.vue'
+import RightToolbar from '@/components/RightToolbar/index.vue'
+import { parseTime } from '@/utils/ruoyi'
+import { getToken } from '@/utils/auth'
+import { listApp, getApp, deleteApp, addApp, updateApp } from '@/api/system/app'
+import { listRole } from '@/api/system/role'
+const { proxy } = getCurrentInstance()
+
+// 使用真实API接口，已从@/api/system/workDocu导入
+const sys_normal_disable = [
+    { label: '正常', value: '1' },
+    { label: '关闭', value: '0' }
+]
+
+const getRowKey = (row) => {
+    return row.appId
+}
+
+// 表格数据
+const docList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref('')
+
+// 角色选项
+const roleOptions = ref([])
+
+// 上传相关
+
+const iconUploadRef = ref(null)
+
+
+const upload = reactive({
+
+    iconFileList: [],
+
+    // 是否显示弹出层
+    open: false,
+    // 弹出层标题
+    title: "",
+    // 是否禁用上传
+    isUploading: false,
+    // 是否更新已经存在的用户数据
+    updateSupport: 0,
+    // 设置上传的请求头部
+    headers: { Authorization: "Bearer " + getToken() },
+    // 上传的地址
+    url: import.meta.env.VITE_APP_BASE_API + "/common/upload"
+})
+
+
+
+
+const handleIconSuccess = (response, file, fileList) => {
+    if (response.code === 200) {
+        form.value.workbenchIcon = response.url
+        ElMessage.success('图标上传成功')
+    } else {
+        ElMessage.error(response.msg || '图标上传失败')
+    }
+}
+
+
+// 图标移除处理
+const handleIconRemove = (file, fileList) => {
+    form.value.workbenchIcon = '';
+}
+
+
+
+
+
+
+// 表单数据
+const data = reactive({
+    form: {
+        appId: null,
+        appName: '',
+        roleIds: [],
+        homeRoleIds: [],
+        appUrl: '',
+        status: '1',
+        // homePage: '0',
+        workbenchIcon: '',
+        homeChart: '',
+        appFile: '',
+        appSort: 1
+
+    },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        appName: '',
+        createBy: '',
+        status: null
+    },
+    rules: {
+        appName: [
+            { required: true, message: '应用名称不能为空', trigger: 'blur' }
+        ],
+        appSort: [
+            { required: true, message: '请输入显示顺序', trigger: 'blur' }
+        ],
+        workbenchIcon: [
+            { required: true, message: '请上传图标', trigger: 'change' }
+        ],
+    }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询应用列表 */
+const getList = () => {
+    loading.value = true
+    listApp(queryParams.value).then(response => {
+        docList.value = response.rows
+        total.value = response.total
+        loading.value = false
+    })
+}
+
+// 取消按钮
+const cancel = () => {
+    open.value = false
+    reset()
+}
+
+// 表单重置
+const reset = () => {
+    form.value = {
+        appId: null,
+        appName: '',
+        roleIds: [],
+        homeRoleIds: [],
+        appUrl: '',
+        status: '1',
+        // homePage: '0',
+        workbenchIcon: '',
+        homeChart: '',
+        appFile: '',
+        appSort: 1
+    }
+    // 清空文件列表
+
+    upload.iconFileList = []
+
+    if (proxy?.$refs?.docRef) {
+        proxy.$refs.docRef.resetFields()
+    }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+    queryParams.value.pageNum = 1
+    getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+    if (proxy?.$refs?.queryRef) {
+        proxy.$refs.queryRef.resetFields()
+    }
+    handleQuery()
+}
+
+///** 多选框选中数据 */
+const handleSelectionChange = (selection) => {
+    ids.value = selection.map(item => item.appId)
+    single.value = selection.length != 1
+    multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+    reset()
+    open.value = true
+    title.value = '添加工作文档'
+}
+
+/** 修改按钮操作 */
+const handleUpdate = (row) => {
+    reset()
+
+    const _id = row?.appId || ids.value
+    getApp(_id).then(response => {
+        form.value = response.data;
+
+
+        if (response.data.sysRoleList) {
+            form.value.roleIds = response.data.sysRoleList.map(item => item.roleId)
+
+        }
+        if (response.data.homePageSysRoleList) {
+            form.value.homeRoleIds = response.data.homePageSysRoleList.map(item => item.roleId)
+        }
+
+        if (response.data.workbenchIcon) {
+            upload.iconFileList = [{
+                name: '',
+                url: response.data.workbenchIcon
+            }]
+        }
+
+
+
+        open.value = true
+        title.value = '修改应用管理'
+    })
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+    if (proxy?.$refs?.docRef) {
+        proxy.$refs.docRef.validate((valid) => {
+            if (valid) {
+                let sysRoleList = roleOptions.value.filter(item => form.value.roleIds.includes(item.roleId))
+                let homePageSysRoleList = roleOptions.value.filter(item => form.value.homeRoleIds.includes(item.roleId))
+                let params = {
+                    ...form.value,
+                        sysRoleList: sysRoleList,
+                        homePageSysRoleList: homePageSysRoleList
+                }
+                if (form.value.appId != undefined) {
+                    updateApp(params).then(response => {
+                        ElMessage.success('修改成功')
+                        open.value = false
+                        getList()
+                    })
+                } else {
+                    addApp(params).then(response => {
+                        ElMessage.success('新增成功')
+                        open.value = false
+                        getList()
+                    })
+                }
+            }
+        })
+    }
+}
+
+/** 删除按钮操作 */
+const handleDelete = (row) => {
+    const _ids = row?.appId || ids.value;
+
+    // 检查是否有要删除的ID
+    if (!_ids || (Array.isArray(_ids) && _ids.length === 0)) {
+        ElMessage.warning('请选择要删除的数据项')
+        return
+    }
+
+    if (proxy?.$modal) {
+        proxy.$modal.confirm('是否确认删除数据项？').then(() => {
+            const deleteIds = Array.isArray(_ids) ? _ids.join(',') : _ids
+            return deleteApp(deleteIds)
+        }).then(() => {
+            getList()
+            ElMessage.success('删除成功')
+        }).catch((error) => {
+            console.error('删除失败:', error)
+            ElMessage.error('删除失败')
+        })
+    }
+}
+
+// 获取角色列表
+const getRoleList = () => {
+    listRole().then(response => {
+        roleOptions.value = response.rows || []
+    })
+}
+
+// 页面加载时获取数据
+onMounted(() => {
+    getList()
+    getRoleList()
+})
+</script>
+
+<style scoped>
+.app-container {
+    padding: 20px;
+}
+
+.mb8 {
+    margin-bottom: 8px;
+}
+
+.fixed-width {
+    width: 140px;
+}
+
+.small-padding .cell {
+    padding: 10px 5px;
+}
+
+.dialog-footer {
+    text-align: right;
+}
+
+/* 图片上传预览样式 */
+.avatar {
+    width: 100px;
+    height: 100px;
+    object-fit: contain;
+    border-radius: 6px;
+}
+
+.avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    transition: border-color 0.3s;
+}
+
+.avatar-uploader-icon:hover {
+    border-color: #409eff;
+}
+
+/* 图片上传组件样式优化 */
+:deep(.el-upload--picture-card) {
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+}
+
+:deep(.el-upload-list--picture-card .el-upload-list__item) {
+    width: 100px;
+    height: 100px;
+}
+
+:deep(.el-upload-list--picture-card .el-upload-list__item-thumbnail) {
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
+}
+</style>

src/views/system/role/index.vue

@@ -1,248 +1,195 @@
 <template>
-   <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="68px">
-         <el-form-item label="角色名称" prop="roleName">
-            <el-input
-               v-model="queryParams.roleName"
-               placeholder="请输入角色名称"
-               clearable
-               style="width: 240px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="权限字符" prop="roleKey">
-            <el-input
-               v-model="queryParams.roleKey"
-               placeholder="请输入权限字符"
-               clearable
-               style="width: 240px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="状态" prop="status">
-            <el-select
-               v-model="queryParams.status"
-               placeholder="角色状态"
-               clearable
-               style="width: 240px"
-            >
-               <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item label="创建时间" style="width: 308px">
-            <el-date-picker
-               v-model="dateRange"
-               value-format="YYYY-MM-DD"
-               type="daterange"
-               range-separator="-"
-               start-placeholder="开始日期"
-               end-placeholder="结束日期"
-            ></el-date-picker>
-         </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
-      </el-form>
-      <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
-            <el-button
-               type="primary"
-               plain
-               icon="Plus"
-               @click="handleAdd"
-               v-hasPermi="['system:role:add']"
-            >新增</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="success"
-               plain
-               icon="Edit"
-               :disabled="single"
-               @click="handleUpdate"
-               v-hasPermi="['system:role:edit']"
-            >修改</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               :disabled="multiple"
-               @click="handleDelete"
-               v-hasPermi="['system:role:remove']"
-            >删除</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="warning"
-               plain
-               icon="Download"
-               @click="handleExport"
-               v-hasPermi="['system:role:export']"
-            >导出</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-
-      <!-- 表格数据 -->
-      <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="角色编号" prop="roleId" width="120" />
-         <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
-         <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
-         <el-table-column label="显示顺序" prop="roleSort" width="100" />
-         <el-table-column label="状态" align="center" width="100">
-            <template #default="scope">
-               <el-switch
-                  v-model="scope.row.status"
-                  active-value="0"
-                  inactive-value="1"
-                  @change="handleStatusChange(scope.row)"
-               ></el-switch>
-            </template>
-         </el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime">
-            <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-         </el-table-column>
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template #default="scope">
-              <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">
-                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
-              </el-tooltip>
-              <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1">
-                <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']"></el-button>
-              </el-tooltip>
-              <el-tooltip content="数据权限" placement="top" v-if="scope.row.roleId !== 1">
-                <el-button link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="68px">
+      <el-form-item label="角色名称" prop="roleName">
+        <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable style="width: 240px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="权限字符" prop="roleKey">
+        <el-input v-model="queryParams.roleKey" placeholder="请输入权限字符" clearable style="width: 240px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="角色状态" clearable style="width: 240px">
+          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" style="width: 308px">
+        <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:role:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['system:role:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['system:role:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['system:role:export']">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 表格数据 -->
+    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="角色编号" prop="roleId" width="120" />
+      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="显示顺序" prop="roleSort" width="100" />
+      <el-table-column label="状态" align="center" width="100">
+        <template #default="scope">
+          <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+            @change="handleStatusChange(scope.row)"></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:role:edit']"></el-button>
+          </el-tooltip>
+          <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1">
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['system:role:remove']"></el-button>
+          </el-tooltip>
+          <el-tooltip content="数据权限" placement="top" v-if="scope.row.roleId !== 1">
+            <el-button link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)"
+              v-hasPermi="['system:role:edit']"></el-button>
+          </el-tooltip>
+          <el-tooltip content="分配用户" placement="top" v-if="scope.row.roleId !== 1">
+            <el-button link type="primary" icon="User" @click="handleAuthUser(scope.row)"
+              v-hasPermi="['system:role:edit']"></el-button>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改角色配置对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body destroy-on-close>
+      <el-form ref="roleRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="角色名称" prop="roleName">
+          <el-input v-model="form.roleName" placeholder="请输入角色名称" />
+        </el-form-item>
+        <el-form-item prop="roleKey">
+          <template #label>
+            <span>
+              <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
+                <el-icon><question-filled /></el-icon>
               </el-tooltip>
-              <el-tooltip content="分配用户" placement="top" v-if="scope.row.roleId !== 1">
-                <el-button link type="primary" icon="User" @click="handleAuthUser(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
-              </el-tooltip>
-            </template>
-         </el-table-column>
-      </el-table>
-
-      <pagination
-         v-show="total > 0"
-         :total="total"
-         v-model:page="queryParams.pageNum"
-         v-model:limit="queryParams.pageSize"
-         @pagination="getList"
-      />
-
-      <!-- 添加或修改角色配置对话框 -->
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-         <el-form ref="roleRef" :model="form" :rules="rules" label-width="100px">
-            <el-form-item label="角色名称" prop="roleName">
-               <el-input v-model="form.roleName" placeholder="请输入角色名称" />
-            </el-form-item>
-            <el-form-item prop="roleKey">
-               <template #label>
-                  <span>
-                     <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
-                        <el-icon><question-filled /></el-icon>
-                     </el-tooltip>
-                     权限字符
-                  </span>
-               </template>
-               <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
-            </el-form-item>
-            <el-form-item label="角色顺序" prop="roleSort">
-               <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
-            </el-form-item>
-            <el-form-item label="状态">
-               <el-radio-group v-model="form.status">
-                  <el-radio
-                     v-for="dict in sys_normal_disable"
-                     :key="dict.value"
-                     :value="dict.value"
-                  >{{ dict.label }}</el-radio>
-               </el-radio-group>
-            </el-form-item>
-            <el-form-item label="菜单权限">
-               <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
-               <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
-               <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
-               <el-tree
-                  class="tree-border"
-                  :data="menuOptions"
-                  show-checkbox
-                  ref="menuRef"
-                  node-key="id"
-                  :check-strictly="!form.menuCheckStrictly"
-                  empty-text="加载中，请稍候"
-                  :props="{ label: 'label', children: 'children' }"
-               ></el-tree>
-            </el-form-item>
-            <el-form-item label="备注">
-               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitForm">确 定</el-button>
-               <el-button @click="cancel">取 消</el-button>
-            </div>
-         </template>
-      </el-dialog>
-
-      <!-- 分配角色数据权限对话框 -->
-      <el-dialog :title="title" v-model="openDataScope" width="500px" append-to-body>
-         <el-form :model="form" label-width="80px">
-            <el-form-item label="角色名称">
-               <el-input v-model="form.roleName" :disabled="true" />
-            </el-form-item>
-            <el-form-item label="权限字符">
-               <el-input v-model="form.roleKey" :disabled="true" />
-            </el-form-item>
-            <el-form-item label="权限范围">
-               <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
-                  <el-option
-                     v-for="item in dataScopeOptions"
-                     :key="item.value"
-                     :label="item.label"
-                     :value="item.value"
-                  ></el-option>
-               </el-select>
-            </el-form-item>
-            <el-form-item label="数据权限" v-show="form.dataScope == 2">
-               <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
-               <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
-               <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
-               <el-tree
-                  class="tree-border"
-                  :data="deptOptions"
-                  show-checkbox
-                  default-expand-all
-                  ref="deptRef"
-                  node-key="id"
-                  :check-strictly="!form.deptCheckStrictly"
-                  empty-text="加载中，请稍候"
-                  :props="{ label: 'label', children: 'children' }"
-               ></el-tree>
-            </el-form-item>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitDataScope">确 定</el-button>
-               <el-button @click="cancelDataScope">取 消</el-button>
-            </div>
-         </template>
-      </el-dialog>
-   </div>
+              权限字符
+            </span>
+          </template>
+          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
+        </el-form-item>
+        <el-form-item label="角色顺序" prop="roleSort">
+          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="菜单权限">
+          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
+          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
+          <el-checkbox v-model="form.menuCheckStrictly"
+            @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
+          <el-tree class="tree-border" :data="menuOptions" show-checkbox ref="menuRef" node-key="id"
+            :check-strictly="!form.menuCheckStrictly" empty-text="加载中，请稍候"
+            :props="{ label: 'label', children: 'children' }"></el-tree>
+        </el-form-item>
+        <el-form-item label="应用权限">
+          <view class="app-permission-container">
+            <view class="app-permission-header">
+              <view>应用名称</view>
+              <view>应用权限</view>
+              <view>首页展示</view>
+            </view>
+
+            <view v-for="(app, index) in appOptions" :key="app.appId" class="app-permission-row">
+              <div>{{ app.appName }}</div>
+
+              <el-checkbox :model-value="appIds.includes(app.appId)"
+                @change="handleAppPermissionChange($event, app.appId)">
+              </el-checkbox>
+
+              <el-checkbox :model-value="homePageAppIds.includes(app.appId)"
+                :disabled="homePageAppIds.length >= 4 && !homePageAppIds.includes(app.appId)"
+                @change="handleHomePageChange($event, app.appId)"></el-checkbox>
+            </view>
+          </view>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 分配角色数据权限对话框 -->
+    <el-dialog :title="title" v-model="openDataScope" width="500px" append-to-body>
+      <el-form :model="form" label-width="80px">
+        <el-form-item label="角色名称">
+          <el-input v-model="form.roleName" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="权限字符">
+          <el-input v-model="form.roleKey" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="权限范围">
+          <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
+            <el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label"
+              :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="数据权限" v-show="form.dataScope == 2">
+          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
+          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
+          <el-checkbox v-model="form.deptCheckStrictly"
+            @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
+          <el-tree class="tree-border" :data="deptOptions" show-checkbox default-expand-all ref="deptRef" node-key="id"
+            :check-strictly="!form.deptCheckStrictly" empty-text="加载中，请稍候"
+            :props="{ label: 'label', children: 'children' }"></el-tree>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitDataScope">确 定</el-button>
+          <el-button @click="cancelDataScope">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup name="Role">
-import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole, deptTreeSelect } from "@/api/system/role"
+import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole, deptTreeSelect, listAllApp, listAppByRoleId } from "@/api/system/role"
 import { roleMenuTreeselect, treeselect as menuTreeselect } from "@/api/system/menu"
 
 const router = useRouter()
@@ -268,6 +215,12 @@ const deptOptions = ref([])
 const openDataScope = ref(false)
 const menuRef = ref(null)
 const deptRef = ref(null)
+const appOptions = ref([])
+const appNodeAll = ref(false)
+// 独立的应用权限数组
+const appIds = ref([])
+// 独立的首页应用数组
+const homePageAppIds = ref([])
 
 /** 数据范围选项*/
 const dataScopeOptions = ref([
@@ -296,6 +249,8 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data)
 
+
+
 /** 查询角色列表 */
 function getList() {
   loading.value = true
@@ -327,7 +282,7 @@ function handleDelete(row) {
   }).then(() => {
     getList()
     proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+  }).catch(() => { })
 }
 
 /** 导出按钮操作 */
@@ -382,6 +337,14 @@ function getMenuTreeselect() {
   })
 }
 
+/** 查询应用列表 */
+function getAppList() {
+  return listAllApp().then(response => {
+    appOptions.value = response.data || []
+    return response
+  })
+}
+
 /** 所有部门节点数据 */
 function getDeptAllCheckedKeys() {
   // 目前被选中的部门节点
@@ -401,6 +364,10 @@ function reset() {
   menuNodeAll.value = false
   deptExpand.value = true
   deptNodeAll.value = false
+  appNodeAll.value = false
+  // 重置独立的应用权限数组
+  appIds.value = []
+  homePageAppIds.value = []
   form.value = {
     roleId: undefined,
     roleName: undefined,
@@ -420,6 +387,7 @@ function reset() {
 function handleAdd() {
   reset()
   getMenuTreeselect()
+  getAppList()
   open.value = true
   title.value = "添加角色"
 }
@@ -430,15 +398,28 @@ function handleUpdate(row) {
   const roleId = row.roleId || ids.value
   const roleMenu = getRoleMenuTreeselect(roleId)
   getRole(roleId).then(response => {
-    form.value = response.data
+    form.value = {
+      ...response.data,
+    }
     form.value.roleSort = Number(form.value.roleSort)
-    open.value = true
-    nextTick(() => {
-      roleMenu.then((res) => {
-        let checkedKeys = res.checkedKeys
-        checkedKeys.forEach((v) => {
-          nextTick(() => {
-            menuRef.value.setChecked(v, true, false)
+
+    // 确保应用列表加载完成后再设置应用权限数据
+    Promise.all([getAppList(), listAppByRoleId(roleId)]).then(([appListRes, appRoleRes]) => {
+      // 使用独立的响应式变量
+      appIds.value = [...(appRoleRes.checkedAppIdList || [])]
+      homePageAppIds.value = [...(appRoleRes.checkedHomePageAppIdList || [])]
+      appNodeAll.value = appIds.value.length == appOptions.value.length
+
+      // 确保数据设置完成后再打开对话框
+      open.value = true
+
+      nextTick(() => {
+        roleMenu.then((res) => {
+          let checkedKeys = res.checkedKeys
+          checkedKeys.forEach((v) => {
+            nextTick(() => {
+              menuRef.value.setChecked(v, true, false)
+            })
           })
         })
       })
@@ -496,6 +477,62 @@ function handleCheckedTreeConnect(value, type) {
   }
 }
 
+/** 应用权限全选/全不选 */
+function handleCheckedAppAll(value) {
+  if (value) {
+    // 全选：获取所有应用的appId
+    appIds.value = appOptions.value.map(app => app.appId)
+  } else {
+    // 全不选：清空选中的应用
+    appIds.value = []
+  }
+}
+
+/** 应用权限选择变化处理 */
+function handleAppPermissionChange(checked, appId) {
+  if (checked) {
+    // 如果选中了应用权限，将应用ID添加到appIds数组中
+    if (!appIds.value.includes(appId)) {
+      // 使用响应式数组更新方式
+      appIds.value = [...appIds.value, appId]
+    }
+  } else {
+    // 如果取消选中应用权限，从appIds数组中移除应用ID
+    const index = appIds.value.indexOf(appId)
+    if (index > -1) {
+      // 使用响应式数组更新方式
+      appIds.value = appIds.value.filter(id => id !== appId)
+    }
+    // 同时从homePageAppIds数组中移除该应用ID（如果存在）
+    const homePageIndex = homePageAppIds.value.indexOf(appId)
+    if (homePageIndex > -1) {
+      homePageAppIds.value = homePageAppIds.value.filter(id => id !== appId)
+    }
+  }
+}
+
+/** 首页应用选择变化处理 */
+function handleHomePageChange(checked, appId) {
+  if (checked) {
+    // 如果选择了首页应用，确保对应的应用权限也被选中
+    if (!appIds.value.includes(appId)) {
+      // 使用响应式数组更新方式
+      appIds.value = [...appIds.value, appId]
+    }
+    // 将应用ID添加到homePageAppIds数组中
+    if (!homePageAppIds.value.includes(appId)) {
+      homePageAppIds.value = [...homePageAppIds.value, appId]
+    }
+  } else {
+    // 如果取消选中首页应用，从homePageAppIds数组中移除应用ID
+    const index = homePageAppIds.value.indexOf(appId)
+    if (index > -1) {
+      // 使用响应式数组更新方式
+      homePageAppIds.value = homePageAppIds.value.filter(id => id !== appId)
+    }
+  }
+}
+
 /** 所有菜单节点数据 */
 function getMenuAllCheckedKeys() {
   // 目前被选中的菜单节点
@@ -510,16 +547,23 @@ function getMenuAllCheckedKeys() {
 function submitForm() {
   proxy.$refs["roleRef"].validate(valid => {
     if (valid) {
+      // 将独立的应用权限数据合并到form对象中
+      const submitData = {
+        ...form.value,
+        appIds: appIds.value,
+        homePageAppIds: homePageAppIds.value
+      }
+
       if (form.value.roleId != undefined) {
-        form.value.menuIds = getMenuAllCheckedKeys()
-        updateRole(form.value).then(response => {
+        submitData.menuIds = getMenuAllCheckedKeys()
+        updateRole(submitData).then(response => {
           proxy.$modal.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        form.value.menuIds = getMenuAllCheckedKeys()
-        addRole(form.value).then(response => {
+        submitData.menuIds = getMenuAllCheckedKeys()
+        addRole(submitData).then(response => {
           proxy.$modal.msgSuccess("新增成功")
           open.value = false
           getList()
@@ -582,3 +626,41 @@ function cancelDataScope() {
 
 getList()
 </script>
+
+<style scoped>
+.app-permission-container {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  border: 1px solid var(--el-border-color);
+  border-radius: 4px;
+  padding: 5px;
+}
+
+.app-permission-header {
+  display: grid;
+  grid-template-columns: 1.6fr 1fr 1fr;
+  font-weight: bold;
+  align-items: center;
+
+  height: 24px;
+  line-height: 24px;
+  padding: 0 8px;
+}
+
+.app-permission-row {
+  height: 24px;
+  line-height: 24px;
+  display: grid;
+  grid-template-columns: 2fr 1fr 1fr;
+  align-items: center;
+  gap: 16px;
+  padding: 0 8px;
+}
+
+.app-permission-row div:first-child {
+  min-height: 32px;
+  display: flex;
+  align-items: center;
+}
+</style>

src/views/system/user/components/UserInfoEdit.vue

@@ -26,12 +26,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if=" form.userId == undefined " label="用户名称" prop="userName">
+            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
               <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if=" form.userId == undefined " label="用户密码" prop="password">
+            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
               <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
             </el-form-item>
           </el-col>
@@ -43,24 +43,39 @@
           <el-col :span="12">
             <el-form-item label="用户性别" prop="sex">
               <el-select v-model="form.sex" placeholder="请选择用户性别">
-                <el-option v-for=" dict in sys_user_sex " :key="dict.value" :label="dict.label"
+                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label"
                   :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="政治面貌" prop="politicalStatus">
-              <el-select v-model="form.politicalStatus" placeholder="请选择政治面貌">
-                <el-option v-for=" item in sys_user_political_status " :key="item.value" :label="item.label"
+            <el-form-item label="生肖" prop="zodiac">
+              <el-select v-model="form.zodiac" placeholder="请选择生肖">
+                <el-option v-for="item in sys_user_zodiac" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="星座" prop="constellation">
+              <el-select v-model="form.constellation" placeholder="请选择星座">
+                <el-option v-for="item in sys_user_constellation" :key="item.value" :label="item.label"
+                  :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="血型" prop="blooGroup">
+              <el-select v-model="form.blooGroup" placeholder="请选择血型">
+                <el-option v-for="item in sys_user_blood_group" :key="item.value" :label="item.label"
                   :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
             <el-form-item label="角色" prop="roleIds">
               <el-select v-model="form.roleIds" multiple placeholder="请选择角色" @change="roleChange">
-                <el-option v-for=" item in roleOptions " :key="item.roleId" :label="item.roleName"
-                  :value="item.roleId"
+                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
                   :disabled="item.status == 1"></el-option>
               </el-select>
             </el-form-item>
@@ -72,7 +87,7 @@
           <el-col :span="12">
             <el-form-item label="账号状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio v-for=" dict in sys_normal_disable " :key="dict.value" :value="dict.value">
+                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">
                   {{ dict.label }}
                 </el-radio>
               </el-radio-group>
@@ -81,7 +96,7 @@
           <el-col :span="12">
             <el-form-item label="培训合规状态" prop="trainingComplianceStatus">
               <el-radio-group v-model="form.trainingComplianceStatus">
-                <el-radio v-for=" dict in sys_user_training_compliance_status " :key="dict.value" :value="dict.value">
+                <el-radio v-for="dict in sys_user_training_compliance_status" :key="dict.value" :value="dict.value">
                   {{ dict.label }}
                 </el-radio>
               </el-radio-group>
@@ -89,28 +104,48 @@
           </el-col>
         </el-row>
       </el-card>
-      <el-card header="资质与岗位信息" style="margin-bottom: 10px;">
+      <el-card header="资质能力" style="margin-bottom: 10px;">
         <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item label="资质等级" prop="qualificationLevel"
-              :rules="( form.roleIds || [] ).includes( 101 ) || ( form.roleIds || [] ).includes( 102 ) ? [ { required: true, message: '请选择资质等级', trigger: 'blur' } ] : []">
+              :rules="(form.roleIds || []).includes(101) || (form.roleIds || []).includes(102) ? [{ required: true, message: '请选择资质等级', trigger: 'blur' }] : []">
               <el-select v-model="form.qualificationLevel" placeholder="请选择资质等级">
-                <el-option v-for=" item in sys_user_qualification_level " :key="item.value" :label="item.label"
+                <el-option v-for="item in sys_user_qualification_level" :key="item.value" :label="item.label"
                   :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="岗位类型" prop="postIds"
-              :rules="( form.roleIds || [] ).includes( 101 ) || ( form.roleIds || [] ).includes( 102 ) ? [ { required: true, message: '请选择岗位类型', trigger: 'blur' } ] : []">
+              :rules="(form.roleIds || []).includes(101) || (form.roleIds || []).includes(102) ? [{ required: true, message: '请选择岗位类型', trigger: 'blur' }] : []">
               <el-cascader v-model="form.postIds" :options="treeData" :props="treeNodeProps" filterable
                 style="width: 100%" />
             </el-form-item>
           </el-col>
-        </el-row>
-      </el-card>
-      <el-card header="人员异常状态记录" style="margin-bottom: 10px;">
-        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="是否通过政审" prop="politicalReviewSituation">
+              <el-radio-group v-model="form.politicalReviewSituation">
+                <el-radio :value="'1'">是</el-radio>
+                <el-radio :value="'0'">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="政治面貌" prop="politicalStatus">
+              <el-select v-model="form.politicalStatus" placeholder="请选择政治面貌">
+                <el-option v-for="item in sys_user_political_status" :key="item.value" :label="item.label"
+                  :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="学历" prop="schooling">
+              <el-select v-model="form.schooling" placeholder="请选择学历">
+                <el-option v-for="item in sys_user_schooling" :key="item.value" :label="item.label"
+                  :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="行政处罚情况" prop="administrativeStatus">
               <el-input v-model="form.administrativeStatus" type="textarea" placeholder="请输入行政处罚情况"></el-input>
@@ -123,6 +158,184 @@
           </el-col>
         </el-row>
       </el-card>
+      <el-card header="工作履历/经验" style="margin-bottom: 10px;">
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="开始工作时间" prop="startWorkingDate">
+              <el-date-picker v-model="form.startWorkingDate" type="date" placeholder="请选择开始工作时间" value-format="YYYY-MM-DD" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开始安检工作时间" prop="securityCheckStartDate" label-width="140px">
+              <el-date-picker v-model="form.securityCheckStartDate" type="date" placeholder="请选择开始安检工作时间" value-format="YYYY-MM-DD" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="曾在安检工作中担任的最高职务" prop="securityInspectionPosition" label-width="220px">
+              <el-select v-model="form.securityInspectionPosition" placeholder="请选择曾在安检工作中担任的最高职务">
+                <el-option label="安检员" value="安检员" />
+                <el-option label="班组长" value="班组长" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="接受奖励次数" prop="workRewardsNumber">
+              <el-input v-model="form.workRewardsNumber" type="number" placeholder="请输入接受奖励次数" min="0" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="接受处罚次数" prop="workPenaltiesNumber">
+              <el-input v-model="form.workPenaltiesNumber" type="number" placeholder="请输入接受处罚次数" min="0" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+      <el-card header="评价类指标" style="margin-bottom: 10px;">
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="性格特征" prop="characterCharacteristics">
+              <el-select v-model="form.characterCharacteristics" placeholder="请选择性格特征">
+                <el-option v-for="item in sys_user_character_characteristics" :key="item.value" :label="item.label"
+                  :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工作风格" prop="workingStyle">
+              <el-select v-model="form.workingStyle" placeholder="请选择工作风格">
+                <el-option v-for="item in sys_user_working_style" :key="item.value" :label="item.label"
+                  :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="团队配合人员" prop="teamCooperation">
+              <UserSelect v-model="form.teamCooperation" :multiple="true" :max="3" :placeholder="'请选择团队配合人员（最多3人）'"
+                width="100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="自我关键词评价" prop="selfKeywords">
+              <el-row :gutter="8" style="width: 100%;">
+                <el-col :span="6">
+                  <el-select v-model="form.selfAssessmentPersonalityTrait" placeholder="请选择性格特质">
+                    <el-option v-for="item in sys_user_personality_trait" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-col>
+                <el-col :span="6">
+                  <el-select v-model="form.selfAssessmentCapabilityPerformance" placeholder="请选择能力表现">
+                    <el-option v-for="item in sys_user_capability_performance" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-col>
+                <el-col :span="6">
+                  <el-select v-model="form.selfAssessmentInterpersonalInteraction" placeholder="请选择人际互动">
+                    <el-option v-for="item in sys_user_interpersonal_interaction" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-col>
+                <el-col :span="6">
+                  <el-select v-model="form.selfAssessmentGrowthPotential" placeholder="请选择成长潜力">
+                    <el-option v-for="item in sys_user_growth_potential" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="同事关键词评价" prop="colleagueKeywords">
+              <el-row :gutter="8" style="width: 100%;">
+                <el-col :span="6">
+                  <el-select v-model="form.colleagueCommentsPersonalityTrait" placeholder="请选择性格特质">
+                    <el-option v-for="item in sys_user_personality_trait" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-col>
+                <el-col :span="6">
+                  <el-select v-model="form.colleagueCommentsCapabilityPerformance" placeholder="请选择能力表现">
+                    <el-option v-for="item in sys_user_capability_performance" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-col>
+                <el-col :span="6">
+                  <el-select v-model="form.colleagueCommentsInterpersonalInteraction" placeholder="请选择人际互动">
+                    <el-option v-for="item in sys_user_interpersonal_interaction" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-col>
+                <el-col :span="6">
+                  <el-select v-model="form.colleagueCommentsGrowthPotential" placeholder="请选择成长潜力">
+                    <el-option v-for="item in sys_user_growth_potential" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="上级关键词评价" prop="superiorKeywords">
+              <el-row :gutter="8" style="width: 100%;">
+                <el-col :span="6">
+                  <el-select v-model="form.superiorEvaluationPersonalityTrait" placeholder="请选择性格特质">
+                    <el-option v-for="item in sys_user_personality_trait" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-col>
+                <el-col :span="6">
+                  <el-select v-model="form.superiorEvaluationCapabilityPerformance" placeholder="请选择能力表现">
+                    <el-option v-for="item in sys_user_capability_performance" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-col>
+                <el-col :span="6">
+                  <el-select v-model="form.superiorEvaluationInterpersonalInteraction" placeholder="请选择人际互动">
+                    <el-option v-for="item in sys_user_interpersonal_interaction" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-col>
+                <el-col :span="6">
+                  <el-select v-model="form.superiorEvaluationGrowthPotential" placeholder="请选择成长潜力">
+                    <el-option v-for="item in sys_user_growth_potential" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="下级关键词评价" prop="subordinateKeywords">
+              <el-row :gutter="8" style="width: 100%;">
+                <el-col :span="6">
+                  <el-select v-model="form.subordinateEvaluationPersonalityTrait" placeholder="请选择性格特质">
+                    <el-option v-for="item in sys_user_personality_trait" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-col>
+                <el-col :span="6">
+                  <el-select v-model="form.subordinateEvaluationCapabilityPerformance" placeholder="请选择能力表现">
+                    <el-option v-for="item in sys_user_capability_performance" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-col>
+                <el-col :span="6">
+                  <el-select v-model="form.subordinateEvaluationInterpersonalInteraction" placeholder="请选择人际互动">
+                    <el-option v-for="item in sys_user_interpersonal_interaction" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-col>
+                <el-col :span="6">
+                  <el-select v-model="form.subordinateEvaluationGrowthPotential" placeholder="请选择成长潜力">
+                    <el-option v-for="item in sys_user_growth_potential" :key="item.value" :label="item.label"
+                      :value="item.value" />
+                  </el-select>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
       <el-card header="应急联络信息" style="margin-bottom: 10px;">
         <el-row :gutter="16">
           <el-col :span="12">
@@ -139,8 +352,7 @@
           <el-col :span="12">
             <el-form-item label="紧急联系人关系" prop="emergencyContactRelationship">
               <el-select v-model="form.emergencyContactRelationship" placeholder="请选择联系人关系">
-                <el-option v-for=" item in sys_user_emergency_contact_relationship " :key="item.value"
-                  :label="item.label"
+                <el-option v-for="item in sys_user_emergency_contact_relationship" :key="item.value" :label="item.label"
                   :value="item.value" />
               </el-select>
             </el-form-item>
@@ -164,6 +376,7 @@
 import { onMounted, reactive, computed } from 'vue';
 import { useDict } from '@/utils/dict'
 import { listAllTree } from '@/api/system/post'
+import UserSelect from '@/components/UserSelect/index.vue'
 // 重父页面迁移过来的代码 2处公用选择框数据 选择使用父组件传入
 defineProps({
   sys_user_sex: {
@@ -189,24 +402,35 @@ defineProps({
 })
 const userRef = ref(null)
 const form = defineModel('form', ref({}))
-// 政治面貌、资质等级、紧急联系人关系
+
+// 政治面貌、资质等级、紧急联系人关系、生肖、星座、血型、是否通过政审、学历、性格特征、工作风格、团队配合、关键词、能力表现、人际互动、成长潜力
 const {
   sys_user_political_status,
   sys_user_qualification_level,
   sys_user_emergency_contact_relationship,
-  sys_user_training_compliance_status
-} = useDict('sys_user_political_status', 'sys_user_qualification_level', 'sys_user_emergency_contact_relationship', 'sys_user_training_compliance_status')
+  sys_user_training_compliance_status,
+  sys_user_zodiac,
+  sys_user_constellation,
+  sys_user_blood_group,
+  sys_user_personality_trait,
+  sys_user_schooling,
+  sys_user_character_characteristics,
+  sys_user_working_style,
+  sys_user_capability_performance,
+  sys_user_interpersonal_interaction,
+  sys_user_growth_potential
+} = useDict('sys_user_personality_trait', 'sys_user_political_status', 'sys_user_qualification_level', 'sys_user_emergency_contact_relationship', 'sys_user_training_compliance_status', 'sys_user_zodiac', 'sys_user_constellation', 'sys_user_blood_group', 'sys_user_schooling', 'sys_user_character_characteristics', 'sys_user_working_style', 'sys_user_capability_performance', 'sys_user_interpersonal_interaction', 'sys_user_growth_potential')
 
 const rules = computed(() => ({
-  userName: [ { required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" } ],
-  deptId: [ { required: true, message: '请选择归属部门', trigger: "blur" } ],
-  nickName: [ { required: true, message: "用户昵称不能为空", trigger: "blur" } ],
-  password: [ { required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" } ],
-  email: [ { type: "email", message: "请输入正确的邮箱地址", trigger: [ "blur", "change" ] } ],
-  phonenumber: [ { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" } ],
-  emergencyContactPhone: [ { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" } ],
-  roleIds: [ { required: true, message: '请选择角色', trigger: "blur" } ],
-  status: [ { required: true, message: '请选择账号状态', trigger: "blur" } ]
+  userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
+  deptId: [{ required: true, message: '请选择归属部门', trigger: "blur" }],
+  nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
+  password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }],
+  email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
+  phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
+  emergencyContactPhone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
+  roleIds: [{ required: true, message: '请选择角色', trigger: "blur" }],
+  status: [{ required: true, message: '请选择账号状态', trigger: "blur" }]
 }))
 
 const treeNodeProps = { multiple: true, expandTrigger: 'hover', label: 'postName', value: 'postId', emitPath: false, checkOnClickNode: true }

src/views/system/user/index.vue

@@ -123,7 +123,7 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" v-model="open" width="75vw" hei append-to-body>
+    <el-dialog :title="title" v-model="open" width="75vw" hei append-to-body destroy-on-close>
       <UserInfoEdit ref="userRef" v-model:form="form" :sys_user_sex="sys_user_sex"
         :enabledDeptOptions="enabledDeptOptions"
         :sys_normal_disable="sys_normal_disable" :postOptions="postOptions" :roleOptions="roleOptions" />
@@ -166,7 +166,7 @@
 <script setup name="User">
 import { getToken } from "@/utils/auth"
 import useAppStore from '@/store/modules/app'
-import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user"
+import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect,listAllUser} from "@/api/system/user"
 import { Splitpanes, Pane } from "splitpanes"
 import "splitpanes/dist/splitpanes.css"
 import UserInfoEdit from './components/UserInfoEdit.vue'
@@ -192,6 +192,7 @@ const enabledDeptOptions = ref(undefined)
 const initPassword = ref(undefined)
 const postOptions = ref([])
 const roleOptions = ref([])
+const allUserList = ref([])
 /*** 用户导入参数 */
 const upload = reactive({
   // 是否显示弹出层（用户导入）
@@ -238,6 +239,15 @@ const filterNode = (value, data) => {
   return data.label.indexOf(value) !== -1
 }
 
+/** 查询所有用户 */
+const getAllUserList = () => {
+  listAllUser().then(res => {
+    
+    allUserList.value = res.data
+  })
+}
+// getAllUserList()
+
 /** 根据名称筛选部门树 */
 watch(deptName, val => {
   proxy.$refs[ "deptTreeRef" ].filter(val)
@@ -251,6 +261,7 @@ function getList () {
     userList.value = res.rows
     total.value = res.total
   })
+
 }
 
 /** 查询部门下拉树结构 */
@@ -417,7 +428,8 @@ function reset () {
     status: "0",
     remark: undefined,
     postIds: [],
-    roleIds: []
+    roleIds: [],
+    teamCooperation:[]
   }
   proxy.$refs[ "userRef" ] && proxy.$refs[ "userRef" ].resetForm()
 }
@@ -448,7 +460,11 @@ function handleUpdate (row) {
   open.value = true
   getUser(userId).then(response => {
     reset()
-    form.value = response.data
+    form.value = {
+      ...response.data,
+      teamCooperation:response.data.teamCooperation?response.data.teamCooperation.split(",").map(Number) : []
+    }
+    
     postOptions.value = response.posts
     roleOptions.value = response.roles
     form.value.postIds = response.postIds || []
@@ -461,14 +477,39 @@ function handleUpdate (row) {
 /** 提交按钮 */
 function submitForm () {
   proxy.$refs[ "userRef" ].submit().then(() => {
+    // console.log(form.value,"form.value")
+    // debugger
+    // // 获取teamCooperationUsers选中的人员对象
+    // const teamCooperationUserIds = form.value.teamCooperation || []
+    // const teamCooperationUsers = []
+    
+    // if (teamCooperationUserIds.length > 0) {
+    //   // 从用户列表中查找对应的用户对象
+    //   teamCooperationUserIds.forEach(userId => {
+    //     const user = allUserList.value.find(u => u.userId === userId)
+    //     if (user) {
+    //       teamCooperationUsers.push({
+    //         ...user
+    //       })
+    //     }
+    //   })
+    
+    // }
+    
+    // 将teamCooperationUsers对象添加到表单数据中
+    const submitData = {
+      ...form.value,
+      teamCooperation: form.value.teamCooperation.join(",")
+    }
+
     if (form.value.userId != undefined) {
-      updateUser(form.value).then(response => {
+      updateUser(submitData).then(response => {
         proxy.$modal.msgSuccess("修改成功")
         open.value = false
         getList()
       })
     } else {
-      addUser(form.value).then(response => {
+      addUser(submitData).then(response => {
         proxy.$modal.msgSuccess("新增成功")
         open.value = false
         getList()

src/views/system/workingDocument/index.vue

@@ -0,0 +1,346 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="文档标题" prop="documentTitle">
+        <el-input v-model="queryParams.documentTitle" placeholder="请输入文档标题" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+
+      <el-form-item label="创建者" prop="createBy">
+        <el-input v-model="queryParams.createBy" placeholder="请输入创建者" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable style="width: 200px;">
+          <el-option label="正常" :value="1" />
+          <el-option label="关闭" :value="0" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+          v-hasPermi="['system:workingDocument:add']">新增</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['system:workDocu:edit']">修改</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['system:workingDocument:remove']">删除</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="docList" @selection-change="handleSelectionChange" :row-key="getRowKey">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="index" label="序号" align="center" width="80" />
+      <el-table-column label="文档标题" align="center" prop="documentTitle" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建者" align="center" prop="createBy" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:workingDocument:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['system:workingDocument:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改工作文档对话框 -->
+    <el-dialog :title="title" v-model="open" width="600" append-to-body destroy-on-close>
+      <el-form ref="docRef" :model="form" :rules="rules" label-width="9em">
+        <el-form-item label="文档标题" prop="documentTitle">
+          <el-input v-model="form.documentTitle" placeholder="请输入文档标题" maxlength="49" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio :label="'1'">正常</el-radio>
+            <el-radio :label="'0'">关闭</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="文档文件" prop="documentUrl">
+          <el-upload ref="uploadRef" :limit="1" accept=".pdf" :headers="upload.headers" :action="upload.url"
+            :file-list="upload.fileList" :disabled="false" :on-success="handleFileSuccess" :on-remove="handleFileRemove"
+            :auto-upload="true" drag style="width:300px">
+            <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <template #tip>
+              <div class="el-upload__tip text-center">
+                <span>仅允许导入pdf格式文件，且文件大小不超过10MB。</span>
+              </div>
+            </template>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="WorkDocu">
+import { onMounted, ref, reactive, toRefs, computed } from 'vue'
+import { ElMessage } from 'element-plus'
+import { UploadFilled } from '@element-plus/icons-vue'
+import Pagination from '@/components/Pagination/index.vue'
+import RightToolbar from '@/components/RightToolbar/index.vue'
+import { parseTime } from '@/utils/ruoyi'
+import { getToken } from '@/utils/auth'
+import { listWorkDocu, getWorkDocu, deleteWorkDocu, addWorkDocu, updateWorkDocu } from '@/api/system/workDocu'
+const { proxy } = getCurrentInstance()
+
+// 使用真实API接口，已从@/api/system/workDocu导入
+const sys_normal_disable = [
+  { label: '正常', value: '1' },
+  { label: '关闭', value: '0', elTagType: 'danger' }
+]
+
+const getRowKey = (row) => {
+  return row.documentId
+}
+
+// 表格数据
+const docList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref('')
+
+// 上传相关
+const uploadRef = ref(null)
+
+const upload = reactive({
+  fileList: [],
+  // 是否显示弹出层
+  open: false,
+  // 弹出层标题
+  title: "",
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的用户数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: { Authorization: "Bearer " + getToken() },
+  // 上传的地址
+  url: import.meta.env.VITE_APP_BASE_API + "/common/upload"
+})
+
+// 文件上传成功处理
+const handleFileSuccess = (response, file, fileList) => {
+
+  if (response.code === 200) {
+    
+    form.value.documentFileName =  response.fileName;
+    form.value.documentNewFileName = response.newFileName;
+    form.value.documentOriginalFileName = response.originalFilename;
+    form.value.documentUrl = response.url
+    ElMessage.success('上传成功')
+  } else {
+    ElMessage.error(response.msg || '上传失败')
+  }
+}
+
+// 文件移除处理
+const handleFileRemove = (file, fileList) => {
+  // form.value.documentTitle = '';
+  form.value.documentFileName = '';
+  form.value.documentUrl = '';
+}
+
+// 表单数据
+const data = reactive({
+  form: {
+    id: null,
+    documentTitle: '',
+    status: '1',
+    documentUrl: ''
+  },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    documentTitle: '',
+    createBy: '',
+    status: null
+  },
+  rules: {
+    documentTitle: [
+      { required: true, message: '文档标题不能为空', trigger: 'blur' }
+    ],
+    documentUrl: [
+      { required: true, message: '文档文件不能为空', trigger: 'blur' }
+    ]
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询文档列表 */
+const getList = () => {
+  loading.value = true
+  listWorkDocu(queryParams.value).then(response => {
+    docList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+const cancel = () => {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+const reset = () => {
+  form.value = {
+    id: null,
+    documentTitle: '',
+    status: '1',
+    documentUrl: ''
+  }
+  // 清空文件列表
+  upload.fileList = []
+  if (proxy?.$refs?.docRef) {
+    proxy.$refs.docRef.resetFields()
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  if (proxy?.$refs?.queryRef) {
+    proxy.$refs.queryRef.resetFields()
+  }
+  handleQuery()
+}
+
+// 多选框选中数据
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map(item => item.documentId)
+  single.value = selection.length !== 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset()
+  open.value = true
+  title.value = '添加工作文档'
+}
+
+/** 修改按钮操作 */
+const handleUpdate = (row) => {
+  reset()
+
+  const _id = row?.documentId || ids.value
+  getWorkDocu(_id).then(response => {
+    form.value = response.data;
+    upload.fileList = [{
+      name: response.data.documentOriginalFileName,
+      url: response.data.documentUrl
+    }]
+    open.value = true
+    title.value = '修改工作文档'
+  })
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  if (proxy?.$refs?.docRef) {
+    proxy.$refs.docRef.validate((valid) => {
+      if (valid) {
+        if (form.value.documentId != null) {
+
+          updateWorkDocu(form.value).then(response => {
+            ElMessage.success('修改成功')
+            open.value = false
+            getList()
+          })
+        } else {
+          addWorkDocu(form.value).then(response => {
+            ElMessage.success('新增成功')
+            open.value = false
+            getList()
+          })
+        }
+      }
+    })
+  }
+}
+
+/** 删除按钮操作 */
+const handleDelete = (row) => {
+  const _ids = row?.documentId || ids.value;
+
+  if (proxy?.$modal) {
+    proxy.$modal.confirm('是否确认删除数据项？').then(() => {
+      // 如果是数组就join，如果不是就直接传
+      const deleteIds = Array.isArray(_ids) ? _ids.join(',') : _ids;
+      return deleteWorkDocu(deleteIds)
+    }).then(() => {
+      getList()
+      ElMessage.success('删除成功')
+    }).catch(() => { })
+  }
+}
+
+// 页面加载时获取数据
+onMounted(() => {
+  getList()
+})
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+
+.mb8 {
+  margin-bottom: 8px;
+}
+
+.fixed-width {
+  width: 140px;
+}
+
+.small-padding .cell {
+  padding: 10px 5px;
+}
+
+.dialog-footer {
+  text-align: right;
+}
+</style>

vite/plugins/auto-import.js

@@ -0,0 +1,12 @@
+import autoImport from 'unplugin-auto-import/vite'
+
+export default function createAutoImport() {
+    return autoImport({
+        imports: [
+            'vue',
+            'vue-router',
+            'pinia'
+        ],
+        dts: false
+    })
+}

vite/plugins/compression.js

@@ -0,0 +1,28 @@
+import compression from 'vite-plugin-compression'
+
+export default function createCompression(env) {
+    const { VITE_BUILD_COMPRESS } = env
+    const plugin = []
+    if (VITE_BUILD_COMPRESS) {
+        const compressList = VITE_BUILD_COMPRESS.split(',')
+        if (compressList.includes('gzip')) {
+            // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
+            plugin.push(
+                compression({
+                    ext: '.gz',
+                    deleteOriginFile: false
+                })
+            )
+        }
+        if (compressList.includes('brotli')) {
+            plugin.push(
+                compression({
+                    ext: '.br',
+                    algorithm: 'brotliCompress',
+                    deleteOriginFile: false
+                })
+            )
+        }
+    }
+    return plugin
+}

vite/plugins/index.js

@@ -0,0 +1,15 @@
+import vue from '@vitejs/plugin-vue'
+
+import createAutoImport from './auto-import'
+import createSvgIcon from './svg-icon'
+import createCompression from './compression'
+import createSetupExtend from './setup-extend'
+
+export default function createVitePlugins(viteEnv, isBuild = false) {
+    const vitePlugins = [vue()]
+    vitePlugins.push(createAutoImport())
+	vitePlugins.push(createSetupExtend())
+    vitePlugins.push(createSvgIcon(isBuild))
+	isBuild && vitePlugins.push(...createCompression(viteEnv))
+    return vitePlugins
+}

vite/plugins/setup-extend.js

@@ -0,0 +1,5 @@
+import setupExtend from 'unplugin-vue-setup-extend-plus/vite'
+
+export default function createSetupExtend() {
+    return setupExtend({})
+}

vite/plugins/svg-icon.js

@@ -0,0 +1,10 @@
+import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
+import path from 'path'
+
+export default function createSvgIcon(isBuild) {
+    return createSvgIconsPlugin({
+		iconDirs: [path.resolve(process.cwd(), 'src/assets/icons/svg')],
+        symbolId: 'icon-[dir]-[name]',
+        svgoOptions: isBuild
+    })
+}