Merge branch 'master' of http://49.4.49.126:3000/GYEE_R.D/neic

src/components/area/windturbine/BasicInformationDetail.vue

@@ -210,78 +210,43 @@
 </script>
 
 <style scoped>
-  .firstdiv {
-    height: 50vh;
-  }
-
-  .onediv {
-    float: right;
-    margin-right: 30px;
-  }
-
-  .twodiv {
-    float: right;
-    margin-right: 30px;
-  }
-
-  td:nth-child(1) {
-    height: 25px;
-    width: 130px;
-    text-align: right;
-  }
-
-  td:nth-child(2) {
-    width: 78px;
-    text-align: right;
-    color: rgb(5, 176, 71);
-  }
-
-  td:nth-child(3) {
-    text-align: center;
-    width: 30px;
-  }
-
-  tr:nth-child(1) {
-    font-size: 20px;
-    width: 90px;
-    text-align: right;
-  }
-
-  th {
-    height: 40px;
-  }
-
-  table {
-    margin-top: 30px;
-  }
-  .worning1{
-    position: absolute;
-    top: 143px;
-    left: 119px;
-    z-index: 999;
-  }
-  .worning2{
-    position: absolute;
-    top: 210px;
-    left: 282px;
-    z-index: 99;
-  }
-  .worning3{
-    position: absolute;
-    top: 219px;
-    left: 348px;
-    z-index: 0;
-  }
-  .worning4{
-    position: absolute;
-    top: 273px;
-    left: 296px;
-    z-index: 0;
-  }
-  .worning5{
-    position: absolute;
-    top: 287px;
-    left: 252px;
-    z-index: 0;
-  }
+.firstdiv {
+  height: 50vh;
+}
+.onediv {
+  float: right;
+  margin-right: 30px;
+}
+.twodiv {
+  float: right;
+  margin-right: 30px;
+}
+td:nth-child(1) {
+  height: 25px;
+  width: 130px;
+  text-align: right;
+  color: rgb(220, 220, 220);
+}
+td:nth-child(2) {
+  width: 78px;
+  text-align: right;
+  color: rgb(5, 176, 71);
+}
+td:nth-child(3) {
+  text-align: center;
+  width: 30px;
+  color: rgb(220, 220, 220);
+}
+tr:nth-child(1) {
+  font-size: 20px;
+  width: 90px;
+  text-align: right;
+  color: rgb(220, 220, 220);
+}
+th {
+  height: 40px;
+}
+table{
+  margin-top: 30px;
+}
 </style>

src/components/area/windturbine/WindturbineDetailPages.vue

@@ -8,7 +8,8 @@
   <template #title>
     <div style="margin-top:-10px;">风机详情</div>
   </template>
-    <div style="background-color: black;margin-top:-30px;margin-left:-10px;margin-right:-10px;margin-bottom:-30px;">
+    
+    <div style="background-color: black;margin-top:-30px;margin-left:-10px;margin-right:-10px;margin-bottom:-10px;">
       <table width="99.8%">
         <tr>
           <td>
@@ -46,44 +47,39 @@
           </td>
         </tr>
       </table>
-      <!-- <div class="worning1">
+
+      <BasicInformationDetail ref="BasicInfo"></BasicInformationDetail>
+      <!--<div class="worning1">
         <Worning></Worning>
       </div>
       <div class="worning2">
         <Worning></Worning>
-      </div> -->
+      </div>
       <el-tabs type="border-card" tab-position="bottom" stretch="true">
         <el-tab-pane label="基本信息">
           <BasicInformationDetail ref="BasicInfo" :alarms="alarms"></BasicInformationDetail>
         </el-tab-pane>
         <el-tab-pane label="机舱信息" disabled>
-          <BasicInformationDetail></BasicInformationDetail>
         </el-tab-pane>
         <el-tab-pane label="故障信息" disabled>
-          <BasicInformationDetail></BasicInformationDetail>
         </el-tab-pane>
         <el-tab-pane label="齿轮箱" disabled>
-          <BasicInformationDetail></BasicInformationDetail>
         </el-tab-pane>
         <el-tab-pane label="变桨" disabled>
-          <BasicInformationDetail></BasicInformationDetail>
         </el-tab-pane>
         <el-tab-pane label="偏航" disabled>
-          <YawDetail></YawDetail>
         </el-tab-pane>
         <el-tab-pane label="液压" disabled>
-          <BasicInformationDetail></BasicInformationDetail>
         </el-tab-pane>
         <el-tab-pane label="发电机" disabled>
-          <BasicInformationDetail></BasicInformationDetail>
         </el-tab-pane>
-      </el-tabs>
+      </el-tabs> -->
     </div>
   </el-dialog>
 </template>
 
 <script>
-import YawDetail from "./YawDetail.vue";
+/* import YawDetail from "./YawDetail.vue"; */
 import BasicInformationDetail from "./BasicInformationDetail.vue";
 import UniformCodes from "../../../assets/script/UniformCodes";
 import {config} from '../../../config';
@@ -92,7 +88,6 @@ import BackgroundData from "../../../assets/script/BackgroundData";
 // import Worning from "./warning.vue"
 export default {
   components: {
-    YawDetail, 
     BasicInformationDetail,
     // Worning,
   },