From 960e42f35928559fd1854abe80558df5691e81c0 Mon Sep 17 00:00:00 2001 From: "2309368887@qq.com" <2309368887@qq.com> Date: Fri, 1 Jul 2022 15:44:48 +0800 Subject: [PATCH 1/2] ququanxian --- src/api/model/am.js | 35 ++ src/views/am/access_form.vue | 258 ++++++++++++++ src/views/am/area.vue | 672 +++++++++++++++++++++++++---------- src/views/am/area_form.vue | 486 +++++++++++++------------ src/views/opm/clear.vue | 2 +- 5 files changed, 1030 insertions(+), 423 deletions(-) create mode 100644 src/views/am/access_form.vue diff --git a/src/api/model/am.js b/src/api/model/am.js index 96159891..a7bb9273 100644 --- a/src/api/model/am.js +++ b/src/api/model/am.js @@ -61,6 +61,41 @@ export default { } } }, + access: { + list: { + name: "出入权限列表", + req: async function(data){ + return await http.get( + `${config.API_URL}/am/access/`, + data + ); + } + }, + update: { + name: "更新出入权限", + req: async function(id, data){ + return await http.put( + `${config.API_URL}/am/access/${id}/`, + data); + } + }, + create: { + name: "创建出入权限", + req: async function(data){ + return await http.post( + `${config.API_URL}/am/access/`, + data); + } + } + , + delete: { + name: "删除出入权限", + req: async function(id){ + return await http.delete( + `${config.API_URL}/am/access/${id}/`); + } + } + }, video: { list: { name: "获取视频设备列表", diff --git a/src/views/am/access_form.vue b/src/views/am/access_form.vue new file mode 100644 index 00000000..8909c829 --- /dev/null +++ b/src/views/am/access_form.vue @@ -0,0 +1,258 @@ + + + + + diff --git a/src/views/am/area.vue b/src/views/am/area.vue index 8794fbd6..9fa8dc9e 100644 --- a/src/views/am/area.vue +++ b/src/views/am/area.vue @@ -1,205 +1,487 @@ diff --git a/src/views/am/area_form.vue b/src/views/am/area_form.vue index e10661b7..4696a889 100644 --- a/src/views/am/area_form.vue +++ b/src/views/am/area_form.vue @@ -1,234 +1,266 @@ diff --git a/src/views/ecm/algo_form.vue b/src/views/ecm/algo_form.vue new file mode 100644 index 00000000..35ebeed4 --- /dev/null +++ b/src/views/ecm/algo_form.vue @@ -0,0 +1,146 @@ + + + + + diff --git a/src/views/ecm/algos_form.vue b/src/views/ecm/algos_form.vue new file mode 100644 index 00000000..8a6cd1c8 --- /dev/null +++ b/src/views/ecm/algos_form.vue @@ -0,0 +1,146 @@ + + + + + diff --git a/src/views/ecm/event.vue b/src/views/ecm/event.vue index e09b0f44..5bf1bb11 100644 --- a/src/views/ecm/event.vue +++ b/src/views/ecm/event.vue @@ -1,6 +1,6 @@ + + + + + + + + \ No newline at end of file +import { CircleCheckFilled, CircleCloseFilled } from "@element-plus/icons-vue"; +import saveDialog from "./event_from.vue"; +export default { + name: "event", + components: { + CircleCheckFilled, + CircleCloseFilled, + saveDialog + }, + data() { + return { + dialog: { + save: false, + permission: false, + }, + apiObj: this.$API.ecm.event.list, + query: {}, + selection: [], + search: { + keyword: null, + }, + }; + }, + methods: { + //查看 + table_show(row) { + this.dialog.save = true; + this.$nextTick(() => { + this.$refs.saveDialog.open("show").setData(row); + }); + }, + //搜索 + upsearch() {}, + //本地更新数据 + + resetQuery() { + this.query = {}; + }, + }, +}; + \ No newline at end of file diff --git a/src/views/ecm/event_cate_form.vue b/src/views/ecm/event_cate_form.vue index 5c68d53d..6537d000 100644 --- a/src/views/ecm/event_cate_form.vue +++ b/src/views/ecm/event_cate_form.vue @@ -30,8 +30,30 @@ /> + + + + + + - + + + + + + @@ -73,7 +95,9 @@ export default { isSaveing: false, //表单数据 form: { - speaker_on: true + speaker_on: true, + self_algo: false, + speakers:[] }, //验证规则 rules: { @@ -103,6 +127,7 @@ export default { label: "定位", }, ], + speakersptions:[], //所需数据选项 groups: [], groupsProps: { @@ -112,7 +137,9 @@ export default { }, }; }, - mounted() {}, + mounted() { + this.getSpeakers(); + }, methods: { //显示 open(mode = "add") { @@ -120,6 +147,13 @@ export default { this.visible = true; return this; }, + //固定喇叭列表 + getSpeakers() { + this.$API.third.tdevice.list.req({type:50, page: 0 }).then((res) => { + this.speakersptions = res; + }); + }, + //表单提交方法 async submit() { var valid = await this.$refs.dialogForm.validate().catch(() => {}); @@ -132,13 +166,16 @@ export default { if (this.mode == "add") { res = await this.$API.ecm.event_cate.create.req(this.form); } else if (this.mode == "edit") { - res = await this.$API.ecm.event_cate.update.req(this.form.id, this.form); + res = await this.$API.ecm.event_cate.update.req( + this.form.id, + this.form + ); } this.isSaveing = false; this.$emit("success", this.form, this.mode); this.visible = false; this.$message.success("操作成功"); - return res + return res; } catch (err) { //可以处理校验错误 this.isSaveing = false; @@ -148,6 +185,8 @@ export default { //表单注入数据 setData(data) { Object.assign(this.form, data); + debugger; + console.log(this.form) }, }, }; diff --git a/src/views/ecm/event_from.vue b/src/views/ecm/event_from.vue new file mode 100644 index 00000000..2dbf95e6 --- /dev/null +++ b/src/views/ecm/event_from.vue @@ -0,0 +1,192 @@ + + + + + diff --git a/src/views/ecm/notify_setting.vue b/src/views/ecm/notify_setting.vue index fa685e8a..48df20b6 100644 --- a/src/views/ecm/notify_setting.vue +++ b/src/views/ecm/notify_setting.vue @@ -86,19 +86,50 @@ stripe :hidePagination="true" > - - + + + + + + + + + + > + width="100" + >