|
@@ -262,7 +262,7 @@
|
|
|
|
|
|
</div>
|
|
|
|
|
|
- <div class="add-rule" @click="addCondition(item,index)" v-show="item.ruleType=='group'"> 添加条件</div>
|
|
|
+ <div class="add-rule" @click="addCondition(item,index)" v-show="item.ruleType=='group'||item.operation==1"> 添加条件</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="toolbox-automate-rules-create-content_rules-and-condition_rules">
|
|
@@ -583,6 +583,7 @@ export default {
|
|
|
console.log(key)
|
|
|
},
|
|
|
addRule(){
|
|
|
+
|
|
|
this.form.ruleList.push(
|
|
|
{
|
|
|
groupName:'默认规则',
|
|
@@ -592,7 +593,9 @@ export default {
|
|
|
operate:'SEND',//预警方式
|
|
|
sendType:'Wechat',//通知方式
|
|
|
isRequired:1,
|
|
|
+ operation:1,
|
|
|
isCopy:0,
|
|
|
+ rulesFieldList:[],
|
|
|
ruleDetail:[
|
|
|
{
|
|
|
ruleName:'',
|
|
@@ -613,7 +616,7 @@ export default {
|
|
|
},
|
|
|
)
|
|
|
console.log(this.$refs.collapse)
|
|
|
-
|
|
|
+ this.getMediaTypeRuleField(1,this.form.ruleList[this.form.ruleList.length-1])
|
|
|
this.activeKey=(this.form.ruleList.length-1)+'';
|
|
|
|
|
|
|
|
@@ -902,23 +905,27 @@ export default {
|
|
|
// this.spinning=true;
|
|
|
this.currentRuleId=this.$route.query.id
|
|
|
if(!this.$route.query.id){
|
|
|
- getAction(this.url.fieldList,{
|
|
|
- mediaType:this.form.mediaType,
|
|
|
- pageNo:1,
|
|
|
- pageSize:500,
|
|
|
- }).then(res=>{
|
|
|
- console.log(res);
|
|
|
- if(res.success){
|
|
|
- this.rulesFieldList=res.result.map(item=>{
|
|
|
- return {
|
|
|
- name:item.dimensionName,
|
|
|
- code:item.dimension,
|
|
|
- children:item.dimensionList
|
|
|
- }
|
|
|
- })
|
|
|
- this.getTempletDetail()
|
|
|
- }
|
|
|
- })
|
|
|
+ this.getMediaTypeRuleField(1,this.form.ruleList[0])
|
|
|
+ // getAction(this.url.fieldList,{
|
|
|
+ // mediaType:this.form.mediaType,
|
|
|
+ // pageNo:1,
|
|
|
+ // pageSize:500,
|
|
|
+ // }).then(res=>{
|
|
|
+ // console.log(res);
|
|
|
+ // if(res.success){
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ // this.rulesFieldList=res.result.map(item=>{
|
|
|
+ // return {
|
|
|
+ // name:item.dimensionName,
|
|
|
+ // code:item.dimension,
|
|
|
+ // children:item.dimensionList
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // this.getTempletDetail()
|
|
|
+ // }
|
|
|
+ // })
|
|
|
}else{
|
|
|
this.getTempletDetail()
|
|
|
}
|