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

src/components/TitleBar.vue

@@ -72,6 +72,22 @@
               </span>
             </template>
           </el-dialog>
+
+          <el-popover
+          placement="bottom"
+          :width="521"
+          trigger="hover"
+          class="popoverBack"
+          :show-arrow="false"
+          visible-arrow="false"
+          v-model="popovermodel"
+        >          
+          <ul>
+            <li>编辑</li>
+            <li>注销</li>
+          </ul>
+
+        </el-popover>
         </div>
       </el-col>
       <el-col :span="2.3">
@@ -180,8 +196,11 @@
       </el-col>
 
       <el-col :span="1.6">
-        <div @click="userClick" style="top: 18px; right: 100px; color: #ffffff; position: absolute" >{{usreName}}</div>
+        
+        <div @click="userClick" @mouseover="popovermodel=false" style="top: 18px; right: 100px; color: #ffffff; position: absolute">{{usreName}}</div>
+        
         <!-- <el-button
+          v-popover:loginref
           type="text"
           @click="dialogVisible = true"
           style="top:9px;right: 85px;color: #ffffff;position: absolute;">管理员</el-button> -->
@@ -207,6 +226,7 @@ export default {
   },
   data() {
     return {
+      popovermodel: false,
       dialogVisible: false,
       dialogFormVisible: false,
       form: {

src/components/area/AlarmArea.vue

@@ -65,10 +65,11 @@ export default {
 <style scoped>
 div{
   background: #292929;
+  line-height: 1.5;
 }
-td{
+td,tr{
   
-  padding:auto;
+  line-height: 1.5;
 }
 .ToolBar{
 position:absolute;

src/components/area/ControlArea.vue

@@ -11,7 +11,13 @@
     <ControlMatrixCard title="待维护" :datas="ls.maintain"></ControlMatrixCard>
     <ControlMatrixCard title="待取消维护" :datas="ls.unmaintain"></ControlMatrixCard>
     <ControlMatrixCard title="待复位" :datas="ls.reset"></ControlMatrixCard>
+    <el-button style="z-index:2;position:absolute;bottom:10px;right:10px;background: #292929;font-size:15px;width:90px;border:none;color:rgb(220,220,220);" size="small">发送</el-button>
+    
   </gy-card>
+  <el-button-group style="z-index:3;position:absolute;top:16px;left:120px;">
+      <el-button style="background: black;font-size:14px;width:80px;border:none;color:rgb(220,220,220);" size="mini" round>自动</el-button>
+      <el-button style="background: #202020;font-size:14px;width:80px;border:none;color:rgb(220,220,220);" size="mini" round>手动</el-button>
+    </el-button-group>
 </template>
 
 <script>
@@ -49,7 +55,7 @@ export default {
       var val = JSON.parse(msg);
       for (var vv in val) {
         var v = val[vv];
-        var windturbineId = parseInt(v.status) + v.windturbineId;
+        var windturbineId = v.windturbineId;
         if (v.adviceOperateStyle == "UnMaintain") {
           if (!this.ls.unmaintain.value.includes(windturbineId)) {
             this.ls.unmaintain.value.push(windturbineId);
@@ -80,4 +86,5 @@ export default {
   },
 };
 </script>
-
+<style scoped>
+</style>

src/components/area/windturbine/MatrixCard.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="main" v-if="values.length > 0">
-    <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

@@ -107,35 +107,43 @@
         display: inline-block;
         margin-top: 5px;
     }
-    /* 卡片整体样式 */
+    /* 卡片整体样式(边框和整体背景) */
+    /* 停机 */
     .card-style-0 {
         border: 2px solid rgb(255, 255, 255);
         background-color: rgba(255, 255, 255, 0.15);
     }
+    /* 上电 */
     .card-style-1 {
         border: 2px solid rgb(197, 48, 72);
         background-color: rgba(197, 48, 72, 0.15);
     }
+    /* 待机 */
     .card-style-2 {
         border: 2px solid rgb(05, 187, 76);
         background-color: rgba(05, 187, 76, 0.15);
     }
+    /* 启动 */
     .card-style-3 {
         border: 2px solid rgb(05, 187, 76);
         background-color: rgba(05, 187, 76, 0.15);
     }
+    /* 并网 */
     .card-style-4 {
         border: 2px solid rgb(75, 85, 174);
         background-color: rgba(75, 85, 174, 0.15);
     }
+    /* 故障 */
     .card-style-5 {
         border: 2px solid rgba(186, 50, 55);
         background-color: rgba(186, 50, 55, 0.15);
     }
+    /* 维护 */
     .card-style-6 {
         border: 2px solid rgb(225, 125, 36);
         background-color: rgba(225, 125, 36, 0.15);
     }
+    /* 离线 */
     .card-style-7 {
         border: 2px solid rgb(96, 103, 105);
         background-color: rgba(96, 103, 105, 0.15);

src/components/area/windturbine/control/ControlMatrixCard.vue

@@ -67,10 +67,10 @@ export default {
     windturbineMessage: function (msg) {
       var json = JSON.parse(msg);
       for (var i = 0; i < this.datas.value.length; i++) {
-        var key = this.datas.value[i].slice(1);
+        var key = this.datas.value[i];
         var data = json[key];
         var active = undefined;
-        var status = this.datas.value[i].slice(0, 1);
+        var status = data.status;
         // 设置当前状态
         this.values.forEach((item) => {
           if (item.windturbineId == key) {
@@ -153,6 +153,88 @@ export default {
 /* ***********颜色************ */
 /* *********************** */
 /*  最外层卡片选中和未选中 */
+.card-select-0 {
+  border: 2px solid rgb(255, 255, 255, 0.5);
+}
+.card-unselect-0 {
+  border: 2px solid rgb(255, 255, 255);
+}
+.card-select-0 {
+  border: 2px solid rgb(255, 255, 255, 0.5);
+}
+/*  左边卡片选中和未选中 */
+.card-left-select-0 {
+  background-color: rgb(255, 255, 255, 0.5);
+}
+.card-left-unselect-0 {
+  background-color: rgb(255, 255, 255);
+}
+/*  右边卡片选中和未选中 */
+.card-right-select-0 {
+  border-left: 2px dashed rgb(255, 255, 255, 0.5);
+}
+.card-right-unselect-0 {
+  border-left: 2px dashed rgb(255, 255, 255);
+}
+
+/* ***********颜色************ */
+/* *********************** */
+/*  最外层卡片选中和未选中 */
+.card-select-1 {
+  border: 2px solid rgb(121, 73, 81, 0.5);
+}
+.card-unselect-1 {
+  border: 2px solid rgb(121, 73, 81);
+}
+.card-select-1 {
+  border: 2px solid rgb(121, 73, 81, 0.5);
+}
+/*  左边卡片选中和未选中 */
+.card-left-select-1 {
+  background-color: rgb(121, 73, 81, 0.5);
+}
+.card-left-unselect-1 {
+  background-color: rgb(121, 73, 81);
+}
+/*  右边卡片选中和未选中 */
+.card-right-select-1 {
+  border-left: 2px dashed rgb(121, 73, 81, 0.5);
+}
+.card-right-unselect-1 {
+  border-left: 2px dashed rgb(121, 73, 81);
+}
+
+/* ***********颜色************ */
+/* *********************** */
+/*  最外层卡片选中和未选中 */
+.card-select-2 {
+  border: 2px solid rgb(05, 187, 76, 0.5);
+}
+.card-unselect-2 {
+  border: 2px solid rgb(05, 187, 76);
+}
+.card-select-2 {
+  border: 2px solid rgb(05, 187, 76, 0.5);
+}
+/*  左边卡片选中和未选中 */
+.card-left-select-2 {
+  background-color: rgb(05, 187, 76, 0.5);
+}
+.card-left-unselect-2 {
+  background-color: rgb(05, 187, 76);
+}
+/*  右边卡片选中和未选中 */
+.card-right-select-2 {
+  border-left: 2px dashed rgb(05, 187, 76, 0.5);
+}
+.card-right-unselect-2 {
+  border-left: 2px dashed rgb(05, 187, 76);
+}
+
+
+/* ***********颜色************ */
+/* *********************** */
+/*  最外层卡片选中和未选中 */
 .card-select-3 {
   border: 2px solid rgb(05, 187, 76, 0.5);
 }
@@ -230,4 +312,58 @@ export default {
 .card-right-unselect-5 {
   border-left: 2px dashed rgb(186, 50, 55);
 }
+
+/* ***********颜色************ */
+/* *********************** *
+/*  最外层卡片选中和未选中 */
+.card-select-6 {
+  border: 2px solid rgb(225, 125, 36, 0.5);
+}
+.card-unselect-6 {
+  border: 2px solid rgb(225, 125, 36);
+}
+.card-select-6 {
+  border: 2px solid rgb(225, 125, 36, 0.5);
+}
+/*  左边卡片选中和未选中 */
+.card-left-select-6 {
+  background-color: rgb(225, 125, 36, 0.5);
+}
+.card-left-unselect-6 {
+  background-color: rgb(225, 125, 36);
+}
+/*  右边卡片选中和未选中 */
+.card-right-select-6 {
+  border-left: 2px dashed rgb(225, 125, 36, 0.5);
+}
+.card-right-unselect-6 {
+  border-left: 2px dashed rgb(225, 125, 36);
+}
+
+/* ***********颜色************ */
+/* *********************** *
+/*  最外层卡片选中和未选中 */
+.card-select-7 {
+  border: 2px solid rgb(159, 163, 165, 0.5);
+}
+.card-unselect-7 {
+  border: 2px solid rgb(159, 163, 165);
+}
+.card-select-7 {
+  border: 2px solid rgb(159, 163, 165, 0.5);
+}
+/*  左边卡片选中和未选中 */
+.card-left-select-7 {
+  background-color: rgb(159, 163, 165, 0.5);
+}
+.card-left-unselect-7 {
+  background-color: rgb(2159, 163, 165);
+}
+/*  右边卡片选中和未选中 */
+.card-right-select-7 {
+  border-left: 2px dashed rgb(159, 163, 165, 0.5);
+}
+.card-right-unselect-7 {
+  border-left: 2px dashed rgb(159, 163, 165);
+}
 </style>