Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into sl

# Conflicts:
#	src/router/index.js

src/views/HealthControl/HealthTab4.vue

@@ -253,7 +253,6 @@ export default {
           rid: row.rid,
         },
         success(res) {
-          console.log(123123, res);
           if (res.code == 200) {
             that.trackDate = res.data;
             that.dialogVisible = true;

src/views/HealthControl/infotrack2.vue

@@ -354,15 +354,14 @@
       height="800px"
       custom-class="modal"
       :close-on-click-modal="true"
+      :destroy-on-close="true"
     >
-      <video
-        class="videoPlayer"
-        id="videoPlayer"
-        muted
-        autoplay
-        webkit-playsinline
-        playsinline
-      ></video>
+      <iframe
+        class="videoBoxiframe"
+        width="100%"
+        height="600px"
+        src="http://localhost:8081?token=stream-1"
+      ></iframe>
     </el-dialog>
     <el-dialog
       title="GIS地貌"
@@ -673,71 +672,12 @@ export default {
         },
       });
       this.tableData.data = data.data;
-      console.log(123123,data)
     },
+
     showVideoBox() {
       this.videoBoxShow = true;
-      this.$nextTick(() => {
-        this.listenEvent();
-        this.resetVideo();
-      });
-    },
-    // 销毁播放实例
-    cancelPlay() {
-      $(".videoPlayer").attr("poster", "").attr("src", "");
-      this.videoPlayer &&
-        this.videoPlayer.disconnect() &&
-        (this.videoPlayer = null);
-    },
-
-    // 监听视频被暂停和被播放
-    listenEvent() {
-      let that = this;
-
-      //判断设备
-      if (H5siOS() === true || H5sSafariBrowser() === true) {
-        $(".videoPlayer").prop("controls", true);
-      }
-
-      //如果是暂停状态，就让它开始；如果是开始就让他暂停。每次开始之前都先清空参数
-      $(".videoPlayer").on("click", function () {
-        if ($(this).get(0).paused) {
-          that.resetVideo();
-        } else {
-          that.videoPlayer.disconnect();
-          $(this).get(0).pause();
-          this.BASE.showMsg({
-            type: "success",
-            msg: "暂停播放",
-          });
-        }
-      });
     },
 
-    // 重置视频播放状态
-    resetVideo() {
-      this.$nextTick(() => {
-        let videoConfig = {
-          videoid: "videoPlayer", //跟上面video标签的id一致
-          protocol: "http:", //'http:' or 'https:'
-          host: this.videoConfigHost, //'localhost:8080'自己内部的网址
-          rootpath: "/", // '/' or window.location.pathname
-          token: this.videoConfigToken, //可变参数
-          // streamprofile: this.videoConfigStreamprofile, // {string} - stream profile, main/sub or other predefine transcoding profile
-          hlsver: "v1", //v1 is for ts, v2 is for fmp4
-          session: "e312287e-d809-4b4b-a5d6-336e5006199f", //session got from login可变参数
-        };
-
-        this.cancelPlay();
-        this.videoPlayer = new H5sPlayerRTC(videoConfig);
-        this.videoPlayer.connect();
-
-        this.BASE.showMsg({
-          type: "success",
-          msg: "播放组件初始化中...请稍后...",
-        });
-      });
-    },
     selectTab: function (tab, index) {
       this.activeTab = index;
       if (index === 0) {
@@ -993,4 +933,9 @@ export default {
     height: 800px;
   }
 }
+
+.videoBoxiframe {
+  border: none;
+  overflow: hidden;
+}
 </style>

src/views/Home/Home.vue

@@ -543,7 +543,7 @@
                 </div>
               </div>
               <div class="situation-item">
-                <div class="icon svg-icon svg-icon-purple">
+                <div class="icon svg-icon svg-icon-green">
                   <svg-icon class="" svgid="svg-待机图标" />
                 </div>
                 <div class="info">
@@ -559,7 +559,7 @@
                 </div>
               </div>
               <div class="situation-item">
-                <div class="icon svg-icon svg-icon-green">
+                <div class="icon svg-icon svg-icon-purple">
                   <svg-icon class="" svgid="svg-运行图标" />
                 </div>
                 <div class="info">
@@ -575,7 +575,7 @@
                 </div>
               </div>
               <div class="situation-item">
-                <div class="icon svg-icon svg-icon-yellow">
+                <div class="icon svg-icon svg-icon-pink">
                   <svg-icon class="" svgid="svg-限电图标" />
                 </div>
                 <div class="info">
@@ -1009,6 +1009,7 @@ export default {
       this.timmer = null;
       this.wpId = wpId;
       this.requestData(false);
+      this.getCharts();
       this.timmer = setInterval(() => {
         this.requestData(false);
       }, this.$store.state.websocketTimeSec);

src/views/WindSite/pages/Tower.vue

@@ -1,35 +1,47 @@
 <template>
-    <div class="tower">
-        <Wave></Wave>
-        <Windmill class="windmill-1"></Windmill>
-        <Windmill class="windmill-2"></Windmill>
-        <Windmill class="windmill-3"></Windmill>
-        <Windmill class="windmill-4"></Windmill>
-        <Windmill class="windmill-5"></Windmill>
-        <WindTower :data="cftmap"></WindTower>
-        <dash-pie-chart class="pie-left" title="空气密度" :value="cftmap.KQMD || 0" height="9.722vh" width="9.722vh" />
-        <dash-pie-chart class="pie-right" title="压强" :value="cftmap.FCCFTYQ || 0" height="9.722vh" width="9.722vh" />
-        <Panel class="panel-top" title="日资源玫瑰图" :bgBlur="true">
-            <div class="direction-chart">
-                <DirectionRadarChart width="100%" height="23vh" :value="rmgtmap" />
-                <div class="legend">
-                    <span class="dot bg-purple"></span>
-                    <span>{{ rmgtTitle || "" }}</span>
-                </div>
-            </div>
-        </Panel>
-        <Panel class="panel-bottom" title="月资源玫瑰图" :bgBlur="true">
-            <div class="direction-chart">
-                <DirectionRadarChart width="100%" height="23vh" :value="ymgtmap" />
-                <div class="legend">
-                    <span class="dot bg-purple"></span>
-                    <span>{{ ymgtTitle || "" }}</span>
-                </div>
-            </div>
-        </Panel>
-      <toolbar-panel class="rose-chart" title="功率曲线">
-            <template v-slot:tools>
-                <!--<div class="tools">
+  <div class="tower">
+    <Wave></Wave>
+    <Windmill class="windmill-1"></Windmill>
+    <Windmill class="windmill-2"></Windmill>
+    <Windmill class="windmill-3"></Windmill>
+    <Windmill class="windmill-4"></Windmill>
+    <Windmill class="windmill-5"></Windmill>
+    <WindTower :data="cftmap"></WindTower>
+    <dash-pie-chart
+      class="pie-left"
+      title="空气密度"
+      :value="cftmap.KQMD || 0"
+      height="9.722vh"
+      width="9.722vh"
+    />
+    <dash-pie-chart
+      class="pie-right"
+      title="压强"
+      :value="cftmap.FCCFTYQ || 0"
+      height="9.722vh"
+      width="9.722vh"
+    />
+    <Panel class="panel-top" title="日资源玫瑰图" :bgBlur="true">
+      <div class="direction-chart">
+        <DirectionRadarChart width="100%" height="23vh" :value="rmgtmap" />
+        <div class="legend">
+          <span class="dot bg-purple"></span>
+          <span>{{ rmgtTitle || "" }}</span>
+        </div>
+      </div>
+    </Panel>
+    <Panel class="panel-bottom" title="月资源玫瑰图" :bgBlur="true">
+      <div class="direction-chart">
+        <DirectionRadarChart width="100%" height="23vh" :value="ymgtmap" />
+        <div class="legend">
+          <span class="dot bg-purple"></span>
+          <span>{{ ymgtTitle || "" }}</span>
+        </div>
+      </div>
+    </Panel>
+    <toolbar-panel class="rose-chart" title="功率曲线">
+      <template v-slot:tools>
+        <!--<div class="tools">
                     <div class="tool-block">
                         <div class="legend bg-green"></div>
                         <div class="legend-text">应发功率</div>
@@ -55,13 +67,18 @@
                         <div class="legend-text">风速</div>
                     </div>
                 </div>-->
-            </template> 
-            <template v-slot:default>
-                <!-- 日发电量 -->
-                <multiple-line-chart :list="Powertrend.value" :units="Powertrend.units" height="28vh" :showLegend="true" />
-            </template>
-        </toolbar-panel>
-    </div>
+      </template>
+      <template v-slot:default>
+        <!-- 日发电量 -->
+        <multiple-line-chart
+          :list="Powertrend.value"
+          :units="Powertrend.units"
+          height="28vh"
+          :showLegend="true"
+        />
+      </template>
+    </toolbar-panel>
+  </div>
 </template>
 
 <script>
@@ -181,7 +198,14 @@ export default {
           that.ymgtTitle = res.data.ymgtmap.jfpl;
 
           let units = ["(万kw)", "(米/s)"];
-          let keyArray = ["value1", "value2", "value3", "value4", "value5", "value6"];
+          let keyArray = [
+            "value1",
+            "value2",
+            "value3",
+            "value4",
+            "value5",
+            "value6",
+          ];
 
           let Powertrend = {
             units,

src/views/globalMonitor/index.vue

@@ -0,0 +1,38 @@
+<template>
+  <div style="width: 100%; height: 100%">
+    <iframe
+      class="videoBoxiframe"
+      width="100%"
+      height="100%"
+      src="http://10.155.32.4:8070/monitor/index.html"
+    ></iframe>
+  </div>
+</template>
+
+<script>
+export default {
+  // 名称
+  name: "globalMonitor",
+
+  // 数据
+  data() {
+    return {};
+  },
+
+  // 函数
+  methods: {},
+
+  created() {},
+
+  mounted() {},
+
+  unmounted() {},
+};
+</script>
+
+<style lang="less" scoped>
+.videoBoxiframe {
+  border: none;
+  overflow: hidden;
+}
+</style>