From dd5596fe1cc5a4356d5891d2fde7c66c949a099b Mon Sep 17 00:00:00 2001 From: liub Date: Tue, 2 Sep 2025 09:46:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=86=E7=BB=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=AB=98=E7=BA=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=EF=BC=8C=E4=B8=8A=E6=96=B9=E6=96=87=E6=9C=AC=E6=A1=86?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=90=8E=E7=9A=84=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipmentManagement/devicegroup/index.ts | 98 +- src/views/fys-equipment/group/index.vue | 1679 +++++++++-------- 2 files changed, 917 insertions(+), 860 deletions(-) diff --git a/src/api/equipmentManagement/devicegroup/index.ts b/src/api/equipmentManagement/devicegroup/index.ts index a43d70c..42d9216 100644 --- a/src/api/equipmentManagement/devicegroup/index.ts +++ b/src/api/equipmentManagement/devicegroup/index.ts @@ -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 + } diff --git a/src/views/fys-equipment/group/index.vue b/src/views/fys-equipment/group/index.vue index 1c78ecb..5ef3f11 100644 --- a/src/views/fys-equipment/group/index.vue +++ b/src/views/fys-equipment/group/index.vue @@ -14,9 +14,9 @@