From 5dc36d1e0ea55358eb5b7273943897a75403993c Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 13 八月 2020 17:26:09 +0800
Subject: [PATCH] 修复底库分页全屏不显示,场景编辑可选参数默认选中第一个operator,表单必填项红星对齐方式修改
---
src/pages/cameraAccess/components/scene/Editor.vue | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/pages/cameraAccess/components/scene/Editor.vue b/src/pages/cameraAccess/components/scene/Editor.vue
index 7ddb8a9..fdfb3c9 100644
--- a/src/pages/cameraAccess/components/scene/Editor.vue
+++ b/src/pages/cameraAccess/components/scene/Editor.vue
@@ -23,7 +23,7 @@
:class="{ init: index == 0 }"
v-cloak
v-for="(sdkItem, index) in sdkGroup"
- :key="sdkItem.id"
+ :key="index"
>
<div class="connection" v-if="index !== 0">
<el-select
@@ -213,6 +213,7 @@
></el-input>-->
<el-select
+ :disabled="optArgItem.operators.length==1"
v-model="optArgItem.operator"
size="mini"
@change="selOperator(optArgItem)"
@@ -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) {
@@ -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 => {
--
Gitblit v1.8.0