diff --git a/debug.log b/debug.log index d6189548..124f8a9b 100644 --- a/debug.log +++ b/debug.log @@ -1,2 +1,8 @@ -[0524/103228.221:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) -[0530/171244.522:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[0530/113505.640:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[0530/113508.674:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[0530/141801.489:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[0530/141801.943:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[0929/090447.805:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[0929/090447.874:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[0929/090448.024:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[0929/090501.978:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) diff --git a/src/components/account.vue b/src/components/account.vue index 8b2c4a72..3f273a59 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -1,138 +1,158 @@ diff --git a/src/components/videoModule/isc_plugin/isc_plugin_h5.vue b/src/components/videoModule/isc_plugin/isc_plugin_h5.vue index f7cca4a6..327a8c86 100644 --- a/src/components/videoModule/isc_plugin/isc_plugin_h5.vue +++ b/src/components/videoModule/isc_plugin/isc_plugin_h5.vue @@ -1,673 +1,761 @@ + class="video-controls" + v-for="i in maxWindows" + :key="i" + :id="'controls-' + i" + :style="{ display: 'none' }" + > +
+
+
+ 关闭 + +
+
+
+
+
+ +
+ + +
+ + + +
+ + +
+ +
+
+ +
+ +
+ + +
+ + +
+ + +
+ + +
+ +
+ + + - + + \ No newline at end of file diff --git a/src/views/equipmentCenter/videoManage/videoConfig.vue b/src/views/equipmentCenter/videoManage/videoConfig.vue index 4a13f423..7a36010b 100644 --- a/src/views/equipmentCenter/videoManage/videoConfig.vue +++ b/src/views/equipmentCenter/videoManage/videoConfig.vue @@ -1010,7 +1010,7 @@ " > @@ -1917,8 +1917,8 @@ export default { this.getProjectVideoConfigList(); this.Popup.accountServer = true; this.currentVideoTypeDetail.account = this.currentVideoTypeDetail.account; - this.currentVideoTypeDetail.password = - this.currentVideoTypeDetail.password; + this.currentVideoTypeDetail.port = + this.currentVideoTypeDetail.port; this.currentVideoTypeDetail.appId = this.currentVideoTypeDetail.appId; this.currentVideoTypeDetail.appSecret = this.currentVideoTypeDetail.appSecret; @@ -2237,12 +2237,31 @@ export default { this.addGroupDialog = true; this.addGroupForm = JSON.parse(JSON.stringify(item)); this.$nextTick(() => { - if (this.addGroupForm.parentObj) { - this.selectVal = JSON.parse(this.addGroupForm.parentObj).groupName; + const find = this.findNodeById(this.videoTreeData, item.parentId); + if(find) { + this.selectVal = find.groupName; this.$refs.groupTree.setCurrentKey(this.addGroupForm.parentId); } + // if (this.addGroupForm.parentObj) { + // this.selectVal = JSON.parse(this.addGroupForm.parentObj).groupName; + // this.$refs.groupTree.setCurrentKey(this.addGroupForm.parentId); + // } }); }, + findNodeById(node, id) { + const find = node.find((item) => item.id === id); + if (find) { + return find; + } + for (let child of node) { + if (child.children && child.children.length > 0) { + const found = this.findNodeById(child.children, id); + if (found) return found; + } + } + + return null; + }, deleteGroupFn(item) { // 确定删除分组 this.$confirm( @@ -2607,17 +2626,23 @@ export default { ? obj.enterpriseIds.split(",") : []; this.$nextTick(() => { - if (this.currentVideoTypeDetail.parentObj) { - this.selectFormVal = JSON.parse( - this.currentVideoTypeDetail.parentObj - ).groupName; - this.selectFormTreeData = JSON.parse( - this.currentVideoTypeDetail.parentObj - ); - this.$refs.groupFormTree.setCurrentKey( - this.currentVideoTypeDetail.parentId - ); + const find = this.findNodeById(this.videoTreeData, obj.groupId); + if(find) { + this.selectFormVal = find.groupName; + this.$refs.groupTree.setCurrentKey(this.currentVideoTypeDetail.groupId); } + + // if (this.currentVideoTypeDetail.parentObj) { + // this.selectFormVal = JSON.parse( + // this.currentVideoTypeDetail.parentObj + // ).groupName; + // this.selectFormTreeData = JSON.parse( + // this.currentVideoTypeDetail.parentObj + // ); + // this.$refs.groupFormTree.setCurrentKey( + // this.currentVideoTypeDetail.parentId + // ); + // } }); console.log("编辑内容", obj); }, diff --git a/src/views/projectFront/buildersDiary/buildersDiaryAll.vue b/src/views/projectFront/buildersDiary/buildersDiaryAll.vue index 98680034..7712334c 100644 --- a/src/views/projectFront/buildersDiary/buildersDiaryAll.vue +++ b/src/views/projectFront/buildersDiary/buildersDiaryAll.vue @@ -429,7 +429,7 @@