|
|
@@ -77,7 +77,7 @@
|
|
|
<p class="plan-for-max-button-null"></p>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-dialog :title='dialogTitle' v-if="dialogOpen" :visible.sync="dialogOpen" width="800px">
|
|
|
+ <el-dialog :title='dialogTitle' v-if="dialogOpen" :visible.sync="dialogOpen" width="800px" @close='closeDialog'>
|
|
|
<div class="scrollbar-box" style="height:600px;">
|
|
|
<el-form :model="dialogForm" ref="dialogForm" :rules="rules" label-width="100px">
|
|
|
<el-form-item label="预案等级：" prop="riskPlanLevel">
|
|
|
@@ -103,26 +103,17 @@
|
|
|
<!--</el-form-item>-->
|
|
|
</div>
|
|
|
<el-form-item label="报警通知方式:" prop="expandType">
|
|
|
- <el-checkbox-group v-model="dialogForm.alarmList">
|
|
|
- <el-checkbox label="11">电话报警</el-checkbox>
|
|
|
- <el-checkbox label="22">短信报警</el-checkbox>
|
|
|
+ <el-checkbox-group v-model="dialogForm.alarmType">
|
|
|
+ <el-checkbox label="1">电话报警</el-checkbox>
|
|
|
+ <el-checkbox label="2">短信报警</el-checkbox>
|
|
|
</el-checkbox-group>
|
|
|
</el-form-item>
|
|
|
<div class="autoClose">
|
|
|
<p class="autoClose_l">自动关闭:</p>
|
|
|
<p class="autoClose_l2">传感器监测数值恢复正常</p>
|
|
|
- <el-form-item prop="close">
|
|
|
- <el-select v-model="dialogForm.close" placeholder="请选择" style="width: 100px" class="autoClose_l3">
|
|
|
- <el-option
|
|
|
- v-for="item in autoClose"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- <p class="autoClose_l4">分钟</p>
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
+ <el-input v-model="dialogForm.riskAutoOff" style="width:120px;" :min="1" :max="600" :controls="false" >
|
|
|
+ <template slot="append">秒</template>
|
|
|
+ </el-input>
|
|
|
<p class="autoClose_l5">以后预案自动关闭</p>
|
|
|
</div>
|
|
|
<div style="border-top:1px solid #e0e0e0;">
|
|
|
@@ -243,7 +234,6 @@
|
|
|
dialogOpen:false,
|
|
|
dialogForm:{
|
|
|
},
|
|
|
- autoClose:[{ value: '1',label: '1'},{ value: '2',label: '2'},{ value: '3',label: '3'},{ value: '4',label: '4'},{ value: '5',label: '5'},{ value: '6',label: '6'},{ value: '7',label: '7'},{ value: '8',label: '8'},{ value: '9',label: '9'},{ value: '10',label: '10'},],
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
name: [
|
|
|
@@ -275,7 +265,7 @@
|
|
|
overAct: [
|
|
|
{ required: true, message: "请选择结束操作", trigger: "change" },
|
|
|
],
|
|
|
- close:[
|
|
|
+ riskAutoOff:[
|
|
|
{ required: true, message: "请选择关闭时间", trigger: "change" },
|
|
|
]
|
|
|
},
|
|
|
@@ -307,6 +297,9 @@
|
|
|
this.getOptionData();
|
|
|
},
|
|
|
methods: {
|
|
|
+ closeDialog(){
|
|
|
+ this.getOptionData()
|
|
|
+ },
|
|
|
//传感器选中事件
|
|
|
sensorChange(val,index){
|
|
|
let self = this;
|
|
|
@@ -364,6 +357,7 @@
|
|
|
//查询设备功能
|
|
|
controlTypeList(val,index) {
|
|
|
let self = this;
|
|
|
+ self.hardwareList.splice(index,1)
|
|
|
for(let i=0;i<self.hardwareList.length;i++){
|
|
|
if(self.hardwareList[i].hardwareTypeEnum.code == val){
|
|
|
this.$set(self.dialogForm.riskPlanHardwareList[index],'hardwareList',self.hardwareList[i].functionStatusList);
|
|
|
@@ -613,6 +607,8 @@
|
|
|
text = text.replace(",","+")
|
|
|
console.log(text);
|
|
|
let obj = JSON.parse(JSON.stringify(this.dialogForm))
|
|
|
+ obj.riskAutoOff =Number(obj.riskAutoOff);
|
|
|
+ obj.alarmType =obj.alarmType.toString();
|
|
|
obj.riskPlanId = this.addPlanData.id;
|
|
|
obj.startCondition = text+'';
|
|
|
planLevelAdd(obj).then((response) => {
|
|
|
@@ -654,7 +650,8 @@
|
|
|
this.$set(this,'dialogForm',{
|
|
|
riskPlanLevel:a==0?1:(b==0?2:(c==0?3:(d==0?4:''))),
|
|
|
ifExit:null,
|
|
|
- alarmList:[],
|
|
|
+ alarmType:[],
|
|
|
+ riskAutoOff:'60',
|
|
|
riskPlanSensorList:[],
|
|
|
riskPlanHardwareList:[],
|
|
|
});
|
|
|
@@ -675,6 +672,8 @@
|
|
|
riskPlanId:obj.riskPlanId,
|
|
|
riskPlanLevel:obj.riskPlanLevel,
|
|
|
ifExit:obj.ifExit,
|
|
|
+ alarmType:obj.alarmType.split(','),
|
|
|
+ riskAutoOff:obj.riskAutoOff+'',
|
|
|
riskPlanSensorList:obj.riskPlanSensorList,
|
|
|
riskPlanHardwareList:obj.riskPlanHardwareList,
|
|
|
});
|
|
|
@@ -727,10 +726,10 @@
|
|
|
.add-plan-max-button-color{
|
|
|
color:#dedede!important;
|
|
|
}
|
|
|
- .el-form-item__content{
|
|
|
- margin-left: 0px!important;
|
|
|
- display: flex;
|
|
|
- }
|
|
|
+ //.el-form-item__content{
|
|
|
+ // margin-left: 0px!important;
|
|
|
+ // display: flex;
|
|
|
+ //}
|
|
|
</style>
|
|
|
<style scoped lang="scss">
|
|
|
.autoClose{
|
heyang
