Browse Source

样式修改,功能修改

sunzehao 2 days ago
parent
commit
fc4fe6c847

+ 13 - 7
src/components/windHome/index.vue

@@ -39,7 +39,7 @@
             </div>
           </div>
         </div>
-        <div class="contrast">
+        <div class="contrast" style="margin-top: 15px">
           <div class="indicator-title">
             <div class="point point-left point-right bottom"></div>
             <div class="point point-right bottom"></div>
@@ -79,7 +79,7 @@
             </BarCharts>
           </div>
         </div>
-        <div class="power" style="height: 400px">
+        <div class="power" style="height: 400px;margin-top: 15px">
           <div class="indicator-title">
             <div class="point point-left bottom"></div>
             <div class="point point-right bottom"></div>
@@ -917,8 +917,8 @@ export default {
 .content {
   display: flex;
   flex-direction: row;
-  height: calc(100% - 56px);
-  overflow-y: auto;
+//   height: calc(100% - 56px);
+//   overflow-y: auto;
 }
 
 .first {
@@ -928,6 +928,7 @@ export default {
   width: 49%;
   height: calc(100% - 10px);
   margin-right: 21px;
+  margin-top: 20px;
 
   .weather {
     display: flex;
@@ -1305,7 +1306,7 @@ export default {
         display: flex;
         flex-direction: column;
         font-size: 24px;
-        //font-family: Source Han Sans SC;
+        // font-family: Source Han Sans SC;
         font-weight: 400;
         color: #fff;
 
@@ -1314,7 +1315,7 @@ export default {
           flex-direction: row;
           align-items: baseline;
           font-size: 50px;
-          font-family: Arial;
+          font-family: Bicubik;
           font-weight: 400;
           padding: 10px 0;
           color: #00e5ff;
@@ -1448,7 +1449,7 @@ export default {
         }
         .others-value {
           font-size: 16px;
-          font-family: Arial;
+          font-family: Bicubik;
           font-weight: 400;
           color: #00e5ff;
           padding: 8px 0;
@@ -1652,3 +1653,8 @@ export default {
   }
 }
 </style>
+<style scoped>
+.body{
+font-family: "Bicubik";
+}
+</style>

+ 12 - 5
src/components/windProDetail/windProblem.vue

@@ -847,7 +847,7 @@ export default {
         flex-wrap: wrap;
           margin-top: 5px;
           font-size: 13px;
-          font-family: Source Han Sans SC;
+        //   font-family: Source Han Sans SC;
           font-weight: 400;
           color: #fff;
           padding: 0 10px;
@@ -861,10 +861,11 @@ export default {
               display: flex;
               flex-direction: row;
               align-items: baseline;
+              font-family: "Bicubik";
 
               .unit {
                 font-size: 12px;
-                font-family: Source Han Sans SC;
+                // font-family: Source Han Sans SC;
                 font-weight: 400;
                 color: #fff;
                 margin-left: 5px;
@@ -919,7 +920,7 @@ export default {
         align-items: center;
         padding-left: 20px;
         font-size: 16px;
-        font-family: Microsoft YaHei;
+        // font-family: Microsoft YaHei;
         font-weight: 400;
         color: #363b46;
         .problemSeach{
@@ -1109,7 +1110,7 @@ export default {
   align-items: center;
   padding-left: 20px;
   font-size: 16px;
-  font-family: Microsoft YaHei;
+//   font-family: Microsoft YaHei;
   font-weight: 400;
   color: #fff;
 }
@@ -1173,7 +1174,7 @@ export default {
   color: #fff;
   padding: 0 0px;
   .table-value {
-    font-family: Arial;
+    font-family: "Bicubik";
     font-weight: 400;
     margin-right: 25px;
     color: rgb(15, 225, 240);
@@ -1196,3 +1197,9 @@ export default {
     }
 }
 </style>
+
+<style scoped>
+.bodys{
+font-family: "Bicubik";
+}
+</style>

+ 89 - 3
src/components/windVideo/index.vue

@@ -1,7 +1,20 @@
 <template>
     <div class="windVideo">
-        <div class="windVideoLeft">
+        <div class="windVideoLeft panel">
+            <el-input
+                style="margin-bottom: 10px"
+                placeholder="输入关键字进行过滤"
+                v-model="filterText">
+            </el-input>
 
+            <el-tree
+                class="filter-tree"
+                :data="data"
+                :props="defaultProps"
+                default-expand-all
+                :filter-node-method="filterNode"
+                ref="tree">
+            </el-tree>
         </div>
         <div class="windVideoRight">
             <video ref="videoPlayer" controls width="90%" muted autoplay>
@@ -13,20 +26,93 @@
 
 <script>
 export default {
+    data() {
+      return {
+        filterText: '',
+        data: [{
+          id: 1,
+          label: '监控 1',
+          children: [{
+            id: 4,
+            label: '监控 1-1',
+            children: [{
+              id: 9,
+              label: '监控 1-1-1'
+            }, {
+              id: 10,
+              label: '监控 1-1-2'
+            }]
+          }]
+        }, {
+          id: 2,
+          label: '监控 2',
+          children: [{
+            id: 5,
+            label: '监控 2-1'
+          }, {
+            id: 6,
+            label: '监控 2-2'
+          }]
+        }, {
+          id: 3,
+          label: '监控 3',
+          children: [{
+            id: 7,
+            label: '监控 3-1'
+          }, {
+            id: 8,
+            label: '监控 3-2'
+          }]
+        }],
+        defaultProps: {
+          children: 'children',
+          label: 'label'
+        }
+      };
+    },
+    watch: {
+      filterText(val) {
+        this.$refs.tree.filter(val);
+      }
+    },
 
+    methods: {
+      filterNode(value, data) {
+        if (!value) return true;
+        return data.label.indexOf(value) !== -1;
+      }
+    },
 }
 </script>
 
 <style lang="less">
 .windVideo{
     width: 100%;
+    display: flex;
     .windVideoLeft{
         width: 20%;
-        height: 100%;
+        height: 77vh;
         background-color: rgba(20, 29, 51, 0.3);
+        margin-right: 2%;
+        .el-input{
+            .el-input__wrapper{
+                background: transparent !important;
+            }
+        }
+        .el-tree{
+            background: transparent !important;
+            .el-text{
+                color: #fff !important;
+            }
+            --el-tree-node-hover-bg-color: #235250 !important;
+            .el-tree-node__content:hover{
+                background-color: #235250 !important;
+            }
+        }
+        
     }
     .windVideoRight{
-        width: 80%;
+        width: 78%;
         height: 100vh;
     }
 }

+ 16 - 0
src/views/cesiumComponents/allStationJson.json

@@ -15,6 +15,22 @@
             "latitude": 35.326667,
             "isShowWind": true,
             "stationNameEn": "MYFDC"
+        },
+        {
+            "plantname": "京能营盘梁",
+            "energytype": "Wind",
+            "longitude": 112.60093207,
+            "latitude": 40.31330713,
+            "isShowWind": true,
+            "stationNameEn": "JNYPL"
+        },
+        {
+            "plantname": "京能苏木山",
+            "energytype": "Wind",
+            "longitude": 112.69922452,
+            "latitude": 40.31857399,
+            "isShowWind": true,
+            "stationNameEn": "JNSMS"
         }
     ],
     "stationS": [

+ 4 - 1
src/views/cesiumComponents/windMap2D.vue

@@ -706,7 +706,10 @@ export default {
         const btn = document.getElementById("windBtn");
 
         btn.addEventListener("click", function (event) {
-          entityxy.show = !entityxy.show;
+        //   entityxy.show = !entityxy.show;
+            that.zbLabelList[0].zb.forEach(it => {
+                it.show = !it.show;
+            })
         });
         if (val.bgFj === "1") {
           const benchmark = viewer.entities.add({

+ 6 - 1
src/views/cesiumComponents/windMap3D.vue

@@ -803,7 +803,12 @@ export default {
       const btn = document.getElementById("windBtn");
 
       btn.addEventListener("click", function (event) {
-        entityxy.show = !entityxy.show;
+        // entityxy.show = !entityxy.show;
+        that.zbLabelList.forEach(iv => {
+            iv.zb.forEach(it => {
+                it.show = !it.show;
+            })
+        })
       });
 
       //   viewer.camera.moveEnd.addEventListener(() => {