From 9a4b79689904a42583493b45a6b1b9294af49673 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期二, 15 六月 2021 16:07:17 +0800
Subject: [PATCH] 修复数据栈选中后无效http请求的问题
---
src/pages/cameraAccess/index/VideoManage.vue | 27 ++++----
src/pages/cameraAccess/components/DataStackInfo.vue | 121 +++++++++++++++++++---------------------
2 files changed, 71 insertions(+), 77 deletions(-)
diff --git a/src/pages/cameraAccess/components/DataStackInfo.vue b/src/pages/cameraAccess/components/DataStackInfo.vue
index 643acd1..1806173 100644
--- a/src/pages/cameraAccess/components/DataStackInfo.vue
+++ b/src/pages/cameraAccess/components/DataStackInfo.vue
@@ -354,7 +354,7 @@
}
},
filters: {
- statusFormat (value) {
+ statusFormat(value) {
let statusCode = {
"-2": "澶勭悊寮傚父",
"-1": "宸插垹闄�",
@@ -365,7 +365,7 @@
}
return statusCode[value];
},
- readFileSizeUnit (value) {
+ readFileSizeUnit(value) {
let UNITS = [' B', ' KB', ' MB', ' GB', ' TB', ' PB', ' EB', ' ZB', ' YB'];
let format = function (value, power) {
return (value / Math.pow(1024, power)).toFixed(2) + UNITS[power];
@@ -384,7 +384,7 @@
}
},
computed: {
- snapshotClass () {
+ snapshotClass() {
let classs = ["snapshot"];
if (this.form.type === 1) {
classs.push("snapshot-video")
@@ -398,13 +398,13 @@
return classs;
},
- dirOptions () {
+ dirOptions() {
return this.DataStackPool.dirs.filter(dir => {
return dir.id !== this.DataStackPool.selectedDir.id
})
}
},
- data () {
+ data() {
return {
videoUrl: "",
imgUrl: "",
@@ -439,29 +439,20 @@
targetFile: "",
};
},
- mounted () {
+ mounted() {
this.initFormData();
console.log(this.PollData.barCharts)
},
- beforeDestroy () {
+ beforeDestroy() {
this.taskUid = 0;
},
- watch: {
- 'fileList.length': {
- handler (n, o) {
- //鏁版嵁鏍堟枃浠舵暟閲忓彉鏇�
- //鏇存柊鐙珛鍦烘櫙鏁版嵁鏍堟枃浠�
- this.$root.$children[0].$children[1].$refs['sepRule'].getStackFiles();
- }
- },
- },
methods: {
- checkResolution (val) {
+ checkResolution(val) {
this.form.resolution_width = Number(val.split('*')[0]);
this.form.resolution_height = Number(val.split('*')[1]);
},
- preview (row) {
+ preview(row) {
this.previewDialog = true;
if (row.type === 1) {
@@ -472,7 +463,7 @@
}
},
// 娓呯┖杈撳叆妗�
- initFormData () {
+ initFormData() {
this.form = {
enable: false,
id: "",
@@ -484,18 +475,19 @@
};
},
// 娣诲姞璁惧
- addDir (node) {
+ addDir(node) {
this.isAdd = true;
this.isDisabled = false;
this.initFormData();
this.DataStackPool.clean();
this.fileList = [];
},
- selectDir (node) {
+ // 鏁版嵁鏍堟枃浠跺す閫変腑鏃讹紝鐢辩埗缁勪欢瑙﹀彂
+ selectDir(node) {
if (node.id === "") {
return
}
- console.log('閫夋嫨鏁版嵁鏍�', node)
+
this.isDisabled = false;
this.isAdd = false;
this.videoItem = null;
@@ -518,12 +510,12 @@
this.videoUrl = '';
this.imgUrl = '';
},
- initFetchListTask () {
+ initFetchListTask() {
const uid = Math.round(Math.random() * 1000);
this.taskUid = uid;
this.timingtask(uid);
},
- timingtask (uid) {
+ timingtask(uid) {
if (uid !== this.taskUid || this.form.id === "") {
return;
}
@@ -533,28 +525,29 @@
_this.timingtask(uid);
}, 2 * 1000);
},
- fetchFileList () {
- findAllFileByStackId({ name: this.searchInput, stackId: this.form.id, page: this.page, size: this.size, type: 0 }).then(rsp => {
- if (rsp && rsp.success && rsp.data.total >= 0) {
- this.fileList = rsp.data.dataList;
- this.total = rsp.data.total;
- // 瀹氭椂鍒锋柊浼氭竻绌洪�変腑鐘舵�侊紝鍦ㄨ繖閲屾仮澶�
- this.fileList.forEach(row => {
- //this.polygonDatas.push({snapshot_url:row.snapshot_url})
- if (this.multipleSelection.indexOf(row.id) !== -1) {
- this.$nextTick(() => {
- this.$refs.multipleTable.toggleRowSelection(row);
- })
- }
- });
- }
- }).catch(err => {
- console.log(err)
- })
+ fetchFileList() {
+ findAllFileByStackId({ name: this.searchInput, stackId: this.form.id, page: this.page, size: this.size, type: 0 }).then(
+ rsp => {
+ if (rsp && rsp.success && rsp.data.total >= 0) {
+ this.fileList = rsp.data.dataList;
+ this.total = rsp.data.total;
+ // 瀹氭椂鍒锋柊浼氭竻绌洪�変腑鐘舵�侊紝鍦ㄨ繖閲屾仮澶�
+ this.fileList.forEach(row => {
+ //this.polygonDatas.push({snapshot_url:row.snapshot_url})
+ if (this.multipleSelection.indexOf(row.id) !== -1) {
+ this.$nextTick(() => {
+ this.$refs.multipleTable.toggleRowSelection(row);
+ })
+ }
+ });
+ }
+ }).catch(err => {
+ console.log(err)
+ })
},
// 淇濆瓨
- onSubmit (formName) {
+ onSubmit(formName) {
if (formName == 'addForm') {
if (this.form.name.indexOf('/') >= 0) {
this.$notify({
@@ -584,7 +577,7 @@
});
},
// 鍒犻櫎鎽勫儚鏈�
- deleteDir () {
+ deleteDir() {
this.$confirm("鏄惁鍒犻櫎姝ゆ枃浠跺す锛�", {
center: true,
cancelButtonClass: "comfirm-class-cancle",
@@ -613,32 +606,32 @@
});
});
},
- handleTabClick (tab, event) {
+ handleTabClick(tab, event) {
console.log(tab, event);
},
- handleSelect (val) {
+ handleSelect(val) {
this.multipleSelection = val.map(row => {
return row.id;
});
},
- handelSearchInputChange (val) {
+ handelSearchInputChange(val) {
this.multipleSelection = [];
},
- handleUpload () {
+ handleUpload() {
console.log(this.DataStackPool.selectedDir.id)
console.log(this.$refs[`uploader_${this.DataStackPool.selectedDir.id}`][0].$refs.button.$refs.btn.click())
},
- handleRefrashFileList (val) {
+ handleRefrashFileList(val) {
this.page = val;
this.multipleSelection = [];
this.fetchFileList();
},
- handleSizeChange (val) {
+ handleSizeChange(val) {
this.size = val;
this.multipleSelection = [];
this.fetchFileList();
},
- async handleSortFile (direct, id) {
+ async handleSortFile(direct, id) {
let res = await sortFile({
id: id,
direct: direct
@@ -654,7 +647,7 @@
})
}
},
- async handleFileStatus (row, status, multi = false) {
+ async handleFileStatus(row, status, multi = false) {
let ids = this.multipleSelection;
if (!multi) {
ids = [row.id];
@@ -682,10 +675,10 @@
console.log("err")
}
},
- dropdownClick (cmd) {
+ dropdownClick(cmd) {
cmd.cb(cmd.data);
},
- handleFileDelete (rows, multi = false) {
+ handleFileDelete(rows, multi = false) {
let _this = this;
let ids = this.multipleSelection;
if (!multi) {
@@ -712,17 +705,17 @@
}).catch(() => { })
},
- handleFileMove (row) {
+ handleFileMove(row) {
this.targetDir = "";
this.targetFile = row.id;
this.fileDialog = true;
},
- handleFileRename (row) {
+ handleFileRename(row) {
this.editRowId = row.id;
clearTimeout(this.timer);
this.timer = null;
},
- cellRenameFile (row) {
+ cellRenameFile(row) {
this.editRowId = "";
renameFile({ id: row.id, name: row.name }).then(rsp => {
if (rsp && rsp.success) {
@@ -745,10 +738,10 @@
}
})
},
- isSelectable (row, rowIndex) {
+ isSelectable(row, rowIndex) {
return row.status !== 2
},
- cellFileCopy () {
+ cellFileCopy() {
copyFile({ id: this.targetFile, stackIds: [this.targetDir] }).then(rsp => {
if (rsp && rsp.success) {
this.$notify({
@@ -764,7 +757,7 @@
}
})
},
- cellFileMove () {
+ cellFileMove() {
moveFile({ id: this.targetFile, stackId: this.targetDir }).then(rsp => {
if (rsp && rsp.success) {
this.$notify({
@@ -884,19 +877,19 @@
vertical-align: middle;
}
.snapshot-video {
- background: url('/images/cameraAccess/video.png');
+ background: url("/images/cameraAccess/video.png");
background-repeat: round;
}
.snapshot-image {
- background: url('/images/cameraAccess/image.png');
+ background: url("/images/cameraAccess/image.png");
background-repeat: round;
}
.snapshot-audio {
- background: url('/images/cameraAccess/audio.png');
+ background: url("/images/cameraAccess/audio.png");
background-repeat: round;
}
.snapshot-files {
- background: url('/images/cameraAccess/files.png');
+ background: url("/images/cameraAccess/files.png");
background-repeat: round;
}
}
diff --git a/src/pages/cameraAccess/index/VideoManage.vue b/src/pages/cameraAccess/index/VideoManage.vue
index c5b7296..217ac51 100644
--- a/src/pages/cameraAccess/index/VideoManage.vue
+++ b/src/pages/cameraAccess/index/VideoManage.vue
@@ -64,8 +64,9 @@
CameraInfo,
DataStackInfo,
SeparateRules,
- LinkageRule },
- data () {
+ LinkageRule
+ },
+ data() {
return {
activeName: "camera-info",
buttonAuthority: sessionStorage.getItem("buttonAuthoritys") || [],
@@ -73,7 +74,7 @@
};
},
computed: {
- isAdmin () {
+ isAdmin() {
if (
sessionStorage.getItem("userInfo") &&
sessionStorage.getItem("userInfo") !== ""
@@ -84,7 +85,7 @@
return false;
},
- firstLabeName () {
+ firstLabeName() {
return this.TreeDataPool.treeActiveName === "camera" ? "鎽勫儚鏈轰俊鎭�" : "鏁版嵁鏍堜俊鎭�"
}
},
@@ -106,7 +107,7 @@
}
},
"TreeDataPool.selectedNodes": {
- handler (nodes) {
+ handler(nodes) {
if (this.activeName == "linkage-rule") {
this.$refs.linkRule.initCameraData();
}
@@ -114,7 +115,7 @@
deep: true
},
"DataStackPool.selectedDir": {
- handler (node, oldNode) {
+ handler(node, oldNode) {
if (this.TreeDataPool.treeActiveName !== 'dataStack') {
return
}
@@ -130,7 +131,7 @@
},
},
- created () {
+ created() {
if (this.TreeDataPool.treeActiveName == 'camera') {
if (this.isShow('cameraAccess:cameraInfo')) {
this.activeName = "camera-info"
@@ -154,11 +155,11 @@
this.selectedNodes = [];
this.VideoManageData.init();
},
- beforeDestroy () {
+ beforeDestroy() {
clearInterval(this.intervalTimer);
//this.TreeDataPool.treeActiveName = "camera";
},
- mounted () {
+ mounted() {
this.$nextTick(() => {
bus.$on("addCameraOnTree", node => {
this.handAddDevice(node);
@@ -176,24 +177,24 @@
}, 10000)
},
methods: {
- isShow (authority) {
+ isShow(authority) {
return this.isAdmin || this.buttonAuthority.indexOf("," + authority + ",") > -1
},
- handAddDevice (node) {
+ handAddDevice(node) {
let _this = this;
setTimeout(() => {
_this.$refs.cameraInfo.addDevice(node);
_this.activeName = "camera-info";
}, 100);
},
- handAddDIr (node) {
+ handAddDIr(node) {
let _this = this;
setTimeout(() => {
_this.$refs.dataStackInfo.addDir(node);
_this.activeName = "camera-info";
}, 100);
},
- handleClick (tab, event) {
+ handleClick(tab, event) {
this.TreeDataPool.multiple = tab.name === "linkage-rule";
if (tab.name === "camera-info") {
if (this.TreeDataPool.treeActiveName == 'camera') {
--
Gitblit v1.8.0