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

package.json

@@ -14,7 +14,14 @@
     "postuninstall": "electron-builder install-app-deps",
     "start": "electron-forge start",
     "package": "electron-forge package",
-    "make": "electron-forge make"
+    "make": "electron-forge make",
+
+    "pack": "electron-builder --dir",
+    "dist": "electron-builder",
+    "dist-win": "electron-builder --win --ia32",
+    "dist-win64": "electron-builder --win --x64",
+    "dist-mac": "electron-builder --mac",
+    "dist-linux": "electron-builder --linux"
   },
   "main": "background.js",
   "dependencies": {
@@ -39,6 +46,7 @@
     "babel-eslint": "^10.1.0",
     "electron": "^12.0.0",
     "electron-devtools-installer": "^3.1.0",
+    "electron-packager": "^15.2.0",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^7.0.0",
     "vue-cli-plugin-electron-builder": "~2.0.0"

src/assets/script/UniformCodes.js

@@ -20,7 +20,7 @@ export default class UniformCodes {
                         {
                           "name": "风速",
                           "num": "2",
-                          "code": "AI005",
+                          "code": "AI007",
                           "unit": "m/s"
                         },
                         {
@@ -729,6 +729,7 @@ export default class UniformCodes {
                         },
                         {
                           "name": "环境温度",
+                          "code": "AI056",
                           "num": "9",
                           "unit": "℃"
                         },
@@ -806,12 +807,13 @@ export default class UniformCodes {
                         {
                           "name": "转子转速",
                           "num": "4",
-                          "code": "DI1269",
+                          "code": "AI300",
                           "unit": "rp"
                         },
                         {
                           "name": "偏航位置",
                           "num": "5",
+                          "code": "AI034",
                           "unit": "度"
                         }
                       ]
@@ -906,7 +908,7 @@ export default class UniformCodes {
                         {
                           "name": "机舱温度",
                           "num": "6",
-                          "code": "MHSFJ.NX_GD_MHSF_FJ_P2_L4_034_AI0042",
+                          "code": "AI070",
                           "unit": "℃"
                         },
                         {
@@ -994,7 +996,7 @@ export default class UniformCodes {
                       {
                         "name": "发电机转速",
                         "num": "3",
-                        "code": "AI223",
+                        "code": "AI128",
                         "unit": "rpm"
                       },
                       {
@@ -1656,7 +1658,7 @@ export default class UniformCodes {
                         {
                           "name": "齿箱侧转子轴承温度",
                           "num": "7",
-                          "code": "AI071",
+                          "code": "AI036",
                           "unit": "℃"
                         },
                         {
@@ -1674,7 +1676,7 @@ export default class UniformCodes {
                         {
                           "name": "电机侧转子轴承温度",
                           "num": "10",
-                          "code": "AI072",
+                          "code": "AI037",
                           "unit": "℃"
                         }
                       ]

src/assets/style/main.css

@@ -59,7 +59,7 @@ body,
   background-color: rgb(29,106,235) !important;
 }
 .el-tabs__item.is-active{
-  background-color: black !important;
+  background-color: rgb(36,36,36) !important;
   border-color: black !important;
 }
 
@@ -76,12 +76,12 @@ body,
   
 /*   .el-table td,.el-table th {
     border-bottom:2px solid rgb(36,36,36);
-  } */
+  } 
   
   .el-table--border th,.el-table--border th.gutter:last-of-type {
     border-bottom:1px solid yellow;
   
-  }
+  }*/
   
   .el-table--border td,.el-table--border th {
     border-right:1px solid rgb(36,36,36);

src/components/AttentionCardWindow.vue

@@ -0,0 +1,156 @@
+<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/TitleBar.vue

@@ -73,115 +73,215 @@
           </el-dialog>
         </div>
       </el-col>
-      <el-col :span="2.3">
-        <div class="titleinfo">
-          <ul>
-            <li>
-              <TitleBarCard
-                title="装机容量"
-                unit="MW"
-                :value="installedCapacity"
-              ></TitleBarCard>
-            </li>
-          </ul>
-        </div>
-      </el-col>
-      <el-col :span="2.3">
-        <div class="titleinfo">
-          <ul>
-            <li>
-              <TitleBarCard
-                title="实时功率"
-                unit="MW"
-                :value="totalPower"
-              ></TitleBarCard>
-            </li>
-          </ul>
-        </div>
-      </el-col>
-      <el-col :span="2.3">
-        <div class="titleinfo">
-          <ul>
-            <li>
-              <TitleBarCard
-                title="日发电量"
-                unit="kWh"
-                :value="dailyPowerGeneration"
-              ></TitleBarCard>
-            </li>
-          </ul>
-        </div>
-      </el-col>
-      <el-col :span="2.3">
-        <div class="titleinfo">
-          <ul>
-            <li>
-              <TitleBarCard
-                title="上网电量"
-                unit="kWh"
-                :value="gridPower"
-              ></TitleBarCard>
-            </li>
-          </ul>
-        </div>
-      </el-col>
-      <el-col :span="2.3">
-        <div class="titleinfo">
-          <ul>
-            <li>
-              <TitleBarCard
-                title="月发电量"
-                unit="kWh"
-                :value="monthlyPowerGeneration"
-              ></TitleBarCard>
-            </li>
-          </ul>
-        </div>
-      </el-col>
-      <el-col :span="2.3">
-        <div class="titleinfo">
-          <ul>
-            <li>
-              <TitleBarCard
-                title="年发电量"
-                unit="kWh"
-                :value="annualPowerGeneration"
-              ></TitleBarCard>
-            </li>
-          </ul>
-        </div>
-      </el-col>
-      <el-col :span="2.3">
-        <div class="titleinfo">
-          <ul>
-            <li>
-              <TitleBarCard
-                title="月利用小时"
-                unit="小时"
-                :value="monthlyUtilizationHours"
-              ></TitleBarCard>
-            </li>
-          </ul>
-        </div>
-      </el-col>
-      <el-col :span="2.3">
-        <div class="titleinfo">
-          <ul>
-            <li>
-              <TitleBarCard
-                title="年利用小时"
-                unit="小时"
-                :value="annualUtilizationHours"
-              ></TitleBarCard>
-            </li>
-          </ul>
-        </div>
+
+      <el-col :span="19">
+            <el-popover
+          placement="bottom"
+          :width="1500"
+          trigger="hover"
+          :show-arrow="false"
+        >
+          <template #reference>
+            <el-row>
+            <el-col :span="2.1">
+              <div class="titleinfo">
+                <ul>
+                  <li>
+                    <TitleBarCard
+                      title="装机容量"
+                      unit="MW"
+                      :value="installedCapacity"
+                    ></TitleBarCard>
+                  </li>
+                </ul>
+              </div>
+            </el-col>
+            <el-col :span="3">
+              <div class="titleinfo">
+                <ul>
+                  <li>
+                    <TitleBarCard
+                      title="实时功率"
+                      unit="MW"
+                      :value="totalPower"
+                    ></TitleBarCard>
+                  </li>
+                </ul>
+              </div>
+            </el-col>
+            <el-col :span="3">
+              <div class="titleinfo">
+                <ul>
+                  <li>
+                    <TitleBarCard
+                      title="日发电量"
+                      unit="kWh"
+                      :value="dailyPowerGeneration"
+                    ></TitleBarCard>
+                  </li>
+                </ul>
+              </div>
+            </el-col>
+            <el-col :span="3">
+              <div class="titleinfo">
+                <ul>
+                  <li>
+                    <TitleBarCard
+                      title="上网电量"
+                      unit="kWh"
+                      :value="gridPower"
+                    ></TitleBarCard>
+                  </li>
+                </ul>
+              </div>
+            </el-col>
+            <el-col :span="3.3">
+              <div class="titleinfo">
+                <ul>
+                  <li>
+                    <TitleBarCard
+                      title="月发电量"
+                      unit="kWh"
+                      :value="monthlyPowerGeneration"
+                    ></TitleBarCard>
+                  </li>
+                </ul>
+              </div>
+            </el-col>
+            <el-col :span="3.3">
+              <div class="titleinfo">
+                <ul>
+                  <li>
+                    <TitleBarCard
+                      title="年发电量"
+                      unit="kWh"
+                      :value="annualPowerGeneration"
+                    ></TitleBarCard>
+                  </li>
+                </ul>
+              </div>
+            </el-col>
+            <el-col :span="3">
+              <div class="titleinfo">
+                <ul>
+                  <li>
+                    <TitleBarCard
+                      title="月利用小时"
+                      unit="小时"
+                      :value="monthlyUtilizationHours"
+                    ></TitleBarCard>
+                  </li>
+                </ul>
+              </div>
+            </el-col>
+            <el-col :span="3.3">
+              <div class="titleinfo">
+                <ul>
+                  <li>
+                    <TitleBarCard
+                      title="年利用小时"
+                      unit="小时"
+                      :value="annualUtilizationHours"
+                    ></TitleBarCard>
+                  </li>
+                </ul>
+              </div>
+            </el-col>
+            </el-row>
+          </template>
+
+          <el-table
+            :data="tableData"
+            style="width: 100%">
+        <el-table-column
+              prop="station"
+              label="站点"
+              width="80">
+          </el-table-column>
+        <el-table-column
+              prop="date"
+              label="运行指标"
+              width="80">
+            <el-table-column
+              prop="date"
+              label="日发电量（万kwh）"
+              width="80">
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="平均风速(m/s)\n日照强度(w/m²)"
+              width="80">
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="实时功率（MW)">
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="AGC有功设定(MW)"
+              width="80">
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="理论功率（MW）"
+              width="80">
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="预测功率（MW）"
+              width="80">
+            </el-table-column>
+        </el-table-column>
+        
+        <el-table-column
+              prop="date"
+              label="发电设备状态汇总"
+              width="80">
+            <el-table-column
+              prop="date"
+              label="接入"
+              width="80">
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="运行"
+              width="80">
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="待机">
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="维护"
+              width="80">
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="故障"
+              width="80">
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="限电"
+              width="80">
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="离线"
+              width="80">
+            </el-table-column>
+        </el-table-column>
+          </el-table>
+
+        </el-popover>
       </el-col>
+      
 
-      <el-col :span="1.6">
+      <el-col :span="1">
         <el-popover  placement="bottom" :width="150" trigger="hover" :show-arrow="false">
           <template #reference>
-            <el-button @click="userClick" style="top: 10px; right: 76px; color: #ffffff; position: absolute;background-color:black;border:none;font-size:16px;">{{usreName}}</el-button>
+            <el-button @click="userClick" style="top: 10px; right: 70px; color: #ffffff; position: absolute;background-color:black;border:none;font-size:16px;">{{usreName}}</el-button>
           </template>
           <div style="background-color: #363636;">
             <!-- <el-button class="loginoption">编&emsp;辑</el-button>
@@ -217,7 +317,7 @@ import BackgroundData from "../assets/script/BackgroundData";
 export default {
   name: "TitleBar",
   components: {
-    TitleBarCard,
+    TitleBarCard
   },
   data() {
     return {

src/components/area/AlarmArea.vue

@@ -10,11 +10,10 @@
     <el-table
       :data="values"
       height="219px"
-      v-if="lastUpdateTime!=null"
       :header-cell-style="{
                 background: 'Black',
                 color: 'rgb(220,220,220)',
-                padding:'5px',
+                padding:'4px',
                 fontSize:'14px',
                 'border-bottom':'solid 1px black'
               }"
@@ -67,7 +66,7 @@ export default {
   props: {},
   data() {
     return {
-      values: new Array()
+      values: ['-','-','-','-','-','-']
     };
   },
   methods: {

src/components/area/windturbine/BasicInformationDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="firstdiv">
     <img
-      style="float: left; margin-left: 30px; margin-top: 90px;width:50vh;height:25vh;"
+      style="float: left; margin-left: 40px; margin-top: 90px;width:50vh;height:25vh;"
       src="../../../assets/img/WindturbineDetailPages/变桨.png"
       object-fit="fill"
     />
@@ -120,17 +120,15 @@ export default {
 
 <style scoped>
 .firstdiv {
-  height: 10vh;
+  height: 49vh;
 }
 .onediv {
   float: right;
   margin-right: 30px;
-  margin-top: 30px;
 }
 .twodiv {
   float: right;
   margin-right: 30px;
-  margin-top: 30px;
 }
 td:nth-child(1) {
   height: 25px;
@@ -155,6 +153,6 @@ th {
   height: 40px;
 }
 table{
-  margin-bottom: 30px;
+  margin-top: 30px;
 }
 </style>

src/components/area/windturbine/WindturbineDetailPages.vue

@@ -9,7 +9,7 @@
   <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:-20px;">
+    <div style="background-color: black;margin-top:-30px;margin-left:-10px;margin-right:-10px;margin-bottom:-30px;">
       <!-- <div class="titeldiv">
       <div class="chunkdiv" width="15%">
         <img src="../../../assets/img/WindturbineDetailPages/pic_01.png"/>