Compare commits
2 Commits
7f85623cb2
...
1eeb8e7f7c
Author | SHA1 | Date | |
---|---|---|---|
1eeb8e7f7c | |||
dd5596fe1c |
@ -3,7 +3,7 @@ import request from '@/utils/request';
|
||||
import { AxiosPromise } from 'axios';
|
||||
|
||||
//左侧节点的数据源
|
||||
function getTreeData(para : any) {
|
||||
function getTreeData(para: any) {
|
||||
|
||||
|
||||
|
||||
@ -39,7 +39,7 @@ function getTreeData(para : any) {
|
||||
});
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
Promise.allSettled([ promise2]).then(res => {
|
||||
Promise.allSettled([promise2]).then(res => {
|
||||
debugger;
|
||||
if (res[0].status == 'fulfilled') {
|
||||
let json = res[0].value;
|
||||
@ -205,7 +205,7 @@ function treeNodeSearch(treeData, search = '', filed = 'groupName', childField =
|
||||
|
||||
//更新节点名称
|
||||
function updateTreeName(nodes, targetValue, newTxt, filed = 'groupName', childField = "children", valueFiled = "id") {
|
||||
let updateTree=function(){
|
||||
let updateTree = function () {
|
||||
for (let node of nodes) {
|
||||
// 检查当前节点是否匹配value
|
||||
if (node[valueFiled] === targetValue) {
|
||||
@ -224,7 +224,7 @@ function updateTreeName(nodes, targetValue, newTxt, filed = 'groupName', childFi
|
||||
return false; // 未找到匹配的节点
|
||||
}
|
||||
|
||||
let requestUpdate=function(){
|
||||
let requestUpdate = function () {
|
||||
let promise2 = new Promise((resolve, reject) => {
|
||||
request({
|
||||
url: '/api/device/group',
|
||||
@ -323,10 +323,10 @@ function delTreeNode(nodes, targetValue, childField = "children", valueFiled = "
|
||||
return false; // 未找到匹配的节点
|
||||
}
|
||||
|
||||
let requestDel=function(){
|
||||
let requestDel = function () {
|
||||
let promise2 = new Promise((resolve, reject) => {
|
||||
request({
|
||||
url: '/api/device/group/'+targetValue,
|
||||
url: '/api/device/group/' + targetValue,
|
||||
method: 'delete',
|
||||
|
||||
}).then((res) => {
|
||||
@ -345,21 +345,20 @@ function delTreeNode(nodes, targetValue, childField = "children", valueFiled = "
|
||||
|
||||
//获取某个节点的设备数据
|
||||
function getNodeDevice(para) {
|
||||
|
||||
|
||||
|
||||
|
||||
let promise2 = new Promise((resolve, reject) => {
|
||||
request({
|
||||
url: '/api/device',
|
||||
method: 'get',
|
||||
params:{
|
||||
"deviceStatus": 1,
|
||||
"pageNum": para.pageIndex,
|
||||
"pageSize": para.pageSize,
|
||||
"groupId": para.nodeCode,
|
||||
params: {
|
||||
"deviceStatus": 1,
|
||||
"pageNum": para.pageIndex,
|
||||
"pageSize": para.pageSize,
|
||||
"groupId": para.nodeCode,
|
||||
"communicationMode": para.communicationMode,//通讯方式 0:4G;1:蓝牙
|
||||
"deviceType": para.deviceType,//设备类型
|
||||
"deviceName": para.deviceName
|
||||
|
||||
}
|
||||
}
|
||||
}).then((res) => {
|
||||
resolve(res);
|
||||
}).catch((ex) => {
|
||||
@ -380,32 +379,56 @@ function getNodeDevice(para) {
|
||||
}
|
||||
|
||||
//从分组中删除设备
|
||||
function groupDelDevice(groupid,deviceIds){
|
||||
return new Promise((resolve,reject)=>{
|
||||
function groupDelDevice(groupid, deviceIds) {
|
||||
return new Promise((resolve, reject) => {
|
||||
request({
|
||||
url: '/api/device/group/groupUnbind/'+deviceIds,
|
||||
method: 'get',
|
||||
url: '/api/device/group/groupUnbind/' + deviceIds,
|
||||
method: 'get',
|
||||
|
||||
}).then((res) => {
|
||||
resolve(res);
|
||||
}).catch((ex) => {
|
||||
reject(ex);
|
||||
});
|
||||
}).then((res) => {
|
||||
resolve(res);
|
||||
}).catch((ex) => {
|
||||
reject(ex);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
//将设备移动至分组
|
||||
function deviceMoveGroup(groupid,deviceIds){
|
||||
return new Promise((resolve,reject)=>{
|
||||
function deviceMoveGroup(groupid, deviceIds) {
|
||||
return new Promise((resolve, reject) => {
|
||||
request({
|
||||
url: '/api/device/group/groupId/'+groupid+'/'+deviceIds,
|
||||
method: 'get',
|
||||
url: '/api/device/group/groupId/' + groupid + '/' + deviceIds,
|
||||
method: 'get',
|
||||
|
||||
}).then((res) => {
|
||||
resolve(res);
|
||||
}).catch((ex) => {
|
||||
reject(ex);
|
||||
});
|
||||
}).then((res) => {
|
||||
resolve(res);
|
||||
}).catch((ex) => {
|
||||
reject(ex);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
//获取设备类型
|
||||
function getDeviceTypeAll(){
|
||||
return new Promise((resolve, reject) => {
|
||||
request({
|
||||
url: '/api/deviceType/all' ,
|
||||
method: 'get',
|
||||
|
||||
}).then((res) => {
|
||||
resolve(res);
|
||||
}).catch((ex) => {
|
||||
reject(ex);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
//获取通讯方式
|
||||
function getNetMode () {
|
||||
return request({
|
||||
url: '/api/deviceType/communicationMode',
|
||||
method: 'get'
|
||||
});
|
||||
}
|
||||
|
||||
@ -416,6 +439,9 @@ export default {
|
||||
addTreeNode: addTreeNode,
|
||||
delTreeNode: delTreeNode,
|
||||
getNodeDevice: getNodeDevice,
|
||||
groupDelDevice:groupDelDevice,
|
||||
deviceMoveGroup:deviceMoveGroup
|
||||
groupDelDevice: groupDelDevice,
|
||||
deviceMoveGroup: deviceMoveGroup,
|
||||
getDeviceTypeAll:getDeviceTypeAll,
|
||||
getNetMode:getNetMode
|
||||
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user