From 1bc9dc3ac0f81047f7ecfe3f039c984d9776e84a Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期二, 04 八月 2020 10:03:26 +0800
Subject: [PATCH] 移除算法商城场景配置相关方法及接口,处理iframe拖拽边界
---
src/api/scene.ts | 40 ++++++------
src/pages/algorithmManage/index/App.vue | 58 +------------------
src/pages/desktop/index/components/DFrame.vue | 19 +++++-
src/pages/cameraAccess/components/SceneRule.vue | 11 ---
src/pages/cameraAccess/components/SeparateRules.vue | 1
5 files changed, 42 insertions(+), 87 deletions(-)
diff --git a/src/api/scene.ts b/src/api/scene.ts
index ca76cd8..8a058e6 100644
--- a/src/api/scene.ts
+++ b/src/api/scene.ts
@@ -1,27 +1,27 @@
import request from "@/scripts/httpRequest";
-export const getAllTemplate = (query: any) => {
- return request({
- url: "/data/api-v/template/rule",
- method: "get",
- params: query
- });
-};
+// export const getAllTemplate = (query: any) => {
+// return request({
+// url: "/data/api-v/template/rule",
+// method: "get",
+// params: query
+// });
+// };
-export const deleteTemplate = (id: string) => {
- return request({
- url: "/data/api-v/template/rule/" + id,
- method: "delete"
- });
-};
+// export const deleteTemplate = (id: string) => {
+// return request({
+// url: "/data/api-v/template/rule/" + id,
+// method: "delete"
+// });
+// };
-export const saveTemplate = (params: any) => {
- return request({
- url: "/data/api-v/template/rule/save",
- method: "post",
- data: params
- });
-};
+// export const saveTemplate = (params: any) => {
+// return request({
+// url: "/data/api-v/template/rule/save",
+// method: "post",
+// data: params
+// });
+// };
export const saveCameraScene = (params: any) => {
return request({
diff --git a/src/pages/algorithmManage/index/App.vue b/src/pages/algorithmManage/index/App.vue
index 552369a..f220764 100644
--- a/src/pages/algorithmManage/index/App.vue
+++ b/src/pages/algorithmManage/index/App.vue
@@ -1554,21 +1554,7 @@
// console.log(item, '淇敼鍚嶇О')
this.$set(item, "isEdit", false);
},
- updateTemplates() {
- getAllTemplate().then(rsp => {
- if (rsp && rsp.success) {
- this.sceneTemplates = rsp.data;
- this.sceneTemplates.forEach(element => {
- element.icon = [
- "iconrenlianjiance",
- "icongetijingzhi",
- "iconchouyan-copy",
- "iconrenshukouzhao"
- ];
- });
- }
- });
- },
+
cleanTemplateForm() {
this.appSceneForm.name = "";
this.appSceneForm.desc = "";
@@ -1578,9 +1564,7 @@
this.$refs.ruleEditor.cleanRule();
},
handleTabClick() {
- if (this.activeName == "appScenarios") {
- this.updateTemplates();
- }
+
},
handleCreateScene() {
this.sceneDialogVisible = true;
@@ -1607,42 +1591,8 @@
this.sceneDialogVisible = true;
this.dialogTitle = '缂栬緫鍦烘櫙妯℃澘';
},
- handleDelScene(item) {
- this.$confirm('姝ゆ搷浣滃皢鍒犻櫎璇ュ簲鐢ㄥ満鏅ā鏉�, 鏄惁缁х画?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- deleteTemplate(item.id).then(res => {
- if (res && res.success) {
- this.updateTemplates();
- this.$message({
- type: 'success',
- message: '鍒犻櫎鎴愬姛!'
- });
- }
- })
-
- }).catch(() => {
- console.log('鍙栨秷鍒犻櫎');
- });
- },
- handleSaveTemplate() {
- let editorResp = this.$refs.ruleEditor.submitRule();
- this.appSceneForm.rules = JSON.stringify(editorResp.rules);
- this.appSceneForm.txt = editorResp.text;
-
- saveTemplate(this.appSceneForm).then(rsp => {
- if (rsp && rsp.success) {
- this.$notify({
- type: "success",
- message: "妯℃澘鍒涘缓鎴愬姛"
- });
- this.updateTemplates();
- this.sceneDialogVisible = false;
- }
- });
- }
+
+
}
};
</script>
diff --git a/src/pages/cameraAccess/components/SceneRule.vue b/src/pages/cameraAccess/components/SceneRule.vue
index 13fcb07..43098ea 100644
--- a/src/pages/cameraAccess/components/SceneRule.vue
+++ b/src/pages/cameraAccess/components/SceneRule.vue
@@ -191,7 +191,6 @@
<script>
import {
- getAllTemplate,
saveCameraScene,
getCameraSceneRule,
deleteCameraScene
@@ -249,7 +248,7 @@
},
mounted() {
// window.addEventListener('resize', this.windowSizeChange)
- this.updateTemplates();
+
},
data() {
return {
@@ -362,13 +361,7 @@
this.$refs.sceneEditor.editHandle(this.templateRules);
},
- updateTemplates() {
- getAllTemplate().then(rsp => {
- if (rsp && rsp.success) {
- this.sceneTemplates = rsp.data;
- }
- })
- },
+
selectTemplate() {
let selectedTpl = {};
this.sceneTemplates.forEach((t) => {
diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue
index a92a0dd..c6aa3f2 100644
--- a/src/pages/cameraAccess/components/SeparateRules.vue
+++ b/src/pages/cameraAccess/components/SeparateRules.vue
@@ -242,7 +242,6 @@
} from '@/api/task';
import {
- getAllTemplate,
saveCameraScene,
getCameraSceneRule,
} from '@/api/scene'
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index c695a5b..5589cdc 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -145,8 +145,21 @@
document.onmousemove = function (e) {
e.preventDefault();
window.getSelection().removeAllRanges();
- el.parentElement.style.left = e.clientX - disx + 'px';
- el.parentElement.style.top = e.clientY - disy + 'px';
+ let toLeft = e.clientX - disx;
+ let toTop = e.clientY - disy;
+ //杈圭晫澶勭悊
+ if(toLeft <= 0 ){
+ toLeft = 0
+ }else if(toLeft >= document.body.getBoundingClientRect().width-40){
+ toLeft = document.body.getBoundingClientRect().width-40;
+ }
+ el.parentElement.style.left = toLeft + 'px';
+ if(toTop <= 0 ){
+ toTop = 0
+ }else if(toTop >= document.body.getBoundingClientRect().height-40){
+ toTop = document.body.getBoundingClientRect().height-40;
+ }
+ el.parentElement.style.top = toTop + 'px';
};
document.onmouseup = function () {
el.dragLock = false;
@@ -185,7 +198,7 @@
<style scoped>
html,
body {
- heiht: 100%;
+ height: 100%;
}
.d-frame {
position: fixed;
--
Gitblit v1.8.0