From 35322555f2ddbc26e73b477e083d9267348c84cb Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 03 十二月 2020 15:36:39 +0800
Subject: [PATCH] 修复编辑区域名称不显示的bug;数据栈信息名称添加命名限制
---
src/components/canvas/Dialog.vue | 4 +
src/pages/labelMark/components/RightSide.vue | 2 -
src/pages/search/index/Searching.vue | 7 ++-
src/pages/cameraAccess/components/DataStackInfo.vue | 87 ++++++++++++++++++++++++-------------------
4 files changed, 55 insertions(+), 45 deletions(-)
diff --git a/src/components/canvas/Dialog.vue b/src/components/canvas/Dialog.vue
index f56437b..05286c6 100644
--- a/src/components/canvas/Dialog.vue
+++ b/src/components/canvas/Dialog.vue
@@ -218,7 +218,8 @@
cancel() {
this.changeType('0')
this.undisabled()
- this.delCursor = {}
+ //this.delCursor = {}
+ this.delCursor = { type: -1, index: -1, remarksName: "", id: "" };
this.canvasHistory.length = 0;
this.step = -1;
this.canvasData = JSON.parse(JSON.stringify(this.canvasDataToChild));
@@ -536,6 +537,7 @@
_this.type = "0";
_this.delCursor.type = "2";
_this.delCursor.index = i;
+ debugger
_this.delCursor.remarksName = v.name;
_this.delCursor.id = v.id;
// console.log("褰撳墠閫変腑鍏冪礌锛�",_this.delCursor)
diff --git a/src/pages/cameraAccess/components/DataStackInfo.vue b/src/pages/cameraAccess/components/DataStackInfo.vue
index fcd94b7..643acd1 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,17 +439,17 @@
targetFile: "",
};
},
- mounted() {
+ mounted () {
this.initFormData();
console.log(this.PollData.barCharts)
},
- beforeDestroy() {
+ beforeDestroy () {
this.taskUid = 0;
},
watch: {
'fileList.length': {
- handler(n, o) {
+ handler (n, o) {
//鏁版嵁鏍堟枃浠舵暟閲忓彉鏇�
//鏇存柊鐙珛鍦烘櫙鏁版嵁鏍堟枃浠�
this.$root.$children[0].$children[1].$refs['sepRule'].getStackFiles();
@@ -457,11 +457,11 @@
},
},
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 +472,7 @@
}
},
// 娓呯┖杈撳叆妗�
- initFormData() {
+ initFormData () {
this.form = {
enable: false,
id: "",
@@ -484,18 +484,18 @@
};
},
// 娣诲姞璁惧
- 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)
+ console.log('閫夋嫨鏁版嵁鏍�', node)
this.isDisabled = false;
this.isAdd = false;
this.videoItem = null;
@@ -518,12 +518,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,7 +533,7 @@
_this.timingtask(uid);
}, 2 * 1000);
},
- fetchFileList() {
+ 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;
@@ -554,7 +554,16 @@
},
// 淇濆瓨
- onSubmit(formName) {
+ onSubmit (formName) {
+ if (formName == 'addForm') {
+ if (this.form.name.indexOf('/') >= 0) {
+ this.$notify({
+ type: "error",
+ message: "淇濆瓨澶辫触,鏁版嵁鏍堝悕绉颁笉鑳藉寘鍚�'/'锛�"
+ });
+ return;
+ }
+ }
this.$refs[formName].validate(async valid => {
if (valid) {
saveDir(this.form).then(rsp => {
@@ -575,7 +584,7 @@
});
},
// 鍒犻櫎鎽勫儚鏈�
- deleteDir() {
+ deleteDir () {
this.$confirm("鏄惁鍒犻櫎姝ゆ枃浠跺す锛�", {
center: true,
cancelButtonClass: "comfirm-class-cancle",
@@ -604,32 +613,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
@@ -645,7 +654,7 @@
})
}
},
- async handleFileStatus(row, status, multi = false) {
+ async handleFileStatus (row, status, multi = false) {
let ids = this.multipleSelection;
if (!multi) {
ids = [row.id];
@@ -673,10 +682,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) {
@@ -703,17 +712,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) {
@@ -736,10 +745,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({
@@ -755,7 +764,7 @@
}
})
},
- cellFileMove() {
+ cellFileMove () {
moveFile({ id: this.targetFile, stackId: this.targetDir }).then(rsp => {
if (rsp && rsp.success) {
this.$notify({
@@ -875,19 +884,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/labelMark/components/RightSide.vue b/src/pages/labelMark/components/RightSide.vue
index 39f7500..e1f2177 100644
--- a/src/pages/labelMark/components/RightSide.vue
+++ b/src/pages/labelMark/components/RightSide.vue
@@ -366,7 +366,6 @@
if (this.isShowPop) return;
//鑾峰彇榧犳爣鐩稿浜庣敾鏉跨殑瀹氫綅
console.log('鑾峰彇褰撳墠瀹氫綅淇℃伅');
- //this.$refs['labelForm'].clearValidate();
this.$refs['labelForm'].resetFields();
let target = {
id: '',
@@ -378,7 +377,6 @@
target.id = 'n'+(this.curCameraData.coords.length-1);
//this.labels.push(target);
this.curCameraData.coords.push(target);
- //this.curLabel = JSON.parse(JSON.stringify(target));
this.curLabel = target;
this.isShowPop = true;
this.isNewLabel = true;
diff --git a/src/pages/search/index/Searching.vue b/src/pages/search/index/Searching.vue
index e42a814..327682f 100644
--- a/src/pages/search/index/Searching.vue
+++ b/src/pages/search/index/Searching.vue
@@ -367,9 +367,10 @@
if (this.VideoPhotoData.uploadType) {
this.VideoPhotoData.findPersonByPage()
} else {
- // this.VideoPhotoData.querySearchList();
- console.log('TreeDataPool.selectedNodes 鏌ヨes')
- this.setLoadSearch(this.VideoPhotoData.querySearchList());
+
+ console.log('TreeDataPool.selectedNodes 鏌ヨes')
+ this.setLoadSearch(this.VideoPhotoData.querySearchList());
+
}
}
},
--
Gitblit v1.8.0