Skip to content

Commit

Permalink
feat: realtimedata
Browse files Browse the repository at this point in the history
  • Loading branch information
@dawnwinterLiu
dawnwinterLiu committed Nov 8, 2022
1 parent 81105b7 commit 42ad3e5
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 33 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.EN.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
## [4.6.3](https://github.com/dgiot/dgiot-dashboard/compare/v4.6.1...v4.6.3) (2022-10-28)
## [4.6.3](https://github.com/dgiot/dgiot-dashboard/compare/v4.6.1...v4.6.3) (2022-11-08)


### Bug Fixes

* amisPage ([8b87ed5](https://github.com/dgiot/dgiot-dashboard/commit/8b87ed53c6ff71f6117618819ad5bd6ddbbbe1be))
* categoryname ([81105b7](https://github.com/dgiot/dgiot-dashboard/commit/81105b72452c28b5cd275cdf61428d174bf048ce))
* **equipmentCloud:** 产品默认位置 ([0c95658](https://github.com/dgiot/dgiot-dashboard/commit/0c95658e11747babaf7b8ceab921fab368cdfac1))
* **equipmentCloud:** config ([a7575d2](https://github.com/dgiot/dgiot-dashboard/commit/a7575d2f6f2aaa8fe60b542d28451833436a5dc0))
* location ([59f42aa](https://github.com/dgiot/dgiot-dashboard/commit/59f42aa8adc4095667e2837388938ec791d3b047))
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.ZH.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
## [4.6.3](https://github.com/dgiot/dgiot-dashboard/compare/v4.6.1...v4.6.3) (2022-10-28)
## [4.6.3](https://github.com/dgiot/dgiot-dashboard/compare/v4.6.1...v4.6.3) (2022-11-08)


### Bug Fixes

* amisPage ([8b87ed5](https://github.com/dgiot/dgiot-dashboard/commit/8b87ed53c6ff71f6117618819ad5bd6ddbbbe1be))
* categoryname ([81105b7](https://github.com/dgiot/dgiot-dashboard/commit/81105b72452c28b5cd275cdf61428d174bf048ce))
* **equipmentCloud:** 产品默认位置 ([0c95658](https://github.com/dgiot/dgiot-dashboard/commit/0c95658e11747babaf7b8ceab921fab368cdfac1))
* **equipmentCloud:** config ([a7575d2](https://github.com/dgiot/dgiot-dashboard/commit/a7575d2f6f2aaa8fe60b542d28451833436a5dc0))
* location ([59f42aa](https://github.com/dgiot/dgiot-dashboard/commit/59f42aa8adc4095667e2837388938ec791d3b047))
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
## [4.6.3](https://github.com/dgiot/dgiot-dashboard/compare/v4.6.1...v4.6.3) (2022-10-28)
## [4.6.3](https://github.com/dgiot/dgiot-dashboard/compare/v4.6.1...v4.6.3) (2022-11-08)


### Bug Fixes

* amisPage ([8b87ed5](https://github.com/dgiot/dgiot-dashboard/commit/8b87ed53c6ff71f6117618819ad5bd6ddbbbe1be))
* categoryname ([81105b7](https://github.com/dgiot/dgiot-dashboard/commit/81105b72452c28b5cd275cdf61428d174bf048ce))
* **equipmentCloud:** 产品默认位置 ([0c95658](https://github.com/dgiot/dgiot-dashboard/commit/0c95658e11747babaf7b8ceab921fab368cdfac1))
* **equipmentCloud:** config ([a7575d2](https://github.com/dgiot/dgiot-dashboard/commit/a7575d2f6f2aaa8fe60b542d28451833436a5dc0))
* location ([59f42aa](https://github.com/dgiot/dgiot-dashboard/commit/59f42aa8adc4095667e2837388938ec791d3b047))
Expand Down
52 changes: 26 additions & 26 deletions src/views/DeviceCloud/manage/component/wmxdetail.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -731,47 +731,47 @@
1. 采集值 设备上行数据经采集公式计算后显示 。
<br />

公式中的%s为占位符，是固定字段。
公式中的%{s}为占位符，是固定字段。
<br />

如：
<br />

加：%s+10
加：%{s}+10
<br />

减：%s-10
减：%{s}-10
<br />

乘：%s*10
乘：%{s}*10
<br />

除：%s/10
除：%{s}/10
<br />

余数：%s%10
余数：%{s}%10
<br />

2. 计算值 添加变量按钮,
<br />
复制对应的标识符
<br />

例：pressure_out
例：%%{pressure_out}
<br />
加：pressure_out+10
加：%%{pressure_out}+10
<br />

减：pressure_out-10
减：%%{pressure_out}-10
<br />

乘：pressure_out*10
乘：%%{pressure_out}*10
<br />

除：pressure_out/10
除：%%{pressure_out}/10
<br />

余数：pressure_out%10
余数：%%{pressure_out}%10
<br />

3. 复杂值 ：关闭本弹窗后使用物解析处理
Expand All @@ -782,7 +782,7 @@
<el-form-item label="采集公式">
<el-input
v-model="sizeForm.collection"
placeholder="%s"
placeholder="%{s}"
:rows="1"
style="width: 90%"
type="textarea"
Expand All @@ -795,47 +795,47 @@
1. 采集值: 主动向设备写数据经控制公式计算后下发 。
<br />

公式中的%s为占位符，是固定字段。
公式中的%{d}为占位符，是固定字段。
<br />

如：
<br />

加：%s+10
加：%{d}+10
<br />

减：%s-10
减：%{d}-10
<br />

乘：%s*10
乘：%{d}*10
<br />

除：%s/10
除：%{d}/10
<br />

余数：%s%10
余数：%{d}%10
<br />

2. 计算值: 点击添加变量按钮,
<br />
复制对应的标识符
<br />

例：pressure_out
例：%%{pressure_out}
<br />
加：pressure_out+10
加：%%{pressure_out}+10
<br />

减：pressure_out-10
减：%%{pressure_out}-10
<br />

乘：pressure_out*10
乘：%%{pressure_out}*10
<br />

除：pressure_out/10
除：%%{pressure_out}/10
<br />

余数：pressure_out%10
余数：%%{pressure_out}%10
<br />

3. 复杂值 ：关闭本弹窗后使用物解析处理
Expand All @@ -846,7 +846,7 @@
<el-form-item label="控制公式">
<el-input
v-model="sizeForm.control"
placeholder="%s"
placeholder="%{s}"
:rows="1"
style="width: 90%"
type="textarea"
Expand Down
8 changes: 4 additions & 4 deletions src/views/DeviceCloud/manage/js/proddetail.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1416,14 +1416,14 @@ export default {
operatetype: 'readCoils',
originaltype: 'short16_AB',
slaveid: '0X10',
collection: '%s',
control: '%d',
collection: '%{s}',
control: '%{d}',
nobound: [],
editdatatype: false,
iscount: '0',
countstrategy: 20,
countround: 'all',
countcollection: '%s',
countcollection: '%{s}',
}
},
changeValue(formName) {
Expand Down Expand Up @@ -3439,7 +3439,7 @@ export default {
if (type) {
this.wmxdialogVisible = false
await this.$refs['sizeForm'].$refs['sizeForm'].resetFields()
await this.$refs['sizeForm'].$refs['sizeForm'].clearValidate()
// await this.$refs['sizeForm'].$refs['sizeForm'].clearValidate()
await this.setSizeForm(this.getFormOrginalData())
this.$refs['sizeForm'].resource.disabled = false
await this.handleChildClick(this.tabsChild)
Expand Down

1 comment on commit 42ad3e5

@vercel
Copy link

@vercel vercel bot commented on 42ad3e5 Nov 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

dgiot-dashboard – ./

dgiot-dashboard-git-master-dgiot.vercel.app
dgiot-dashboard-dgiot.vercel.app
dgiot-dashboard.vercel.app

Please sign in to comment.