From 1fbade862552c9387809f7e50dd75d6b019086f1 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期二, 13 十月 2020 15:04:45 +0800
Subject: [PATCH] 数据栈底图修复,场景配置算法关系改为读取字典
---
src/pages/cameraAccess/components/scene/Editor.vue | 89 ++++++++++++++++++++++++++------------------
1 files changed, 52 insertions(+), 37 deletions(-)
diff --git a/src/pages/cameraAccess/components/scene/Editor.vue b/src/pages/cameraAccess/components/scene/Editor.vue
index 4f540a6..6363c74 100644
--- a/src/pages/cameraAccess/components/scene/Editor.vue
+++ b/src/pages/cameraAccess/components/scene/Editor.vue
@@ -32,12 +32,13 @@
placeholder="閫夊叧绯�"
@change="selConnection(sdkItem)"
>
- <el-option value="&&" title="and/涓�" label="and/涓�"></el-option>
+ <el-option :value="item.value" :title="item.name" :label="item.name" v-for="item in sdkConnects" :key="item.id"></el-option>
+ <!-- <el-option value="&&" title="and/涓�" label="and/涓�"></el-option>
<el-option value="||" title="or/鎴�" label="or/鎴�"></el-option>
- <el-option value="=>" title="鈥�>/瑙﹀彂" label="鈥�>/瑙﹀彂"></el-option>
+ <el-option value="=>" title="鈥�>/瑙﹀彂" label="鈥�>/瑙﹀彂"></el-option> -->
</el-select>
<el-checkbox
- v-show="sdkItem.rule_with_pre == '=>'"
+ v-show="sdkItem.rule_with_pre == '=>' || sdkItem.rule_with_pre == '!=>'"
v-model="sdkItem.is_save_anyhow"
style="margin-left:30px"
>淇濆瓨杩囩▼鏁版嵁</el-checkbox>
@@ -386,13 +387,13 @@
sdkGroup: {
handler(newV, oldV) {
if (newV) {
- debugger
+
newV.forEach(sdk => {
let rangeOne = sdk.defaultArg.find(
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 {
@@ -421,13 +422,14 @@
}
// ruleList: {
// handler(newVal, oldVal) {
- // debugger
+ //
// this.editHandle(newVal)
// }
// }
},
mounted() {
+
this.TaskMange.findAllSdk({ installed: true })
//this.TaskMange.list1 = sdkJson.data;
@@ -523,8 +525,18 @@
}
},
methods: {
+ getSdkConnection(){
+ console.log(this.VideoManageData.Dictionary)
+ this.sdkConnects = this.VideoManageData.Dictionary['RULECOMPUTEBETWEEN'].map(r => {
+
+ return {
+ name: r.name,
+ value: r.value
+ }
+ });
+ },
selConnection(sdkItem) {
- debugger
+
},
addSdkItem() {
@@ -533,9 +545,9 @@
itemTemp.polygonObj = JSON.parse(JSON.stringify(this.allPolygonData[0]))
this.selectPolygonOption(itemTemp)
this.sdkGroup.push(itemTemp)
+
},
delConfigItem(index) {
- debugger
// if(index != 0){
// this.sdkGroup.splice(index,1);
// }else{
@@ -626,7 +638,7 @@
}
},
selOptionalArg(sdkItem, optArgItem) {
- debugger
+
let newSort = 0
sdkItem.optNames.forEach(name => {
if (name.name == optArgItem.name) {
@@ -657,7 +669,7 @@
console.log(argObj.valueOptions)
},
setOptArgValueOptions(optArg) {
- debugger
+
let alias = optArg.alias;
console.log(this.VideoManageData.Dictionary[alias])
optArg.valueOptions = this.VideoManageData.Dictionary[alias].map(r => {
@@ -668,7 +680,7 @@
});
},
validateArgVal(sdkArgItem, e) {
- debugger
+
if (typeof (sdkArgItem.sdk_arg_value) == 'string' && sdkArgItem.sdk_arg_value == '') {
this.$notify({
type: 'warning',
@@ -688,7 +700,7 @@
let res = sdkArgItem.range.match(reg)
let min = Number(res[1]),
max = Number(res[2])
- debugger
+
//鍒ゆ柇闈炲尯闂寸被
if (sdkArgItem.sdk_arg_value && sdkArgItem.operator != 'range') {
@@ -822,7 +834,7 @@
this.valideArgValue(rule)
},
selectPolygonOption(rule) {
- debugger
+
rule.polygon_id = rule.polygonObj.polygonId
? rule.polygonObj.polygonId
: rule.polygon_id
@@ -833,7 +845,7 @@
},
//閫夋嫨绠楁硶 resetArgs涓簍rue鏄坊鍔犱负false鏄垵濮嬪寲缂栬緫
selectSDKOption(sdkItem, resetArgs) {
- debugger
+
//sdkItem.sdk_id = sdkItem.sdkObj.id;
if (resetArgs) {
sdkItem.argDef = JSON.parse(sdkItem.sdkObj.argDef)
@@ -849,12 +861,12 @@
if (arg.operators[0].operator == 'range') {
//鍖洪棿鍊肩殑澶勭悊
- debugger
+
//this.$set(arg, 'sdk_arg_value', arg.min+','+arg.max)
//this.$set(arg, 'sdk_arg_value', arg.range.substring(1,arg.range.length-1));
}
}
- debugger
+
if(arg.type == 'option'){
this.setOptArgValueOptions(arg)
}
@@ -873,14 +885,14 @@
sort: arg.sort,
isSelected: false
}))
- debugger
+
sdkItem.initAddOptional = sdkItem.optionalArg.length > 0 ? true : false
sdkItem.optArg = []
}
//娣诲姞鍦烘櫙鏃�,濡傛灉鍦烘櫙鍚嶇О涓虹┖,灏卞皢閫夋嫨鐨勭涓�涓畻娉曞悕鍚屾鍒板満鏅悕绉�
if (this.sdkGroup[0] && resetArgs) {
- debugger
+
this.$emit('sdkNameChange', this.sdkGroup[0].sdkObj.sdk_name)
}
@@ -912,7 +924,7 @@
},
//閫夋嫨绠楁硶閰嶇疆
selOperator(rule) {
- debugger
+
},
selectArgsOption(rule, resetArgValue) {
// rule.operator_type = "";
@@ -1102,7 +1114,7 @@
this.groupRules.splice(index + 1, 0, newRule)
},
editHandle(ruleTxt) {
- debugger
+
// if (ruleTxt.length < 1) {
// return
// }
@@ -1127,12 +1139,12 @@
// }
},
editRule(ruleGroup) {
- debugger
+
this.sdkGroup = []
this.group_id = ''
ruleGroup.forEach(rule => {
- debugger
+
let tempObj = {}
if (rule.group_id && rule.group_id != '') {
@@ -1170,7 +1182,7 @@
sdkObj = this.TaskMange.list1.find(sdk => sdk.id == rule.sdk_id)
argDef = JSON.parse(sdkObj.argDef)
- debugger
+
defaultArg = argDef.filter(arg => !arg.config.isOptional)
optionalArg = argDef.filter(arg => arg.config.isOptional)
@@ -1202,7 +1214,7 @@
}
//鍦╬ush涔嬪墠,闇�瑕佸垽鏂槸鍚﹂厤缃簡杩欎釜鍙�夐」 鍦╯dk_set閰嶇疆鏁扮粍閲�,
- debugger
+
optArg.push(optItem)
} else {
@@ -1210,14 +1222,14 @@
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.operator = 'range'
//} else if(arg.sdk_arg_value.indexOf(',') > 0){
} else if(arg.operator_type == 'option'){
- debugger
+
//澶氶�夌被鍨嬬殑鍊�
d.sdk_arg_value = arg.sdk_arg_value.split(',');
this.setOptArgValueOptions(d)
@@ -1263,7 +1275,7 @@
tempObj.isAddable = false;
}
//this.selectSDKOption(tempObj, false)
- debugger
+
this.sdkGroup.push(tempObj)
//璁剧疆绠楁硶
})
@@ -1294,7 +1306,7 @@
.catch(() => { })
},
submitRule() {
- debugger
+
let groupRule = { rules: [] }
let group_text = ''
@@ -1315,7 +1327,7 @@
} else {
//鏍￠獙蹇呭～椤�
let undefinished = this.sdkGroup.some((sdk, index) => {
- debugger
+
//娌℃湁閰嶇疆绠楁硶
if (Object.keys(sdk.sdkObj).length == 0) {
return sdk
@@ -1324,7 +1336,7 @@
if (sdk.rule_with_pre === '' && index != 0) {
return sdk
}
- debugger
+
//澶勭悊鏈睍绀虹殑鍙傛暟鐨勫��
sdk.defaultArg.forEach(arg => {
if(!arg.config.isShow){
@@ -1354,7 +1366,7 @@
} else {
//鍖洪棿绫诲弬鏁板�兼渶灏�,鏈�澶у�兼槸鍚﹂兘璁剧疆
if (arg.operator == 'range') {
- debugger
+
if (!arg.min.trim() && arg.max.trim()) {
return arg
}
@@ -1395,9 +1407,9 @@
}
//鏍￠獙鑻ョ畻娉曞叧绯讳负瑙﹀彂,鍒欑畻娉曞悕涓嶈兘閲�
let sameSdk = this.sdkGroup.some((sdk, index) => {
- debugger
+
if (sdk.index != 0 && sdk.rule_with_pre == '=>') {
- debugger
+
if (sdk.sdkObj.id == this.sdkGroup[index - 1].sdkObj.id) {
return sdk
}
@@ -1462,7 +1474,7 @@
}
if (arg.operator == 'range') {
let valRange = '';
- debugger
+
valRange = arg.sdk_arg_value.replace(',', '-');
defaultArgDesc += `${arg.name}${arg.operators[0].name}${valRange}${arg.unit || ''}, `
} else {
@@ -1472,7 +1484,7 @@
}
});
- debugger;
+ ;
defaultArgDesc = defaultArgDesc.substring(0, defaultArgDesc.length - 2);
//defaultArgDesc = defaultArgDesc.substring(0,defaultArgDesc.length-3)+defaultArgDesc.substring(defaultArgDesc.length-1,defaultArgDesc.length);
@@ -1548,11 +1560,14 @@
case '=>':
rule_with_pre = ' -> '
break
+ case '!=>':
+ rule_with_pre = ' !-> '
+ break
default:
rule_with_pre = ''
}
}
- debugger;
+ ;
group_text += `${rule_with_pre ? "<br/>" + rule_with_pre + "<br/>" : ""} <span style="background-color:RGB(183,183,183);">${
sdk.sdkObj.sdk_name
}</span> ${
@@ -1568,7 +1583,7 @@
group_text.substring(0, group_text.length - 3) +
group_text.substring(group_text.length - 2, group_text.length)
}
- debugger
+
})
console.log(group_text)
}
--
Gitblit v1.8.0