xushili 3 rokov pred
rodič
commit
5317e57882

+ 1 - 1
src/components/TitleBar.vue

@@ -172,7 +172,7 @@
       </el-col>
 
       <el-col :span="1.6">
-        <div class="admin" @click="dialogVisible = true" style="top:18px;right: 80px;color: #ffffff;position: absolute;">
+        <div @click="dialogVisible = true" style="top:18px;right: 100px;color: #ffffff;position: absolute;">
             管理员
         </div>
         <!-- <el-button

+ 1 - 1
src/components/area/mainwindow/TitleBarCard.vue

@@ -44,7 +44,7 @@ export default {
 <style scoped>
 
 span{
-  font-size: 8;
+  font-size: 15px;
   margin-left: 9px;
 }
 .title{

+ 5 - 0
src/components/area/windturbine/WindturbineDetailPages.vue

@@ -0,0 +1,5 @@
+<template>
+    <el-dialog>
+        
+    </el-dialog>
+</template>

+ 22 - 11
src/components/area/windturbine/WindturbineMinCard.vue

@@ -22,10 +22,13 @@
                 </el-row>
             </div>
         </el-row>
+        
     </div>
 </template>
 
 <script>
+
+
     export default {
         name: "WindturbineMinCard",
         props: {
@@ -40,6 +43,9 @@
                 sigSelect: false
             }
         },
+        components: {
+            
+        },
         computed: {
             cardStyle: function () {
                 if (this.sigSelect) {
@@ -56,7 +62,11 @@
                 }
             },
             rightStyle: function () {
-                return "card-right-style card-right-style-" + this.status;
+                if (this.sigSelect) {
+                    return "card-right-style card-right-style-select-" + this.status;
+                } else {
+                    return "card-right-style card-right-style-" + this.status;
+                }
             },
             title1Style: function () {
                 return "card-title1-style card-title1-style-" + this.status;
@@ -95,11 +105,12 @@
         height: 50px;
         box-sizing: border-box;
         display: inline-block;
+        margin-top: 5px;
     }
+    /* 卡片整体样式 */
     .card-style-0 {
         border: 2px solid rgb(255, 255, 255);
         background-color: rgba(255, 255, 255, 0.15);
-        color: rgb(200, 200, 200);
     }
     .card-style-1 {
         border: 2px solid rgb(197, 48, 72);
@@ -129,11 +140,10 @@
         border: 2px solid rgb(96, 103, 105);
         background-color: rgba(96, 103, 105, 0.15);
     }
-
+    /* 卡片整体样式-选择 */
     .card-style-select-0 {
         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(197, 48, 72, 0.5);
@@ -171,9 +181,10 @@
         margin: 3px;
         display: inline-block;
     }
+    /* 卡片左边样式 */
     .card-left-style-0 {
         background-color: rgb(255, 255, 255);
-        color: rgb(80, 80, 80);
+        color: rgb(0, 0, 0);
     }
     .card-left-style-1 {
         background-color: rgb(121, 73, 81);
@@ -196,10 +207,10 @@
     .card-left-style-7 {
         background-color: rgb(159, 163, 165);
     }
-
+    /* 卡片左边样式-选择 */
     .card-left-style-select-0 {
         background-color: rgba(255, 255, 255,0.7);
-        color: rgba(200, 200, 200,0.7);
+        color: rgba(0, 0, 0,0.7);
     }
     .card-left-style-select-1 {
         background-color: rgba(121, 73, 81,0.7);
@@ -240,10 +251,10 @@
         position: absolute;
         right: 0px;
     }
-
+    /* 卡片虚线样式 */
     .card-right-style-0 {
         border-left: 2px dashed rgb(255, 255, 255);
-        color: rgb(120, 120, 120);
+        color: rgb(255, 255, 255);
     }
     .card-right-style-1 {
         border-left: 2px dashed rgb(121, 73, 81);
@@ -266,10 +277,10 @@
     .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);
+        color: rgba(255, 255, 255,0.7);
     }
     .card-right-style-select-1 {
         border-left: 2px dashed rgba(121, 73, 81,0.7);