From 7fa43de6c7d54ed5ba7bdaef9eee64defef16c7c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 9 Oct 2023 15:51:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E9=97=A8=E7=A6=81=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=9F=A5=E7=9C=8B=E4=B8=8E=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/api/model/third.js | 20 ++++++- src/config/route.js | 11 +++- src/views/hrm/doorauth.vue | 114 +++++++++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 src/views/hrm/doorauth.vue diff --git a/package.json b/package.json index 44015da5..f38b0814 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "d3": "^7.6.1", "dagre": "^0.8.5", "dagre-d3": "^0.6.4", + "dhtmlx-gantt": "^8.0.6", "echarts": "5.4.1", "element-plus": "2.2.32", "file-saver": "^2.0.5", diff --git a/src/api/model/third.js b/src/api/model/third.js index c790bdce..32e9624b 100644 --- a/src/api/model/third.js +++ b/src/api/model/third.js @@ -114,6 +114,24 @@ export default { data ); } + }, + doorauth: { + list: { + name: "门禁权限", + req: async function(data){ + return await http.get( + `${config.API_URL}/third/doorauth/`, + data + ); + } + }, + delete: { + name: "删除权限", + req: async function(id){ + return await http.delete( + `${config.API_URL}/third/doorauth/${id}/`, + ); + } + } } - } diff --git a/src/config/route.js b/src/config/route.js index 936e6604..44a99fc8 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -1496,7 +1496,16 @@ const routes = [ }, "component": "hrm/certificate" }, - + { + "name": "doorAuth", + "path": "/hrm/doorauth", + "meta": { + "title": "门禁权限", + "icon": "el-icon-key", + "perms": ["doorauth"] + }, + "component": "hrm/doorauth" + }, ] }, //基础配置 diff --git a/src/views/hrm/doorauth.vue b/src/views/hrm/doorauth.vue new file mode 100644 index 00000000..726ccc4a --- /dev/null +++ b/src/views/hrm/doorauth.vue @@ -0,0 +1,114 @@ + + \ No newline at end of file From a090b463ee3671227a34abe829990870c2839194 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 9 Oct 2023 17:31:15 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E5=8F=96=E6=B6=88=E5=A4=9A=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E9=A1=B5=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/index.js b/src/config/index.js index b98103b5..54eaa7d7 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -44,7 +44,7 @@ const DEFAULT_CONFIG = { MENU_UNIQUE_OPENED: true, //是否开启多标签 - LAYOUT_TAGS: true, + LAYOUT_TAGS: false, //语言 LANG: 'zh-cn', From 2f30d9c2eed04ce2f4f287687f969ab63962dd69 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 10 Oct 2023 12:12:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E9=97=A8=E7=A6=81=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/third.js | 27 +++--- src/components/scTable/index.vue | 9 +- src/config/route.js | 8 +- src/views/am/monitor.vue | 122 +++++++++++------------- src/views/hrm/dchannel_auth.vue | 156 +++++++++++++++++++++++++++++++ src/views/hrm/doorauth.vue | 114 ---------------------- 6 files changed, 235 insertions(+), 201 deletions(-) create mode 100644 src/views/hrm/dchannel_auth.vue delete mode 100644 src/views/hrm/doorauth.vue diff --git a/src/api/model/third.js b/src/api/model/third.js index 32e9624b..a3997e5e 100644 --- a/src/api/model/third.js +++ b/src/api/model/third.js @@ -57,6 +57,15 @@ export default { ); } }, + dchannelAuth: { + name: "门禁权限", + req: async function(data){ + return await http.post( + `${config.API_URL}/third/tdevice/dchannel_auth/`, + data + ); + } + }, }, blt:{ list:{ @@ -115,23 +124,15 @@ export default { ); } }, - doorauth: { - list: { - name: "门禁权限", + dh:{ + dchannelAuthDelete: { + name: "删除门禁权限", req: async function(data){ - return await http.get( - `${config.API_URL}/third/doorauth/`, + return await http.post( + `${config.API_URL}/third/dahua/`, data ); } }, - delete: { - name: "删除权限", - req: async function(id){ - return await http.delete( - `${config.API_URL}/third/doorauth/${id}/`, - ); - } - } } } diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue index 99f4d290..64513a41 100644 --- a/src/components/scTable/index.vue +++ b/src/components/scTable/index.vue @@ -17,9 +17,8 @@ diff --git a/src/views/hrm/dchannel_auth.vue b/src/views/hrm/dchannel_auth.vue new file mode 100644 index 00000000..ce3870b5 --- /dev/null +++ b/src/views/hrm/dchannel_auth.vue @@ -0,0 +1,156 @@ + + \ No newline at end of file diff --git a/src/views/hrm/doorauth.vue b/src/views/hrm/doorauth.vue deleted file mode 100644 index 726ccc4a..00000000 --- a/src/views/hrm/doorauth.vue +++ /dev/null @@ -1,114 +0,0 @@ - - \ No newline at end of file From 17a030bdbf57fdf821805b5285e467a824bfe798 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 10 Oct 2023 12:25:27 +0800 Subject: [PATCH 4/4] fix: visit purpose options --- src/views/vm/visit.vue | 184 ++++++++-------------------------- src/views/vm/visit_detial.vue | 57 +++++------ src/views/vm/visit_form.vue | 85 +++++----------- 3 files changed, 95 insertions(+), 231 deletions(-) diff --git a/src/views/vm/visit.vue b/src/views/vm/visit.vue index 0b98e88a..f784cfdf 100644 --- a/src/views/vm/visit.vue +++ b/src/views/vm/visit.vue @@ -2,128 +2,60 @@
- 新建项目 - - + 新建项目 + + - +
- - + + - - + + - + - - - + + + - + - +
@@ -220,6 +116,8 @@ export default { keyword: null, }, purposeOptions: [ + { label: "售后服务", value: 2 }, + { label: "业务洽谈", value: 4 }, { label: "参观", value: 10 }, { label: "拜访", value: 20 }, { label: "面试", value: 30 }, @@ -228,6 +126,8 @@ export default { { label: "其他", value: 60 }, ], purpose_: { + 2: "售后服务", + 4: "业务洽谈", 10: "参观", 20: "拜访", 30: "面试", diff --git a/src/views/vm/visit_detial.vue b/src/views/vm/visit_detial.vue index f09a1da3..59a46bda 100644 --- a/src/views/vm/visit_detial.vue +++ b/src/views/vm/visit_detial.vue @@ -5,27 +5,28 @@ - {{form.name}} - {{levelOptions[form.level]}} - {{form.company}} + {{ form.name }} + {{ levelOptions[form.level] }} + {{ form.company }} {{ form.count_people }}人 {{ item.visitor_.name }} - {{state_[form.state]}} - {{form.visit_time}} - {{form.leave_time}} - {{purpose_[form.purpose]}} - {{form.description}} - {{ form.receptionist_.name }} + {{ state_[form.state] }} + {{ form.visit_time }} + {{ form.leave_time }} + {{ purpose_[form.purpose] }} + {{ form.description }} + {{ form.receptionist_.name + }}
- 车辆照片: - 车辆照片: + -
+
@@ -42,13 +43,9 @@ - + - - + + - + @@ -98,25 +65,19 @@ - + + + - -
- 保存 + 保存 取消 @@ -138,7 +99,7 @@ export default { }, form: {}, rules: { - purpose: [{ required: true, message: "请输入" }], + purpose: [{ required: true, message: "请输入" }], name: [{ required: true, message: "来访概述" }], visit_time: [{ required: true, message: "请输入" }], leave_time: [{ required: true, message: "请输入" }], @@ -150,18 +111,20 @@ export default { selectionFilters: [], setFiltersVisible: false, purposeoptions: [ + { name: "售后服务", id: 2 }, + { name: "业务洽谈", id: 4 }, { id: 10, name: "参观" }, { id: 20, name: "拜访" }, { id: 30, name: "面试" }, { id: 40, name: "开会" }, { id: 50, name: "货车司机" }, ], - + receptionist_name: null, }; }, mounted() { - + }, methods: { @@ -173,11 +136,11 @@ export default { }, - + getReceptionist(data) { // 子组件调用父组件的方法并传参 - this.form.receptionist=data.id; - this.receptionist_name=data.name + this.form.receptionist = data.id; + this.receptionist_name = data.name },