-
{{ row.node.label }}
-
+ -->
diff --git a/SafeCampus.WEB/src/views/userManage/department/components/form.vue b/SafeCampus.WEB/src/views/userManage/department/components/form.vue
new file mode 100644
index 0000000..4b48292
--- /dev/null
+++ b/SafeCampus.WEB/src/views/userManage/department/components/form.vue
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
+
diff --git a/SafeCampus.WEB/src/views/userManage/department/index.vue b/SafeCampus.WEB/src/views/userManage/department/index.vue
new file mode 100644
index 0000000..16eb98f
--- /dev/null
+++ b/SafeCampus.WEB/src/views/userManage/department/index.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SafeCampus.WEB/src/views/userManage/major/components/form.vue b/SafeCampus.WEB/src/views/userManage/major/components/form.vue
new file mode 100644
index 0000000..07a1005
--- /dev/null
+++ b/SafeCampus.WEB/src/views/userManage/major/components/form.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
+
diff --git a/SafeCampus.WEB/src/views/userManage/major/index.vue b/SafeCampus.WEB/src/views/userManage/major/index.vue
new file mode 100644
index 0000000..8b5ac38
--- /dev/null
+++ b/SafeCampus.WEB/src/views/userManage/major/index.vue
@@ -0,0 +1,138 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SafeCampus.WEB/src/views/userManage/personnel/components/form/form_basic.vue b/SafeCampus.WEB/src/views/userManage/personnel/components/form/form_basic.vue
index abaf000..6e7db4c 100644
--- a/SafeCampus.WEB/src/views/userManage/personnel/components/form/form_basic.vue
+++ b/SafeCampus.WEB/src/views/userManage/personnel/components/form/form_basic.vue
@@ -13,10 +13,21 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -72,12 +83,16 @@
diff --git a/SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue b/SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue
index 5237eb1..fc5b54c 100644
--- a/SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue
@@ -45,12 +45,13 @@ const sysUserProps = reactive>({
// 表单验证规则
const rules = reactive({
- // personId: [required("请输入人员ID")],
name: [required("请输入姓名")],
gender: [required("请选择性别")],
faces: [required("请上传人脸图片")],
- phone: [required("请输入手机号")]
- // extData: [required("请输入扩展数据")]
+ phone: [required("请输入手机号")],
+ depId: [required("请选择系部")],
+ majorId: [required("请选择专业")],
+ personSetId: [required("请选择班级")]
});
/**
diff --git a/SafeCampus.WEB/src/views/userManage/personnel/index.vue b/SafeCampus.WEB/src/views/userManage/personnel/index.vue
index ca34c02..55e1a3d 100644
--- a/SafeCampus.WEB/src/views/userManage/personnel/index.vue
+++ b/SafeCampus.WEB/src/views/userManage/personnel/index.vue
@@ -5,55 +5,11 @@
-->
-
-
-
-
-
-
- {{ row.node.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ cmdEnumTree.AddTeacher }}
-
-
- {{ cmdEnumTree.UpdateTeacher }}
-
-
- {{ cmdEnumTree.DeleteTeacher }}
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
@@ -115,15 +67,13 @@
diff --git a/SafeCampus.WEB/src/views/warn/zjrq/index.vue b/SafeCampus.WEB/src/views/warn/zjrq/index.vue
index 75628b0..46625d7 100644
--- a/SafeCampus.WEB/src/views/warn/zjrq/index.vue
+++ b/SafeCampus.WEB/src/views/warn/zjrq/index.vue
@@ -11,13 +11,13 @@
label="label"
id="value"
:isData="true"
- width="260px"
+ width="240px"
:data="warnOptions"
@change="changeType"
>
-
+
@@ -30,6 +30,14 @@
@click="onDelete(scope.selectedListIds, '删除所选数据')"
/>
+
+
+ {{ scope.row.tick }}
+
+
+ 已处理
+ 未处理
+
@@ -191,6 +199,13 @@ function getWarnTypeList() {
})
}
+// 自定义渲染表头(使用tsx语法)
+const headerRender = (scope: any) => {
+ return (
+ {scope.column.label}
+
+ );
+};
// 获取 ProTable 元素,调用其获取刷新数据方法(还能获取到当前查询参数,方便导出携带参数)
const proTable = ref();
const dictStore = useDictStore();
@@ -249,7 +264,20 @@ const columns: ColumnProps[] = [
// // span: 1
// }
},
+
{
+ prop: "tick",
+ label: "预警时间",
+ headerRender,
+ width: 180,
+ search: {
+ el: "date-picker",
+ span: 2,
+ props: { type: "datetimerange", valueFormat: "YYYY-MM-DD HH:mm:ss" },
+ // defaultValue: ["2022-11-12 11:35:00", "2022-12-12 11:35:00"]
+ }
+ },
+ {
prop: "warnHand",
label: "处理状态",
enum: [
@@ -262,61 +290,29 @@ const columns: ColumnProps[] = [
value: 0
}
],
- render: scope => {
- if (scope.row.warnHand === 1) {
- return "已处理";
- } else {
- return "未处理";
- }
- },
+ // render: scope => {
+ // if (scope.row.warnHand === 1) {
+ // return "已处理";
+ // } else {
+ // return "未处理";
+ // }
+ // },
search: {
el: "tree-select",
- span: 0.1
+ span: 1
}
},
- {
- prop: "tick",
- label: "预警时间",
- width: 180,
- search: {
- // 自定义 search 组件
- span: 1,
- render: ({ searchParam }) => {
- return (
-
-
- {/* - */}
- -
-
-
- );
- }
- }
-
- },
{ prop: "operation", label: "操作", width: 250, fixed: "right" }
];
-/**
+const getTableList = (params: any) => {
+ let newParams = JSON.parse(JSON.stringify(params));
+ newParams.tick && (newParams.StartTick = newParams.tick[0]);
+ newParams.tick && (newParams.EndTick = newParams.tick[1]);
+ delete newParams.tick;
+ return warnZJRQApi.page(newParams);
+};/**
* 删除
* @param ids id数组
*/