style：数据采集模块添加部分字段排序

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',

src/locales/zh-CN.ts

@@ -3737,6 +3737,8 @@ export default {
       tableFaultTimeColumn: '故障时间(小时)',
       tableWarningTimeColumn: '警告时间(小时)',
       tableUtilizationRateColumn: '稼动率',
+      tableUtilizationRateTooltip:
+        '开机率 = 在线时间 / 总的时间\n在线时间 = 运行时间 + 空闲时间 + 故障时间\n稼动率 = 运行时间 / 在线时间\n开机率 =（运行时间 + 空闲时间 + 故障时间）/ 总的时间',
       tablePowerOnRateColumn: '开机率',
       tableStartTimeColumn: '设备运行开始时间',
       tableEndTimeColumn: '设备运行结束时间',

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
       />
       <el-table-column
         :label="t('DataCollection.Device.attributeName')"
         align="left"
         prop="attributeName"
         width="150px"
+        sortable
       />
       <el-table-column
         :label="t('DataCollection.Device.attributeType')"
@@ -116,6 +118,7 @@ ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-to
         align="center"
         prop="addressValue"
         min-width="120px"
+        sortable
       >
         <template #default="scope">
           {{ 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
       />
       <el-table-column
         :label="t('DataCollection.Device.remark')"

src/views/iot/device/index.vue

@@ -74,8 +74,8 @@
       ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"
       @selection-change="handleSelectionChange" @row-click="handleShowAttribute">
       <el-table-column type="selection" width="55" reserve-selection />
-      <el-table-column :label="t('DataCollection.Device.deviceCode')" align="left" prop="deviceCode" />
+      <el-table-column :label="t('DataCollection.Device.deviceCode')" align="left" prop="deviceCode" sortable/>
-      <el-table-column :label="t('DataCollection.Device.deviceName')" align="left" prop="deviceName" />
+      <el-table-column :label="t('DataCollection.Device.deviceName')" align="left" prop="deviceName" sortable/>
       <el-table-column :label="t('DataCollection.Device.operatingStatus')" align="center" prop="operatingStatus" width="120px">
         <template #default="scope">
           <el-tag
@@ -135,6 +135,7 @@
         prop="collectionTime"
         width="180px"
         :formatter="dateFormatter"
+        sortable
       />
       <el-table-column :label="t('DataCollection.Device.operate')" align="center" fixed="right" width="380px">
         <template #default="scope">
@@ -267,6 +268,7 @@
               prop="createTime"
               :formatter="dateFormatter"
               width="180px"
+              sortable
             />
         <el-table-column :label="t('DataCollection.DeviceModel.ruleOperate')" align="center" width="160px">
           <template #default="scope">

src/views/iot/deviceattributetype/index.vue

@@ -89,9 +89,9 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" reserve-selection />
-      <el-table-column :label="t('DataCollection.DeviceAttributeType.code')" align="center" prop="code" />
+      <el-table-column :label="t('DataCollection.DeviceAttributeType.code')" align="center" prop="code" sortable />
-      <el-table-column :label="t('DataCollection.DeviceAttributeType.name')" align="center" prop="name" />
+      <el-table-column :label="t('DataCollection.DeviceAttributeType.name')" align="center" prop="name" sortable/>
-      <el-table-column :label="t('DataCollection.DeviceAttributeType.sort')" align="center" prop="sort" />
+      <el-table-column :label="t('DataCollection.DeviceAttributeType.sort')" align="center" prop="sort" sortable/>
       <el-table-column :label="t('DataCollection.DeviceAttributeType.remark')" align="center" prop="remark" />
       <el-table-column
         :label="t('DataCollection.DeviceAttributeType.createTime')"
@@ -99,6 +99,7 @@
         prop="createTime"
         :formatter="dateFormatter"
         width="180px"
+        sortable
       />
       <el-table-column :label="t('DataCollection.DeviceAttributeType.operate')" align="center" width="150px" fixed="right">
         <template #default="scope">

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">
       <el-table-column type="selection" width="55" reserve-selection />
       <!-- <el-table-column label="ID" align="center" prop="id" /> -->
-      <el-table-column :label="t('DataCollection.DeviceModel.attributeCode')" align="center" prop="attributeCode" />
+      <el-table-column :label="t('DataCollection.DeviceModel.attributeCode')" align="center" prop="attributeCode" sortable/>
-      <el-table-column :label="t('DataCollection.DeviceModel.attributeName')" align="center" prop="attributeName" />
+      <el-table-column :label="t('DataCollection.DeviceModel.attributeName')" align="center" prop="attributeName" sortable/>
       <el-table-column :label="t('DataCollection.DeviceModel.attributeType')" align="center" prop="typeName" />
       <el-table-column :label="t('DataCollection.DeviceModel.dataType')" align="center" prop="dataType" />
       <el-table-column :label="t('DataCollection.DeviceModel.address')" align="center" prop="address" />
@@ -85,7 +85,7 @@ ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-to
       <!-- <el-table-column label="采集设备模型id" align="center" prop="deviceModelId" /> -->
       <el-table-column
 :label="t('DataCollection.DeviceModel.createTime')" align="center" prop="createTime"
-        :formatter="dateFormatter" width="180px" />
+        :formatter="dateFormatter" width="180px" sortable/>
       <el-table-column :label="t('DataCollection.DeviceModel.operate')" align="center" width="150px" fixed="right">
         <template #default="scope">
           <el-button

src/views/iot/devicemodel/index.vue

@@ -78,8 +78,8 @@ type="success" plain @click="handleExport" :loading="exportLoading"
       ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
       highlight-current-row row-key="id" @selection-change="handleSelectionChange" @row-click="handleShowAttribute">
       <el-table-column type="selection" width="55" reserve-selection />
-      <el-table-column :label="t('DataCollection.DeviceModel.code')" align="center" prop="code" />
+      <el-table-column :label="t('DataCollection.DeviceModel.code')" align="center" prop="code" sortable/>
-      <el-table-column :label="t('DataCollection.DeviceModel.name')" align="center" prop="name" />
+      <el-table-column :label="t('DataCollection.DeviceModel.name')" align="center" prop="name" sortable/>
       <el-table-column align="center" :label="t('DataCollection.DeviceModel.protocol')" prop="protocol" min-width="150">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.IOT_PROTOCOL" :value="scope.row.protocol" />

src/views/iot/historyData/index.vue

@@ -75,12 +75,14 @@
         align="left"
         prop="deviceCode"
         min-width="140px"
+        sortable
       />
       <el-table-column
         :label="t('DataCollection.HistoryData.tableDeviceNameColumn')"
         align="left"
         prop="deviceName"
         min-width="160px"
+        sortable
       />
        <el-table-column
         :label="t('DataCollection.HistoryData.tableLineCodeColumn')"
@@ -100,6 +102,7 @@
         prop="collectionTime"
         :formatter="dateFormatter"
         width="180px"
+        sortable
       />
       <el-table-column
         :label="t('DataCollection.HistoryData.tableOperateColumn')"

src/views/iot/realTimeMonitoring/index.vue

@@ -75,12 +75,14 @@
         align="left"
         prop="deviceCode"
         min-width="140px"
+        sortable
       />
       <el-table-column
         :label="t('DataCollection.RealTimeMonitoring.tableDeviceNameColumn')"
         align="left"
         prop="deviceName"
         min-width="160px"
+        sortable
       />
       <el-table-column
         :label="t('DataCollection.RealTimeMonitoring.tableLineCodeColumn')"
@@ -110,6 +112,7 @@
         prop="collectionTime"
         :formatter="dateFormatter"
         width="180px"
+        sortable
       />
       <el-table-column
         :label="t('DataCollection.RealTimeMonitoring.tableOperateColumn')"

src/views/iot/runReport/index.vue

@@ -59,12 +59,14 @@
         align="left"
         prop="deviceCode"
         min-width="140px"
+        sortable
       />
       <el-table-column
         :label="t('DataCollection.RunReport.tableDeviceNameColumn')"
         align="left"
         prop="deviceName"
         min-width="160px"
+        sortable
       />
       <el-table-column
         :label="t('DataCollection.RunReport.tableRunningTimeColumn')"
@@ -94,17 +96,13 @@
         align="center"
         prop="utilizationRate"
         min-width="120px"
+        sortable
       >
         <template #header>
           <span>{{ t('DataCollection.RunReport.tableUtilizationRateColumn') }}</span>
           <el-tooltip placement="top" :offset="10">
             <template #content>
-              <div style="white-space: pre-line;">
+              <div style="white-space: pre-line;">{{ t('DataCollection.RunReport.tableUtilizationRateTooltip') }}</div>
-                开机率 = 在线时间 / 总的时间<br/>
-                在线时间 = 运行时间 + 空闲时间 + 故障时间<br/>
-                稼动率 = 运行时间 / 在线时间<br/>
-                开机率 =（运行时间 + 空闲时间 + 故障时间）/ 总的时间
-              </div>
             </template>
             <el-icon style="margin-left: 4px; cursor: pointer; color: #909399; vertical-align: middle;">
               <QuestionFilled />
@@ -117,18 +115,21 @@
         align="center"
         prop="powerOnRate"
         min-width="120px"
+        sortable
       />
       <el-table-column
         :label="t('DataCollection.RunReport.tableStartTimeColumn')"
         align="center"
         prop="startTime"
         min-width="120px"
+        sortable
       />
       <el-table-column
         :label="t('DataCollection.RunReport.tableEndTimeColumn')"
         align="center"
         prop="endTime"
         min-width="120px"
+        sortable
       />
     </el-table>
     <Pagination