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

src/components/StatusBar.vue

@@ -1,6 +1,6 @@
 /* 状态栏 */
 <template>
-  <div class="status-bar">
+  <div class="status-bar" onselectstart="return false">
     <el-row>
       <el-col :span="19" style="margin-top: 5px">
         <span style="color: white; margin-left: 20px">系统时间：</span>

src/components/TitleBar.vue

@@ -1,6 +1,6 @@
 /* 标题栏 */
 <template>
-  <div class="title-bar">
+  <div class="title-bar" onselectstart="return false">
     <el-row>
       <el-col :span="2">
         <img
@@ -182,16 +182,13 @@
       </el-col>
 
       <el-col :span="1.6">
-        <!-- <div class="admin"  style="position: absolute;right: 70px;">
+        <div class="admin" @click="dialogVisible = true" style="top:18px;right: 80px;color: #ffffff;position: absolute;">
-            <p>管理员</p>
+            管理员
-          </div> -->
+        </div>
-        <el-button
+        <!-- <el-button
           type="text"
           @click="dialogVisible = true"
-          class="admin"
+          style="top:9px;right: 85px;color: #ffffff;position: absolute;">管理员</el-button> -->
-          style="position: absolute; right: 66px"
-          >管理员</el-button
-        >
       </el-col>
 
       <el-col :span="1">
@@ -311,13 +308,6 @@ export default {
   position: relative;
   top: 33%;
 }
-.admin {
-  color: #ffffff;
-  position: relative;
-  /* margin-left: 10px;
-  padding: 0; */
-  padding: 22px;
-}
 .titleinfo {
   background-color: rgb(20, 20, 20);
   height: auto;

src/components/area/gy-card.vue

@@ -1,8 +1,8 @@
 /* 自定义tabs */
 <template>
     <transition>
-        <div :class='areaClass' @mouseover="hover = true"
+        <div :class='areaClass' @mouseover="hover = false"
-             @mouseleave="hover = false" @contextmenu="rightClick">
+             @mouseleave="hover = false" @contextmenu="rightClick" onselectstart="return false">
             <div :class="headerClass" @dblclick="gyCardDbClick">
                 <div :class='circleClass'></div>
                 <span class="gy-card-title">{{ title }}</span>
@@ -96,7 +96,7 @@
                 if (big) {
                     this.big = false
                 } else {
-                    this.big = true
+                    this.big = false
                 }
             },
             rightClick() {
@@ -290,7 +290,7 @@
     .gy-card-header-hover {
         position: relative;
         height: 40px;
-        background-color: #606060;
+        background-color: #292929;
         color: white;
         box-sizing: border-box;
     }
@@ -298,7 +298,7 @@
     .gy-card-area-problem:hover {
         position: relative;
         height: 89vh;
-        background-color: #606060;
+        background-color: #292929;
         border-radius: 7px;
         margin: 0px;
         padding-top: 0;
@@ -312,7 +312,7 @@
         position: relative;
         height: 25vh;
         margin-top: 10px;
-        background-color: #606060;
+        background-color: #292929;
         border-radius: 7px;
         padding-left: 10px;
         padding-right: 10px;
@@ -323,7 +323,7 @@
     .gy-card-area-check:hover {
         position: relative;
         height: 44vh;
-        background-color: #606060;
+        background-color: #292929;
         border-radius: 7px;
         margin: 0px;
         padding-top: 0;
@@ -337,7 +337,7 @@
         position: relative;
         width: 100%;
         height: 44vh;
-        background-color: #606060;
+        background-color: #292929;
         border-radius: 7px;
         margin-top: 10px;
         padding-top: 0;
@@ -351,7 +351,7 @@
         position: relative;
         height: 25vh;
         margin-top: 10px;
-        background-color: #606060;
+        background-color: #292929;
         border-radius: 7px;
         padding-left: 10px;
         padding-right: 10px;
@@ -362,7 +362,7 @@
     .gy-card-area-recommended:hover {
         position: relative;
         height: 37vh;
-        background-color: #606060;
+        background-color: #292929;
         border-radius: 7px;
         padding-left: 10px;
         padding-right: 10px;

src/components/area/windturbine/MatrixCard.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="main">
-    <div>{{ title }}</div>
+    <div style="font-size:15px">{{ title }}</div>
     <div class="content">
       <WindturbineMinCard
         v-for="vs in values"

src/components/area/windturbine/WindturbineMinCard.vue

@@ -99,7 +99,7 @@
     .card-style-0 {
         border: 2px solid rgb(255, 255, 255);
         background-color: rgba(255, 255, 255, 0.15);
-        color: rgb(120, 120, 120);
+        color: rgb(200, 200, 200);
     }
     .card-style-1 {
         border: 2px solid rgb(197, 48, 72);
@@ -173,7 +173,7 @@
     }
     .card-left-style-0 {
         background-color: rgb(255, 255, 255);
-        color: rgb(120, 120, 120);
+        color: rgb(80, 80, 80);
     }
     .card-left-style-1 {
         background-color: rgb(121, 73, 81);
@@ -199,7 +199,7 @@
 
     .card-left-style-select-0 {
         background-color: rgba(255, 255, 255,0.7);
-        color: rgba(120, 120, 120,0.7);
+        color: rgba(200, 200, 200,0.7);
     }
     .card-left-style-select-1 {
         background-color: rgba(121, 73, 81,0.7);