|
@@ -310,7 +310,7 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
tabActiveKey:[0],
|
|
|
- customStyle:'background: #f9f9fa;border-radius: 4px;margin-bottom:20px;overflow: hidden',
|
|
|
+ customStyle:'background: #f9f9fa;border-radius: 4px;margin-bottom:15px;overflow: hidden;border: 1px solid #d9d9d9;',
|
|
|
conditionList:[],
|
|
|
url:{
|
|
|
fieldList:'/ruleIndicator/list',
|
|
@@ -476,7 +476,7 @@ export default {
|
|
|
conditionList:[],
|
|
|
dataType:'',
|
|
|
judgeFormat:0,
|
|
|
- isUnlimited:true,
|
|
|
+ isUnlimited:1,
|
|
|
})
|
|
|
}
|
|
|
|
|
@@ -580,21 +580,27 @@ export default {
|
|
|
return !item.groupId
|
|
|
})
|
|
|
console.log(ruleList)
|
|
|
- postAction(this.url.createRuleGroup,{
|
|
|
- templateId:this.currentRuleId,
|
|
|
- ruleList
|
|
|
- }).then(res=>{
|
|
|
- console.log(res);
|
|
|
- this.saveLoading=false;
|
|
|
- if(res.success){
|
|
|
+ if(ruleList.length>0){
|
|
|
+ postAction(this.url.createRuleGroup,{
|
|
|
+ templateId:this.currentRuleId,
|
|
|
+ ruleList
|
|
|
+ }).then(res=>{
|
|
|
+ console.log(res);
|
|
|
+ this.saveLoading=false;
|
|
|
+ if(res.success){
|
|
|
+
|
|
|
+ this.$router.push('/earlyWarningRules/index')
|
|
|
+ this.$bus.$emit('remove', '/earlyWarningRules/configRules')
|
|
|
+ }else{
|
|
|
+ this.$message.error(res.message)
|
|
|
+ }
|
|
|
|
|
|
- this.$router.push('/earlyWarningRules/index')
|
|
|
- this.$bus.$emit('remove', '/earlyWarningRules/configRules')
|
|
|
- }else{
|
|
|
- this.$message.error(res.message)
|
|
|
- }
|
|
|
-
|
|
|
- })
|
|
|
+ })
|
|
|
+ }else{
|
|
|
+ this.$router.push('/earlyWarningRules/index')
|
|
|
+ this.$bus.$emit('remove', '/earlyWarningRules/configRules')
|
|
|
+ }
|
|
|
+
|
|
|
}else{
|
|
|
postAction(this.url.creativeTemplate,this.form).then(res=>{
|
|
|
console.log(res);
|
|
@@ -754,7 +760,7 @@ export default {
|
|
|
justify-content: center;
|
|
|
align-items: center;
|
|
|
color: #666;
|
|
|
- margin-top: 16px;
|
|
|
+ margin-top: 5px;
|
|
|
-moz-user-select: none;
|
|
|
-webkit-user-select: none;
|
|
|
-ms-user-select: none;
|
|
@@ -1125,5 +1131,11 @@ export default {
|
|
|
.ant-checkbox-wrapper:first-child {
|
|
|
padding: 0 15px 5px;
|
|
|
}
|
|
|
+
|
|
|
+ .ant-collapse{
|
|
|
+ border: 1px solid #fff;
|
|
|
+ background-color: #fff;
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
</style>
|