Commit 6c75dcbbbbd136b2cbec662ac812d52545b311b4
Merge branch 'perf/device-state/07-09' into 'main_dev'
feat: 设备状态新增活动状态 See merge request yunteng/thingskit-front!1402
Showing
3 changed files
with
6 additions
and
0 deletions
| @@ -7,6 +7,7 @@ export enum DeviceState { | @@ -7,6 +7,7 @@ export enum DeviceState { | ||
| 7 | INACTIVE = 'INACTIVE', | 7 | INACTIVE = 'INACTIVE', |
| 8 | ONLINE = 'ONLINE', | 8 | ONLINE = 'ONLINE', |
| 9 | OFFLINE = 'OFFLINE', | 9 | OFFLINE = 'OFFLINE', |
| 10 | + ACTIVE = 'ACTIVE', | ||
| 10 | } | 11 | } |
| 11 | export enum DeviceTypeEnum { | 12 | export enum DeviceTypeEnum { |
| 12 | GATEWAY = 'GATEWAY', | 13 | GATEWAY = 'GATEWAY', |
| @@ -202,6 +202,7 @@ export const searchFormSchema: FormSchema[] = [ | @@ -202,6 +202,7 @@ export const searchFormSchema: FormSchema[] = [ | ||
| 202 | { label: '待激活', value: DeviceState.INACTIVE }, | 202 | { label: '待激活', value: DeviceState.INACTIVE }, |
| 203 | { label: '在线', value: DeviceState.ONLINE }, | 203 | { label: '在线', value: DeviceState.ONLINE }, |
| 204 | { label: '离线', value: DeviceState.OFFLINE }, | 204 | { label: '离线', value: DeviceState.OFFLINE }, |
| 205 | + { label: '活动', value: DeviceState.ACTIVE }, | ||
| 205 | ], | 206 | ], |
| 206 | placeholder: '请选择设备状态', | 207 | placeholder: '请选择设备状态', |
| 207 | }, | 208 | }, |
| @@ -147,6 +147,8 @@ | @@ -147,6 +147,8 @@ | ||
| 147 | ? 'warning' | 147 | ? 'warning' |
| 148 | : record.deviceState == DeviceState.ONLINE | 148 | : record.deviceState == DeviceState.ONLINE |
| 149 | ? 'success' | 149 | ? 'success' |
| 150 | + : record.deviceState == DeviceState.ACTIVE | ||
| 151 | + ? 'success' | ||
| 150 | : 'error' | 152 | : 'error' |
| 151 | " | 153 | " |
| 152 | class="ml-2" | 154 | class="ml-2" |
| @@ -156,6 +158,8 @@ | @@ -156,6 +158,8 @@ | ||
| 156 | ? '待激活' | 158 | ? '待激活' |
| 157 | : record.deviceState == DeviceState.ONLINE | 159 | : record.deviceState == DeviceState.ONLINE |
| 158 | ? '在线' | 160 | ? '在线' |
| 161 | + : record.deviceState == DeviceState.ACTIVE | ||
| 162 | + ? '活动' | ||
| 159 | : '离线' | 163 | : '离线' |
| 160 | }} | 164 | }} |
| 161 | </Tag> | 165 | </Tag> |