diff --git a/src/locales/en.ts b/src/locales/en.ts index 7ab1f06d..ec76eead 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -3893,6 +3893,8 @@ export default { tableFaultTimeColumn: 'Fault Time (Hours)', tableWarningTimeColumn: 'Warning Time (Hours)', tableUtilizationRateColumn: 'Utilization Rate', + tableUtilizationRateTooltip: + 'Power-on Rate = Online Time / Total Time\nOnline Time = Running Time + Standby Time + Fault Time\nUtilization Rate = Running Time / Online Time\nPower-on Rate = (Running Time + Standby Time + Fault Time) / Total Time', tablePowerOnRateColumn: 'Power-on Rate', tableStartTimeColumn: 'Device Run Start Time', tableEndTimeColumn: 'Device Run End Time', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index be57a502..09385d58 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -3737,6 +3737,8 @@ export default { tableFaultTimeColumn: '故障时间(小时)', tableWarningTimeColumn: '警告时间(小时)', tableUtilizationRateColumn: '稼动率', + tableUtilizationRateTooltip: + '开机率 = 在线时间 / 总的时间\n在线时间 = 运行时间 + 空闲时间 + 故障时间\n稼动率 = 运行时间 / 在线时间\n开机率 =(运行时间 + 空闲时间 + 故障时间)/ 总的时间', tablePowerOnRateColumn: '开机率', tableStartTimeColumn: '设备运行开始时间', tableEndTimeColumn: '设备运行结束时间', diff --git a/src/views/iot/device/components/DeviceAttributeList.vue b/src/views/iot/device/components/DeviceAttributeList.vue index 9c6a8826..8b6476c7 100644 --- a/src/views/iot/device/components/DeviceAttributeList.vue +++ b/src/views/iot/device/components/DeviceAttributeList.vue @@ -82,12 +82,14 @@ ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-to align="left" prop="attributeCode" width="150px" + sortable /> {{ formatAddressValue(scope.row.addressValue) }} @@ -139,6 +142,7 @@ ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-to prop="latestCollectionTime" :formatter="dateFormatter" width="170px" + sortable /> - - + + @@ -267,6 +268,7 @@ prop="createTime" :formatter="dateFormatter" width="180px" + sortable /> diff --git a/src/views/iot/deviceattributetype/index.vue b/src/views/iot/deviceattributetype/index.vue index 7ef67d79..a8e552a7 100644 --- a/src/views/iot/deviceattributetype/index.vue +++ b/src/views/iot/deviceattributetype/index.vue @@ -89,9 +89,9 @@ @selection-change="handleSelectionChange" > - - - + + + diff --git a/src/views/iot/devicemodel/components/ModelAttributeList.vue b/src/views/iot/devicemodel/components/ModelAttributeList.vue index fdbeab15..217ca110 100644 --- a/src/views/iot/devicemodel/components/ModelAttributeList.vue +++ b/src/views/iot/devicemodel/components/ModelAttributeList.vue @@ -74,8 +74,8 @@ ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-to @selection-change="handleSelectionChange"> - - + + @@ -85,7 +85,7 @@ ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-to + :formatter="dateFormatter" width="180px" sortable/> - - + + diff --git a/src/views/iot/historyData/index.vue b/src/views/iot/historyData/index.vue index 8ae5d062..8448ed9e 100644 --- a/src/views/iot/historyData/index.vue +++ b/src/views/iot/historyData/index.vue @@ -75,12 +75,14 @@ align="left" prop="deviceCode" min-width="140px" + sortable /> {{ t('DataCollection.RunReport.tableUtilizationRateColumn') }} - - 开机率 = 在线时间 / 总的时间 - 在线时间 = 运行时间 + 空闲时间 + 故障时间 - 稼动率 = 运行时间 / 在线时间 - 开机率 =(运行时间 + 空闲时间 + 故障时间)/ 总的时间 - + {{ t('DataCollection.RunReport.tableUtilizationRateTooltip') }} @@ -117,18 +115,21 @@ align="center" prop="powerOnRate" min-width="120px" + sortable />