diff --git a/src/assets/images/basic/tagBG-small.png b/src/assets/images/basic/tagBG-small.png
new file mode 100644
index 0000000..914cc63
Binary files /dev/null and b/src/assets/images/basic/tagBG-small.png differ
diff --git a/src/components/custom-echart-triangle/index.vue b/src/components/custom-echart-triangle/index.vue
index aaa1600..7fbb704 100644
--- a/src/components/custom-echart-triangle/index.vue
+++ b/src/components/custom-echart-triangle/index.vue
@@ -36,10 +36,10 @@ export default {
const { setOptions, getInstance, resize, startAutoPlay } = useEcharts(chartRef);
const option = reactive({
tooltip: {
- // trigger: 'axis',
- // axisPointer: {
- // type: 'shadow',
- // },
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow',
+ },
backgroundColor: 'rgba(18, 55, 85, 0.8);',
borderColor: '#35d0c0',
formatter: (data) => {
@@ -62,7 +62,7 @@ export default {
gap: 0,
label: {
show: true,
- position: 'right',
+ position: 'outside',
width: '200px',
align: 'right',
formatter: function (params) {
@@ -74,9 +74,29 @@ export default {
a: { color: '#fff', fontSize: '16px' },
b: { color: '#05FCC6', fontSize: '16px' },
},
+ verticalAlign: 'middle',
+ padding: [5, 10], // 增加标签内边距
},
labelLine: {
- show: false,
+ show: true,
+ length: 20,
+ length2: 30,
+ smooth: true,
+ lineStyle: {
+ width: 2,
+ color: '#ffffff',
+ opacity: 1,
+ type: 'solid',
+ },
+ // 自定义折线路径(从标签到数据点的像素坐标)
+ // 参数:idx-数据索引, params-包含标签位置信息的对象
+ // formatter: function (idx, params) {
+ // return [
+ // [params.labelRect.x, params.labelRect.y], // 起点(标签位置)
+ // [params.labelRect.x + 20, params.labelRect.y], // 水平线段
+ // [params.labelRect.x + 20, params.dataCoord[1]] // 垂直线段
+ // ];
+ // },
},
itemStyle: {
show: false,
diff --git a/src/components/custom-scroll-title/index.vue b/src/components/custom-scroll-title/index.vue
index 5714650..1a6e7c6 100644
--- a/src/components/custom-scroll-title/index.vue
+++ b/src/components/custom-scroll-title/index.vue
@@ -69,7 +69,7 @@ const props = defineProps({
});
const titleContentW = ref('0');
const itemW = ref('1');
-const gap = ref(24);
+const gap = ref(1);
const leftNum = ref(0);
const position = ref(0);
const right = ref(null);
@@ -133,7 +133,7 @@ function handleTitleClick(val) {
.header_title {
background-color: #000;
position: relative;
- padding: 0 68px;
+ padding: 0 40px;
display: flex;
justify-content: space-between;
width: 100vw;
@@ -174,7 +174,7 @@ function handleTitleClick(val) {
.left_titles_container,
.right_titles_container {
position: relative;
- width: 30%;
+ width: 31%;
height: 100%;
overflow: hidden;
line-height: 90px;
@@ -182,10 +182,10 @@ function handleTitleClick(val) {
position: absolute;
top: 10px;
width: var(--titleContentW);
- height: 40px;
+ height: 56px;
transition: all 0.4s ease;
- font-size: 20px;
- font-weight: bold;
+ font-size: 24px;
+ // font-weight: bold;
.active {
color: #fff;
opacity: 1 !important;
@@ -194,9 +194,9 @@ function handleTitleClick(val) {
.title_item {
margin-right: var(--gap);
display: inline-block;
- width: var(--itemW);
- height: 40px;
- line-height: 40px;
+ min-width: var(--itemW);
+ height: 56px;
+ line-height: 56px;
text-align: center;
color: #f5fffe;
cursor: pointer;
diff --git a/src/components/subTop.vue b/src/components/subTop.vue
index 83c87c4..ee9e800 100644
--- a/src/components/subTop.vue
+++ b/src/components/subTop.vue
@@ -147,8 +147,8 @@ const handleCommand = (data) => {
}
.title-top-content {
line-height: 38px;
- font-size: 14px;
- font-weight: bold;
+ font-size: 20px;
+ // font-weight: bold;
display: inline-block;
transform: skewX(-13deg);
background: linear-gradient(to bottom, '#ff7e5f', '#548fff');
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 2709e62..2dbc94f 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -74,6 +74,7 @@ onMounted(() => {
}
.base-laytout-header {
height: 90px;
+ margin-bottom: 50px;
}
}
diff --git a/src/views/entities/components/benefitCharts.vue b/src/views/entities/components/benefitCharts.vue
index 8c6a819..17467ec 100644
--- a/src/views/entities/components/benefitCharts.vue
+++ b/src/views/entities/components/benefitCharts.vue
@@ -145,6 +145,7 @@ function handleChange(n) {
top: 8px;
width: 24px;
height: 24px;
+ text-shadow: 2px 0px 10px 0px #01eeff;
}
.left_btn {
left: 6px;
diff --git a/src/views/entities/components/categoryCharts.vue b/src/views/entities/components/categoryCharts.vue
index f3f9f52..e6e3237 100644
--- a/src/views/entities/components/categoryCharts.vue
+++ b/src/views/entities/components/categoryCharts.vue
@@ -1,39 +1,60 @@
-
+
diff --git a/src/views/entities/components/entitiesCategoryCharts.vue b/src/views/entities/components/entitiesCategoryCharts.vue
index 500b686..751140b 100644
--- a/src/views/entities/components/entitiesCategoryCharts.vue
+++ b/src/views/entities/components/entitiesCategoryCharts.vue
@@ -67,7 +67,7 @@ const state = reactive({
});
const refresData = () => {
- console.info('landPatrol********************refresData');
+ // console.info('landPatrol********************refresData');
state.data = reactive([
{
value: 20,
diff --git a/src/views/entities/components/entitiesStatistics.vue b/src/views/entities/components/entitiesStatistics.vue
index 4af9de3..d80321e 100644
--- a/src/views/entities/components/entitiesStatistics.vue
+++ b/src/views/entities/components/entitiesStatistics.vue
@@ -2,21 +2,23 @@
diff --git a/src/views/entities/components/entitieslist.vue b/src/views/entities/components/entitieslist.vue
index 3befb6e..f356943 100644
--- a/src/views/entities/components/entitieslist.vue
+++ b/src/views/entities/components/entitieslist.vue
@@ -1,34 +1,40 @@
-
+
diff --git a/src/views/entities/index.vue b/src/views/entities/index.vue
index d937e59..75de771 100644
--- a/src/views/entities/index.vue
+++ b/src/views/entities/index.vue
@@ -100,6 +100,7 @@ import entitiesMap from './components/entitiesMap.vue';
import { sleep } from '@/utils';
const oneRef = ref(null);
+const thirdRef = ref(null);
const state = reactive({
loading: false,
@@ -144,9 +145,9 @@ const handleCommand = (data) => {
const handleContrast = (data) => {
state.contrastCode = data.value;
// console.info('data=', data);
- // nextTick(() => {
- // thirdRef.value && thirdRef.value.refresData();
- // });
+ nextTick(() => {
+ thirdRef.value && thirdRef.value.refresData();
+ });
};