From 57b66478e7e335379435b31c20da4619bd1411f5 Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期一, 26 八月 2024 18:47:46 +0800
Subject: [PATCH] fix: 修改部分样式
---
src/layout/components/app-tags/tag-item.vue | 3 +
src/views/components/the-a-select/index.vue | 2
src/views/oneThree/house/index.vue | 2
src/views/oneThree/comprehensive/index.vue | 66 ++++++++++++++++++---------------
src/layout/components/app-tags/index.vue | 4 +-
src/views/components/the-icon-card/index.vue | 5 +-
src/layout/components/layout-left/index.vue | 5 +-
src/views/oneThree/actualPopulation/index.vue | 4 +-
src/views/components/the-a-search/index.vue | 2
src/views/components/the-a-cascader/index.vue | 2
10 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/src/layout/components/app-tags/index.vue b/src/layout/components/app-tags/index.vue
index 26f39a6..5cf2b4e 100644
--- a/src/layout/components/app-tags/index.vue
+++ b/src/layout/components/app-tags/index.vue
@@ -26,9 +26,9 @@
background-color: var(--color-bg-2);
.tab-bar-box {
display: flex;
- padding: 0 0 0 20px;
+ padding: 0;
background-color: var(--color-bg-2);
- border-bottom: 1px solid var(--color-border);
+ // border-bottom: 1px solid var(--color-border);
height: 100%;
.tab-bar-scroll {
flex: 1;
diff --git a/src/layout/components/app-tags/tag-item.vue b/src/layout/components/app-tags/tag-item.vue
index ce37848..09d0ed4 100644
--- a/src/layout/components/app-tags/tag-item.vue
+++ b/src/layout/components/app-tags/tag-item.vue
@@ -160,7 +160,8 @@
user-select: none;
}
.link-activated {
- color: $main;
+ // color: $main;
+ color: #1057fd;
.tag-link {
color: $main;
}
diff --git a/src/layout/components/layout-left/index.vue b/src/layout/components/layout-left/index.vue
index 058b752..05eb5f1 100644
--- a/src/layout/components/layout-left/index.vue
+++ b/src/layout/components/layout-left/index.vue
@@ -7,10 +7,11 @@
<div class="layout-right">
<div class="layout-header">
<div class="app-header">
- <app-bread></app-bread>
+ <!-- <app-bread></app-bread> -->
+ <app-tags></app-tags>
<app-header-right></app-header-right>
</div>
- <app-tags></app-tags>
+ <!-- <app-tags></app-tags> -->
</div>
<div class="layout-content">
<app-main></app-main>
diff --git a/src/views/components/the-a-cascader/index.vue b/src/views/components/the-a-cascader/index.vue
index 0c3658b..e9e74f4 100644
--- a/src/views/components/the-a-cascader/index.vue
+++ b/src/views/components/the-a-cascader/index.vue
@@ -1,7 +1,7 @@
<template>
<div>
<p>{{ title }}</p>
- <a-cascader :options="data" :style="{ width: '250px' }" :placeholder="placeholder" />
+ <a-cascader :options="data" :placeholder="placeholder" />
</div>
</template>
<script lang="ts" setup name="TheACascader">
diff --git a/src/views/components/the-a-search/index.vue b/src/views/components/the-a-search/index.vue
index 2b05158..cf184ae 100644
--- a/src/views/components/the-a-search/index.vue
+++ b/src/views/components/the-a-search/index.vue
@@ -1,7 +1,7 @@
<template>
<div>
<p>{{ title }}</p>
- <a-input-search :style="{ width: '250px' }" :placeholder="placeholder" />
+ <a-input-search :placeholder="placeholder" />
</div>
</template>
<script lang="ts" setup name="TheASearch">
diff --git a/src/views/components/the-a-select/index.vue b/src/views/components/the-a-select/index.vue
index 1e96c46..8058122 100644
--- a/src/views/components/the-a-select/index.vue
+++ b/src/views/components/the-a-select/index.vue
@@ -1,7 +1,7 @@
<template>
<div>
<p>{{ title }}</p>
- <a-select :style="{ width: '100px' }" :placeholder="placeholder">
+ <a-select :placeholder="placeholder">
<a-option v-for="(item, key) in data" :key="key">{{ item }}</a-option>
</a-select>
</div>
diff --git a/src/views/components/the-icon-card/index.vue b/src/views/components/the-icon-card/index.vue
index fe3ff62..5f8a559 100644
--- a/src/views/components/the-icon-card/index.vue
+++ b/src/views/components/the-icon-card/index.vue
@@ -55,13 +55,14 @@
}
}
.icon-card {
- min-width: 88px;
- max-width: 208px;
+ // min-width: 88px;
+ // max-width: 208px;
width: 100%;
min-height: 77px;
border-radius: 4px;
box-sizing: border-box;
margin-right: 10px;
+ flex: 1;
&:last-child {
margin-right: 0;
}
diff --git a/src/views/oneThree/actualPopulation/index.vue b/src/views/oneThree/actualPopulation/index.vue
index 2558c92..46b4716 100644
--- a/src/views/oneThree/actualPopulation/index.vue
+++ b/src/views/oneThree/actualPopulation/index.vue
@@ -279,7 +279,7 @@
}
}
.main {
- padding: 8px 20px;
+ padding: 8px 12px;
background: var(--color-bg-2);
margin-top: 8px;
flex: 1;
@@ -287,7 +287,7 @@
overflow: hidden;
> div {
float: left;
- margin: 0 20px 20px 0;
+ margin: 0 12px 12px 0;
}
}
}
diff --git a/src/views/oneThree/comprehensive/index.vue b/src/views/oneThree/comprehensive/index.vue
index 7e80acf..258abbf 100644
--- a/src/views/oneThree/comprehensive/index.vue
+++ b/src/views/oneThree/comprehensive/index.vue
@@ -1,39 +1,43 @@
<template>
<div class="comprehensive">
- <div class="top-title">
- <the-icon-card
- v-for="(item, index) in dataList"
- :key="index"
- :title="item.title"
- :icon="item.icon"
- :unit="item.unit"
- :metering="item.metering"
- :color-bg="item.colorBg"
- ></the-icon-card>
- </div>
- <div class="menus">
- <the-a-cascader :data="cascaderData" placeholder="璇烽�夋嫨" title="鍖哄煙"></the-a-cascader>
- <div><the-a-search placeholder="璇疯緭鍏�" title="鎼滅储"></the-a-search></div>
- <div><the-a-change :data="changeData" default-value="custom"></the-a-change></div>
- <div><a-time-picker type="time-range" style="width: 250px" /></div>
- <div>
- <a-button type="primary">
- <template #icon>
- <icon-search />
- </template>
- <template #default>鎼滅储</template>
- </a-button>
+ <div>
+ <div class="top-title">
+ <the-icon-card
+ v-for="(item, index) in dataList"
+ :key="index"
+ :title="item.title"
+ :icon="item.icon"
+ :unit="item.unit"
+ :metering="item.metering"
+ :color-bg="item.colorBg"
+ ></the-icon-card>
</div>
- <div>
- <a-button>
- <template #icon>
- <icon-refresh />
- </template>
- <template #default>閲嶇疆</template>
- </a-button>
+ <div class="menus">
+ <the-a-cascader :data="cascaderData" placeholder="璇烽�夋嫨" title="鍖哄煙"></the-a-cascader>
+ <div><the-a-search placeholder="璇疯緭鍏�" title="鎼滅储"></the-a-search></div>
+ <div><the-a-change :data="changeData" default-value="custom"></the-a-change></div>
+ <div><a-time-picker type="time-range" style="width: 250px" /></div>
+ <div>
+ <a-button type="primary">
+ <template #icon>
+ <icon-search />
+ </template>
+ <template #default>鎼滅储</template>
+ </a-button>
+ </div>
+ <div>
+ <a-button>
+ <template #icon>
+ <icon-refresh />
+ </template>
+ <template #default>閲嶇疆</template>
+ </a-button>
+ </div>
</div>
</div>
+
<div class="main">
+ <!-- <a-scrollbar class="box-scrollbar" style="height: calc(100vh - 300px) overflow: auto"> -->
<div class="cards">
<the-box-card
v-for="(item, index) in list"
@@ -56,6 +60,7 @@
></the-box-card>
</div>
<a-pagination :total="50" show-total show-jumper show-page-size style="margin-top: 8px" />
+ <!-- </a-scrollbar> -->
</div>
</div>
</template>
@@ -238,6 +243,7 @@
}
.top-title {
display: flex;
+ width: 100%;
}
.card-box {
width: 391px;
diff --git a/src/views/oneThree/house/index.vue b/src/views/oneThree/house/index.vue
index 66d697e..fbacff1 100644
--- a/src/views/oneThree/house/index.vue
+++ b/src/views/oneThree/house/index.vue
@@ -199,7 +199,7 @@
.menus {
position: relative;
background: var(--color-bg-2);
- margin-top: 8px;
+ // margin-top: 8px;
padding: 14px 20px;
display: flex;
> div {
--
Gitblit v1.8.0