diff --git a/ui/dasadmin/src/views/backend/home/windMatrix.vue b/ui/dasadmin/src/views/backend/home/windMatrix.vue
index 9948dab4..f7312bb2 100644
--- a/ui/dasadmin/src/views/backend/home/windMatrix.vue
+++ b/ui/dasadmin/src/views/backend/home/windMatrix.vue
@@ -7,15 +7,15 @@
                      @contextmenu.prevent="windContextMenu($event,item)"
                 >
                     <div class="FanList-panel wind-default" :class="{
-                '': item.standard==1,
-                '': item.standard==0,
-                'wind-offline': item.attributeMap.processedoperationmode == 33
-                  }">
+                                '': item.standard==1,
+                                '': item.standard==0,
+                                'wind-offline': item.attributeMap.processedoperationmode == 33
+                                  }">
 
                         <div class="fanlist-top">
-            <span :class="item.standard == 1 ? 'wind-mark-icon' : 'fanlist-icon'">
-                <img :class="item.standard == 1 ? '' : 'wind-picture'" src="~assets/dashboard/biaogan.png" alt="" />
-            </span>
+                            <span :class="item.standard == 1 ? 'wind-mark-icon' : 'fanlist-icon'">
+                                <img :class="item.standard == 1 ? '' : 'wind-picture'" src="~assets/dashboard/biaogan.png" alt="" />
+                            </span>
                             <span class="fanlist-name"> {{ item.name }}</span>
                             <el-tag v-if="item.attributeMap.processedoperationmode === 20" class="tag-panel" :style="getStyles(item.attributeMap.color)" type="primary">并网</el-tag>
                             <el-tag v-if="item.attributeMap.processedoperationmode === 11" class="tag-panel" :style="getStyles(item.attributeMap.color)" type="primary">待机</el-tag>
@@ -37,16 +37,43 @@
                             >通讯中断</el-tag>
                         </div>
                         <div class="fanlist-main">
-                            <WindContentleft :item="item" v-if="item.layout==='风格1'"></WindContentleft>
-                            <WindContentright :item="item" v-else-if="item.layout==='风格2'"></WindContentright>
-                            <WindContentcenter :item="item" v-else-if="item.layout==='风格3'"></WindContentcenter>
+                            <el-row>
+                                <el-col :span="24">
+                                    <div class="fanlist-pic">
+                                        <div class="mask">
+                                            <div class="heart"><img src="~assets/dashboard/leaf2.png" alt="" /></div>
+                                            <div class="leafs" :style="getAnimationStyle(item)">
+                                                <div class="leaf_1"><img src="~assets/dashboard/leaf1.png" alt="" /></div>
+                                                <div class="leaf_2"><img src="~assets/dashboard/leaf1.png" alt="" /></div>
+                                                <div class="leaf_3"><img src="~assets/dashboard/leaf1.png" alt="" /></div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="fanlist-pic">
+                                        <img src="~assets/dashboard/fanlist2.png" alt="" />
+                                    </div>
+                                </el-col>
+                            </el-row>
+                            <el-row class="fanlist-data">
+                                <div class="fanlist-text">
+                                    <span class="content-number">{{ item.attributeMap.iwindspeed }}</span>
+                                    <span>m/s</span>
+                                </div>
+                                <div class="fanlist-text">
+                                    <span class="content-number">{{ item.attributeMap.igenpower }}</span>
+                                    <span>kW</span>
+                                </div>
+                                <div class="fanlist-text">
+                                    <span class="content-number">{{ item.attributeMap.ikwhthisday }}</span>
+                                    <span>kWh</span>
+                                </div>
+                            </el-row>
                         </div>
                         <div class="fanlist-bottom">
                             <!--                            <el-tag class="tag-panel is-danger">已锁定</el-tag>-->
                             <el-tag v-if="item.attributeMap.locked === 1" class="tag-panel is-danger">已锁定</el-tag>
                         </div>
                     </div>
-
                 </div>
             </el-col>
         </el-row>
@@ -62,11 +89,11 @@
                     >启动</el-button>
                     <el-button @click="sendCommand('setTurbineStop')" v-else class="control-btn" type="primary">停机</el-button>
                     <el-button @click="sendCommand('setTurbineResetStatusCode')" class="control-btn" type="primary">复位</el-button>
-                   <el-button
-                       @click="sendManualCommand(1)"
-                       v-if="realTimeData.locked !== 1"
-                       class="control-btn"
-                       type="primary">锁定</el-button>
+                    <el-button
+                        @click="sendManualCommand(1)"
+                        v-if="realTimeData.locked !== 1"
+                        class="control-btn"
+                        type="primary">锁定</el-button>
                     <el-button @click="sendManualCommand(0)" v-else class="control-btn" type="primary">解锁</el-button>
                     <el-button
                         class="control-btn"
@@ -94,9 +121,6 @@ import ContextMenu from '/@/views/backend/auth/model/contextMenu.vue'
 import { sendCommandReq, sendManualCommandReq } from '/@/api/backend/control/request'
 import {ElMessage, ElMessageBox} from "element-plus";
 import {equipUpdate} from '/@/api/backend/index.ts'
-import WindContentleft from './windMatrixleft.vue'
-import WindContentright from './windMatrixright.vue'
-import WindContentcenter from './windMatrixcenter.vue'
 
 const router = useRouter()
 debugger
@@ -415,10 +439,10 @@ const hexToRgba = (hex, alpha) => {
                         text-align: center;
                         top: 5px;
                         left: 17px;
-                       /* z-index: 3;*/
+                        /* z-index: 3;*/
                     }
                     .leafs {
-                       /* z-index: 1;*/
+                        /* z-index: 1;*/
                         position: absolute;
                         /* animation: leafRotate 1s infinite linear;*/
                         transform-origin: center center;
@@ -487,7 +511,7 @@ const hexToRgba = (hex, alpha) => {
         justify-content: space-between;
         align-items: center;
         width: 80px;
-       /* height: 80px;*/
+        /* height: 80px;*/
         .el-button {
             margin: 5px;
         }