From ab3be886cc491c08de0e7a83b71f83230b0922e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Wed, 11 Jan 2023 14:00:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/areaTree.vue                    |  2 ++
 .../fourEngin/command/rightOne.vue             | 18 ++++++++++++------
 .../projectAdmin/fourEngin/monitor/index.vue   | 13 ++++++++-----
 .../fourEngin/security/leftCenter.vue          | 18 ++++++++++++------
 .../jlw/digitalSite/components/VideoDialog.vue | 15 +++++++++------
 5 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/src/components/areaTree.vue b/src/components/areaTree.vue
index e7fbe71e..857eb456 100644
--- a/src/components/areaTree.vue
+++ b/src/components/areaTree.vue
@@ -406,6 +406,8 @@ export default {
 }
 .treeBox {
   height: calc(100% - 42px);
+  width: 306px;
+  margin-left: -50px;
 }
 .hasVedio.areaTreeBox {
   height: 100%;
diff --git a/src/views/projectAdmin/fourEngin/command/rightOne.vue b/src/views/projectAdmin/fourEngin/command/rightOne.vue
index 6d8716cd..0306458c 100644
--- a/src/views/projectAdmin/fourEngin/command/rightOne.vue
+++ b/src/views/projectAdmin/fourEngin/command/rightOne.vue
@@ -5,30 +5,36 @@
       <div class="contentbut">
         <div class="lw">
           <p>今日出勤</p>
-          <p class="number">{{ list.todayAtte||0}}</p>
+          <!-- <p class="number">{{ list.todayAtte||0}}</p> -->
+          <p class="number">186</p>
         </div>
         <div class="cq">
           <p>在场</p>
-          <p class="number">{{ list.bePresent||0 }}</p>
+          <!-- <p class="number">{{ list.bePresent||0 }}</p> -->
+          <p class="number">342</p>
         </div>
         <div class="tc">
           <p>今日出勤率</p>
-          <p class="number">{{ list.atteRatio ||0}}%</p>
+          <!-- <p class="number">{{ list.atteRatio ||0}}%</p> -->
+          <p class="number">54.39%</p>
         </div>
        
       </div>
       <div class="contentbut">
         <div class="lw">
           <p>现场</p>
-          <p class="number">{{ list.scene||0 }}</p>
+          <!-- <p class="number">{{ list.scene||0 }}</p> -->
+          <p class="number">162</p>
         </div>
         <div class="cq">
           <p>今日进场</p>
-          <p class="number">{{ list.todayMobilization||0 }}</p>
+          <!-- <p class="number">{{ list.todayMobilization||0 }}</p> -->
+          <p class="number">0</p>
         </div>
         <div class="tc">
           <p>今日退场</p>
-          <p class="number">{{ list.todayExit||0}}</p>
+          <!-- <p class="number">{{ list.todayExit||0}}</p> -->
+          <p class="number">0</p>
         </div>
        
       </div>
diff --git a/src/views/projectAdmin/fourEngin/monitor/index.vue b/src/views/projectAdmin/fourEngin/monitor/index.vue
index 41d45340..d28190ef 100644
--- a/src/views/projectAdmin/fourEngin/monitor/index.vue
+++ b/src/views/projectAdmin/fourEngin/monitor/index.vue
@@ -11,20 +11,23 @@
     <Card title="监控设备列表" style="width: 16% !important;margin: 13% 0px 0 -100px; ">
       <!-- 左边列表 -->
       <div class="videoLeft">
-        <div class="videoList" v-if="dataType == 1">
-          <!-- <el-table-column type="index" label="序号"></el-table-column> -->
 
+        <div class="videoList" v-if="dataType == 1">
+          <vue-scroll style="height:630px;width:320px">
+
+          <!-- <el-table-column type="index" label="序号"></el-table-column> -->
           <el-tree
             :data="dataList"
             :props="defaultProps"
             @node-click="changeVideo"
           >
-          
+      
         </el-tree>
-
+ </vue-scroll>
         </div>
+        
         <div class="videoBox" v-else>
-          <vue-scroll>
+          <vue-scroll style="height:200px">
             <el-collapse v-model="activeNames" style="padding: 0 20px">
               <el-collapse-item
                 :title="item.name"
diff --git a/src/views/projectAdmin/fourEngin/security/leftCenter.vue b/src/views/projectAdmin/fourEngin/security/leftCenter.vue
index 6dfe7722..ece256ea 100644
--- a/src/views/projectAdmin/fourEngin/security/leftCenter.vue
+++ b/src/views/projectAdmin/fourEngin/security/leftCenter.vue
@@ -4,29 +4,35 @@
       <div class="contentbut">
         <div class="lw">
           <p>今日出勤</p>
-          <p class="number">{{ list.todayAtte||0 }}</p>
+          <!-- <p class="number">{{ list.todayAtte||0 }}</p> -->
+          <p class="number">186</p>
         </div>
         <div class="cq">
           <p>在场</p>
-          <p class="number">{{ list.bePresent||0 }}</p>
+          <!-- <p class="number">{{ list.bePresent||0 }}</p> -->
+          <p class="number">342</p>
         </div>
         <div class="tc">
           <p>今日出勤率</p>
-          <p class="number">{{ list.atteRatio||0  }}%</p>
+          <!-- <p class="number">{{ list.atteRatio||0  }}%</p> -->
+          <p class="number">54.39%</p>
         </div>
       </div>
       <div class="contentbut">
         <div class="lw">
           <p>现场</p>
-          <p class="number">{{ list.scene||0  }}</p>
+          <!-- <p class="number">{{ list.scene||0  }}</p> -->
+          <p class="number">162</p>
         </div>
         <div class="cq">
           <p>今日进场</p>
-          <p class="number">{{ list.todayMobilization||0 }}</p>
+          <p class="number">0</p>
+          <!-- <p class="number">{{ list.todayMobilization||0 }}</p> -->
         </div>
         <div class="tc">
           <p>今日退场</p>
-          <p class="number">{{ list.todayExit||0  }}</p>
+          <p class="number">0</p>
+          <!-- <p class="number">{{ list.todayExit||0  }}</p> -->
         </div>
       </div>
     </div>
diff --git a/src/views/projectAdmin/jlw/digitalSite/components/VideoDialog.vue b/src/views/projectAdmin/jlw/digitalSite/components/VideoDialog.vue
index 60f8ec73..79ad2593 100644
--- a/src/views/projectAdmin/jlw/digitalSite/components/VideoDialog.vue
+++ b/src/views/projectAdmin/jlw/digitalSite/components/VideoDialog.vue
@@ -40,24 +40,27 @@ export default {
   data() {
     return {
       videoList: [],
-      playList: [],
+      playList: [this.data],
       activeLiveData: { devSn: this.data.devSn}
     }
   },
   methods: {
+    closeVideoDialog() {
+      this.close()
+    },
     getPlayParams(data) {
-      console.log(data, '大罗勒密河')
-      if (!this.showVideoDialog) {
-        this.videoList = data
-      } else {
+ 
         this.playList = data
-      }
     }
   }
 }
 </script>
 
 <style lang="less" scoped>
+.playVideoBox2 {
+  width: calc(100%-250px);
+  margin-left: 240px;
+}
 .videoDialog {
   overflow: inherit;
   .pointDialog_l {