diff --git a/SafeCampus.WEB/src/components/Selectors/OrgSelector/index.vue b/SafeCampus.WEB/src/components/Selectors/OrgSelector/index.vue
index be7e850..6ea1b03 100644
--- a/SafeCampus.WEB/src/components/Selectors/OrgSelector/index.vue
+++ b/SafeCampus.WEB/src/components/Selectors/OrgSelector/index.vue
@@ -82,7 +82,7 @@ function getOrgTree() {
function changeOrg(value: number | string) {
valueOrg.value = value; //更新当前选中的组织名称
emit("update:orgValue", value); //更新父组件数据
- emit("change", treeRef.value.getCurrentNode().path); //触发change事件
+ emit("change", treeRef.value.getCurrentNode().path, treeRef.value.getCurrentNode()); //触发change事件
}
diff --git a/SafeCampus.WEB/src/routers/modules/staticRouter.ts b/SafeCampus.WEB/src/routers/modules/staticRouter.ts
index 7bc653b..7c2f2e1 100644
--- a/SafeCampus.WEB/src/routers/modules/staticRouter.ts
+++ b/SafeCampus.WEB/src/routers/modules/staticRouter.ts
@@ -40,9 +40,9 @@ export const staticRouter: RouteRecordRaw[] = [
children: [
{
meta: {
- title: "任务人员列表"
+ title: "学生点名详情"
},
- name: "任务人员列表",
+ name: "学生点名详情",
path: "/roolcall/detail",
component: () => import("@/views/attendance/roolcall/detail.vue")
}
diff --git a/SafeCampus.WEB/src/views/attendance/roolcall/components/form/index.vue b/SafeCampus.WEB/src/views/attendance/roolcall/components/form/index.vue
index 151e639..7d104d7 100644
--- a/SafeCampus.WEB/src/views/attendance/roolcall/components/form/index.vue
+++ b/SafeCampus.WEB/src/views/attendance/roolcall/components/form/index.vue
@@ -19,12 +19,16 @@
-
-
+
@@ -63,28 +67,23 @@
diff --git a/SafeCampus.WEB/src/views/attendance/roolcall/index.vue b/SafeCampus.WEB/src/views/attendance/roolcall/index.vue
index 7e6d370..5ad34d9 100644
--- a/SafeCampus.WEB/src/views/attendance/roolcall/index.vue
+++ b/SafeCampus.WEB/src/views/attendance/roolcall/index.vue
@@ -22,8 +22,7 @@
-
-
+
@@ -54,7 +53,6 @@ import { attendanceRoolcallApi,userManagePersonnelApi,userManageClassManageApi}
import { useHandleData } from "@/hooks/useHandleData";
import { FormOptEnum } from "@/enums";
import Form from "./components/form/index.vue";
-import { ArrowDown,More } from "@element-plus/icons-vue";
import { ColumnProps, ProTableInstance } from "@/components/ProTable/interface";
import TreeFilter from "@/components/TreeFilter/index.vue";
import { useRouter } from "vue-router";
@@ -73,20 +71,7 @@ enum FormOptEnums {
// 获取 ProTable 元素,调用其获取刷新数据方法(还能获取到当前查询参数,方便导出携带参数)
const visible = ref(false); //是否显示人员表单
const proTable = ref();
-const treeFilter = ref | null>(null);
-
-const tableData = ref([
- {
- cameraName: "摄像头1",
- continueTime: "20",
- similarity: "0.7",
- },
- {
- cameraName: "摄像头2",
- continueTime: "30",
- similarity: "0.45",
- }
-])
+const treeFilter = ref();
// 表格配置项
const columns: ColumnProps[] = [
{ type: "selection", fixed: "left", width: 50 },
@@ -104,12 +89,14 @@ const columns: ColumnProps[] = [
},
{ prop: "operation", label: "操作", width: 250, fixed: "right" }
];
-const handleClose = () => {
- visible.value = false;
-};
-
const onView = (row: any) => {
- router.push('/roolcall/detail');
+ router.push( {
+ path:'/roolcall/detail',
+ query: {
+ taskId: row.taskId,
+ personSetId:row.personSetId
+ }
+ });
};
// 发起任务表单引用
const formRef = ref | null>(null);
@@ -119,7 +106,7 @@ const formRef = ref | null>(null);
* @param opt 操作类型
* @param record 记录
*/
- function onOpen(opt: FormOptEnum, record: {},treeAllData:any) {
+ function onOpen(opt: FormOptEnums, record: {},treeAllData:any) {
formRef.value?.onOpen({ opt: opt, record: record,treeAllData:treeAllData, successful: RefreshTable });
}