Browse Source

feat(param): 新增获取主数据参数接口

HMY 9 months ago
parent
commit
f4a34c2ebd
3 changed files with 43 additions and 11 deletions
  1. 33 11
      ui/src/api/dcs/flowControl.js
  2. 8 0
      ui/src/api/hnyz/param.js
  3. 2 0
      ui/src/main.js

+ 33 - 11
ui/src/api/dcs/flowControl.js

@@ -15,7 +15,7 @@ export function getEquipmentIndexList() {
 //获取数据
 export function getValues({ dataArr, startAddress }) {
     return request({
-        url: '/modbus/getValues?data='+dataArr+'&slaveId=1&startAddress='+startAddress+'&dataType=1&functionCode=1&quantity=1',
+        url: '/modbus/getValues?data=' + dataArr + '&slaveId=1&startAddress=' + startAddress + '&dataType=1&functionCode=1&quantity=1',
         method: 'get',
         headers: {
             'Content-Type': 'application/json'
@@ -24,23 +24,45 @@ export function getValues({ dataArr, startAddress }) {
 }
 
 // 设置单个线圈
-export function setCoil({ dataArr, startAddress }) {
+// export function setCoil({ dataArr, startAddress }) {
+//     return request({
+//         url: '/modbus/setCoil?data='+dataArr+'&slaveId=1&startAddress='+startAddress+'&dataType=1&functionCode=1&quantity=1',
+//         method: 'post',
+//         headers: {
+//             'Content-Type': 'application/json' 
+//         },
+//     })
+// }
+
+export function setCoil({ dataArr, startAddress, unitId, ipAddress, port }) {
     return request({
-        url: '/modbus/setCoil?data='+dataArr+'&slaveId=1&startAddress='+startAddress+'&dataType=1&functionCode=1&quantity=1',
+        url: '/modbus/setCoil',
         method: 'post',
         headers: {
-            'Content-Type': 'application/json' 
+            'Content-Type': 'application/json'
         },
+        data: {
+            //   protocol: 1,                    // MODBUS_TCP 协议
+            unitId: unitId,                      // 从站 ID
+            dataType: "1",                 // 1 表示布尔型
+            resource: "5",                  // 功能码,05 是写单个线圈
+            offsetOrIndex: startAddress,   // 起始地址
+            lengthOrQos: 1,                // 数量
+            data: dataArr,                 // 写入的值,例如 [true]
+            ipAddress: ipAddress,    // 你的 Modbus TCP 服务地址
+            port: port                      // 默认端口
+        }
     })
 }
 
+
 //设置多个线圈
-export function setCoils({ dataArr, startAddress , quantity }) {
+export function setCoils({ dataArr, startAddress, quantity }) {
     return request({
-        url: '/modbus/setCoils?data='+dataArr+'&slaveId=1&startAddress='+startAddress+'&dataType=1&functionCode=1&quantity='+quantity,
+        url: '/modbus/setCoils?data=' + dataArr + '&slaveId=1&startAddress=' + startAddress + '&dataType=1&functionCode=1&quantity=' + quantity,
         method: 'post',
         headers: {
-            'Content-Type': 'application/json' 
+            'Content-Type': 'application/json'
         },
     })
 }
@@ -48,10 +70,10 @@ export function setCoils({ dataArr, startAddress , quantity }) {
 //设置单个整型
 export function setIntRegister({ dataArr, startAddress }) {
     return request({
-        url: '/modbus/setIntRegister?data='+dataArr+'&slaveId=1&startAddress='+startAddress+'&dataType=3&functionCode=3&quantity=1',
+        url: '/modbus/setIntRegister?data=' + dataArr + '&slaveId=1&startAddress=' + startAddress + '&dataType=3&functionCode=3&quantity=1',
         method: 'post',
         headers: {
-            'Content-Type': 'application/json' 
+            'Content-Type': 'application/json'
         },
     })
 }
@@ -59,10 +81,10 @@ export function setIntRegister({ dataArr, startAddress }) {
 //设置单个浮点数
 export function setFloatRegister({ dataArr, startAddress }) {
     return request({
-        url: '/modbus/setFloatRegister?data='+dataArr+'&slaveId=1&startAddress='+startAddress+'&dataType=2&functionCode=3&quantity=1',
+        url: '/modbus/setFloatRegister?data=' + dataArr + '&slaveId=1&startAddress=' + startAddress + '&dataType=2&functionCode=3&quantity=1',
         method: 'post',
         headers: {
-            'Content-Type': 'application/json' 
+            'Content-Type': 'application/json'
         },
     })
 }

+ 8 - 0
ui/src/api/hnyz/param.js

@@ -53,4 +53,12 @@ export function changeStatus(registerId, status) {
       status: status
     }
   })
+}
+
+//根据设备id查询对应主设置项寄存器
+export function getMainSetParam(equipmentId) {
+  return request({
+    url: '/hnyz/param/getMainSetParam/' + equipmentId,
+    method: 'get'
+  })
 }

+ 2 - 0
ui/src/main.js

@@ -7,6 +7,7 @@ import '@/assets/dcs/iconfont_colour/iconfont.css'// iconfont彩色字体图标
 import '@/assets/dcs/iconfont_colour_hnyz/iconfont.css'// iconfont彩色字体图标
 import DataVVue3 from '@kjgl77/datav-vue3'//dataV组件库
 import HeaderComponent from '@/components/DCS/HeaderComponent.vue'
+import PageDrawer from '@/components/HnyzDcs/PageDrawerComponent.vue';
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
 import 'element-plus/theme-chalk/dark/css-vars.css'
@@ -76,6 +77,7 @@ app.use(elementIcons)
 app.use(DataVVue3)//dataV组件库
 app.component('svg-icon', SvgIcon)
 app.component('HeaderComponent', HeaderComponent)//header组件
+app.component('PageDrawer', PageDrawer)//侧边栏组件
 
 directive(app)