From 39f0c1e38b06dbf326fe4c7a24e956ee71b20feb Mon Sep 17 00:00:00 2001 From: SelfRidicule Date: Fri, 22 Mar 2024 12:00:49 +0800 Subject: [PATCH] 1 --- src/api/admin/meeting/equipment.js | 27 ++++++++++++++++------- src/views/admin/meeting/EquipmentList.vue | 23 ++++++++++++++----- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/api/admin/meeting/equipment.js b/src/api/admin/meeting/equipment.js index fc688b9..327069f 100644 --- a/src/api/admin/meeting/equipment.js +++ b/src/api/admin/meeting/equipment.js @@ -4,7 +4,7 @@ const api = { equipment: '/meeting/equipment' } -export function getEquipmentList (parameter) { +export function getEquipmentList(parameter) { return axios({ url: api.equipment + '/list', method: 'get', @@ -12,23 +12,23 @@ export function getEquipmentList (parameter) { }) } -export function get (id) { +export function get(id) { return axios({ - url: api.equipment + '/get/'+id, + url: api.equipment + '/get/' + id, method: 'get', params: {} }) } -export function recordByDeviceId (id) { +export function recordByDeviceId(id) { return axios({ - url: api.equipment + '/recordByDeviceId/'+id, + url: api.equipment + '/recordByDeviceId/' + id, method: 'get', params: {} }) } -export function getUserList(params){ +export function getUserList(params) { return axios({ url: api.equipment + '/getUserList', method: 'get', @@ -37,7 +37,7 @@ export function getUserList(params){ } -export function saveEquipment (parameter) { +export function saveEquipment(parameter) { return axios({ url: api.equipment + (parameter.id > 0 ? '/update' : '/save'), method: 'post', @@ -48,7 +48,7 @@ export function saveEquipment (parameter) { }) } -export function delEquipment (parameter) { +export function delEquipment(parameter) { return axios({ url: api.equipment + '/remove', method: 'post', @@ -56,4 +56,15 @@ export function delEquipment (parameter) { }) } +export function saveDevice(parameter) { + return axios({ + url: api.equipment + '/saveDevice', + method: 'post', + data: parameter, + headers: { + 'Content-Type': 'application/json;charset=UTF-8' + } + }) +} + export const equipmentExport = api.equipment + '/export' diff --git a/src/views/admin/meeting/EquipmentList.vue b/src/views/admin/meeting/EquipmentList.vue index e788034..1261d87 100644 --- a/src/views/admin/meeting/EquipmentList.vue +++ b/src/views/admin/meeting/EquipmentList.vue @@ -77,8 +77,8 @@ - 全部 - {{item.name}} + 全部 + {{ item.name }} @@ -126,6 +126,8 @@ import { STable } from '@/components' import { delEquipment, getEquipmentList, getUserList } from '@/api/admin/meeting/equipment' import { getTicketByCompany } from '@/api/admin/meeting/ticket' +import { saveDevice } from '@/api/admin/meeting/equipment' + import EquipmentModal from './modules/EquipmentModal.vue' import { checkPermission } from '@/utils/permissions' import difference from 'lodash/difference' @@ -240,7 +242,7 @@ export default { created() { // 查询企业 getTicketByCompany().then(res => { - console.log('getTicketByCompany' , res) + console.log('getTicketByCompany', res) this.enterpriseList = res.rows }) @@ -254,7 +256,7 @@ export default { }) }, // 查询企业下的员工 - searchEnterprisePerson(){ + searchEnterprisePerson() { getUserList(this.personQueryParam).then(res => { this.personLoadData = res.data }) @@ -262,7 +264,18 @@ export default { personHandleOk() { console.log(this.deviceId) console.log(this.selectedPersonRowKeys) - //新增用户设备 + // 新增用户设备 + saveDevice({ + id: this.deviceId, + userIds: this.selectedPersonRowKeys + }).then(res => { + console.log('saveDevice', res) + if(res.code == 0){ + this.visible = false; + }else{ + this.$message.error(res.msg); + } + }) }, onPersonSelectChange(selectedRowKeys, selectedRows) { this.selectedPersonRowKeys = selectedRowKeys