diff --git a/src/components/EmptyCard.vue b/src/components/EmptyCard.vue index 793169cfa3418f763efc18dfa5a4ef0b8c293e94..4fc6ac358a36fa87095adb80740eac54492a5d05 100644 --- a/src/components/EmptyCard.vue +++ b/src/components/EmptyCard.vue @@ -35,6 +35,7 @@ export default { .card { width: 100%; height: 100%; + margin-top: 20px; .clearfix:before, .clearfix:after { display: table; @@ -45,9 +46,9 @@ export default { } .box-card { - margin-top: 20px; + //margin-top: 20px; width: 100%; - height: calc(100vh - 136px); + //height: calc(100vh - 136px); } } diff --git a/src/plugins/element.js b/src/plugins/element.js index accd799524ed9468abb20e8640c54e5b34a71e1c..283fac4dd5851f2f4c0690492f5615b369dad2a6 100644 --- a/src/plugins/element.js +++ b/src/plugins/element.js @@ -78,7 +78,7 @@ import { MessageBox, Message, Notification, - Drawer + Drawer, } from 'element-ui' Vue.use(Avatar) @@ -156,7 +156,6 @@ Vue.use(Backtop) Vue.use(PageHeader) Vue.use(CascaderPanel) Vue.use(Drawer) - Vue.use(Loading.directive) Vue.prototype.$loading = Loading.service diff --git a/src/utils/DeviceManagementApi.js b/src/utils/DeviceManagementApi.js index 6e9f5637157f84628f439b185ce0a9fb64fe50c1..d9432956b4b64733e18f248ed0be9a7c88ef5e2d 100644 --- a/src/utils/DeviceManagementApi.js +++ b/src/utils/DeviceManagementApi.js @@ -1,15 +1,11 @@ // 获取设备数据 import { deleteRequest, getRequest, postRequest } from './http' +import {post} from "./api"; export function getDeviceData(query) { return postRequest('api/api/network/search', query) } -// ESD设备列表 -export function getESDDeviceData(query) { - return postRequest('api/api/esd/search', query) -} - // 设备列表---添加设备 export function addDevice(query) { return postRequest('api/api/network/add', query) @@ -59,3 +55,58 @@ export function updateServerState(query) { export function updateRemind(query) { return postRequest('api/api/configure/update/remind', query) } + +/* ESD配置模块（设备管理）管理 开始 */ +// 获取ESD设备信息 +export function getESDDeviceData(query) { + return postRequest('api/api/esd/search', query) +} + +// 获取产品类型、开门方式、开门条件下拉框数据 +export function getESDSelectData() { + return getRequest('api/api/esd/dropDown') +} + +// 通过esd设备id获取设备参数信息 +export function getESDParameterByDeviceId(query) { + return getRequest(`api/api/esd/search/${query}`) +} + +// 修改ESD设备的配置参数 +export function editESDParameter(query) { + return postRequest('api/api/esd/update', query) +} + +// 根据设备id删除esd设备 +export function deleteESDDeviceByDeviceId(query) { + return deleteRequest(`api/api/esd/delete/${query}`) +} + +// 对esd设备进行操作 +export function operateESDDevice(query) { + return postRequest('api/api/esd/operation', query) +} + +/* ESD配置模块（设备管理）管理 结束 */ + +/* ESD通信规则模块 */ + +// 分页获取通信规则信息 +export function getESDTrafficRules(query) { + return postRequest('api/api/esd/role/search', query) +} + +// 进行添加或修改通行规则 +export function changeESDTrafficRules(query) { + return postRequest('api/api/esd/role/operation',query) +} + +// 根据规则id查询规则信息 +export function getESDTrafficRulesById(query) { + return getRequest(`api/api/esd/role/get/${query}`) +} + +// 根据id删除通行规则 +export function deleteESDTrafficRulesById(query) { + return deleteRequest(`api/api/esd/role/delete/${query}`) +} diff --git a/src/utils/config.js b/src/utils/config.js index d6d8127dcfac237d4c8278a2ca3e1595b0c09ab4..0aa94b71fb327082a00561a20ab52adf5e92301b 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -1,8 +1,7 @@ module.exports = { // baseUrl: 'localhost:2011' // baseUrl: '49.234.81.196:2011' - baseUrl: '120.25.106.20:2011' // baseUrl: '120.25.106.20:2011' // baseUrl: 'localhost:40000' - // baseUrl: '192.168.0.102:2011' + baseUrl: '192.168.0.107:2011' } diff --git a/src/utils/websocket_service.js b/src/utils/websocket_service.js index cb32cc6ccdb1566414206623e835b0ae9c487f82..dea5f27d716e316a273531dd8a60039147ceb5e7 100644 --- a/src/utils/websocket_service.js +++ b/src/utils/websocket_service.js @@ -52,7 +52,7 @@ connect() { this.connectRetryCount++ setTimeout(() => { this.connect() - }, 500 * this.connectRetryCount) + }, 100 * this.connectRetryCount) } } // 接收数据 @@ -71,7 +71,7 @@ send(data) { this.sendRetryCount++ setTimeout(() => { this.send(data) - }, this.sendRetryCount * 500) + }, this.sendRetryCount * 100) } } diff --git a/src/views/ESD/ESDPersonelManagement.vue b/src/views/ESD/ESDPersonelManagement.vue index aab5497363a791074c2d4950dfc821a25047accf..77bfb4a18d29e763071d90f308b771f164706efc 100644 --- a/src/views/ESD/ESDPersonelManagement.vue +++ b/src/views/ESD/ESDPersonelManagement.vue @@ -1,7 +1,7 @@