diff --git a/front/src/views/abilityStatistics/components/SharingSituation.vue b/front/src/views/abilityStatistics/components/SharingSituation.vue index 88b0eddc..c49277ad 100644 --- a/front/src/views/abilityStatistics/components/SharingSituation.vue +++ b/front/src/views/abilityStatistics/components/SharingSituation.vue @@ -85,7 +85,7 @@ import * as moment from 'moment' import * as echarts from 'echarts' import { applyAmount, trafficStatistics } from '@/api/abilityStatistics' - const quarter = ref(['近七天', '近14天', '月度']) + const quarter = ref(['近七天', '近十四天', '月度']) let startDate = ref('') let endDate = ref('') @@ -128,7 +128,7 @@ hebdomad() swtichname.value = '日' break - case '近14天': + case '近十四天': fortnight() swtichname.value = '14日' break diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmCommonProblem.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmCommonProblem.vue index 967a2296..c05adf26 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmCommonProblem.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmCommonProblem.vue @@ -85,7 +85,9 @@ display: flex; align-items: center; margin-bottom: 20px; - line-height: 20px; + div:last-child { + line-height: 34px; + } } .content-bottom { display: flex; diff --git a/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue b/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue index c4168a11..17d7a7c9 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue @@ -89,7 +89,9 @@ display: flex; align-items: center; margin-bottom: 20px; - line-height: 20px; + div:last-child { + line-height: 34px; + } } .content-bottom { diff --git a/front/src/views/detailsAll/components/Business/BusinessCommonProblem.vue b/front/src/views/detailsAll/components/Business/BusinessCommonProblem.vue index 0345e0cd..583a7525 100644 --- a/front/src/views/detailsAll/components/Business/BusinessCommonProblem.vue +++ b/front/src/views/detailsAll/components/Business/BusinessCommonProblem.vue @@ -85,7 +85,9 @@ display: flex; align-items: center; margin-bottom: 0.2rem; - line-height: 0.2rem; + div:last-child { + line-height: 0.34rem; + } } .content-bottom { display: flex; diff --git a/front/src/views/detailsAll/components/Developer/DeveloperCommonProblem.vue b/front/src/views/detailsAll/components/Developer/DeveloperCommonProblem.vue index 967a2296..c05adf26 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperCommonProblem.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperCommonProblem.vue @@ -85,7 +85,9 @@ display: flex; align-items: center; margin-bottom: 20px; - line-height: 20px; + div:last-child { + line-height: 34px; + } } .content-bottom { display: flex; diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceCommonProblem.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceCommonProblem.vue index 0345e0cd..ba57667e 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceCommonProblem.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceCommonProblem.vue @@ -85,7 +85,9 @@ display: flex; align-items: center; margin-bottom: 0.2rem; - line-height: 0.2rem; + div:last-child { + line-height: 34px; + } } .content-bottom { display: flex; diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index faadcd15..a67954ed 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -151,8 +151,8 @@ // eslint-disable-next-line no-undef const navList = ref(navListManagement.navList) - console.log('navList------------>', navList); - + console.log('navList------------>', navList) + const props = defineProps({ showView: { type: String, default: '' }, }) @@ -422,6 +422,9 @@ padding: 0 0.04rem 0 0.1rem; border-left: 0.01rem solid #666; } + .icon { + cursor: pointer; + } } } .white { @@ -430,6 +433,9 @@ .name { color: #0058e1; } + .icon { + cursor: pointer; + } .nav { color: #000; } diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue index 3169b131..bd99da15 100644 --- a/front/src/views/newHome/components/WorkDynamics.vue +++ b/front/src/views/newHome/components/WorkDynamics.vue @@ -384,7 +384,6 @@ height: 2.2rem; padding-top: 0.49rem; } - background: #f3f5f9; border: #eaedf2 0.01rem solid; } @@ -516,7 +515,8 @@ .content > div { height: 4.8rem; width: 3.1rem; - margin-right: 0.2rem; + margin-right: 0.1rem; + background: #f3f5f9; } .fixedmount {