From d8fcf4c20cd4638a3def6227a71ea2c81fbc0885 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期五, 23 十月 2020 17:23:15 +0800
Subject: [PATCH] 标注静态交互
---
src/pages/cameraAccess/components/scene/Editor.vue | 33 ++++++++++++---------------------
1 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/src/pages/cameraAccess/components/scene/Editor.vue b/src/pages/cameraAccess/components/scene/Editor.vue
index 6363c74..a8e8fff 100644
--- a/src/pages/cameraAccess/components/scene/Editor.vue
+++ b/src/pages/cameraAccess/components/scene/Editor.vue
@@ -393,7 +393,7 @@
arg => arg.operators[0].operator == 'range'
)
if (rangeOne) {
-
+ debugger
if (rangeOne.min.trim() && rangeOne.max.trim()) {
rangeOne.sdk_arg_value = rangeOne.min + '|' + rangeOne.max
} else {
@@ -420,31 +420,16 @@
},
deep: true
}
- // ruleList: {
- // handler(newVal, oldVal) {
- //
- // this.editHandle(newVal)
- // }
- // }
},
mounted() {
-
this.TaskMange.findAllSdk({ installed: true })
- //this.TaskMange.list1 = sdkJson.data;
//this.editHandle(this.ruleList)
},
data() {
return {
- // rule: {
- // sdk_id:'',
- // sdkObj: {},
- // polygonObj: {},
- // argDef: []
- // },
hideDel: true,
- //isAddable: true,
allPolygonData: [],
group_id: '',
baseSdkItem: {
@@ -1114,7 +1099,7 @@
this.groupRules.splice(index + 1, 0, newRule)
},
editHandle(ruleTxt) {
-
+ this.getSdkConnection();
// if (ruleTxt.length < 1) {
// return
// }
@@ -1222,10 +1207,10 @@
if (d.sort == arg.sort) {
if (arg.sdk_arg_value.indexOf('|') > 0) {
-
+ debugger
//鍖洪棿鍊�
- d.min = arg.sdk_arg_value.split(',')[0];
- d.max = arg.sdk_arg_value.split(',')[1];
+ d.min = arg.sdk_arg_value.split('|')[0];
+ d.max = arg.sdk_arg_value.split('|')[1];
d.operator = 'range'
//} else if(arg.sdk_arg_value.indexOf(',') > 0){
} else if(arg.operator_type == 'option'){
@@ -1332,6 +1317,12 @@
if (Object.keys(sdk.sdkObj).length == 0) {
return sdk
}
+ //澶嶅埗绠楁硶鏃舵娴嬪尯鍩熶笉鑳戒负绌�
+ if(!sdk.polygon_id){
+ return sdk
+ }
+ debugger
+
//澶氫簬涓ら」绠楁硶鏃�,绠楁硶鍏崇郴涓嶈兘涓虹┖
if (sdk.rule_with_pre === '' && index != 0) {
return sdk
@@ -1408,7 +1399,7 @@
//鏍￠獙鑻ョ畻娉曞叧绯讳负瑙﹀彂,鍒欑畻娉曞悕涓嶈兘閲�
let sameSdk = this.sdkGroup.some((sdk, index) => {
- if (sdk.index != 0 && sdk.rule_with_pre == '=>') {
+ if (sdk.index != 0 && (sdk.rule_with_pre == '=>'||sdk.rule_with_pre == '!=>')) {
if (sdk.sdkObj.id == this.sdkGroup[index - 1].sdkObj.id) {
return sdk
--
Gitblit v1.8.0