Explorar o código

fix(notify): no content

using error codes
Casper Dai %!s(int64=2) %!d(string=hai) anos
pai
achega
3fffbb16f1

+ 7 - 3
src/api/device.js

@@ -367,6 +367,10 @@ export function getDeviceStatisticsByPath (path, options) {
   })
 }
 
+const handeEnum = ['应用重启', '设备重启', '恢复出厂', '未干预']
+const typeEnum = ['primary', 'success', 'danger']
+const labelEnum = ['处理中', '成功', '失败']
+
 export function getDeviceAlarms (query) {
   const { pageNum: pageIndex, pageSize, ...params } = query
   return request({
@@ -389,11 +393,11 @@ export function getDeviceAlarms (query) {
             }
             : null,
           type: bugMessage || `预警码【${type}】`,
-          handle: ['应用重启', '设备重启', '恢复出厂', '未干预'][handle] || '-',
+          handle: handeEnum[handle] || '-',
           status: handle <= 2 && status <= 2
             ? {
-              type: ['primary', 'success', 'danger'][status],
-              label: ['处理中', '成功', '失败'][status]
+              type: typeEnum[status],
+              label: labelEnum[status]
             }
             : { label: '-' }
         }

+ 1 - 1
src/layout/components/Notify.vue

@@ -14,7 +14,7 @@
             icon-class="v0-alarm"
             :color="scope.row.color"
           />
-          <span style="padding:10px">{{ scope.row.happenTime }} {{ scope.row.deviceName }} {{ scope.row.bugName }}</span>
+          <span style="padding:10px;">{{ scope.row.happenTime }} {{ scope.row.deviceName }} {{ scope.row.bugName || `预警码【${scope.row.deviceErrorId}】` }}</span>
         </template>
       </el-table-column>
       <el-table-column

+ 5 - 2
src/views/device/detail/components/DeviceAlarm.vue

@@ -52,6 +52,9 @@ export default {
     return {
       options: createListOptions({ deviceId: this.device.id }),
       schema: {
+        props: {
+          size: 'small'
+        },
         listeners: {
           'row-click': this.showAccounts
         },
@@ -78,8 +81,8 @@ export default {
           { label: '预警级别', type: 'tag', render: ({ level }) => AlarmLevelInfo[level] && {
             type: ['primary', 'wraning', 'danger'][level],
             label: AlarmLevelInfo[level]
-          }, width: 108, align: 'center' },
-          { prop: 'happenTime', label: '预警时间', width: 180, align: 'center' },
+          }, align: 'center' },
+          { prop: 'happenTime', label: '预警时间', width: 140, align: 'center' },
           { prop: 'type', label: '预警类型' },
           { prop: 'handle', label: '处理方式', width: 100, align: 'center' },
           { prop: 'status', label: '处理结果', type: 'tag' },