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 cdf82a8..d9124bd 100644 --- a/src/views/base/staff/index.vue +++ b/src/views/base/staff/index.vue @@ -309,16 +309,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 8f9d149..e67511f 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 @@
- - - - +
+ +
+
+ +
+
+ +
+
+ +
+
@@ -118,6 +124,7 @@