Selaa lähdekoodia

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/types/components.d.ts
Hwf 5 kuukautta sitten
vanhempi
commit
dc73508b24

+ 13 - 5
src/api/dataFilling/fillingManage.ts

@@ -28,10 +28,18 @@ export const fillingList = (reportId) => {
 };
 
 // 填报修改
-export function fillingChange(data) {
+export const fillingChange = (reportId, payload) => {
   return request({
-    url: '/api/dataFilling/report/',
-    method: 'post',
-    data: data
+    url: `/api/dataFilling/report/${reportId}`,
+    method: 'put',
+    data: payload
   });
-}
+};
+
+// 下发发布
+export const fillingRelease = (reportId) => {
+  return request({
+    url: `/api/dataFilling/report/${reportId}/update_status`,
+    method: 'put'
+  });
+};

+ 5 - 5
src/api/emergencyCommandMap/JointDuty.ts

@@ -103,11 +103,11 @@ export function getUser(params) {
   });
 }
 
-// 任务删除
-export function deleteTask(data) {
+//  获取用户列表
+export function getUserList(params) {
   return request({
-    url: '/api/taskRegistration/delete',
-    method: 'post',
-    data: data
+    url: '/system/user/list',
+    method: 'get',
+    params: params
   });
 }

BIN
src/assets/images/top1.png


BIN
src/assets/images/top2.png


BIN
src/assets/images/top3.png


BIN
src/assets/images/top4.png


BIN
src/assets/images/top5.png


+ 1 - 0
src/assets/styles/index.scss

@@ -36,6 +36,7 @@ body {
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
   color: rgba(0, 0, 0, 0.85);
+  background-color: #ffffff;
   font-family:
     Helvetica Neue,
     Helvetica,

+ 50 - 40
src/assets/styles/variables.module.scss

@@ -22,46 +22,56 @@
   // ele
   --brder-color: #e8e8e8
 }
-//html.dark {
-//  --menuBg: #1d1e1f;
-//  --menuColor: #bfcbd9;
-//  --menuActiveText: #f4f4f5;
-//  --menuHover: #2c81ff;
-//
-//  --subMenuBg: #0f2942;
-//  --subMenuActiveText: #1d1e1f;
-//  --subMenuHover: #2c81ff;
-//  --subMenuTitleHover: #2c81ff;
-//
-//  --fixedHeaderBg: #171819;
-//  --tableHeaderBg: var(--el-bg-color);
-//  --tableHeaderTextColor: var(--el-text-color);
-//
-//  // 覆盖ele 高亮当前行的标准暗色
-//  .el-tree-node__content {
-//    --el-color-primary-light-9: #262727;
-//  }
-//  // vxe-table 主题
-//  --vxe-font-color: #98989E;
-//  --vxe-primary-color: #2C7ECF;
-//  --vxe-icon-background-color: #98989E;
-//  --vxe-table-font-color: #98989E;
-//  --vxe-table-resizable-color: #95969a;
-//  --vxe-table-header-background-color: #28282A;
-//  --vxe-table-body-background-color: #151518;
-//  --vxe-table-background-color: #4a5663;
-//  --vxe-table-border-width: 1px;
-//  --vxe-table-border-color: #37373A;
-//  --vxe-toolbar-background-color: #37373A;
-//
-//  // 工作流
-//  --bpmn-panel-border: #37373A;
-//  --bpmn-panel-box-shadow: #37373A;
-//  --bpmn-panel-bar-background-color: #37373A;
-//
-//  // ele
-//  --brder-color: #37373Az
-//}
+html.dark {
+  --menuBg: #304156;
+  --menuColor: #bfcbd9;
+  --menuActiveText: #f4f4f5;
+  --menuHover: #2c81ff;
+  --el-bg-color:#ffffff !important;
+  --el-fill-color-light: #f5f7fa !important;
+  --el-border-color-light: #ffffff !important;
+  --el-border-color:#dcdfe6 !important;
+  --el-border-color-lighter:#ececec !important;
+  --el-bg-color-overlay:#ffffff !important;
+  --el-box-shadow-light: 0px 0px 12px rgba(0,0,0,0.12) !important;
+  --el-text-color-primary:#303133 !important;
+  --el-text-color-regular:#606266 !important;
+  --el-color-danger-light-9:#fef0f0 !important;
+  --el-color-danger-light-8:#fde2e2 !important;
+  --subMenuBg: #0f2942;
+  --subMenuActiveText: #f4f4f5;
+  --subMenuHover: #2c81ff;
+  --subMenuTitleHover: #2c81ff;
+
+  --fixedHeaderBg: #ffffff;
+  --tableHeaderBg: #f8f8f9;
+  --tableHeaderTextColor: #515a6e;
+
+  // 覆盖ele 高亮当前行的标准暗色
+  .el-tree-node__content {
+    --el-color-primary-light-9: #262727;
+  }
+  // vxe-table 主题
+  --vxe-font-color: #98989E;
+  --vxe-primary-color: #2C7ECF;
+  --vxe-icon-background-color: #98989E;
+  --vxe-table-font-color: #98989E;
+  --vxe-table-resizable-color: #95969a;
+  --vxe-table-header-background-color: #28282A;
+  --vxe-table-body-background-color: #151518;
+  --vxe-table-background-color: #4a5663;
+  --vxe-table-border-width: 1px;
+  --vxe-table-border-color: #37373A;
+  --vxe-toolbar-background-color: #37373A;
+
+  // 工作流
+  --bpmn-panel-border: #37373A;
+  --bpmn-panel-box-shadow: #37373A;
+  --bpmn-panel-bar-background-color: #37373A;
+
+  // ele
+  --brder-color: #37373Az
+}
 
 // base color
 $blue: #324157;

+ 5 - 6
src/types/components.d.ts

@@ -17,7 +17,6 @@ declare module 'vue' {
     CompanyMap: typeof import('./../components/Map/company-map.vue')['default']
     Contact: typeof import('./../components/Contact/index.vue')['default']
     ContactSelect: typeof import('./../components/ContactSelect/index.vue')['default']
-    DataImport: typeof import('./../components/DataImport/index.vue')['default']
     Dialog: typeof import('./../components/Dialog/index.vue')['default']
     DictTag: typeof import('./../components/DictTag/index.vue')['default']
     DistributionMap: typeof import('./../components/Map/YztMap/DistributionMap.vue')['default']
@@ -31,6 +30,8 @@ declare module 'vue' {
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
+    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -43,7 +44,7 @@ declare module 'vue' {
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
@@ -53,9 +54,8 @@ declare module 'vue' {
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
+    ElSegmented: typeof import('element-plus/es')['ElSegmented']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
-    ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
     ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
@@ -79,8 +79,7 @@ declare module 'vue' {
     HikvisionPlayer: typeof import('./../components/HKVideo/hikvision-player.vue')['default']
     HKVideo: typeof import('./../components/HKVideo/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
-    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
-    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
+    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']

+ 15 - 12
src/views/dataFilling/fillingManage.vue

@@ -97,7 +97,7 @@ import { onMounted, reactive, ref, toRefs } from 'vue';
 import FillingAdd from './fillingAdd.vue';
 import TableDetails from './tableDetails.vue';
 import { ElButton, ElCol } from 'element-plus';
-import { fillingSelect } from '@/api/dataFilling/fillingManage';
+import { fillingSelect, fillingRelease } from '@/api/dataFilling/fillingManage';
 import * as XLSX from 'xlsx';
 
 const loading = ref(true);
@@ -214,17 +214,20 @@ const handlePagination = ({ page, limit }) => {
 };
 
 const handleIssue = (row) => {
-  const index = tableData.value.findIndex((item) => item.id === row.id);
-  if (index !== -1) {
-    // 更新前端表格状态
-    tableData.value[index].issued_status = 2;
-    someApiToUpdateStatus(row.id)
-      .then(() => {
-        console.log('状态更新成功');
-      })
-      .catch((error) => {
-        console.error('状态更新失败', error);
-      });
+  // 检查是否有report_id
+  if (!row.report_id) {
+    console.error('报告ID不存在,无法下发');
+    return;
   }
+  // 构造下发请求的URL
+  const releaseUrl = `${row.report_id}`;
+  // 发起下发请求
+  fillingRelease(releaseUrl)
+    .then(() => {
+      fetchFillList();
+    })
+    .catch((error) => {
+      console.error('下发操作失败:', error);
+    });
 };
 </script>

+ 65 - 19
src/views/emergencyCommandMap/RightSection/RenWuDengJi.vue

@@ -29,12 +29,25 @@
               popper-class="custom-select-popper"
               :teleported="false"
               clearable
-              filterable>
-              <el-option v-for="unit in filteredUnits" :key="unit.id" :label="unit.unit_name" :value="unit.unit_name" />
+              filterable
+              @change="handleUnitChange"
+            >
+              <el-option v-for="unit in filteredUnits" :key="unit.unitId" :label="unit.unit_name" :value="unit.unit_name" />
             </el-select>
           </el-form-item>
           <el-form-item label="执行人:" label-width="80px" prop="executor">
-            <el-input v-model="form.executor" class="custom-input2" type="text" placeholder="请输入执行人"  />
+            <el-select
+              v-model="form.executor"
+              placeholder="请选择执行人"
+              class="custom-select"
+              size="large"
+              popper-class="custom-select-popper"
+              :teleported="false"
+              clearable
+              filterable
+            >
+              <el-option v-for="user in executorList" :key="user.userId" :label="user.nickName" :value="user.nickName" />
+            </el-select>
           </el-form-item>
           <el-form-item label="登记人:" label-width="80px" prop="registrar">
             <el-input v-model="form.registrar" class="custom-input2" type="text" readonly />
@@ -67,14 +80,14 @@
 
 <script lang="ts" setup>
 import { ref, reactive, onMounted } from 'vue';
-import { addTask, getUnits, getUser } from '@/api/emergencyCommandMap/JointDuty';
+import { addTask, getUnits, getUser, getUserList } from '@/api/emergencyCommandMap/JointDuty';
 const proxy = getCurrentInstance()?.proxy;
 
 const opt_task_type = [
-  { text: "事件处置", value: "0" },
-  { text: "防范措施", value: "1" },
-  { text: "险情处理", value: "2" },
-  { text: "督办任务", value: "3" }
+  { text: '事件处置', value: '0' },
+  { text: '防范措施', value: '1' },
+  { text: '险情处理', value: '2' },
+  { text: '督办任务', value: '3' }
 ];
 // 表单初始数据
 const initFormData = {
@@ -99,11 +112,12 @@ const data = reactive({
     registrar: [{ required: true, message: '登记人不能为空', trigger: 'blur' }],
     executor: [{ required: true, message: '执行人不能为空', trigger: 'blur' }],
     contact_phone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
-    expire_time: [{ required: true, message: '完成时限不能为空', trigger: 'blur' }],
+    expire_time: [{ required: true, message: '完成时限不能为空', trigger: 'blur' }]
   }
 });
 const taskFormRef = ref();
 const filteredUnits = ref([]);
+const executorList = ref([]);
 const { form, rules } = toRefs(data);
 const props = defineProps<{
   eventId?: string;
@@ -115,7 +129,6 @@ const fetchUser = async () => {
     const response = await getUser({});
     if (response.code === 200) {
       form.value.registrar = response.data.user.nickName;
-      form.value.executor = response.data.user.nickName;
       form.value.contact_phone = response.data.user.phonenumber;
     } else {
       console.error('获取用户信息失败:', response.msg);
@@ -127,9 +140,18 @@ const fetchUser = async () => {
 
 const fetchUnits = async () => {
   try {
-    const response = await getUnits({});
+    const response = await getUserList({});
     if (response.code === 200) {
-      filteredUnits.value = response.data;
+      const units = new Map();
+      response.rows.forEach((unit) => {
+        if (!units.has(unit.deptName)) {
+          units.set(unit.deptName, {
+            unitId: unit.deptId,
+            unit_name: unit.deptName
+          });
+        }
+      });
+      filteredUnits.value = Array.from(units.values());
     } else {
       console.error('获取单位数据失败:', response.msg);
     }
@@ -138,6 +160,29 @@ const fetchUnits = async () => {
   }
 };
 
+const fetchUsers = async (deptId) => {
+  try {
+    const response = await getUserList({ deptId });
+    if (response.code === 200 && response.rows && Array.isArray(response.rows)) {
+      executorList.value = response.rows.map((user) => ({
+        userId: user.userId,
+        nickName: user.nickName
+      }));
+    } else {
+      console.error('获取用户列表失败:', response);
+    }
+  } catch (error) {
+    console.error('请求用户列表失败:', error);
+  }
+};
+
+const handleUnitChange = async (newUnitName) => {
+  const selectedUnit = filteredUnits.value.find((unit) => unit.unit_name === newUnitName);
+  if (selectedUnit) {
+    await fetchUsers(selectedUnit.unitId);
+  }
+};
+
 const emit = defineEmits(['update:show']);
 
 const closeDialog = () => {
@@ -148,13 +193,13 @@ const confirmRegister = () => {
   taskFormRef.value?.validate((valid) => {
     if (valid) {
       form.value.event_code = props.eventId;
-        addTask(form.value).then((response)=>{
-          if (response.code === 200) {
-            proxy?.$modal.msgSuccess('任务登记成功');
-            closeDialog();
-          } else {
-            console.error('任务登记失败:', response.msg);
-          }
+      addTask(form.value).then((response) => {
+        if (response.code === 200) {
+          proxy?.$modal.msgSuccess('任务登记成功');
+          closeDialog();
+        } else {
+          console.error('任务登记失败:', response.msg);
+        }
       });
     }
   });
@@ -163,6 +208,7 @@ const confirmRegister = () => {
 onMounted(() => {
   fetchUser();
   fetchUnits();
+  fetchUsers();
 });
 </script>
 

+ 459 - 0
src/views/setting/PreventionResponsible/index.vue

@@ -0,0 +1,459 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :lg="4" :xs="24" style="">
+        <el-input v-model="deptName" placeholder="请输入部门名称" prefix-icon="Search" clearable />
+        <el-tree
+          ref="deptTreeRef"
+          class="mt-2"
+          node-key="id"
+          :data="deptOptions"
+          :props="{ label: 'label', children: 'children' }"
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          highlight-current
+          default-expand-all
+          @node-click="handleNodeClick"
+        />
+      </el-col>
+      <el-col :lg="20" :xs="24">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+          <div v-show="showSearch" class="mb-[10px]">
+            <h1>茂名市责任人列表</h1>
+            <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+              <el-form-item>
+                <el-button v-has-permi="['system:user:add']" type="primary" icon="Plus" @click="handleAdd()">新增责任人</el-button>
+                <el-button v-has-permi="['system:user:add']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">
+                  查看导入情况</el-button
+                >
+                <el-button v-has-permi="['system:user:delete']" type="danger" plain :disabled="multiple" icon="Delete" @click="handleExport()">
+                  批量导出</el-button
+                >
+                <el-button v-has-permi="['system:user:delete']" type="danger" plain :disabled="multiple" icon="Delete" @click="handleImport()">
+                  批量导入</el-button
+                >
+              </el-form-item>
+              <el-form-item label="姓名:" prop="userName" label-width="auto">
+                <el-input v-model="queryParams.userName" placeholder="请输入联系人" clearable @keyup.enter="handleQuery" />
+              </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>
+          </div>
+        </transition>
+
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column v-if="columns[0].visible" key="userId" label="用户编号" align="center" prop="userId" />
+          <el-table-column
+            v-if="columns[1].visible"
+            key="userName"
+            label="姓名"
+            align="center"
+            prop="userName"
+            :show-overflow-tooltip="true"
+            width="120"
+          />
+          <el-table-column v-if="columns[2].visible" key="nickName" label="行政区划" align="center" prop="deptName" :show-overflow-tooltip="true" />
+          <el-table-column v-if="columns[3].visible" key="deptName" label="所属单位" align="center" prop="deptName" :show-overflow-tooltip="true" />
+          <el-table-column v-if="columns[4].visible" key="phonenumber" label="职务" align="center" prop="phonenumber" width="120" />
+          <el-table-column v-if="columns[5].visible" key="status" label="电话号码" align="center" prop="phonenumber" width="120" />
+<!--            <template #default="scope">-->
+<!--              <dict-tag :options="sys_normal_disable" :value="scope.row.status" />-->
+<!--            </template>-->
+
+          <el-table-column v-if="columns[6].visible" label="责任类型" align="center" prop="createTime" width="160">
+            <template #default="scope">
+              <span>{{ scope.row.createTime }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template #default="scope">
+              <el-text v-hasPermi="['system:menu:resetPwd']" class="common-btn-text-primary" @click="handleResetPwd(scope.row)">查看详情</el-text>
+              <el-text v-hasPermi="['system:menu:edit']" class="common-btn-text-primary" @click="handleUpdate(scope.row)">修改</el-text>
+              <el-text v-hasPermi="['system:menu:remove']" class="common-btn-text-danger" @click="handleDelete(scope.row)">删除</el-text>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup lang="ts">
+import api from '@/api/system/user';
+import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
+import { DeptVO } from '@/api/system/dept/types';
+import { RoleVO } from '@/api/system/role/types';
+import { PostQuery, PostVO } from '@/api/system/post/types';
+import { treeselect } from '@/api/system/dept';
+import { globalHeaders } from '@/utils/request';
+import { to } from 'await-to-js';
+import { optionselect } from '@/api/system/post';
+
+const router = useRouter();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const userList = ref<UserVO[]>();
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<number | string>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const deptName = ref('');
+const deptOptions = ref<DeptVO[]>([]);
+const initPassword = ref<string>('');
+const postOptions = ref<PostVO[]>([]);
+const roleOptions = ref<RoleVO[]>([]);
+/*** 用户导入参数 */
+const upload = reactive<ImportOption>({
+  // 是否显示弹出层(用户导入)
+  open: false,
+  // 弹出层标题(用户导入)
+  title: '',
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的用户数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: globalHeaders(),
+  // 上传的地址
+  url: import.meta.env.VITE_APP_BASE_API + '/system/user/importData'
+});
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `用户编号`, visible: false, children: [] },
+  { key: 1, label: `用户名称`, visible: true, children: [] },
+  { key: 2, label: `用户昵称`, visible: true, children: [] },
+  { key: 3, label: `部门`, visible: true, children: [] },
+  { key: 4, label: `手机号码`, visible: true, children: [] },
+  { key: 5, label: `状态`, visible: true, children: [] },
+  { key: 6, label: `创建时间`, visible: true, children: [] }
+]);
+
+const deptTreeRef = ref<ElTreeInstance>();
+const queryFormRef = ref<ElFormInstance>();
+const userFormRef = ref<ElFormInstance>();
+const uploadRef = ref<ElUploadInstance>();
+const formDialogRef = ref<ElDialogInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: UserForm = {
+  userId: undefined,
+  deptId: undefined,
+  userName: '',
+  nickName: undefined,
+  password: '',
+  phonenumber: undefined,
+  email: undefined,
+  sex: undefined,
+  status: '0',
+  remark: '',
+  postIds: [],
+  roleIds: []
+};
+
+const initData: PageData<UserForm, UserQuery> = {
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    userName: '',
+    phonenumber: '',
+    status: '',
+    deptId: '',
+    roleId: ''
+  },
+  rules: {
+    userName: [
+      { required: true, message: '用户名称不能为空', trigger: 'blur' },
+      {
+        min: 2,
+        max: 20,
+        message: '用户名称长度必须介于 2 和 20 之间',
+        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'
+      }
+    ],
+    roleIds: [{ required: true, message: '用户角色不能为空', trigger: 'blur' }]
+  }
+};
+const data = reactive<PageData<UserForm, UserQuery>>(initData);
+
+const { queryParams, form, rules } = toRefs<PageData<UserForm, UserQuery>>(data);
+
+/** 通过条件过滤节点  */
+const filterNode = (value: string, data: any) => {
+  if (!value) return true;
+  return data.label.indexOf(value) !== -1;
+};
+/** 根据名称筛选部门树 */
+watchEffect(
+  () => {
+    deptTreeRef.value?.filter(deptName.value);
+  },
+  {
+    flush: 'post' // watchEffect会在DOM挂载或者更新之前就会触发,此属性控制在DOM元素更新后运行
+  }
+);
+
+/** 查询部门下拉树结构 */
+const getTreeSelect = async () => {
+  const res = await api.deptTreeSelect();
+  deptOptions.value = res.data;
+};
+
+/** 查询用户列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
+  loading.value = false;
+  userList.value = res.rows;
+  total.value = res.total;
+};
+
+/** 节点单击事件 */
+const handleNodeClick = (data: DeptVO) => {
+  queryParams.value.deptId = data.id;
+  handleQuery();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+/** 重置按钮操作 */
+const resetQuery = () => {
+  dateRange.value = ['', ''];
+  queryFormRef.value?.resetFields();
+  queryParams.value.pageNum = 1;
+  queryParams.value.deptId = undefined;
+  deptTreeRef.value?.setCurrentKey(undefined);
+  handleQuery();
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: UserVO) => {
+  const userIds = row?.userId || ids.value;
+  const [err] = await to(proxy?.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项?') as any);
+  if (!err) {
+    await api.delUser(userIds);
+    await getList();
+    proxy?.$modal.msgSuccess('删除成功');
+  }
+};
+
+/** 用户状态修改  */
+const handleStatusChange = async (row: UserVO) => {
+  let text = row.status === '0' ? '启用' : '停用';
+  try {
+    await proxy?.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?');
+    await api.changeUserStatus(row.userId, row.status);
+    proxy?.$modal.msgSuccess(text + '成功');
+  } catch (err) {
+    row.status = row.status === '0' ? '1' : '0';
+  }
+};
+/** 跳转角色分配 */
+const handleAuthRole = (row: UserVO) => {
+  const userId = row.userId;
+  router.push('/system/user-auth/role/' + userId);
+};
+
+/** 重置密码按钮操作 */
+const handleResetPwd = async (row: UserVO) => {
+  const [err, res] = await to(
+    ElMessageBox.prompt('请输入"' + row.userName + '"的新密码', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      closeOnClickModal: false,
+      inputPattern: /^.{5,20}$/,
+      inputErrorMessage: '用户密码长度必须介于 5 和 20 之间',
+      inputValidator: (value) => {
+        if (/<|>|"|'|\||\\/.test(value)) {
+          return '不能包含非法字符:< > " \' \\\ |';
+        }
+      }
+    })
+  );
+  if (!err && res) {
+    await api.resetUserPwd(row.userId, res.value);
+    proxy?.$modal.msgSuccess('修改成功,新密码是:' + res.value);
+  }
+};
+
+/** 选择条数  */
+const handleSelectionChange = (selection: UserVO[]) => {
+  ids.value = selection.map((item) => item.userId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 导入按钮操作 */
+const handleImport = () => {
+  upload.title = '用户导入';
+  upload.open = true;
+};
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'system/user/export',
+    {
+      ...queryParams.value
+    },
+    `user_${new Date().getTime()}.xlsx`
+  );
+};
+/** 下载模板操作 */
+const importTemplate = () => {
+  proxy?.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`);
+};
+
+/**文件上传中处理 */
+const handleFileUploadProgress = () => {
+  upload.isUploading = true;
+};
+/** 文件上传成功处理 */
+const handleFileSuccess = (response: any, file: UploadFile) => {
+  upload.open = false;
+  upload.isUploading = false;
+  uploadRef.value?.handleRemove(file);
+  ElMessageBox.alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + '</div>', '导入结果', {
+    dangerouslyUseHTMLString: true
+  });
+  getList();
+};
+
+/** 提交上传文件 */
+function submitFileForm() {
+  uploadRef.value?.submit();
+}
+
+/** 初始化部门数据 */
+const initTreeData = async () => {
+  // 判断部门的数据是否存在,存在不获取,不存在则获取
+  if (deptOptions.value === undefined) {
+    const { data } = await treeselect();
+    deptOptions.value = data;
+  }
+};
+
+/** 重置操作表单 */
+const reset = () => {
+  form.value = { ...initFormData };
+  userFormRef.value?.resetFields();
+};
+/** 取消按钮 */
+const cancel = () => {
+  dialog.visible = false;
+  reset();
+};
+
+/** 新增按钮操作 */
+const handleAdd = async () => {
+  reset();
+  const { data } = await api.getUser();
+  dialog.visible = true;
+  dialog.title = '新增用户';
+  await initTreeData();
+  postOptions.value = data.posts;
+  roleOptions.value = data.roles;
+  form.value.password = initPassword.value.toString();
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: UserForm) => {
+  reset();
+  const userId = row?.userId || ids.value[0];
+  const { data } = await api.getUser(userId);
+  dialog.visible = true;
+  dialog.title = '修改用户';
+  await initTreeData();
+  Object.assign(form.value, data.user);
+  postOptions.value = data.posts;
+  roleOptions.value = data.roles;
+  form.value.postIds = data.postIds;
+  form.value.roleIds = data.roleIds;
+  form.value.password = '';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  userFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      form.value.userId ? await api.updateUser(form.value) : await api.addUser(form.value);
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/**
+ * 关闭用户弹窗
+ */
+const closeDialog = () => {
+  dialog.visible = false;
+  resetForm();
+};
+
+/**
+ * 重置表单
+ */
+const resetForm = () => {
+  userFormRef.value?.resetFields();
+  userFormRef.value?.clearValidate();
+
+  form.value.id = undefined;
+  form.value.status = '1';
+};
+onMounted(() => {
+  getTreeSelect(); // 初始化部门数据
+  getList(); // 初始化列表数据
+  proxy?.getConfigKey('sys.user.initPassword').then((response) => {
+    initPassword.value = response.data;
+  });
+});
+
+async function handleDeptChange(value: number | string) {
+  const response = await optionselect(value);
+  postOptions.value = response.data;
+  form.value.postIds = [];
+}
+</script>
+
+<style scoped lang="scss"></style>