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 @@ + :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 44a99fc8..003bd824 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -1497,14 +1497,14 @@ const routes = [ "component": "hrm/certificate" }, { - "name": "doorAuth", - "path": "/hrm/doorauth", + "name": "dchannelAuth", + "path": "/hrm/dchannel_auth", "meta": { "title": "门禁权限", "icon": "el-icon-key", - "perms": ["doorauth"] + "perms": ["dchannel_auth"] }, - "component": "hrm/doorauth" + "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/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 @@ - - - - - - - - - - - - - - - - - - - - - - - {{ scope.row.dchannel_.name }} - - - - - {{ epOptions[scope.row.employee_.type] }} - - - - - {{ scope.row.employee_.name }} - - - - - {{ scope.row.employee_.belong_dept_name }} - - - - - - {{ scope.row.employee_.third_info.dh_face_card_start }} - {{ scope.row.employee_.third_info.dh_face_card_end }} - - - - - - - - 删除 - - - - - - - - - \ No newline at end of file
{{ scope.row.my_info.third_info.dh_face_card_start }} +
{{ scope.row.my_info.third_info.dh_face_card_end }} +
{{ scope.row.employee_.third_info.dh_face_card_start }}
{{ scope.row.employee_.third_info.dh_face_card_end }}