From 4aac84897e1f326bbeed5df27ac46c73723a7efd Mon Sep 17 00:00:00 2001 From: suyanyan <1321717064@qq.com> Date: Fri, 19 Jul 2024 15:05:20 +0800 Subject: [PATCH 1/4] any --- SafeCampus.WEB/src/components/Form/SButton/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SafeCampus.WEB/src/components/Form/SButton/index.vue b/SafeCampus.WEB/src/components/Form/SButton/index.vue index fe8a93d..1051cdf 100644 --- a/SafeCampus.WEB/src/components/Form/SButton/index.vue +++ b/SafeCampus.WEB/src/components/Form/SButton/index.vue @@ -18,7 +18,8 @@ import { FormOptEnum } from "@/enums"; //接口 interface Props { /** 操作 */ - opt?: FormOptEnum; + // opt?: FormOptEnum; + opt?: any; /** 前缀 */ prefix?: string; /** 标题 */ From 19c178aa8158928a0c2543d7317e1e9d7ddcaca7 Mon Sep 17 00:00:00 2001 From: wwp <782568523@qq.com> Date: Fri, 19 Jul 2024 16:12:53 +0800 Subject: [PATCH 2/4] 11 --- SafeCampus.WEB/src/typings/props.d.ts | 1 + .../views/monitor/live/components/form.vue | 2 +- .../monitor/live/components/moveForm.vue | 4 +- .../monitor/live/components/userForm.vue | 24 +++++---- .../src/views/monitor/live/index.vue | 24 +++++++-- .../sysconfig/ability/components/userForm.vue | 49 +++++++------------ .../src/views/sysconfig/ability/index.vue | 36 +++++++++----- 7 files changed, 80 insertions(+), 60 deletions(-) diff --git a/SafeCampus.WEB/src/typings/props.d.ts b/SafeCampus.WEB/src/typings/props.d.ts index 6875428..62ea201 100644 --- a/SafeCampus.WEB/src/typings/props.d.ts +++ b/SafeCampus.WEB/src/typings/props.d.ts @@ -29,6 +29,7 @@ declare namespace FormProps { inline?: boolean; // 树数据 treeAllData?: Array; + records: Array; /** 表单布局 */ successful?: () => void; } diff --git a/SafeCampus.WEB/src/views/monitor/live/components/form.vue b/SafeCampus.WEB/src/views/monitor/live/components/form.vue index 744eaf3..6633839 100644 --- a/SafeCampus.WEB/src/views/monitor/live/components/form.vue +++ b/SafeCampus.WEB/src/views/monitor/live/components/form.vue @@ -50,7 +50,7 @@ const dictStore = useDictStore(); //字典仓库 const statusOptions = dictStore.getDictList(SysDictEnum.COMMON_STATUS); // 表单参数 -const orgProps = reactive>({ +const orgProps = reactive>({ opt: FormOptEnum.ADD, record: {}, disabled: false diff --git a/SafeCampus.WEB/src/views/monitor/live/components/moveForm.vue b/SafeCampus.WEB/src/views/monitor/live/components/moveForm.vue index d56779b..61b9e5e 100644 --- a/SafeCampus.WEB/src/views/monitor/live/components/moveForm.vue +++ b/SafeCampus.WEB/src/views/monitor/live/components/moveForm.vue @@ -41,7 +41,7 @@ const dictStore = useDictStore(); //字典仓库 const statusOptions = dictStore.getDictList(SysDictEnum.COMMON_STATUS); // 表单参数 -const orgProps = reactive>({ +const orgProps = reactive>({ opt: FormOptEnum.ADD, record: {}, disabled: false, @@ -57,7 +57,7 @@ const rules = reactive({ * 打开表单 * @param props 表单参数 */ -function omMove(props: FormProps.Base) { +function omMove(props: FormProps.Base) { // 合并参数 Object.assign(orgProps, props); //合并参数 if (orgProps.opt == FormOptEnum.ADD) { diff --git a/SafeCampus.WEB/src/views/monitor/live/components/userForm.vue b/SafeCampus.WEB/src/views/monitor/live/components/userForm.vue index 48ae156..c655ce0 100644 --- a/SafeCampus.WEB/src/views/monitor/live/components/userForm.vue +++ b/SafeCampus.WEB/src/views/monitor/live/components/userForm.vue @@ -15,7 +15,7 @@ label-width="auto" label-suffix=" :" > - + 选择 {{ liveUserProps.record.userInfo?.name @@ -43,7 +43,7 @@ const visible = ref(false); //是否显示表单 const dictStore = useDictStore(); //字典仓库 // 表单参数 -const liveUserProps = reactive>({ +const liveUserProps = reactive>({ opt: FormOptEnum.ADD, record: {}, disabled: false @@ -51,25 +51,27 @@ const liveUserProps = reactive>({ // 表单验证规则 const rules = reactive({ - userId: [required("请选择指定分组推送人")] + userId: [required("请选择指定推送人")] }); /** * 打开表单 * @param props 表单参数 */ -function onOpen(props: FormProps.Base) { +function onOpen(props: FormProps.Base) { Object.assign(liveUserProps, props); //合并参数 if (props.opt == FormOptEnum.ADD) { //如果是新增,设置默认值 } visible.value = true; //显示表单 - // if (props.record.id) { - // //如果传了id，就去请求api获取record - // sysOrgApi.detail({ id: props.record.id }).then(res => { - // liveUserProps.record = res.data; - // }); - // } + if (props.record.pushUserId) { + //如果传了id，就去请求api获取record + liveUserProps.record.userId = props.record.pushUserId; + liveUserProps.record.userInfo = props.record.sysUserItem; + // sysOrgApi.detail({ id: props.record.id }).then(res => { + // liveUserProps.record.userId = res.data; + // }); + } } // 提交数据（新增/编辑） @@ -118,6 +120,8 @@ async function handleSubmit() { /** 关闭表单*/ function onClose() { visible.value = false; + liveUserProps.record.userId = null; + liveUserProps.record.userInfo = null; } const userSelectorRef = ref(); //用户选择器引用 diff --git a/SafeCampus.WEB/src/views/monitor/live/index.vue b/SafeCampus.WEB/src/views/monitor/live/index.vue index a3507d9..cc52889 100644 --- a/SafeCampus.WEB/src/views/monitor/live/index.vue +++ b/SafeCampus.WEB/src/views/monitor/live/index.vue @@ -126,9 +126,27 @@ 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 { FormOptEnum, SysDictEnum, MenuTypeDictEnum } from "@/enums"; // import './aliyun-rts-sdk.js' import "./ali.js"; +enum FormOptEnum { + /** 新增 */ + ADD = "新增", + /** 编辑 */ + EDIT = "编辑", + /** 查看 */ + VIEW = "查看", + /** 删除 */ + DELETE = "删除", + // 分组推送人 + GroupPushPerson = "分组推送人", + // 视频推送人 + VideoPushPerson = "视频推送人", + // 移动 + MOVE = "移动", + // 分组 + GROUP = "分组" +} // 分组字段配置 const defaultProps = { children: "children", @@ -231,8 +249,6 @@ const filterNode = (value: string, data: Tree) => { }; const handleNodeClick = (data: Tree) => { - console.log(data); - // personSetId.value = val proTable.value!.pageable.pageNum = 1; proTable.value!.searchParam.groupId = data.id; proTable.value!.search(); @@ -432,7 +448,7 @@ function getvideo2() { player.value.on("error", function (event:any) { console.log("[EVENT]error", event.paramData); }); - + player.value.setVolume(0) // 当RTS拉流成功时触发，通过订阅该事件，可以获取到RTS TraceId player.value.on("rtsTraceId", function (data:any) { console.log("[EVENT]rtsTraceId", data.paramData); diff --git a/SafeCampus.WEB/src/views/sysconfig/ability/components/userForm.vue b/SafeCampus.WEB/src/views/sysconfig/ability/components/userForm.vue index d3b865e..518e6a9 100644 --- a/SafeCampus.WEB/src/views/sysconfig/ability/components/userForm.vue +++ b/SafeCampus.WEB/src/views/sysconfig/ability/components/userForm.vue @@ -15,7 +15,7 @@ label-width="auto" label-suffix=" :" > - + 选择 {{ liveUserProps.record.userInfo?.name @@ -43,7 +43,7 @@ const visible = ref(false); //是否显示表单 const dictStore = useDictStore(); //字典仓库 // 表单参数 -const liveUserProps = reactive>({ +const liveUserProps = reactive>({ opt: FormOptEnum.ADD, record: {}, disabled: false @@ -51,25 +51,27 @@ const liveUserProps = reactive>({ // 表单验证规则 const rules = reactive({ - userId: [required("请选择指定分组推送人")] + userId: [required("请选择指定推送人")] }); /** * 打开表单 * @param props 表单参数 */ -function onOpen(props: FormProps.Base) { +function onOpen(props: FormProps.Base) { Object.assign(liveUserProps, props); //合并参数 if (props.opt == FormOptEnum.ADD) { //如果是新增,设置默认值 } visible.value = true; //显示表单 - // if (props.record.id) { - // //如果传了id，就去请求api获取record - // sysOrgApi.detail({ id: props.record.id }).then(res => { - // liveUserProps.record = res.data; - // }); - // } + if (props.record.pushUserId) { + //如果传了id，就去请求api获取record + liveUserProps.record.userId = props.record.pushUserId; + liveUserProps.record.userInfo = props.record.sysUserItem; + // sysOrgApi.detail({ id: props.record.id }).then(res => { + // liveUserProps.record.userId = res.data; + // }); + } } // 提交数据（新增/编辑） @@ -78,27 +80,13 @@ const userFormRef = ref(); async function handleSubmit() { userFormRef.value?.validate(async valid => { if (!valid) return; //表单验证失败 - console.log(liveUserProps, 888); let params: any = { - groupId: "", - userId: "", - ids: [] + warnCode: "", + userId: "" }; - if (liveUserProps.opt == "分组推送人") { - params.groupId = liveUserProps.record.id; - params.userId = liveUserProps.record.userId; - //提交表单 - await monitorLIVEApi - .setPushPerson(params) - .then(() => { - liveUserProps.successful!(); //调用父组件的successful方法 - }) - .finally(() => { - onClose(); - }); - } else { + if (liveUserProps.opt == "预警推送人") { + params.warnCode = liveUserProps.record.warnCode; params.userId = liveUserProps.record.userId; - params.warnCode = liveUserProps.record.code; //提交表单 await monitorLIVEApi .setWarningPushPerson(params) @@ -108,16 +96,15 @@ async function handleSubmit() { .finally(() => { onClose(); }); - // delete params. } - // console.log(params); - // return; }); } /** 关闭表单*/ function onClose() { visible.value = false; + liveUserProps.record.userId = null; + liveUserProps.record.userInfo = null; } const userSelectorRef = ref(); //用户选择器引用 diff --git a/SafeCampus.WEB/src/views/sysconfig/ability/index.vue b/SafeCampus.WEB/src/views/sysconfig/ability/index.vue index 95f785b..fe4c980 100644 --- a/SafeCampus.WEB/src/views/sysconfig/ability/index.vue +++ b/SafeCampus.WEB/src/views/sysconfig/ability/index.vue @@ -45,7 +45,7 @@ --> - +
{{ v.name }}
@@ -64,15 +64,32 @@
-