diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue index 17143c77..f4d2b888 100644 --- a/ui/dasadmin/src/views/backend/dashboard.vue +++ b/ui/dasadmin/src/views/backend/dashboard.vue @@ -484,6 +484,7 @@ const StatusListData = () => { igenpower: item.attributeMap.igenpower, ikwhthisday: item.attributeMap.ikwhthisday, iturbineoperationmode: state, + locked: item.attributeMap.locked, } } }); @@ -515,18 +516,6 @@ const powerChartData: { time: any; values: any } = { time: {}, values: {}, } -/*const powerChartData = { - time: { - iGenPower:['00:00','00:05','00:10','00:15'], - iTheoreticalPower:['00:00','00:05','00:10','00:15'], - iWindSpeed:['00:00','00:05','00:10','00:15'] - }, - values: { - iGenPower:[0,5,2,7], - iTheoreticalPower:[0,0,0,0], - iWindSpeed:[3,8,9,1] - }, -}*/ const initpowerChart = () => { const powerChart = state.charts.powerChart ?? echarts.init(powerChartRef.value as unknown as HTMLElement) const option = { @@ -1127,10 +1116,9 @@ const tabhandleClick = () => { inittrendChart(trendChartType.value) }) } + onMounted(() => { getAllChartData() - //inittrendChart(trendChartType.value) - //initpowerChart() createScroll() overviewList() StatusListData() diff --git a/ui/dasadmin/src/views/backend/home/windMatrix.vue b/ui/dasadmin/src/views/backend/home/windMatrix.vue index 5798a643..7219daec 100644 --- a/ui/dasadmin/src/views/backend/home/windMatrix.vue +++ b/ui/dasadmin/src/views/backend/home/windMatrix.vue @@ -56,6 +56,9 @@ +
+ 已锁定 +
@@ -183,7 +186,8 @@ const animationDuration=reactive({ .fanlist-main{ width: 100%; display: flex; - padding: 10px; + /*padding: 10px;*/ + padding: 10px 10px 0 10px; text-align: center; .fanlist-pic{ display: flex; @@ -241,7 +245,7 @@ const animationDuration=reactive({ } } .fanlist-text{ - margin-top:30px; + margin-top:10px; display: flex; flex-direction: column; .content-number{ @@ -255,5 +259,14 @@ const animationDuration=reactive({ } } + .fanlist-bottom{ + display: flex; + justify-content: end; + height: 24px; + .tag-panel{ + border-radius: 0 0 8px 0; + line-height: 20px; + } + } }