From ddb0df2153bc75e54c3f7c1049be663d4d2dba96 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 15 八月 2020 19:10:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/vue-smart-ai
---
src/pages/cameraAccess/components/scene/Editor.vue | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/pages/cameraAccess/components/scene/Editor.vue b/src/pages/cameraAccess/components/scene/Editor.vue
index 0278baa..fdfb3c9 100644
--- a/src/pages/cameraAccess/components/scene/Editor.vue
+++ b/src/pages/cameraAccess/components/scene/Editor.vue
@@ -213,6 +213,7 @@
></el-input>-->
<el-select
+ :disabled="optArgItem.operators.length==1"
v-model="optArgItem.operator"
size="mini"
@change="selOperator(optArgItem)"
@@ -423,7 +424,7 @@
// }
},
mounted() {
- this.TaskMange.findAllSdk({installed:true})
+ this.TaskMange.findAllSdk({ installed: true })
//this.TaskMange.list1 = sdkJson.data;
//this.editHandle(this.ruleList)
@@ -545,10 +546,10 @@
this.selectPolygonOption(itemTemp)
this.sdkGroup.splice(index, 1, itemTemp)
} else {
- if(this.sdkGroup[index+1] && this.sdkGroup[index+1].rule_with_pre){
- this.sdkGroup[index+1].rule_with_pre = '';
+ if (this.sdkGroup[index + 1] && this.sdkGroup[index + 1].rule_with_pre) {
+ this.sdkGroup[index + 1].rule_with_pre = '';
}
-
+
this.sdkGroup.splice(index, 1);
}
},
@@ -560,7 +561,6 @@
this.sdkGroup[index].isSpread = !this.sdkGroup[index].isSpread
},
addOptionalArg(sdkItem) {
- debugger
sdkItem.initAddOptional = false
sdkItem.optArg.forEach(arg => {
sdkItem.optNames.forEach(name => {
@@ -591,7 +591,11 @@
this.setOptArgValueOptions(copyArgTemp)
}
-
+ //榛樿閫変腑绗竴涓猳perator
+ //if (copyArgTemp.operators.length == 1) {
+ this.$set(copyArgTemp, 'operator', copyArgTemp.operators[0].operator)
+ //}
+
if (copyArgTemp.default_value) {
this.$set(copyArgTemp, 'sdk_arg_value', copyArgTemp.default_value)
}
@@ -635,7 +639,10 @@
if (argObj.type == 'option') {
this.setOptArgValueOptions(argObj);
}
- debugger
+ //榛樿閫変腑绗竴涓猳perator
+ //if (argObj.operators.length == 1) {
+ this.$set(argObj, 'operator', argObj.operators[0].operator)
+ //}
//鏇挎崲鏂扮殑鍙傛暟閰嶇疆瀵硅薄
sdkItem.optArg.forEach((arg, index) => {
if (arg.sort == optArgItem.sort) {
@@ -1092,9 +1099,7 @@
// return
// }
let ruleInfo = JSON.parse(ruleTxt);
- debugger;
- //let ruleInfo = JSON.parse(ruleTxt)
this.editRule(ruleInfo)
// 濡傛灉鏄仈鍔ㄤ换鍔�, 鏌ヨ鑱斿姩鎽勫儚鏈哄垪琛�, 灏嗘爲閫変腑鐨勫垪琛ㄦ洿鏀逛负璇ユ潯瑙勫垯鎵�闇�瑕佺殑鎽勫儚鏈�, 骞跺浠藉綋鍓嶇殑閫変腑鐘舵��, 瑙勫垯淇濆瓨鍚庢仮澶�
// if (this.isLinkRule) {
@@ -1170,7 +1175,7 @@
optNames = []
sdkObj = this.TaskMange.list1.find(sdk => sdk.id == rule.sdk_id)
-
+
argDef = JSON.parse(sdkObj.argDef)
defaultArg = argDef.filter(arg => !arg.config.isOptional)
optionalArg = argDef.filter(arg => arg.config.isOptional)
@@ -1182,10 +1187,10 @@
}
})
if (optItem) {
- if (optItem.operators.length > 1) {
+ //if (optItem.operators.length > 1) {
optItem.operator = arg.operator
//this.selOperator(optItem)
- }
+ //}
//璧嬪��
optItem.sdk_arg_value = arg.sdk_arg_value
@@ -1199,6 +1204,8 @@
if (optItem.type == 'option') {
this.setOptArgValueOptions(optItem)
}
+
+
optArg.push(optItem)
} else {
defaultArg.forEach(d => {
@@ -1350,15 +1357,15 @@
return false
}
//鏍￠獙鍖洪棿宸︿晶鍊兼槸鍚﹀皬浜庡彸渚у��
- let illegalRange = this.sdkGroup.some((sdk,index)=>{
- let rangeArg = sdk.defaultArg.find(arg=>arg.operator=='range');
- if(rangeArg){
+ let illegalRange = this.sdkGroup.some((sdk, index) => {
+ let rangeArg = sdk.defaultArg.find(arg => arg.operator == 'range');
+ if (rangeArg) {
if (Number(rangeArg.max) <= Number(rangeArg.min)) {
return sdk
}
}
});
- if(illegalRange){
+ if (illegalRange) {
this.$notify({
type: 'error',
message: '鍖洪棿宸︿晶涓嶈兘澶т簬鎴栫瓑浜庡尯闂村彸渚х殑鍊�'
@@ -1555,7 +1562,7 @@
</script>
<style lang="scss">
-body{
+body {
font-size: 12px;
}
.edit-rules-box {
--
Gitblit v1.8.0