风机详情页样式更新

src/components/CenterPage.vue

@@ -8,12 +8,12 @@
       <el-col :span="8">
         <el-row>
           <el-col :span="24">
-            <CheckArea />
+            <ControlArea />
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <ControlArea />
+            <CheckArea />
           </el-col>
         </el-row>
       </el-col>

src/components/TitleBar.vue

@@ -337,7 +337,7 @@ export default {
   color:rgb(220,220,220);
 }
 .title-bar {
-  height: 6vh;
+  height: 5vh;
   background-color: #000000;
   margin-top: 0;
   margin-right: 0;
@@ -346,6 +346,7 @@ export default {
 .logo {
   position: relative;
   top: 33%;
+  margin-left: 10px;
 }
 .titleinfo {
   background-color: rgb(20, 20, 20);

src/components/area/AlarmArea.vue

@@ -10,6 +10,7 @@
     <el-table
       :data="values"
       height="219px"
+      v-if="lastUpdateTime!=null"
       :header-cell-style="{
                 background: 'Black',
                 color: 'rgb(220,220,220)',

src/components/area/ControlArea.vue

@@ -55,7 +55,7 @@
     >
   </gy-card>
   <el-button-group
-    style="z-index: 3; position: absolute; top: 16px; left: 120px"
+    style="z-index: 3; position: absolute; top: 6px; left: 120px"
   >
     <el-button :class="buttonLeftStyle" size="mini" @click="controlClick(false)"
       >手动</el-button

src/components/area/LabelArea.vue

@@ -1,10 +1,10 @@
 /* 标注区 */
 <template>
     <gy-card title="标注区" area-style="label" circle-style="yellow" content-style="25">
-        <div v-for="mk in values" :key="mk" @contextmenu="contextmenu(mk)" style="width:100px;margin-left:10px;margin-top:10px;display: inline-block;">
-            <img src="../../assets/img/LabelArea/flag.png" style="float:left;margin-top:5px;margin-left:12px;"/>
-            <div style="text-align:center;font-size:12px;float:right;margin-right:12px;">{{mk.title}}</div>
-            <input v-model="mk.value" style="font-size:12px;border:none;background-color:#292929;height:26px;border-radius:6px;text-align:center;outline:none;width:100px;color:rgb(220,220,220);"/>
+        <div v-for="mk in values" :key="mk" @contextmenu="contextmenu(mk)" style="width:110px;margin-left:10px;margin-top:10px;display: inline-block;">
+            <img src="../../assets/img/LabelArea/flag.png" style="float:left;margin-top:5px;margin-left:18px;"/>
+            <div style="text-align:center;font-size:12px;float:right;margin-right:18px;">{{mk.title}}</div>
+            <input v-model="mk.value" style="font-size:12px;border:none;background-color:#292929;height:26px;border-radius:6px;text-align:center;outline:none;width:110px;color:rgb(220,220,220);"/>
         </div>
     </gy-card>
 </template>

src/components/area/gy-card.vue

@@ -214,7 +214,7 @@
         height: 44vh;
         background-color: #292929;
         border-radius: 7px;
-        margin: 0px;
+        margin-top: 10px;
         padding-top: 0;
         padding-left: 10px;
         padding-right: 10px;
@@ -228,7 +228,7 @@
         height: 44vh;
         background-color: #292929;
         border-radius: 7px;
-        margin-top: 10px;
+        margin: 0px;
         padding-top: 0;
         padding-left: 10px;
         padding-right: 10px;
@@ -292,7 +292,7 @@
         box-sizing: border-box;
     }
 
-    .gy-card-area-check:hover {
+/*     .gy-card-area-check:hover {
         position: relative;
         height: 44vh;
         background-color: #292929;
@@ -304,8 +304,8 @@
         padding-bottom: 10px;
         box-sizing: border-box;
     }
-
-    .gy-card-area-control:hover {
+ */
+/*     .gy-card-area-control:hover {
         position: relative;
         width: 100%;
         height: 44vh;
@@ -317,7 +317,7 @@
         padding-right: 10px;
         padding-bottom: 10px;
         box-sizing: border-box;
-    }
+    } */
 
     .gy-card-area-label:hover {
         position: relative;

src/components/area/windturbine/BasicInformationDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="firstdiv">
     <img
-      style="float: left; margin-left: 30px; margin-top: 100px"
+      style="float: left; margin-left: 90px; margin-top: 120px;width:64vh;height:32vh;"
       src="../../../assets/img/WindturbineDetailPages/变桨.png"
       object-fit="fill"
     />
@@ -124,19 +124,16 @@ export default {
 }
 .onediv {
   float: right;
-  margin-right: 80px;
-  margin-top: 23px;
+  margin-right: 60px;
+  margin-top: 90px;
 }
 .twodiv {
   float: right;
-  margin-right: 80px;
-  margin-top: 23px;
-}
-div {
-  margin-top: 30px;
+  margin-right: 90px;
+  margin-top: 90px;
 }
 td:nth-child(1) {
-  height: 30px;
+  height: 25px;
   width: 130px;
   text-align: right;
 }
@@ -155,6 +152,9 @@ tr:nth-child(1) {
   text-align: right;
 }
 th {
-  height: 50px;
+  height: 40px;
+}
+table{
+  margin-bottom: 30px;
 }
 </style>

src/components/area/windturbine/WindturbineDetailPages.vue

@@ -5,6 +5,8 @@
     top="11vh"
     @opened="opened()"
     @closed="closed()"
+    :show-close="false"
+
   >
     <div style="background-color: black">
       <!-- <div class="titeldiv">
@@ -35,6 +37,7 @@
               <img
                 src="../../../assets/img/WindturbineDetailPages/pic_01.png"
               />
+              <div>&emsp;</div>
               <div>{{ windturbine.windturbineId }}</div>
             </div>
           </td>
@@ -69,13 +72,13 @@
         <el-tab-pane label="基本信息">
           <BasicInformationDetail ref="BasicInfo"></BasicInformationDetail>
         </el-tab-pane>
-        <el-tab-pane label="机舱信息">
+        <!-- <el-tab-pane label="机舱信息">
           <BasicInformationDetail></BasicInformationDetail>
         </el-tab-pane>
         <el-tab-pane label="故障信息">
           <BasicInformationDetail></BasicInformationDetail>
         </el-tab-pane>
-        <el-tab-pane label="齿轮箱">
+        <el-tab-pane label="齿轮箱" >
           <BasicInformationDetail></BasicInformationDetail>
         </el-tab-pane>
         <el-tab-pane label="变桨">
@@ -89,20 +92,20 @@
         </el-tab-pane>
         <el-tab-pane label="发电机">
           <BasicInformationDetail></BasicInformationDetail>
-        </el-tab-pane>
+        </el-tab-pane> -->
       </el-tabs>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import YawDetail from "./YawDetail.vue";
-import BasicInformationDetail from "./BasicInformationDetail.vue";
+/* import YawDetail from "./YawDetail.vue";
+ */import BasicInformationDetail from "./BasicInformationDetail.vue";
 import UniformCodes from "../../../assets/script/UniformCodes";
 
 export default {
   components: {
-    YawDetail,
+    /* YawDetail, */
     BasicInformationDetail,
   },
   props: {