diff --git a/SafeCampus.WEB/src/api/interface/sys/warn/zjrq.ts b/SafeCampus.WEB/src/api/interface/sys/warn/zjrq.ts index c09ffae..f48fb6b 100644 --- a/SafeCampus.WEB/src/api/interface/sys/warn/zjrq.ts +++ b/SafeCampus.WEB/src/api/interface/sys/warn/zjrq.ts @@ -41,5 +41,7 @@ export namespace ZJRQ { rects: string; /** 扩展字段 */ extend: string; + // 处理意见 + remark: string; } } diff --git a/SafeCampus.WEB/src/api/modules/usermanage/dormitory.ts b/SafeCampus.WEB/src/api/modules/usermanage/dormitory.ts index 8911382..2a81e45 100644 --- a/SafeCampus.WEB/src/api/modules/usermanage/dormitory.ts +++ b/SafeCampus.WEB/src/api/modules/usermanage/dormitory.ts @@ -53,7 +53,7 @@ const userManageDormitoryApi = { }, /** 删除寝室 */ delete(params: ReqId) { - return httpChamber.delete("delete", params); + return httpChamber.post("delete", params); }, /**寝室分配人员*/ setAssignPerson(params: SysDormitory.ChamberPersonnel) { diff --git a/SafeCampus.WEB/src/api/modules/warn/zjrq.ts b/SafeCampus.WEB/src/api/modules/warn/zjrq.ts index f975120..264512d 100644 --- a/SafeCampus.WEB/src/api/modules/warn/zjrq.ts +++ b/SafeCampus.WEB/src/api/modules/warn/zjrq.ts @@ -42,6 +42,10 @@ const warnZJRQApi = { warnType(params: ReqId) { return http.get("getAlarmType", params); }, + /** 处理告警 */ + handWarn(params: ReqId) { + return http.post("handWarn", params); + } }; export { warnZJRQApi }; diff --git a/SafeCampus.WEB/src/components/Selectors/ClassUserselector/index.vue b/SafeCampus.WEB/src/components/Selectors/ClassUserselector/index.vue index 84f096b..96ded90 100644 --- a/SafeCampus.WEB/src/components/Selectors/ClassUserselector/index.vue +++ b/SafeCampus.WEB/src/components/Selectors/ClassUserselector/index.vue @@ -149,7 +149,16 @@ const chooseTable = ref(); const columns: ColumnProps[] = [ { type: "selection", fixed: "left", width: 50 }, { prop: "operation", label: "操作", width: 80, fixed: "left" }, + { + prop: "personName", + label: "姓名", + render: row => { + return row.row.name; + }, + search: { el: "input", span: 2 } + }, { prop: "personSetName", label: "班级" }, + { prop: "dormitoryName", label: "寝室" }, { prop: "faceUrl", label: "人脸", @@ -159,14 +168,6 @@ const columns: ColumnProps[] = [ ); } }, - { - prop: "personName", - label: "姓名", - render: row => { - return row.row.name; - }, - search: { el: "input", span: 2 } - } ]; /** 显示选择器 */ diff --git a/SafeCampus.WEB/src/views/userManage/dormitory/index.vue b/SafeCampus.WEB/src/views/userManage/dormitory/index.vue index 631dff3..979227f 100644 --- a/SafeCampus.WEB/src/views/userManage/dormitory/index.vue +++ b/SafeCampus.WEB/src/views/userManage/dormitory/index.vue @@ -128,7 +128,6 @@ import { useHandleData } from "@/hooks/useHandleData"; import { FormOptEnum } from "@/enums"; import Form from "./components/form/index.vue"; import FormDormitory from "./components/formDormitory/index.vue"; -import formUser from "./components/formUser/index.vue"; import { ArrowDown,More } from "@element-plus/icons-vue"; import { ColumnProps, ProTableInstance } from "@/components/ProTable/interface"; import TreeFilter from "@/components/TreeFilter/index.vue"; @@ -235,8 +234,7 @@ const onTimeSubmit = () => { const formRef = ref | null>(null); // 宿舍楼表单引用 const formRefD = ref | null>(null); -// 人员引用 -const formRefU = ref | null>(null); + /** * 打开表单 @@ -244,13 +242,14 @@ const formRefU = ref | null>(null); * @param record 记录 */ function onOpen(opt: FormOptEnum, record: {} | SysDormitory.ChamberInfo = {}) { - if(buildId.value) { - formRef.value?.onOpen({ opt: opt, record: record, successful: RefreshTable }); - } else { + if(!buildId.value && opt == '新增') { ElMessage({ message: '请选择宿舍楼', type: 'warning' }); + } else { + formRef.value?.onOpen({ opt: opt, record: record, successful: RefreshTable }); + } } @@ -287,7 +286,7 @@ function onOpen(opt: FormOptEnum, record: {} | SysDormitory.ChamberInfo = {}) { return } // 二次确认 => 请求api => 刷新表格 - await useHandleData(userManageDormitoryApi.delete, {id: ids.join(",") }, msg); + await useHandleData(userManageDormitoryApi.delete, {ids: ids }, msg); RefreshTable(); //刷新表格 } diff --git a/SafeCampus.WEB/src/views/warn/zjrq/components/handleForm.vue b/SafeCampus.WEB/src/views/warn/zjrq/components/handleForm.vue new file mode 100644 index 0000000..2844d7e --- /dev/null +++ b/SafeCampus.WEB/src/views/warn/zjrq/components/handleForm.vue @@ -0,0 +1,101 @@ + + + + + + diff --git a/SafeCampus.WEB/src/views/warn/zjrq/index.vue b/SafeCampus.WEB/src/views/warn/zjrq/index.vue index 4e37b29..36197e0 100644 --- a/SafeCampus.WEB/src/views/warn/zjrq/index.vue +++ b/SafeCampus.WEB/src/views/warn/zjrq/index.vue @@ -34,7 +34,7 @@ @@ -77,6 +77,16 @@ + +
+ 处理意见: + + {{ detailData.remark }} + + 暂无数据 + +
+
@@ -120,6 +132,7 @@ import { warnZJRQApi } from "@/api"; import { ZJRQ } from "@/api/interface"; import { useHandleData } from "@/hooks/useHandleData"; import { ColumnProps, ProTableInstance } from "@/components/ProTable/interface"; +import handleForm from "./components/handleForm.vue"; import { useDictStore } from "@/stores/modules"; import { FormOptEnum, SysDictEnum, MenuTypeDictEnum } from "@/enums"; const faceUrl = ref(''); @@ -136,14 +149,18 @@ const visible = ref(false); //是否显示表单 onMounted(() => { getWarnTypeList(); }); +const formRefH = ref | null>(null); +function toHandle(opt: FormOptEnum, record: {} | ZJRQ.WarnInfo= {}) { + formRefH.value?.onOpen({ opt: opt, record: JSON.parse(JSON.stringify(record)), successful: RefreshTable }); +} let warnOptions = ref([]); function getWarnTypeList() { setTimeout(async ()=> { - await warnZJRQApi.warnType({}).then(res => { + await warnZJRQApi.warnType({}).then((res:any) => { let { code, data } = res; if (code == 200) { - warnOptions.value = data.map(item => { + warnOptions.value = data.map((item:any) => { return { label: item.name, value: item.code @@ -299,14 +316,14 @@ let detailData = ref({}); function onDetail(row: any) { visible.value = true; setTimeout(async ()=> { - await warnZJRQApi.detail({ id: row.id }).then(res => { - let { code, data } = res; - - if (code == 200) { - detailData.value = data - - } - }); + await warnZJRQApi.detail({ id: row.id }).then((res:any) => { + let { code, data } = res; + + if (code == 200) { + detailData.value = data + + } + }); }) }