Sumuxi/fastbee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20260412:设备管理页面添加设备历史记录

Browse Source
This commit is contained in:
zhugongping 2026-04-12 10:23:26 +08:00
parent 0cadc302d0
commit cdaf411ea1
4 changed files with 1179 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yack-web/src/lang/en-US/device.json
View File

@ -111,6 +111,7 @@
"device.device-edit.148398-81": "equipment alarm ", "device.device-edit.148398-81": "equipment alarm ",
"device.device-edit.148398-82": "Voice intercom", "device.device-edit.148398-82": "Voice intercom",
"device.device-edit.148398-83": "Calculation Formula", "device.device-edit.148398-83": "Calculation Formula",
"device.device-edit.148398-84": "History Records",
"device.device-functionlog.399522-0": "Please Select A Device Slave:", "device.device-functionlog.399522-0": "Please Select A Device Slave:",
"device.device-functionlog.399522-1": "Please Select A Device Slave", "device.device-functionlog.399522-1": "Please Select A Device Slave",
"device.device-functionlog.399522-2": "Slave Address:$", "device.device-functionlog.399522-2": "Slave Address:$",

1
yack-web/src/lang/zh-CN/device.json
View File

@ -111,6 +111,7 @@
"device.device-edit.148398-81": "设备告警", "device.device-edit.148398-81": "设备告警",
"device.device-edit.148398-82": "语音对讲", "device.device-edit.148398-82": "语音对讲",
"device.device-edit.148398-83": "计算公式", "device.device-edit.148398-83": "计算公式",
"device.device-edit.148398-84": "历史记录",
"device.device-functionlog.399522-0": "请选择设备从机:", "device.device-functionlog.399522-0": "请选择设备从机:",
"device.device-functionlog.399522-1": "请选择设备从机", "device.device-functionlog.399522-1": "请选择设备从机",
"device.device-functionlog.399522-2": "从机地址:$", "device.device-functionlog.399522-2": "从机地址:$",

1167
yack-web/src/views/dataCenter/components/DeviceHistoryTablePanel.vue Normal file
View File

File diff suppressed because it is too large Load Diff

10
yack-web/src/views/iot/device/device-edit.vue
View File

@ -165,6 +165,14 @@
<device-things-model ref="deviceThingsModel" :device="form"/> <device-things-model ref="deviceThingsModel" :device="form"/>
</el-tab-pane> </el-tab-pane>
<!-- 历史记录（照搬数据中心-历史记录） -->
<el-tab-pane name="deviceHistoryRecord" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3" lazy>
<span slot="label">{{ $t('device.device-edit.148398-84') }}</span>
<div style="padding-left: 10px">
<device-history-table-panel :device="form" :load-calculated-history-defaults="true" />
</div>
</el-tab-pane>
<el-tab-pane <el-tab-pane
name="deviceSub" name="deviceSub"
:disabled="form.deviceId == 0" :disabled="form.deviceId == 0"
@ -375,6 +383,7 @@ import deviceInlineVideo from './device-inline-video';
import deviceFuncLog from './device-functionlog'; import deviceFuncLog from './device-functionlog';
import deviceSub from './device-sub'; import deviceSub from './device-sub';
import deviceThingsModel from './device-things-model.vue'; import deviceThingsModel from './device-things-model.vue';
import DeviceHistoryTablePanel from '@/views/dataCenter/components/DeviceHistoryTablePanel.vue';
import vueQr from 'vue-qr'; import vueQr from 'vue-qr';
import {loadMap} from '@/utils/map.js'; import {loadMap} from '@/utils/map.js';
import { import {
@ -424,6 +433,7 @@ export default {
deviceModbusTask, deviceModbusTask,
deviceInlineVideo, deviceInlineVideo,
deviceThingsModel, deviceThingsModel,
DeviceHistoryTablePanel,
}, },
watch: { watch: {
activeName(val) { activeName(val) {