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

package-lock.json

@@ -2122,6 +2122,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",
@@ -2130,6 +2187,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.3.0",
+          "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.0.tgz",
+          "integrity": "sha1-LxleS6D7DiY1ltaDDfF9Gjbok2w=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
         }
       }
     },
@@ -10847,7 +10926,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": {
@@ -10961,7 +11040,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": {
@@ -14720,6 +14799,7 @@
         }
       }
     },
+<<<<<<< HEAD
     "vue-loader-v16": {
       "version": "npm:vue-loader@16.3.0",
       "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.0.tgz",
@@ -14806,6 +14886,8 @@
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.2.tgz",
       "integrity": "sha512-807gn82hTnjCYGrnF3eNmIw/dk7/GE4B5h69BlyCK9KHASwSloD1Sjcn06zg9fVG4fYH2DrsNBZkpLtb25WtaQ=="
     },
+=======
+>>>>>>> 4168fe6061986fe19a367a8d63264d715f10a586
     "vue-style-loader": {
       "version": "4.1.3",
       "resolved": "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-4.1.3.tgz",
@@ -14989,7 +15071,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/AttentionCardWindow.vue

@@ -1,156 +0,0 @@
-<template>
-    <el-table
-      :data="tableData"
-      style="width: 100%">
-  <el-table-column
-        prop="station"
-        label="站点"
-        width="180">
-    </el-table-column>
-  <el-table-column
-        prop="date"
-        label="运行指标"
-        width="180">
-      <el-table-column
-        prop="date"
-        label="日发电量（万kwh）"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        label="平均风速(m/s)\n日照强度(w/m²)"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="address"
-        label="实时功率（MW)">
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        label="AGC有功设定(MW)"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        label="理论功率（MW）"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        label="预测功率（MW）"
-        width="180">
-      </el-table-column>
-  </el-table-column>
-  
-  <el-table-column
-        prop="date"
-        label="发电设备状态汇总"
-        width="180">
-      <el-table-column
-        prop="date"
-        label="接入"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        label="运行"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="address"
-        label="待机">
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        label="维护"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        label="故障"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        label="限电"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        label="离线"
-        width="180">
-      </el-table-column>
-  </el-table-column>
-    </el-table>
-</template>
-<script>
-
-export default{
-    data() {
-        return {
-          tableData: [{
-            station:'麻黄山',
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-          }, {
-            station:'牛首山',
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-          }, {
-            station:'青山',
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-          }, {
-            station:'石板泉',
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '江路 1516 '
-          }, {
-            station:'香山',
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '江路 1516 '
-          }, {
-            station:'风场汇总',
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '江路 1516 '
-          }, {
-            station:'大武口',
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '江路 1516 '
-          }, {
-            station:'平罗',
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '江路 1516 '
-          }, {
-            station:'宣和',
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '江路 1516 '
-          }, {
-            station:'马场湖',
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '江路 1516 '
-          }, {
-            station:'海子井',
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '江路 1516 '
-          }, {
-            station:'光伏汇总',
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '江路 1516 '
-          }
-          ]
-        }
-      }
-}
-</script>

src/components/StatusBar.vue

@@ -284,12 +284,12 @@ export default {
       }
       if (this.hiddenDangerData.length <= 0) {
         this.hiddenDangerData = [
-          { lastUpdateTime: "-", stationName: "-", alertText: "-" },
+          { lastUpdateTime: "-", windturbineId: "-", alertText: "-" },
         ];
       }
       if (this.defectData.length <= 0) {
         this.defectData = [
-          { lastUpdateTime: "-", stationName: "-", alertText: "-" },
+          { lastUpdateTime: "-", windturbineId: "-", alertText: "-" },
         ];
       }
       if (this.malfunctionData.length <= 0) {

src/components/TitleBar.vue

@@ -75,13 +75,14 @@
       </el-col>
 
       <el-col :span="19">
-            <el-popover
+            <!-- <el-popover
           placement="bottom"
           :width="1416"
           trigger="hover"
           :show-arrow="false"
+          offset="0"
         >
-          <template #reference>
+          <template #reference> -->
             <div class="titleinfoall">
               <div class="titleinfo">
                 <ul>
@@ -172,7 +173,7 @@
                 </ul>
               </div>
             </div>
-          </template>
+          <!-- </template>
 
           <el-table
             :data="tableData"
@@ -285,9 +286,9 @@
               width="80px">
             </el-table-column>
         </el-table-column>
-          </el-table>
+          </el-table> 
 
-        </el-popover>
+        </el-popover> -->
       </el-col>
       
 

src/components/area/windturbine/green.vue

@@ -1,3 +0,0 @@
-<template>
-    <img style="float:left;" src="../../../assets/img/WindturbineDetailPages/green.png" object-fit="fill">
-</template>

src/components/area/windturbine/red.vue

@@ -1,3 +0,0 @@
-<template>
-    <img style="float:left;" src="../../../assets/img/WindturbineDetailPages/red.png" object-fit="fill">
-</template>