Commit af24610749347f409c3d0684fdf8fd21349b9774
Merge branch 'feat/device-list-search-filter' into 'main_dev'
feat: 设备列表过滤器新增告警过滤 See merge request yunteng/thingskit-front!1148
Showing
2 changed files
with
23 additions
and
2 deletions
@@ -237,4 +237,17 @@ export const searchFormSchema: FormSchema[] = [ | @@ -237,4 +237,17 @@ export const searchFormSchema: FormSchema[] = [ | ||
237 | placeholder: '请选择', | 237 | placeholder: '请选择', |
238 | }, | 238 | }, |
239 | }, | 239 | }, |
240 | + { | ||
241 | + field: 'alarmStatus', | ||
242 | + label: '是否告警', | ||
243 | + component: 'Select', | ||
244 | + colProps: { span: 6 }, | ||
245 | + componentProps: { | ||
246 | + options: [ | ||
247 | + { label: '是', value: 1 }, | ||
248 | + { label: '否', value: 0 }, | ||
249 | + ], | ||
250 | + placeholder: '请选择设备是否存在告警', | ||
251 | + }, | ||
252 | + }, | ||
240 | ]; | 253 | ]; |
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | <div> | 2 | <div> |
3 | <PageWrapper dense contentFullHeight contentClass="flex"> | 3 | <PageWrapper dense contentFullHeight contentClass="flex"> |
4 | <OrganizationIdTree @select="handleSelect" ref="organizationIdTreeRef" /> | 4 | <OrganizationIdTree @select="handleSelect" ref="organizationIdTreeRef" /> |
5 | - <BasicTable style="flex: auto" @register="registerTable" class="w-5/6 xl:w-4/5"> | 5 | + <BasicTable style="flex: auto" @register="registerTable" class="w-5/6 xl:w-4/5 device-table"> |
6 | <template #toolbar> | 6 | <template #toolbar> |
7 | <Authority :value="DeviceListAuthEnum.CREATE"> | 7 | <Authority :value="DeviceListAuthEnum.CREATE"> |
8 | <a-button type="primary" @click="handleCreate" v-if="authBtn(role)"> | 8 | <a-button type="primary" @click="handleCreate" v-if="authBtn(role)"> |
@@ -557,4 +557,12 @@ | @@ -557,4 +557,12 @@ | ||
557 | }; | 557 | }; |
558 | </script> | 558 | </script> |
559 | 559 | ||
560 | -<style scoped lang="css"></style> | 560 | +<style scoped lang="less"> |
561 | + .device-table { | ||
562 | + :deep(.ant-form-item-control-input-content) { | ||
563 | + & > div > div { | ||
564 | + width: 100%; | ||
565 | + } | ||
566 | + } | ||
567 | + } | ||
568 | +</style> |