diff --git a/src/packages/components/Decorates/Titles/Weather/index.vue b/src/packages/components/Decorates/Titles/Weather/index.vue index c8e6e98..8393252 100644 --- a/src/packages/components/Decorates/Titles/Weather/index.vue +++ b/src/packages/components/Decorates/Titles/Weather/index.vue @@ -14,7 +14,10 @@
- {{`风速:${windPower}m/s`}}{{`风向: ${winddirection}`}}
+   + {{`${windPower}m/s`}} +   + {{`${winddirection}`}} @@ -24,6 +27,7 @@ import dayjs from 'dayjs'; import { CreateComponentType } from '@/packages/index.d'; import { GoIconify } from '@/components/GoIconify'; + import Icon from '@/components/Icon/Icon.vue'; const props = defineProps({ chartConfig: { type: Object as PropType, diff --git a/src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue b/src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue index cf1cc30..8c793fb 100644 --- a/src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue +++ b/src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue @@ -17,7 +17,7 @@ v-for="(item, index) in sectionDatas" @click="handlerFireDetail(item)" > -
+
{{ item.describe }}
{{ item.degreeType }}
@@ -389,6 +389,7 @@ const getFileImage = (type) => { height: calc(100% - 40px); margin-left: 4%; overflow: auto; + padding-right: 5px; img { width: 21px; height: 21px; @@ -397,6 +398,7 @@ const getFileImage = (type) => { width: 15px; height: 15px; margin-left: 3px; + margin-right: 10px; } } .sectionLi { @@ -410,7 +412,9 @@ const getFileImage = (type) => { text-overflow: ellipsis; white-space: nowrap; color: v-bind('titleColor'); - font-size: v-bind('titleSize+"px"'); + // font-size: v-bind('titleSize+"px"'); + font-size: 14px; + font-weight: 600; } .dataStyle { font-size: 14px; @@ -434,6 +438,9 @@ const getFileImage = (type) => { .desStyle { color: v-bind('desColor'); font-size: v-bind('desSize+"px"'); + display: flex; + align-items: center; + height: 100%; } .desImg { margin-right: 10px; @@ -445,7 +452,7 @@ const getFileImage = (type) => { margin-right: 6px; } .mt-1 { - margin-top: 8px; + // margin-top: 8px; } diff --git a/src/packages/components/Equipment/Equipment/WuRenJi/config.ts b/src/packages/components/Equipment/Equipment/WuRenJi/config.ts index 450c3f2..4f76da6 100644 --- a/src/packages/components/Equipment/Equipment/WuRenJi/config.ts +++ b/src/packages/components/Equipment/Equipment/WuRenJi/config.ts @@ -19,6 +19,5 @@ export default class Config extends PublicConfigClass implements CreateComponent public attr = { ...chartInitConfig, w: 117, h: 168, zIndex: 1 } public chartConfig = cloneDeep(WuRenJiConfig) public option = cloneDeep(option) - public request = { ...requestSqlConfig, requestSQLContent: { sql: 'select * from ' }, } public filter = "return res.result;" } diff --git a/src/packages/components/Equipment/Equipment/WuRenJi/index.vue b/src/packages/components/Equipment/Equipment/WuRenJi/index.vue index d26ef2d..e482684 100644 --- a/src/packages/components/Equipment/Equipment/WuRenJi/index.vue +++ b/src/packages/components/Equipment/Equipment/WuRenJi/index.vue @@ -38,9 +38,8 @@ onMounted(() => { }) }) // 数据callback处理(预览时触发) - useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => { -// props.chartConfig.option.dataset = resData; -}); + // useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => { + // }); const chartEditStore = useChartEditStore(); diff --git a/src/packages/components/Tasks/Tasks/TaskBanner/index.vue b/src/packages/components/Tasks/Tasks/TaskBanner/index.vue index d65548f..43037ac 100644 --- a/src/packages/components/Tasks/Tasks/TaskBanner/index.vue +++ b/src/packages/components/Tasks/Tasks/TaskBanner/index.vue @@ -12,7 +12,7 @@
-
+
{{ item.title }}
{{ item.desc }}
@@ -162,7 +162,7 @@ const handlerShowColumns = ()=> { margin: 0 auto; } .tasktitlesbox{ - width: 120px; + width: 90px; height: 30px; } .dots{ @@ -175,6 +175,11 @@ const handlerShowColumns = ()=> { .titleText{ color: v-bind('titleColor'); font-size: v-bind('titleSize+"px"'); + width: 72px; + text-align: right; + margin-right: 10px; + color: #9aa4af; + flex-shrink: 0; } .desStyle{ width: calc(100% - 120px); diff --git a/src/packages/components/Zhichu/Zhichu/ResourceAnalysisReport/index.vue b/src/packages/components/Zhichu/Zhichu/ResourceAnalysisReport/index.vue index 234ba03..76c822c 100644 --- a/src/packages/components/Zhichu/Zhichu/ResourceAnalysisReport/index.vue +++ b/src/packages/components/Zhichu/Zhichu/ResourceAnalysisReport/index.vue @@ -1,6 +1,6 @@