From d774203bd72f3e670e53af8185466c53f69ff91d Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Thu, 29 Aug 2024 19:40:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84bug=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=8E=E8=A7=86=E9=A2=91=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/views/base/staff/index.vue | 6 +- src/views/base/team/index.vue | 43 ++- .../manage/components/monitor.vue | 298 ++++++++++++++++++ .../manage/realTimeManage/realTimeManage.vue | 157 +++++++-- vue.config.js | 3 +- 6 files changed, 474 insertions(+), 34 deletions(-) create mode 100644 src/views/construction/manage/components/monitor.vue diff --git a/package.json b/package.json index 464b9c6..a495009 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "echarts": "5.4.0", "element-ui": "2.15.14", "file-saver": "^2.0.5", + "flv.js": "^1.6.2", "fuse.js": "6.4.3", "highlight.js": "9.18.5", "html2canvas": "^1.4.1", diff --git a/src/views/base/staff/index.vue b/src/views/base/staff/index.vue index 30feb06..13331ac 100644 --- a/src/views/base/staff/index.vue +++ b/src/views/base/staff/index.vue @@ -302,16 +302,16 @@ - + - + - + diff --git a/src/views/base/team/index.vue b/src/views/base/team/index.vue index 8ac6c54..310a830 100644 --- a/src/views/base/team/index.vue +++ b/src/views/base/team/index.vue @@ -280,7 +280,7 @@ - + @@ -306,7 +306,7 @@
- @@ -323,7 +323,10 @@
-
已选择
+
+
已选择
+
清空
+
{{ item.name }}
@@ -622,13 +625,38 @@ cancelPeople() { this.openPeople = false; }, + //清空人员 + cleanChosen(){ + this.chosenUser=[]; + // 取消勾选 + this.$nextTick(()=>{ + //清空时全部清除勾选 + this.$refs.peopleTable.clearSelection() + // this.peopleList.forEach(row => { + // for(let i=0;i \ No newline at end of file diff --git a/src/views/construction/manage/realTimeManage/realTimeManage.vue b/src/views/construction/manage/realTimeManage/realTimeManage.vue index 8fd859d..04b45b2 100644 --- a/src/views/construction/manage/realTimeManage/realTimeManage.vue +++ b/src/views/construction/manage/realTimeManage/realTimeManage.vue @@ -13,27 +13,27 @@
- +
- - + +
- +
- + 缩放 - +
- + 聚焦 - +
@@ -59,14 +59,20 @@
- - - - +
+ +
+
+ +
+
+ +
+
+ +
+
@@ -111,6 +117,7 @@