Browse Source

监控 财务

Shannon_mu 2 years ago
parent
commit
dbb30106df

+ 0 - 1
commandCenter/src/views/commandDispatch/index.vue

@@ -122,7 +122,6 @@ export default {
     watch: {
         //全局社区接口调用
         homeCommunityAll(val) {
-            debugger;
             if (!!val) {
                 this.mixins_query.communityId = val;
                 this.getData();

+ 1 - 5
commandCenter/src/views/financialAnalysis/smallModuleIndex/allcommunit.js

@@ -19,16 +19,12 @@ export default {
     'homeCommunityAll'(n) {
       this.mixins_query.communityId = n;
       this.getData();
-    }, resize(va) {
-      // console.log(va);
     }
   },
   methods: {
   },
   created() {
     this.mixins_query.communityId = this.homeCommunityAll;
-    if (!!this.mixins_query.communityId) {
-      this.getData();
-    }
+    this.getData();
   }
 }

+ 28 - 19
commandCenter/src/views/videoSurveillance/index.vue

@@ -115,6 +115,7 @@ export default {
         },
 
         checkChange(nodeObj, SelectedObj) {
+            debugger;
             this.videoUrlList = [];
             this.$refs.tree.getCheckedNodes().map((item) => {
                 if (item.type == 'device') {
@@ -128,7 +129,9 @@ export default {
 
 <style scoped lang='scss'>
 /* 实时视频左侧 */
-
+/deep/ .el-tree{
+    background: transparent;
+}
 /deep/ .el-tree-node .el-tree-node__expand-icon {
     display: hidden;
 }
@@ -160,10 +163,11 @@ export default {
     display: none;
 }
 /deep/.el-tree-node__content:hover {
-    background-color: #f5f7fa;
+   color: #ffffffa5;
+   background: transparent;
 }
 /deep/.is-current {
-    background: linear-gradient(90deg, rgba(37, 43, 60, 0.5) 0%, rgba(37, 43, 60, 0) 100%);
+    // background: linear-gradient(90deg, rgba(37, 43, 60, 0.5) 0%, rgba(37, 43, 60, 0) 100%);
 }
 
 /deep/.el-tree-node__content > label.el-checkbox {
@@ -188,7 +192,7 @@ export default {
     }
 }
 /deep/.el-tree-node__content {
-    color: #000;
+    color: white;
     padding: 0 !important;
 }
 
@@ -208,7 +212,9 @@ export default {
     .el-tree-node {
         position: relative;
         padding-left: 5px;
-        background: white;
+        &:focus{
+            background: transparent;
+        }
     }
     //节点有间隙,隐藏掉展开按钮就好了,如果觉得空隙没事可以删掉
     .el-tree-node__expand-icon.is-leaf {
@@ -267,20 +273,20 @@ export default {
     background: url('~@/assets/img/expand.png') no-repeat center center;
     content: '';
     display: block;
-    width: 12px;
-    height: 12px;
-    font-size: 12px;
-    background-size: 12px;
+      width: 14px;
+    height: 14px;
+    font-size: 14px;
+    background-size: 14px;
 }
 //有子节点 且已展开
 .el-tree /deep/ .el-tree-node__expand-icon.expanded.el-icon-caret-right:before {
     background: url('~@/assets/img/shrink.png') no-repeat center center;
     content: '';
     display: block;
-    width: 12px;
-    height: 12px;
-    font-size: 12px;
-    background-size: 12px;
+      width: 14px;
+    height: 14px;
+    font-size: 14px;
+    background-size: 14px;
 }
 //没有子节点
 .el-tree /deep/.el-tree-node__expand-icon.is-leaf::before {
@@ -295,11 +301,10 @@ export default {
 /deep/.el-tree-node__expand-icon.expanded {
     -webkit-transform: rotate(0deg);
     transform: rotate(0deg);
-    background: white;
 }
-// /deep/.el-tree-node:focus > .el-tree-node__content {
-//     background-color: transparent !important;
-// }
+/deep/.el-tree-node:focus > .el-tree-node__content {
+    background-color: transparent !important;
+}
 /deep/ .el-checkbox__input.is-checked .el-checkbox__inner {
     background: url('~@/assets/img/checks.png') no-repeat center center;
     content: '';
@@ -324,7 +329,7 @@ export default {
         width: 250px;
         padding: 20px;
         height: calc(100% - 80px);
-        background: white;
+        background: #000;
         /deep/ .el-input__suffix{
             top: 5px;
         }
@@ -344,13 +349,17 @@ export default {
             &::-webkit-scrollbar-thumb {
                 border-radius: 5px;
                 width: 4px;
-                background: #e2e2e2;
+                // background: #e2e2e2;
             }
             &::-webkit-scrollbar-track-piece {
                 background: transparent;
                 width: 4px;
             }
         }
+       /deep/ .el-input__inner{
+            background: transparent !important;
+            color: white;
+        }
     }
     .rightVideo {
         width: calc(100% - 270px);

+ 86 - 77
commandCenter/src/views/videoSurveillance/myVideoPlayer.vue

@@ -1,23 +1,32 @@
 <template>
-  <video-player
-    class="video-player vjs-custom-skin"
-    :ref="uid"
-    :playsinline="true"
-    :options="playerOption"
-    @play="onPlayerPlay($event)"
-    @pause="onPlayerPause($event)"
-    @ended="onPlayerEnded($event)"
-    @waiting="onPlayerWaiting($event)"
-    @playing="onPlayerPlaying($event)"
-    @loadeddata="onPlayerLoadeddata($event)"
-    @timeupdate="onPlayerTimeupdate($event)"
-    @canplay="onPlayerCanplay($event)"
-    @canplaythrough="onPlayerCanplaythrough($event)"
-    @statechanged="playerStateChanged($event)"
-    @ready="playerReadied"
-  >
-  </video-player>
+    <video-player
+        class="video-player vjs-custom-skin"
+        :ref="uid"
+        :playsinline="true"
+        :options="playerOption"
+        @play="onPlayerPlay($event)"
+        @pause="onPlayerPause($event)"
+        @ended="onPlayerEnded($event)"
+        @waiting="onPlayerWaiting($event)"
+        @playing="onPlayerPlaying($event)"
+        @loadeddata="onPlayerLoadeddata($event)"
+        @timeupdate="onPlayerTimeupdate($event)"
+        @canplay="onPlayerCanplay($event)"
+        @canplaythrough="onPlayerCanplaythrough($event)"
+        @statechanged="playerStateChanged($event)"
+        @ready="playerReadied"
+    >
+    </video-player>
 </template>
+<style lang="scss" scoped>
+.video-player {
+    height: 100%;
+   /deep/ .video-js.vjs-fluid {
+        height: 100%;
+        padding: 0;
+    }
+}
+</style>
 <script >
 import { videoPlayer } from 'vue-video-player';
 import 'video.js/dist/video-js.css';
@@ -25,76 +34,76 @@ import 'vue-video-player/src/custom-theme.css';
 import 'videojs-contrib-hls';
 
 export default {
-  components: {
-    videoPlayer
-  },
-  props: {
-    videoData: Array
-  },
-  data () {
-    return {
-      uid: `videoPlayer_${this._uid}`
-    };
-  },
-  computed: {
-    playerOption () {
-      return {
-        playbackRates: [0.5, 1.0, 1.5, 2.0], // 可选的播放速度
-        autoplay: false, // 如果为true,浏览器准备好时开始回放。
-        muted: false, // 默认情况下将会消除任何音频。
-        loop: false, // 是否视频一结束就重新开始。
-        preload: 'auto', // 建议浏览器在<video>加载元素后是否应该开始下载视频数据。auto浏览器选择最佳行为,立即开始加载视频(如果浏览器支持)
-        language: 'zh-CN',
-        aspectRatio: '16:9', // 将播放器置于流畅模式,并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字(例如"16:9"或"4:3")
-        fluid: true, // 当true时,Video.js player将拥有流体大小。换句话说,它将按比例缩放以适应其容器。
-        sources: this.videoData,
-        hls: true,
-        poster: '', // 封面地址
-        notSupportedMessage: '此视频暂无法播放,请稍后再试', // 允许覆盖Video.js无法播放媒体源时显示的默认信息。
-        controlBar: {
-          timeDivider: true, // 当前时间和持续时间的分隔符
-          durationDisplay: true, // 显示持续时间
-          remainingTimeDisplay: false, // 是否显示剩余时间功能
-          fullscreenToggle: true // 是否显示全屏按钮
+    components: {
+        videoPlayer
+    },
+    props: {
+        videoData: Array
+    },
+    data() {
+        return {
+            uid: `videoPlayer_${this._uid}`
+        };
+    },
+    computed: {
+        playerOption() {
+            return {
+                playbackRates: [0.5, 1.0, 1.5, 2.0], // 可选的播放速度
+                autoplay: false, // 如果为true,浏览器准备好时开始回放。
+                muted: false, // 默认情况下将会消除任何音频。
+                loop: false, // 是否视频一结束就重新开始。
+                preload: 'auto', // 建议浏览器在<video>加载元素后是否应该开始下载视频数据。auto浏览器选择最佳行为,立即开始加载视频(如果浏览器支持)
+                language: 'zh-CN',
+                aspectRatio: '16:9', // 将播放器置于流畅模式,并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字(例如"16:9"或"4:3")
+                fluid: true, // 当true时,Video.js player将拥有流体大小。换句话说,它将按比例缩放以适应其容器。
+                sources: this.videoData,
+                hls: true,
+                poster: '', // 封面地址
+                notSupportedMessage: '此视频暂无法播放,请稍后再试', // 允许覆盖Video.js无法播放媒体源时显示的默认信息。
+                controlBar: {
+                    timeDivider: true, // 当前时间和持续时间的分隔符
+                    durationDisplay: true, // 显示持续时间
+                    remainingTimeDisplay: false, // 是否显示剩余时间功能
+                    fullscreenToggle: true // 是否显示全屏按钮
+                }
+            };
         }
-      };
-    }
-  },
-  methods: {
-    // 播放回调
-    onPlayerPlay (player) {
-      this.$refs[this.uid].player.play();
     },
+    methods: {
+        // 播放回调
+        onPlayerPlay(player) {
+            this.$refs[this.uid].player.play();
+        },
 
-    // 暂停回调
-    onPlayerPause (player) { },
+        // 暂停回调
+        onPlayerPause(player) {},
 
-    // 视频播完回调
-    onPlayerEnded ($event) { },
+        // 视频播完回调
+        onPlayerEnded($event) {},
 
-    // DOM元素上的readyState更改导致播放停止
-    onPlayerWaiting ($event) { },
+        // DOM元素上的readyState更改导致播放停止
+        onPlayerWaiting($event) {},
 
-    // 已开始播放回调
-    onPlayerPlaying ($event) { },
+        // 已开始播放回调
+        onPlayerPlaying($event) {},
 
-    // 当播放器在当前播放位置下载数据时触发
-    onPlayerLoadeddata ($event) { },
+        // 当播放器在当前播放位置下载数据时触发
+        onPlayerLoadeddata($event) {},
 
-    // 当前播放位置发生变化时触发。
-    onPlayerTimeupdate ($event) { },
+        // 当前播放位置发生变化时触发。
+        onPlayerTimeupdate($event) {},
 
-    //媒体的readyState为HAVE_FUTURE_DATA或更高
-    onPlayerCanplay (player) { },
+        //媒体的readyState为HAVE_FUTURE_DATA或更高
+        onPlayerCanplay(player) {},
 
-    //媒体的readyState为HAVE_ENOUGH_DATA或更高。这意味着可以在不缓冲的情况下播放整个媒体文件。
-    onPlayerCanplaythrough (player) { },
+        //媒体的readyState为HAVE_ENOUGH_DATA或更高。这意味着可以在不缓冲的情况下播放整个媒体文件。
+        onPlayerCanplaythrough(player) {},
 
-    //播放状态改变回调
-    playerStateChanged (playerCurrentState) { },
+        //播放状态改变回调
+        playerStateChanged(playerCurrentState) {},
 
-    //将侦听器绑定到组件的就绪状态。与事件监听器的不同之处在于,如果ready事件已经发生,它将立即触发该函数。。
-    playerReadied (player) { }
-  }
+        //将侦听器绑定到组件的就绪状态。与事件监听器的不同之处在于,如果ready事件已经发生,它将立即触发该函数。。
+        playerReadied(player) {}
+    }
 };
 </script>

+ 5 - 3
commandCenter/src/views/videoSurveillance/video.vue

@@ -32,6 +32,7 @@ export default {
   watch: {
     videoUrlList (news) {
       if (!!news.length) {
+        this.urlArr = []
         news.map((item) => {
           this.getVideo(item);
         });
@@ -40,9 +41,7 @@ export default {
   },
   data () {
     return {
-      urlArr: [
-        // 'http://cmgw-vpc.lechange.com:8888/LCO/7D100C2PAZ6C590/0/0/20220112T081910/051edef3559a8eca65febb70e504acdb.m3u8',
-      ]
+      urlArr: []
     };
   },
   methods: {
@@ -54,6 +53,8 @@ export default {
             if (data.indexOf('10.35.239.168:7086') != -1) {
               let newUrl = data.replace('10.35.239.168:7086', '60.191.94.122:20046');
               this.urlArr.push(newUrl);
+              // this.urlArr.push('http://cmgw-vpc.lechange.com:8888/LCO/7D100C2PAZ6C590/0/0/20220112T081910/051edef3559a8eca65febb70e504acdb.m3u8');
+              
             }
           }
         });
@@ -64,6 +65,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .videoContent {
+  height: 100%;
     &.content_most {
         display: grid;
         row-gap: 20px;