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 @@

今日出勤

-

{{ list.todayAtte||0}}

+ +

186

在场

-

{{ list.bePresent||0 }}

+ +

342

今日出勤率

-

{{ list.atteRatio ||0}}%

+ +

54.39%

现场

-

{{ list.scene||0 }}

+ +

162

今日进场

-

{{ list.todayMobilization||0 }}

+ +

0

今日退场

-

{{ list.todayExit||0}}

+ +

0

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 @@
-
- +
+ + + - + - +
+
- +

今日出勤

-

{{ list.todayAtte||0 }}

+ +

186

在场

-

{{ list.bePresent||0 }}

+ +

342

今日出勤率

-

{{ list.atteRatio||0 }}%

+ +

54.39%

现场

-

{{ list.scene||0 }}

+ +

162

今日进场

-

{{ list.todayMobilization||0 }}

+

0

+

今日退场

-

{{ list.todayExit||0 }}

+

0

+
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 - } } } }