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

src/assets/style/main.css

@@ -30,4 +30,14 @@ body,
 }
 .el-dialog{
   background-color: rgb(36,36,36) !important;
+}
+.el-form-item__label{
+  color: rgb(220, 220, 220) !important;
+}
+.el-dialog__title{
+  color: rgb(220, 220, 220) !important;
+}
+.el-input__inner{
+  background-color: rgb(100,100,100) !important;
+  color: rgb(220, 220, 220) !important;
 }

src/components/StatusBar.vue

@@ -12,7 +12,7 @@
           :width="521"
           trigger="hover"
           class="popoverBack"
-          show-arrow="false"
+          :show-arrow="false"
           visible-arrow="false"
         >
           <template #reference>
@@ -61,7 +61,7 @@
           :width="521"
           trigger="hover"
           class="popoverBack"
-          show-arrow="false">
+          :show-arrow="false">
           <template #reference>
             <div class="status-list">
               <img
@@ -108,7 +108,7 @@
           :width="521"
           trigger="hover"
           class="popoverBack"
-          show-arrow="false">
+          :show-arrow="false">
           <template #reference>
             <div class="status-list">
               <img
@@ -155,7 +155,7 @@
           :width="521"
           trigger="hover"
           class="popoverBack"
-          show-arrow="false">
+          :show-arrow="false">
           <template #reference>
             <div class="status-list">
               <img

src/components/TitleBar.vue

@@ -16,7 +16,8 @@
             v-model="dialogVisible"
             width="21%"
             :before-close="handleClose"
-            :header-cell-style="{ color: 'rgb(220,220,220)'}"
+            :show-close="false"
+            
           >
             <el-form :model="form">
               <el-form-item label="" :label-width="formLabelWidth">
@@ -56,7 +57,7 @@
             </el-form>
             <template #footer>
               <span class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button @click="dialogVisible = false" style="background-color: rgb(100,100,100);color: rgb(220, 220, 220);">取 消</el-button>
                 <el-button type="primary" @click="dialogVisible = false"
                   >登 录</el-button
                 >
@@ -72,7 +73,7 @@
               <TitleBarCard
                 title="装机容量"
                 unit="MW"
-                value="2000"
+                value="734"
               ></TitleBarCard>
             </li>
           </ul>
@@ -85,7 +86,7 @@
               <TitleBarCard
                 title="实时功率"
                 unit="MW"
-                value="2000"
+                value="34.01"
               ></TitleBarCard>
             </li>
           </ul>
@@ -98,7 +99,7 @@
               <TitleBarCard
                 title="日发电量"
                 unit="kWh"
-                value="200.0"
+                value="33,96"
               ></TitleBarCard>
             </li>
           </ul>
@@ -111,7 +112,7 @@
               <TitleBarCard
                 title="上网电量"
                 unit="kWh"
-                value="2000.0"
+                value="38.96"
               ></TitleBarCard>
             </li>
           </ul>
@@ -124,7 +125,7 @@
               <TitleBarCard
                 title="月发电量"
                 unit="kWh"
-                value="2000.0"
+                value="6197.87"
               ></TitleBarCard>
             </li>
           </ul>
@@ -137,7 +138,7 @@
               <TitleBarCard
                 title="年发电量"
                 unit="kWh"
-                value="20000.0"
+                value="69843.02"
               ></TitleBarCard>
             </li>
           </ul>
@@ -150,7 +151,7 @@
               <TitleBarCard
                 title="月利用小时"
                 unit="小时"
-                value="200"
+                value="84.44"
               ></TitleBarCard>
             </li>
           </ul>
@@ -163,7 +164,7 @@
               <TitleBarCard
                 title="年利用小时"
                 unit="小时"
-                value="2000"
+                value="951.54"
               ></TitleBarCard>
             </li>
           </ul>
@@ -178,9 +179,7 @@
           type="text"
           @click="dialogVisible = true"
           class="admin"
-          style="position: absolute; right: 70px"
-          >管理员</el-button
-        >
+          style="position: absolute; right: 66px">管理员</el-button>
       </el-col>
 
       <el-col :span="1">
@@ -246,6 +245,7 @@ export default {
 
 
 <style scoped>
+
 .title-bar {
   height: 6vh;
   background-color: #000000;
@@ -260,9 +260,9 @@ export default {
 .admin {
   color: #ffffff;
   position: relative;
-  margin-left: 10px;
-  /* padding: 0; */
-  padding: 18px;
+  /* margin-left: 10px;
+  padding: 0; */
+  padding: 22px;
 }
 .titleinfo {
   background-color: rgb(20, 20, 20);

src/components/area/windturbine/WindturbineMinCard.vue

@@ -12,13 +12,13 @@
             </div>
             <div :class="rightStyle">
                 <el-row>
-                    <div :class="contentStyle" style="font-size: 12px;">{{power.toFixed(2)}} kw</div>
+                    <div :class="contentStyle" style="font-size: 12px;position: absolute;right: 5px;">{{power.toFixed(2)}} kw</div>
                 </el-row>
                 <el-row>
-                    <div :class="contentStyle" style="font-size: 12px;">{{windSpeed.toFixed(2)}} m/s</div>
+                    <div :class="contentStyle" style="font-size: 12px;position: absolute;right: 5px;top:15px;">{{windSpeed.toFixed(2)}} m/s</div>
                 </el-row>
                 <el-row>
-                    <div :class="contentStyle" style="font-size: 12px;">{{rollSpeed.toFixed(2)}} rpm</div>
+                    <div :class="contentStyle" style="font-size: 12px;position: absolute;right: 5px;top:30px;">{{rollSpeed.toFixed(2)}} rpm</div>
                 </el-row>
             </div>
         </el-row>
@@ -99,69 +99,71 @@
         display: inline-block;
     }
     .card-style-0 {
-        border: 2px solid rgba(250, 250, 250, 1);
-        background-color: rgba(245, 245, 245, 1);
+        border: 2px solid rgb(255, 255, 255);
+        background-color: rgba(255, 255, 255, 0.15);
+        color: rgb(120, 120, 120);
     }
     .card-style-1 {
-        border: 2px solid rgba(218, 132, 219, 1);
-        background-color: rgba(218, 132, 219, 0.5);
+        border: 2px solid rgb(197, 48, 72);
+        background-color: rgba(197, 48, 72, 0.15);
     }
     .card-style-2 {
-        border: 2px solid rgba(107, 212, 148, 1);
-        background-color: rgba(107, 212, 148, 0.5);
+        border: 2px solid rgb(05, 187, 76);
+        background-color: rgba(05, 187, 76, 0.15);
     }
     .card-style-3 {
-        border: 2px solid rgba(107, 212, 148, 1);
-        background-color: rgba(107, 212, 148, 0.5);
+        border: 2px solid rgb(05, 187, 76);
+        background-color: rgba(05, 187, 76, 0.15);
     }
     .card-style-4 {
-        border: 2px solid rgba(133, 140, 173, 1);
-        background-color: rgba(133, 140, 173, 0.5);
+        border: 2px solid rgb(75, 85, 174);
+        background-color: rgba(75, 85, 174, 0.15);
     }
     .card-style-5 {
-        border: 2px solid rgba(211, 133, 136, 1);
-        background-color: rgba(211, 133, 136, 0.5);
+        border: 2px solid rgba(186, 50, 55);
+        background-color: rgba(186, 50, 55, 0.15);
     }
     .card-style-6 {
-        border: 2px solid rgba(234, 176, 125, 1);
-        background-color: rgba(234, 176, 125, 0.5);
+        border: 2px solid rgb(225, 125, 36);
+        background-color: rgba(225, 125, 36, 0.15);
     }
     .card-style-7 {
-        border: 2px solid rgba(159, 163, 165, 1);
-        background-color: rgba(159, 163, 165, 0.5);
+        border: 2px solid rgb(96, 103, 105);
+        background-color: rgba(96, 103, 105, 0.15);
     }
 
     .card-style-select-0 {
-        border: 2px solid rgba(250, 250, 250, 0.5);
-        background-color: rgba(245, 245, 245, 0.3);
+        border: 2px solid rgba(255, 255, 255, 0.5);
+        background-color: rgba(255, 255, 255, 0.1);
+        color: rgba(120, 120, 120,0.5);
     }
     .card-style-select-1 {
-        border: 2px solid rgba(218, 132, 219, 0.5);
-        background-color: rgba(218, 132, 219, 0.3);
+        border: 2px solid rgba(197, 48, 72, 0.5);
+        background-color: rgba(197, 48, 72, 0.1);
     }
     .card-style-select-2 {
-        border: 2px solid rgba(107, 212, 148, 0.5);
-        background-color: rgba(107, 212, 148, 0.3);
+        border: 2px solid rgba(05, 187, 76, 0.5);
+        background-color: rgba(05, 187, 76, 0.1);
     }
     .card-style-select-3 {
-        border: 2px solid rgba(107, 212, 148, 0.5);
-        background-color: rgba(107, 212, 148, 0.3);
+        border: 2px solid rgba(05, 187, 76, 0.5);
+        background-color: rgba(05, 187, 76, 0.1);
     }
     .card-style-select-4 {
-        border: 2px solid rgba(133, 140, 173, 0.5);
-        background-color: rgba(133, 140, 173, 0.3);
+        border: 2px solid rgba(75, 85, 174, 0.5);
+        background-color: rgba(75, 85, 174, 0.1);
     }
     .card-style-select-5 {
-        border: 2px solid rgba(211, 133, 136, 0.5);
-        background-color: rgba(211, 133, 136, 0.3);
+        border: 2px solid rgba(186, 50, 55, 0.5);
+        background-color: rgba(186, 50, 55, 0.1);
     }
     .card-style-select-6 {
-        border: 2px solid rgba(234, 176, 125, 0.5);
-        background-color: rgba(234, 176, 125, 0.3);
+        border: 2px solid rgba(225, 125, 36, 0.5);
+        background-color: rgba(225, 125, 36, 0.1);
     }
     .card-style-select-7 {
         border: 2px solid rgba(159, 163, 165, 0.5);
-        background-color: rgba(159, 163, 165, 0.3);
+        background-color: rgba(159, 163, 165, 0.1);
     }
     .card-style-left{
         position: relative;
@@ -172,50 +174,52 @@
         display: inline-block;
     }
     .card-left-style-0 {
-        background-color: rgb(250, 250, 250);
+        background-color: rgb(255, 255, 255);
+        color: rgb(120, 120, 120);
     }
     .card-left-style-1 {
-        background-color: rgb(218, 132, 219);
+        background-color: rgb(121, 73, 81);
     }
     .card-left-style-2 {
-        background-color: rgb(107, 212, 148);
+        background-color: rgb(05, 187, 76);
     }
     .card-left-style-3 {
-        background-color: rgb(107, 212, 148);
+        background-color: rgb(05, 187, 76);
     }
     .card-left-style-4 {
-        background-color: rgb(133, 140, 173);
+        background-color: rgb(75, 85, 174);
     }
     .card-left-style-5 {
-        background-color: rgb(211, 133, 136);
+        background-color: rgb(186, 50, 55);
     }
     .card-left-style-6 {
-        background-color: rgb(234, 176, 125);
+        background-color: rgb(225, 125, 36);
     }
     .card-left-style-7 {
         background-color: rgb(159, 163, 165);
     }
 
     .card-left-style-select-0 {
-        background-color: rgba(250, 250, 250,0.7);
+        background-color: rgba(255, 255, 255,0.7);
+        color: rgba(120, 120, 120,0.7);
     }
     .card-left-style-select-1 {
-        background-color: rgba(218, 132, 219,0.7);
+        background-color: rgba(121, 73, 81,0.7);
     }
     .card-left-style-select-2 {
-        background-color: rgba(107, 212, 148,0.7);
+        background-color: rgba(05, 187, 76,0.7);
     }
     .card-left-style-select-3 {
-        background-color: rgba(107, 212, 148,0.7);
+        background-color: rgba(05, 187, 76,0.7);
     }
     .card-left-style-select-4 {
-        background-color: rgba(133, 140, 173,0.7);
+        background-color: rgba(75, 85, 174,0.7);
     }
     .card-left-style-select-5 {
-        background-color: rgba(211, 133, 136,0.7);
+        background-color: rgba(186, 50, 55,0.7);
     }
     .card-left-style-select-6 {
-        background-color: rgba(234, 176, 125,0.7);
+        background-color: rgba(225, 125, 36,0.7);
     }
     .card-left-style-select-7 {
         background-color: rgba(159, 163, 165,0.7);
@@ -231,15 +235,66 @@
     }
 
     .card-right-style{
-        position: relative;
         width: calc(116px - 4px - 6px - 25px);
         height: calc(50px - 2px);
         box-sizing: border-box;
         display: inline-block;
+        position: absolute;
+        right: 0px;
+    }
+
+    .card-right-style-0 {
+        border-left: 2px dashed rgb(255, 255, 255);
+        color: rgb(120, 120, 120);
     }
     .card-right-style-1 {
-        border-left: 2px dashed rgba(200, 10, 10, 0.3);
+        border-left: 2px dashed rgb(121, 73, 81);
+    }
+    .card-right-style-2 {
+        border-left: 2px dashed rgb(05, 187, 76);
+    }
+    .card-right-style-3 {
+        border-left: 2px dashed rgb(05, 187, 76);
+    }
+    .card-right-style-4 {
+        border-left: 2px dashed rgb(75, 85, 174);
+    }
+    .card-right-style-5 {
+        border-left: 2px dashed rgb(186, 50, 55);
+    }
+    .card-right-style-6 {
+        border-left: 2px dashed rgb(225, 125, 36);
+    }
+    .card-right-style-7 {
+        border-left: 2px dashed rgb(159, 163, 165);
     }
+    
+    .card-right-style-select-0 {
+        border-left: 2px dashed rgba(255, 255, 255,0.7);
+        color: rgba(120, 120, 120,0.7);
+    }
+    .card-right-style-select-1 {
+        border-left: 2px dashed rgba(121, 73, 81,0.7);
+    }
+    .card-right-style-select-2 {
+        border-left: 2px dashed rgba(05, 187, 76,0.7);
+    }
+    .card-right-style-select-3 {
+        border-left: 2px dashed rgba(05, 187, 76,0.7);
+    }
+    .card-right-style-select-4 {
+        border-left: 2px dashed rgba(75, 85, 174,0.7);
+    }
+    .card-right-style-select-5 {
+        border-left: 2px dashed rgba(186, 50, 55,0.7);
+    }
+    .card-right-style-select-6 {
+        border-left: 2px dashed rgba(225, 125, 36,0.7);
+    }
+    .card-right-style-select-7 {
+        border-left: 2px dashed rgba(159, 163, 165,0.7);
+    }
+
     .card-title1-style{
         margin-top: 2px;
         font-size: 14px;