From d2d50b2537e6af9def5b4a52d4446e4d41a46e05 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 15 八月 2020 19:09:54 +0800
Subject: [PATCH] orc识别
---
src/pages/ai/index/App.vue | 2 +-
src/pages/desktop/index/store/modules/desktop.js | 2 +-
src/pages/cameraAccess/index/App.vue | 1 +
src/pages/desktop/index/components/ToolsEntry.vue | 2 ++
src/pages/search/index/Searching.vue | 1 +
src/components/subComponents/CardItem.vue | 1 +
src/pages/cameraAccess/components/SceneRule.vue | 3 ++-
src/pages/cameraAccess/components/SeparateRules.vue | 5 +++++
8 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/components/subComponents/CardItem.vue b/src/components/subComponents/CardItem.vue
index e549a88..d57617e 100644
--- a/src/components/subComponents/CardItem.vue
+++ b/src/components/subComponents/CardItem.vue
@@ -563,6 +563,7 @@
this.$emit("addToBase", item);
},
tosearch(item) {
+ console.log('search')
let captureId = item.id == "" ? item.baseInfo[0].targetId : item.id
let imgUrl = item.targetInfo ? item.targetInfo[0].picSmUrl : item.baseInfo[0].targetPicUrl
let compType = 1 // 鏁版嵁鏉ヨ嚜浜巈s
diff --git a/src/pages/ai/index/App.vue b/src/pages/ai/index/App.vue
index a346f5b..1917651 100644
--- a/src/pages/ai/index/App.vue
+++ b/src/pages/ai/index/App.vue
@@ -1866,7 +1866,7 @@
transform: translate(-50%, -50%);
}
.baseImg {
- width: 80%;
+ width: 60%;
position: absolute;
top: 50%;
left: 50%;
diff --git a/src/pages/cameraAccess/components/SceneRule.vue b/src/pages/cameraAccess/components/SceneRule.vue
index 2fe8c47..6699401 100644
--- a/src/pages/cameraAccess/components/SceneRule.vue
+++ b/src/pages/cameraAccess/components/SceneRule.vue
@@ -346,6 +346,7 @@
this.onSaveScene(this.sceneForm);
},
handleDelScene(groupRule) {
+ let _this = this;
this.$confirm("鎻愮ず锛氬垹闄ゅ悗锛岃鏉¤鍒欏皢澶辨晥锛屾槸鍚﹀垹闄わ紵", {
center: true,
cancelButtonClass: "comfirm-class-cancle",
@@ -359,7 +360,7 @@
type: "success",
message: "鍒犻櫎鎴愬姛"
});
-
+ _this.$root.$children[0].$children[0].querySearchAsync('camera')
} else {
this.$notify({
type: "error",
diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue
index a92430e..358ad1a 100644
--- a/src/pages/cameraAccess/components/SeparateRules.vue
+++ b/src/pages/cameraAccess/components/SeparateRules.vue
@@ -320,6 +320,7 @@
saveSceneRule(groupRule) {
const payload = { ...groupRule }
payload.cameraIds = [this.Camera.cameraId];
+ let _this = this;
saveCameraScene(payload).then(rsp => {
if (rsp && rsp.success) {
this.Camera.update();
@@ -327,6 +328,10 @@
type: "success",
message: "绛栫暐淇濆瓨鎴愬姛锛�"
});
+ //鍒锋柊宸︿晶鏍�
+ debugger
+ _this.$root.$children[0].$children[0].querySearchAsync('camera')
+
}
});
},
diff --git a/src/pages/cameraAccess/index/App.vue b/src/pages/cameraAccess/index/App.vue
index e60b5dc..bf4b566 100644
--- a/src/pages/cameraAccess/index/App.vue
+++ b/src/pages/cameraAccess/index/App.vue
@@ -37,6 +37,7 @@
}
},
mounted() {
+ debugger
this.screenHeight = document.documentElement.clientHeight;
window.onresize = () => {
return (() => {
diff --git a/src/pages/desktop/index/components/ToolsEntry.vue b/src/pages/desktop/index/components/ToolsEntry.vue
index 5bc5d61..f4e5e7d 100644
--- a/src/pages/desktop/index/components/ToolsEntry.vue
+++ b/src/pages/desktop/index/components/ToolsEntry.vue
@@ -34,6 +34,7 @@
},
mounted() {
window.addEventListener('message', e => {
+ console.log('msg')
if (e.data && e.data.msg) {
let msg = e.data.msg;
// token 涓嶅悎娉�, 閫�鍑�
@@ -44,6 +45,7 @@
// 鎵撳紑妫�绱�, toSearch?showType=findByPic&targetId=108ba0bc-b0a1-433d-8e1e-d5d2e712b53b&picSmUrl=192.168.20.10:6700/47628,7cc869f3a9c714&compType=1
if (msg.indexOf("toSearch") >= 0) {
+ console.log('msg,search')
let params = msg.substring(7);
this.addFrameByName("search", params)
}
diff --git a/src/pages/desktop/index/store/modules/desktop.js b/src/pages/desktop/index/store/modules/desktop.js
index dd4abc1..ed18975 100644
--- a/src/pages/desktop/index/store/modules/desktop.js
+++ b/src/pages/desktop/index/store/modules/desktop.js
@@ -177,7 +177,7 @@
state.notificationCenterVisible = visible;
},
closeFrame: (state, item) => {
-
+ debugger
state.frames.find(function (it, idx) {
if (it.id === item.id) {
state.frames.splice(idx, 1);
diff --git a/src/pages/search/index/Searching.vue b/src/pages/search/index/Searching.vue
index 9a9d55e..1929f51 100644
--- a/src/pages/search/index/Searching.vue
+++ b/src/pages/search/index/Searching.vue
@@ -430,6 +430,7 @@
}
},
"VideoPhotoData.uploadDiaplay": function (value) {
+ debugger
this.getHeight();
console.log("upload鐨勫�兼槸锛�", value)
if (value) {
--
Gitblit v1.8.0