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..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:{ @@ -114,6 +123,16 @@ export default { data ); } + }, + dh:{ + dchannelAuthDelete: { + name: "删除门禁权限", + req: async function(data){ + return await http.post( + `${config.API_URL}/third/dahua/`, + data + ); + } + }, } - } 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 @@ + :width="item.width" :sortable="item.sortable" :fixed="item.fixed" :filters="item.filters" :filter-method="remoteFilter || !item.filters ? null : filterHandler + " :show-overflow-tooltip="item.showOverflowTooltip"> {{ scope.row[item.prop] }} @@ -205,10 +204,10 @@ export default { // delete reqData[config.request.page] // delete reqData[config.request.pageSize] } - Object.assign(reqData, this.tableParams); + var c = Object.assign({}, this.tableParams, reqData) try { if (this.apiObj) { - var res = await this.apiObj.req(reqData); + var res = await this.apiObj.req(c); var response = this.parseData(res); if (response.total === 0) { this.emptyText = "暂无数据"; diff --git a/src/config/route.js b/src/config/route.js index d0db8e4f..910c16ef 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -1507,7 +1507,16 @@ const routes = [ }, "component": "hrm/certificate" }, - + { + "name": "dchannelAuth", + "path": "/hrm/dchannel_auth", + "meta": { + "title": "门禁权限", + "icon": "el-icon-key", + "perms": ["dchannel_auth"] + }, + "component": "hrm/dchannel_auth" + }, ] }, //基础配置 diff --git a/src/views/am/monitor.vue b/src/views/am/monitor.vue index 3cc3f8aa..5f70cbcd 100644 --- a/src/views/am/monitor.vue +++ b/src/views/am/monitor.vue @@ -6,24 +6,15 @@ - + - + + :pageSizeStr="pageSizeStr" :orderStr="orderStr" :parseData="parseData" @selection-change="selectionChange" stripe + @resetQuery="resetQuery"> @@ -37,7 +28,7 @@ {{ - deviceTypes[scope.row.cameraType] + deviceTypes[scope.row.cameraType] }} @@ -90,8 +81,9 @@ 关闭 - + 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 @@ + + + + + + 门禁通道 + + + + + + + + + 当前通道: {{ currentDchannel }} + + + + + + + + + + + + {{ currentDchannel }} + + + + {{ epOptions[scope.row.my_info.type] }} + + + + + {{ scope.row.my_info.name }} + + + + + {{ scope.row.my_info.belong_dept_name }} + + + + + + {{ scope.row.my_info.third_info.dh_face_card_start }} + + {{ scope.row.my_info.third_info.dh_face_card_end }} + + + + + + + + + 删除 + + + + + + + + + + \ No newline at end of file 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 @@ - 新建项目 - - + 新建项目 + + - + - - + + - - + + {{ purpose_[scope.row.purpose] }} - - + + 一般 重要 - + {{ state_[scope.row.state] }} - {{ scope.row.ticket_.state_.name }} - {{ + scope.row.ticket_.state_.name }} + {{ act_states[scope.row.ticket_.act_state] }} + ? 'danger' + : scope.row.ticket_.act_state === 3 + ? 'danger' + : scope.row.ticket_.act_state === 5 + ? 'danger' + : scope.row.ticket_.act_state === 4 + ? 'success' + : '' + ">{{ act_states[scope.row.ticket_.act_state] }} - - - + + + {{ @@ -153,46 +73,22 @@ }} - + - 继续编辑 + 继续编辑 - 查看 + 查看 - 删除 + 删除 - + @@ -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 },
{{ scope.row.my_info.third_info.dh_face_card_start }} +
{{ scope.row.my_info.third_info.dh_face_card_end }} +