@@ -139,6 +140,7 @@
import { useDictStore } from "@/stores/modules";
import Form from "./components/form.vue";
import userForm from "./components/userForm.vue";
+ import moveForm from "./components/moveForm.vue";
import { FormOptEnum, SysDictEnum, MenuTypeDictEnum } from "@/enums";
// import './aliyun-rts-sdk.js'
import './ali.js'
@@ -291,29 +293,13 @@ const remove = (node: Node, data: Tree) => {
await useHandleData(monitorLIVEApi.delete, { ids }, msg);
RefreshTable();
}
- async function move(ids: string[], msg: string) {
- return new Promise((resolve, reject) => {
- ElMessageBox.confirm(`是否${msg}?`, "温馨提示", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: 'warning',
- draggable: true
- })
- .then(async () => {
- // const res = await api(params);
- // if (!res) return reject(false);
- // ElMessage({
- // type: "success",
- // message: `${message}成功!`
- // });
- resolve(true);
- })
- .catch(() => {
- //啥也不干
- });
- })
- }
+
+
+ const moveFormRef = ref
| null>(null);
+ function omMove(opt: FormOptEnum, record: {} | SysOrg.SysOrgInfo = {}) {
+ moveFormRef.value?.omMove({ opt: opt, record: record, successful: RefreshTable });
+}
/**
* 刷新表格
*/
diff --git a/SafeCampus.WEB/src/views/warn/zjrq/index.vue b/SafeCampus.WEB/src/views/warn/zjrq/index.vue
index 5acb962..be69a3d 100644
--- a/SafeCampus.WEB/src/views/warn/zjrq/index.vue
+++ b/SafeCampus.WEB/src/views/warn/zjrq/index.vue
@@ -110,7 +110,28 @@ import { ColumnProps, ProTableInstance } from "@/components/ProTable/interface";
import { useDictStore } from "@/stores/modules";
import { FormOptEnum, SysDictEnum, MenuTypeDictEnum } from "@/enums";
const visible = ref(false); //是否显示表单
-
+onMounted(() => {
+ getWarnTypeList();
+});
+let warnOptions = ref([]);
+function getWarnTypeList() {
+ setTimeout(async ()=> {
+ await warnZJRQApi.warnType({}).then(res => {
+ let { code, data } = res;
+
+ if (code == 200) {
+ warnOptions.value = data.map(item => {
+ return {
+ label: item.name,
+ value: item.code
+ };
+ })
+
+ }
+ });
+ })
+
+}
// 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
const proTable = ref();
const dictStore = useDictStore();
@@ -118,7 +139,7 @@ const dictStore = useDictStore();
// 表格配置项
const columns: ColumnProps[] = [
{ type: "selection", fixed: "left", width: 80 },
- { prop: "searchKey", label: "关键字", search: { el: "input" }, isShow: false },
+ // { prop: "searchKey", label: "关键字", search: { el: "input" }, isShow: false },
// { prop: "cameraId", label: "所属摄像头", search: { el: "input" }, isShow: false },
// { prop: "alarmTypeDesc", label: "告警类型", search: { el: "input" }, isShow: false },
{
@@ -151,21 +172,75 @@ const columns: ColumnProps[] = [
}
},
{
- prop: "alarmTypeDesc",
- label: "告警类型"
+ prop: "alarmType",
+ label: "告警类型",
+ enum: warnOptions,
+ search: {
+ el: "tree-select",
+ // span: 1
+ }
},
{
prop: "warnHand",
label: "处理状态",
+ enum: [
+ {
+ label: "已处理",
+ value: 1
+ },
+ {
+ label: "未处理",
+ value: 0
+ }
+ ],
render: scope => {
if (scope.row.warnHand === 1) {
return "已处理";
} else {
return "未处理";
}
- }
+ },
+ search: {
+ el: "tree-select",
+ // span: 1
+ }
},
- { prop: "tick", label: "预警时间" },
+ {
+ prop: "tick",
+ label: "预警时间",
+ search: {
+ // 自定义 search 组件
+ span: 1,
+ render: ({ searchParam }) => {
+ return (
+
+
+ -
+
+
+ );
+ }
+ }
+
+ },
{ prop: "operation", label: "操作", width: 250, fixed: "right" }
];
From 0b550a8c76dae38a55e601907b49ce5614417a67 Mon Sep 17 00:00:00 2001
From: suyanyan <1321717064@qq.com>
Date: Wed, 17 Jul 2024 15:36:40 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=8F=AD=E7=BA=A7?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/interface/sys/usermanage/personnel.ts | 11 +-
.../src/api/modules/usermanage/personnel.ts | 18 +--
.../personnel/components/form/form_basic.vue | 122 ++++++++++++++++--
.../personnel/components/form/index.vue | 9 +-
.../personnel/components/formClass/index.vue | 3 +-
.../src/views/userManage/personnel/index.vue | 31 +++--
6 files changed, 154 insertions(+), 40 deletions(-)
diff --git a/SafeCampus.WEB/src/api/interface/sys/usermanage/personnel.ts b/SafeCampus.WEB/src/api/interface/sys/usermanage/personnel.ts
index 628085c..691834d 100644
--- a/SafeCampus.WEB/src/api/interface/sys/usermanage/personnel.ts
+++ b/SafeCampus.WEB/src/api/interface/sys/usermanage/personnel.ts
@@ -24,6 +24,8 @@ export namespace SysUserPersonnel {
/** 底库信息 */
export interface ClassPage {
+ personSetId?: string | undefined;
+ personSetName?: string | undefined;
id?: string | undefined;
name?: string | undefined;
}
@@ -31,9 +33,14 @@ export namespace SysUserPersonnel {
export interface SysUserAvatar {
/** 人脸 */
personId?: string | undefined;
- faceId: string;
+ faceId?: string | number;
faceUrl: string;
- tag: string;
+ uid?: string | number;
+ }
+ // 人脸删除
+ export interface SysUserFace {
+ personId: string | undefined;
+ faceIds: Array;
}
/** 用户信息 */
diff --git a/SafeCampus.WEB/src/api/modules/usermanage/personnel.ts b/SafeCampus.WEB/src/api/modules/usermanage/personnel.ts
index 39f7455..ccae5a6 100644
--- a/SafeCampus.WEB/src/api/modules/usermanage/personnel.ts
+++ b/SafeCampus.WEB/src/api/modules/usermanage/personnel.ts
@@ -13,7 +13,7 @@
* @see https://gitee.com/dotnetmoyu/SimpleAdmin
*/
import { moduleRequest } from "@/api/request";
-import { ResPage, ReqPersonId, SysUserPersonnel } from "@/api/interface";
+import { ReqId, ResPage, ReqPersonId, SysUserPersonnel } from "@/api/interface";
const http = moduleRequest("/business/personApi/");
/**
@@ -27,18 +27,18 @@ const userManagePersonnelApi = {
return http.post("pageQuery", params);
},
/** 获取单页详情 */
- detail(params: ReqPersonId) {
+ detail(params: ReqId) {
return http.get("getPersionById", params);
},
- /** 删除机构 */
- delete(params: ReqPersonId) {
- return http.post("deletePersonD", params);
+ /** 删除人员 */
+ delete(params: ReqId) {
+ return http.delete("deletePersonD", params);
},
- /** 新增机构 */
+ /** 新增人员 */
add(params: SysUserPersonnel.SysUserPerInfo) {
return http.post("createPersonA", params);
},
- /** 修改机构 */
+ /** 修改人员 */
update(params: SysUserPersonnel.SysUserPerInfo) {
return http.put("updatePersionU", params);
},
@@ -47,8 +47,8 @@ const userManagePersonnelApi = {
return http.post("addFaceA", params);
},
/** 删除人脸 */
- deleteFace(params: SysUserPersonnel.SysUserAvatar) {
- return http.delete("deleteFaceD", params);
+ deleteFace(params: SysUserPersonnel.SysUserFace) {
+ return http.post("deleteFaceD", params);
},
/**底库绑定 */
personBindDfie(params: SysUserPersonnel.ClassPage) {
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 c85f356..97b7411 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
@@ -4,15 +4,46 @@
* @Date: 2023-12-15 15:45:50
-->
-