From fa3cce939f807bd84e4b1d2e088a6f9f9487e18f Mon Sep 17 00:00:00 2001 From: Qiuxia Fan Date: Tue, 28 Dec 2021 15:34:47 +0800 Subject: [PATCH] feat: add filters on dasboard --- src/components/Selector.vue | 7 ++ src/router/dashboard.ts | 2 +- src/views/dashboard/Edit.vue | 2 +- src/views/dashboard/data.ts | 64 +++++++++++--- src/views/dashboard/panel/Tool.vue | 136 +++++++++++++++++++++++------ 5 files changed, 172 insertions(+), 39 deletions(-) diff --git a/src/components/Selector.vue b/src/components/Selector.vue index cd99a1b0..0b814075 100644 --- a/src/components/Selector.vue +++ b/src/components/Selector.vue @@ -18,6 +18,8 @@ limitations under the License. --> v-model="selected" :placeholder="placeholder" @change="changeSelected" + filterable + :style="{ borderRadius }" > (props.value); function changeSelected() { @@ -92,4 +95,8 @@ function changeSelected() { width: 30px; } } + +.el-input__inner { + border-radius: unset !important; +} diff --git a/src/router/dashboard.ts b/src/router/dashboard.ts index a98134fa..c1924a21 100644 --- a/src/router/dashboard.ts +++ b/src/router/dashboard.ts @@ -48,7 +48,7 @@ export const routesDashboard: Array = [ }, }, { - path: "/dashboard/edit/:layerId/:entityId/:dashboardId", + path: "/dashboard/edit/:layerId/:entity/:dashboardId", component: () => import("@/views/dashboard/Edit.vue"), name: "Edit", meta: { diff --git a/src/views/dashboard/Edit.vue b/src/views/dashboard/Edit.vue index 40a15f5a..2a18bbe1 100644 --- a/src/views/dashboard/Edit.vue +++ b/src/views/dashboard/Edit.vue @@ -15,7 +15,7 @@ limitations under the License. -->