简柏林 / thingskit-scada · Commits

Commit 00c98f1fa00543c5869be45f5ef37e48594447b5

Authored by loveumiko
1 parent f8edc316

fix: 修复组态下发命令一直是单向和数据动效显示隐藏隐藏组件取值

Inline Side-by-side
Showing 4 changed files with 18 additions and 14 deletions
1 import type { DeviceAttributeItemType, DeviceItemType, DeviceProfileItemType, OrganizationItemType, RpcCommandType, SendValue, ThingsModel, ThingsModelItemType } from './model' 1 import type { DeviceAttributeItemType, DeviceItemType, DeviceProfileItemType, OrganizationItemType, RpcCommandType, SendValue, ThingsModel, ThingsModelItemType } from './model'
2 -import type { CommandWayEnum } from '@/enums/commandEnum' 2 +import { CommandWayEnum } from '@/enums/commandEnum'
3 import type { DeviceTypeEnum } from '@/enums/datasource' 3 import type { DeviceTypeEnum } from '@/enums/datasource'
4 import { isShareMode } from '@/utils/env' 4 import { isShareMode } from '@/utils/env'
5 import { defHttp } from '@/utils/http' 5 import { defHttp } from '@/utils/http'
@@ -15,6 +15,7 @@ enum Api { @@ -15,6 +15,7 @@ enum Api {
15 RPC_COMMAND = '/rpc/', 15 RPC_COMMAND = '/rpc/',
16 GET_DEVICE_ACTIVE = 'plugins/telemetry/DEVICE/', 16 GET_DEVICE_ACTIVE = 'plugins/telemetry/DEVICE/',
17 RPC_ONEWAY = '/rpc/oneway', 17 RPC_ONEWAY = '/rpc/oneway',
  18 + RPC_TWOWAY = '/rpc/twoway',
18 19
19 GEN_MODBUS_COMMAND = '/js/modbus', 20 GEN_MODBUS_COMMAND = '/js/modbus',
20 GET_DEVICE_DETAIL = '/device/', // 获取设备详情 21 GET_DEVICE_DETAIL = '/device/', // 获取设备详情
@@ -88,9 +89,9 @@ export const getDeviceActive = (deviceId: string) => { @@ -88,9 +89,9 @@ export const getDeviceActive = (deviceId: string) => {
88 } 89 }
89 90
90 // 命令下发 91 // 命令下发
91 -export const sendRpcOneway = (param: SendValue | any, deviceId?: string) => { 92 +export const sendRpcOneway = (param: SendValue | any, deviceId?: string, way?: string) => {
92 return defHttp.post({ 93 return defHttp.post({
93 - url: `${Api.RPC_ONEWAY}/${deviceId}`, 94 + url: `${way !== CommandWayEnum.TWO_WAY ? Api.RPC_ONEWAY : Api.RPC_TWOWAY}/${deviceId}`,
94 data: param, 95 data: param,
95 }, 96 },
96 { 97 {
@@ -161,11 +161,13 @@ export interface RangeItemType { @@ -161,11 +161,13 @@ export interface RangeItemType {
161 } 161 }
162 162
163 export interface BasicActDataType { 163 export interface BasicActDataType {
164 - deviceId: string  
165 - attr: string 164 + deviceId?: string
  165 + attr?: string
166 enable?: boolean 166 enable?: boolean
167 deviceProfileId?: string | number 167 deviceProfileId?: string | number
  168 + deviceProfileTemplateId?: string | number
168 attrInfo?: ThingsModelItemType 169 attrInfo?: ThingsModelItemType
  170 + deviceInfo?: DeviceTypeEnum
169 } 171 }
170 172
171 export interface FlashActDataType extends BasicActDataType { 173 export interface FlashActDataType extends BasicActDataType {
@@ -79,7 +79,6 @@ const handleDeleteRow = (data: FlashActDataType) => { @@ -79,7 +79,6 @@ const handleDeleteRow = (data: FlashActDataType) => {
79 79
80 const getFieldsValue = () => { 80 const getFieldsValue = () => {
81 const values = getFieldsForm() 81 const values = getFieldsForm()
82 - const { deviceId, attr, deviceProfileId, attrInfo } = values  
83 const rangeList = unref(dataSource).map((item) => { 82 const rangeList = unref(dataSource).map((item) => {
84 return { 83 return {
85 ...item, 84 ...item,
@@ -87,17 +86,14 @@ const getFieldsValue = () => { @@ -87,17 +86,14 @@ const getFieldsValue = () => {
87 } 86 }
88 }) 87 })
89 return { 88 return {
90 - deviceId,  
91 - attr,  
92 - deviceProfileId,  
93 - attrInfo, 89 + ...values,
94 rangeList, 90 rangeList,
95 } as BasicFlashActDataType 91 } as BasicFlashActDataType
96 } 92 }
97 93
98 const setFieldsValue = (list: FlashActDataType) => { 94 const setFieldsValue = (list: FlashActDataType) => {
99 - const { attr, deviceId, rangeList } = list || {}  
100 - setFieldsForm({ attr, deviceId }) 95 + const { rangeList } = list || {}
  96 + setFieldsForm(list || {})
101 clearValidate() 97 clearValidate()
102 dataSource.value = rangeList ? rangeList?.map(item => ({ ...item, uuid: buildUUID() })) : [getInitTableRecord()] 98 dataSource.value = rangeList ? rangeList?.map(item => ({ ...item, uuid: buildUUID() })) : [getInitTableRecord()]
103 } 99 }
@@ -11,6 +11,7 @@ import { genModbusCommand, getDeviceActiveTime, getDeviceInfo, getThingsModelSer @@ -11,6 +11,7 @@ import { genModbusCommand, getDeviceActiveTime, getDeviceInfo, getThingsModelSer
11 import { ThingsModelForm } from '@/core/Library/components/ThingsModelForm' 11 import { ThingsModelForm } from '@/core/Library/components/ThingsModelForm'
12 import { useMessage } from '@/hooks/web/useMessage' 12 import { useMessage } from '@/hooks/web/useMessage'
13 import type { StructJSON } from '@/api/device/model' 13 import type { StructJSON } from '@/api/device/model'
  14 +import { CommandWayEnum } from '@/enums/commandEnum'
14 15
15 interface ServiceInfo { 16 interface ServiceInfo {
16 title?: string 17 title?: string
@@ -19,6 +20,7 @@ interface ServiceInfo { @@ -19,6 +20,7 @@ interface ServiceInfo {
19 transportType?: string 20 transportType?: string
20 callType?: string 21 callType?: string
21 code?: string 22 code?: string
  23 + way?: string
22 } 24 }
23 25
24 const visible = ref<boolean>(false) 26 const visible = ref<boolean>(false)
@@ -49,6 +51,7 @@ const serviceInfo = reactive<ServiceInfo>({ @@ -49,6 +51,7 @@ const serviceInfo = reactive<ServiceInfo>({
49 transportType: '', 51 transportType: '',
50 callType: '', 52 callType: '',
51 code: '', 53 code: '',
  54 + way: '', // 单向还是双向
52 }) 55 })
53 56
54 const [register, { getFieldsValue, validate, setFieldsValue, updateSchema, setProps }] = useForm({ // 自定义下发值 57 const [register, { getFieldsValue, validate, setFieldsValue, updateSchema, setProps }] = useForm({ // 自定义下发值
@@ -88,11 +91,12 @@ const getDeviceDetail = async (deviceId: string) => { @@ -88,11 +91,12 @@ const getDeviceDetail = async (deviceId: string) => {
88 } 91 }
89 92
90 const open = async (_data: SingleClickEventDataType) => { 93 const open = async (_data: SingleClickEventDataType) => {
  94 + console.warn(_data, 'data')
91 const { operationPassword } = _data || {} 95 const { operationPassword } = _data || {}
92 dataSourceJson.value = _data.deviceInfo 96 dataSourceJson.value = _data.deviceInfo
93 isPasswordInfo.value = operationPassword || {} 97 isPasswordInfo.value = operationPassword || {}
94 // commandWay-->命令下发方式 98 // commandWay-->命令下发方式
95 - const { commandWay, customCommand, serviceCommand, service, callType } = _data || {} 99 + const { commandWay, customCommand, serviceCommand, service, callType, way } = _data || {}
96 isCommandWay.value = commandWay 100 isCommandWay.value = commandWay
97 const { attrInfo, deviceId } = unref(dataSourceJson) 101 const { attrInfo, deviceId } = unref(dataSourceJson)
98 const { identifier, extensionDesc, detail, name } = attrInfo || {}// 属性信息 102 const { identifier, extensionDesc, detail, name } = attrInfo || {}// 属性信息
@@ -110,6 +114,7 @@ const open = async (_data: SingleClickEventDataType) => { @@ -110,6 +114,7 @@ const open = async (_data: SingleClickEventDataType) => {
110 formField.value = identifier 114 formField.value = identifier
111 isShowActionType.value = !!actionType // 判断modBUS类型时 物模型是否填写扩展描述 115 isShowActionType.value = !!actionType // 判断modBUS类型时 物模型是否填写扩展描述
112 serviceInfo.callType = callType // 服务命令调用方式 是同步还是异步 116 serviceInfo.callType = callType // 服务命令调用方式 是同步还是异步
  117 + serviceInfo.way = way || 'oneway' // 命令下发是双向还是单向
113 118
114 serviceInfo.transportType = transportType 119 serviceInfo.transportType = transportType
115 serviceInfo.code = code 120 serviceInfo.code = code
@@ -268,7 +273,7 @@ const handleSubmit = async () => { @@ -268,7 +273,7 @@ const handleSubmit = async () => {
268 persistent: true, 273 persistent: true,
269 method: 'methodThingskit', 274 method: 'methodThingskit',
270 params: serviceInfo.transportType !== TransportTypeEnum.TCP && unref(isCommandWay) === CommandDeliveryWayEnum.SERVICE ? { service: unref(sendValue) } : unref(sendValue), 275 params: serviceInfo.transportType !== TransportTypeEnum.TCP && unref(isCommandWay) === CommandDeliveryWayEnum.SERVICE ? { service: unref(sendValue) } : unref(sendValue),
271 - }, dataSourceJson.value.deviceId) 276 + }, dataSourceJson.value.deviceId, serviceInfo.way)
272 createMessage.success('命令下发成功') 277 createMessage.success('命令下发成功')
273 visible.value = false 278 visible.value = false
274 isInputData.value = false 279 isInputData.value = false