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

package-lock.json

@@ -3272,6 +3272,63 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995625950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
+          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz?cache=0&sync_timestamp=1618995297666&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.1.tgz",
+          "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
+          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
+          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
+          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
+          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "ssri": {
           "version": "8.0.1",
           "resolved": "https://registry.nlark.com/ssri/download/ssri-8.0.1.tgz?cache=0&sync_timestamp=1621364735533&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fssri%2Fdownload%2Fssri-8.0.1.tgz",
@@ -3280,6 +3337,28 @@
           "requires": {
             "minipass": "^3.1.1"
           }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
+          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.2.0",
+          "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.2.0.tgz",
+          "integrity": "sha1-BGpTMI3Ufljv4g3ewe3sAnzjtG4=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
         }
       }
     },
@@ -7186,7 +7265,7 @@
     },
     "electron": {
       "version": "12.0.11",
-      "resolved": "https://registry.nlark.com/electron/download/electron-12.0.11.tgz?cache=0&sync_timestamp=1623341150449&other_urls=https%3A%2F%2Fregistry.nlark.com%2Felectron%2Fdownload%2Felectron-12.0.11.tgz",
+      "resolved": "https://registry.nlark.com/electron/download/electron-12.0.11.tgz",
       "integrity": "sha1-VV3Bz2Y+Mg8vLL34kxk1Kwj8WfI=",
       "dev": true,
       "requires": {
@@ -13411,7 +13490,7 @@
     },
     "postcss": {
       "version": "7.0.36",
-      "resolved": "https://registry.nlark.com/postcss/download/postcss-7.0.36.tgz?cache=0&sync_timestamp=1623380305104&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss%2Fdownload%2Fpostcss-7.0.36.tgz",
+      "resolved": "https://registry.nlark.com/postcss/download/postcss-7.0.36.tgz?cache=0&sync_timestamp=1623677287157&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss%2Fdownload%2Fpostcss-7.0.36.tgz",
       "integrity": "sha1-BW+M/6k5ZiqPWQWVDAfVKFZE38s=",
       "dev": true,
       "requires": {
@@ -13525,7 +13604,7 @@
     },
     "postcss-load-config": {
       "version": "2.1.2",
-      "resolved": "https://registry.npm.taobao.org/postcss-load-config/download/postcss-load-config-2.1.2.tgz?cache=0&sync_timestamp=1612743037145&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-load-config%2Fdownload%2Fpostcss-load-config-2.1.2.tgz",
+      "resolved": "https://registry.nlark.com/postcss-load-config/download/postcss-load-config-2.1.2.tgz",
       "integrity": "sha1-xepQTyxK7zPHNZo03jVzdyrXUCo=",
       "dev": true,
       "requires": {
@@ -14644,7 +14723,7 @@
     },
     "regexpp": {
       "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/regexpp/download/regexpp-2.0.1.tgz",
+      "resolved": "https://registry.nlark.com/regexpp/download/regexpp-2.0.1.tgz",
       "integrity": "sha1-jRnTHPYySCtYkEn4KB+T28uk0H8=",
       "dev": true
     },
@@ -17648,87 +17727,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.2.0",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
-      "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-style-loader": {
       "version": "4.1.3",
       "resolved": "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-4.1.3.tgz",
@@ -17904,7 +17902,7 @@
     },
     "webpack": {
       "version": "4.46.0",
-      "resolved": "https://registry.nlark.com/webpack/download/webpack-4.46.0.tgz?cache=0&sync_timestamp=1622151377755&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwebpack%2Fdownload%2Fwebpack-4.46.0.tgz",
+      "resolved": "https://registry.nlark.com/webpack/download/webpack-4.46.0.tgz",
       "integrity": "sha1-v5tEBOogoHNgXgoBHRiNd8tq1UI=",
       "dev": true,
       "requires": {

src/components/StatusBar.vue

@@ -2,11 +2,11 @@
 <template>
   <div class="status-bar" onselectstart="return false">
     <el-row>
-      <el-col :span="19" style="margin-top: 5px">
+      <el-col :span="18" style="margin-top: 5px">
         <span style="color: white; margin-left: 20px">系统时间：</span>
         <span style="color: white">{{ currentTime }}</span>
       </el-col>
-      <el-col :span="5" style="margin-top: 5px">
+      <el-col :span="6" style="margin-top: 5px">
         <el-popover
           placement="top-start"
           :width="521"
@@ -25,11 +25,12 @@
               <span>{{ hiddenDangerNum }}</span>
             </div>
           </template>
+          <el-scrollbar>
           <el-table
             :data="hiddenDangerData"
             border
             border-color="rgb(36,36,36)"
-            max-height="750px"
+            max-height="650px"
             :header-cell-style="{
               background: 'Black',
               color: 'rgb(220,220,220)',
@@ -38,24 +39,25 @@
             :cell-style="{ background: 'Black', color: 'rgb(220,220,220)',}"
           >
             <el-table-column
-              width="100"
+              width="160"
               property="lastUpdateTime"
               label="时间"
               align="center"
             ></el-table-column>
             <el-table-column
-              width="120"
+              width="110"
               property="windturbineId"
               label="设备"
               align="center"
             ></el-table-column>
             <el-table-column
-              width="300"
+              width="250"
               property="alertText"
               label="故障信息"
               align="center"
             ></el-table-column>
           </el-table>
+          </el-scrollbar>
         </el-popover>
         <el-popover placement="top-start"
           :width="521"
@@ -76,7 +78,7 @@
             :data="defectData"
             border
             border-color="rgb(36,36,36)"
-            max-height="750px"
+            max-height="650px"
             :header-cell-style="{
               background: 'Black',
               color: 'rgb(220,220,220)',
@@ -84,19 +86,19 @@
             }"
             :cell-style="{ background: 'Black', color: 'rgb(220,220,220)',}">
             <el-table-column
-              width="100"
+              width="160"
               property="lastUpdateTime"
               label="时间"
               align="center"
             ></el-table-column>
             <el-table-column
-              width="120"
+              width="110"
               property="windturbineId"
               label="设备"
               align="center"
             ></el-table-column>
             <el-table-column
-              width="300"
+              width="250"
               property="alertText"
               label="故障信息"
               align="center"
@@ -123,7 +125,7 @@
             :data="malfunctionData"
             border
             border-color="rgb(36,36,36)"
-            max-height="750px"
+            max-height="650px"
             :header-cell-style="{
               background: 'Black',
               color: 'rgb(220,220,220)',
@@ -131,19 +133,19 @@
             }"
             :cell-style="{ background: 'Black', color: 'rgb(220,220,220)',}">
             <el-table-column
-              width="100"
+              width="160"
               property="lastUpdateTime"
               label="时间"
               align="center"
             ></el-table-column>
             <el-table-column
-              width="120"
+              width="110"
               property="stationName"
               label="设备"
               align="center"
             ></el-table-column>
             <el-table-column
-              width="300"
+              width="250"
               property="alertText"
               label="故障信息"
               align="center"
@@ -170,7 +172,7 @@
             :data="accidentData"
             border
             border-color="rgb(36,36,36)"
-            max-height="750px"
+            max-height="650px"
             :header-cell-style="{
               background: 'Black',
               color: 'rgb(220,220,220)',
@@ -178,19 +180,19 @@
             }"
             :cell-style="{ background: 'Black', color: 'rgb(220,220,220)',}">
             <el-table-column
-              width="100"
+              width="160"
               property="lastUpdateTime"
               label="时间"
               align="center"
             ></el-table-column>
             <el-table-column
-              width="120"
+              width="110"
               property="stationName"
               label="设备"
               align="center"
             ></el-table-column>
             <el-table-column
-              width="300"
+              width="250"
               property="alertText"
               label="故障信息"
               align="center"
@@ -263,12 +265,24 @@ export default {
       this.defectData = bd.Defects;
       this.malfunctionData = bd.Failure;
       this.accidentData = bd.Accidents;
+      if(this.accidentData.length<=0){
+        this.accidentData=[{lastUpdateTime:"-",stationName:"-",alertText:"-"}];
+      }
     }
   },
 };
 </script>
 
 <style scoped>
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 8px;
+  background-color: black;
+}
+
+/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb  {
+  background-color: #292929;
+  border-radius: 6px;
+}
 span {
   font-size: 13px;
 }
@@ -316,4 +330,6 @@ span {
 .status-label.accident {
   color: #af3e3d;
 }
+
+
 </style>

src/components/area/AlarmArea.vue

@@ -6,16 +6,25 @@
     circle-style="green"
     content-style="25"
   >
-    <table>
+    <table class="ToolBar">
+      
       <tr>
-        <td>时间</td>
-        <td>描述</td>
-        <td>确认</td>
+        
+        <td width="150px">时间</td>
+        <td idth="400px">描述</td>
+        <td width="50px">确认</td>
+        
       </tr>
+      
+    </table>
+
+    <table class="Tables">
       <tr v-for="v in values" :key="v">
-        <td>{{ v.lastUpdateTime }}</td>
-        <td>{{ v.alertText }}</td>
-        <td></td>
+        <div>
+        <td width="150px">{{ v.lastUpdateTime }}</td>
+        <td width="400px">{{ v.alertText }}</td>
+        <td width="50px"><input type="checkbox" disabled="disabled"/></td>
+        </div>
       </tr>
     </table>
   </gy-card>
@@ -53,3 +62,29 @@ export default {
   },
 };
 </script>
+<style scoped>
+div{
+  background: #292929;
+}
+td{
+  
+  padding:auto;
+}
+.ToolBar{
+position:absolute;
+right:12px;
+width:596px;
+text-align:center;
+z-index:2;
+font-size:14px;
+height: 28px;
+margin-top:-2px;
+background: #292929;
+}
+.Tables{
+  font-size:14px;
+  width:600px;
+  padding-top: 28px;
+text-align:center;
+}
+</style>

src/components/area/windturbine/WindturbineDetailPages.vue

@@ -1,5 +1,20 @@
 <template>
-    <el-dialog>
+    <el-dialog
+  title="风机详情"
+  width="80%"
+  :before-close="handleClose">
+  <span>这是一段信息</span>
+</el-dialog>
+</template>
+
+<script>
+
+export default{
+    props:{
         
-    </el-dialog>
-</template>
+    },
+    methods:{
+
+    }
+}
+</script>