ly.fan
/
cac-fronted
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
newCac1.0
fanluyan 6 months ago
parent 9c716e7a1b
commit baf4fc3c09
7 changed files with 61 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
src/views/I2config/filed/components/addfiledDialog.vue
Unescape Escape View File

@ -37,7 +37,7 @@
<div class="coltitle">
<span>表字段</span>
<span>导出字段</span>
<span>拆分sensorCode附加值</span>
<span>拆分sensorCode编号替换</span>
</div>
<div

2
src/views/I2config/filed/index.vue
Unescape Escape View File

@ -25,7 +25,7 @@
</el-table-column>
<el-table-column prop="destFieldName" label="导出字段">
</el-table-column>
<el-table-column prop="attach" label="拆分sensorCode附加值">
<el-table-column prop="attach" label="拆分sensorCode编号替换">
</el-table-column>
</el-table>
</template>

16
src/views/alarmRules/components/addRules.vue
Unescape Escape View File

@ -87,6 +87,16 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="硬接点告警：" prop="notifyCom">
<el-switch
v-model="formInfo.notifyCom"
active-text="是"
inactive-text="否"
:active-value="1"
:inactive-value="0"
></el-switch>
</el-form-item>
<el-form-item label="状态：" prop="state">
<el-switch
v-model="formInfo.state"
@ -126,6 +136,7 @@ export default {
thresholdR: "",
riskLevelVal: 0, //风险等级
state: 1,
notifyCom: 1,
},
rulesId: "",
//获取当前type
@ -168,6 +179,7 @@ export default {
thresholdR: thresholdValues[1],
riskLevelVal: val.level, //风险等级
state: val.active,
notifyCom: val.active,
};
console.log(this.formInfo);
} else {
@ -178,6 +190,7 @@ export default {
threshold: val.threshold, //阈值
riskLevelVal: val.level, //风险等级
state: val.active,
notifyCom: val.active,
};
}
this.rulesId = val.id;
@ -285,6 +298,7 @@ export default {
threshold: threholdVal,
level: this.formInfo.riskLevelVal,
active: this.formInfo.state, //启用
notifyCom: this.formInfo.notifyCom,
};
} else {
params = {
@ -295,6 +309,7 @@ export default {
threshold: this.formInfo.threshold,
level: this.formInfo.riskLevelVal,
active: this.formInfo.state, //启用
notifyCom: this.formInfo.notifyCom,
};
}
if (this.title == "添加规则") {
@ -367,6 +382,7 @@ export default {
thresholdR: "",
riskLevelVal: 0, //风险等级
state: 1,
notifyCom: 1,
};
},
},

11
src/views/alarmRules/components/copyRules.vue
Unescape Escape View File

@ -28,7 +28,12 @@
</span>
<span v-else> <el-tag type="success">启用</el-tag> </span>
</el-descriptions-item>
<el-descriptions-item label="硬接点告警">
<span v-if="rulesData.notifyCom == 0"
><el-tag type="danger">否</el-tag>
</span>
<span v-else> <el-tag type="success">是</el-tag> </span>
</el-descriptions-item>
<el-descriptions-item label="告警等级"
><span v-if="rulesData.level == 2"
><el-tag type="danger">高</el-tag>
@ -130,6 +135,7 @@ export default {
thresholdR: thresholdValues[1],
riskLevelVal: val.level, //风险等级
state: val.active,
notifyCom: val.notifyCom,
};
console.log(this.formInfo);
} else {
@ -140,6 +146,7 @@ export default {
threshold: val.threshold, //阈值
riskLevelVal: val.level, //风险等级
state: val.active,
notifyCom: val.notifyCom,
};
}
},
@ -221,6 +228,7 @@ export default {
threshold: thresholdVal,
level: this.formInfo.riskLevelVal,
active: this.formInfo.state, // 启用
notifyCom: this.formInfo.notifyCom,
};
} else {
params = {
@ -231,6 +239,7 @@ export default {
threshold: this.formInfo.threshold,
level: this.formInfo.riskLevelVal,
active: this.formInfo.state, // 启用
notifyCom: this.formInfo.notifyCom,
};
}

8
src/views/alarmRules/index.vue
Unescape Escape View File

@ -71,6 +71,14 @@
<span v-else> <el-tag type="success">启用</el-tag> </span>
</template>
</el-table-column>
<el-table-column prop="notifyCom" label="硬接点告警">
<template slot-scope="scope">
<span v-if="scope.row.notifyCom == 0"
><el-tag type="danger">否</el-tag>
</span>
<span v-else> <el-tag type="success">是</el-tag> </span>
</template>
</el-table-column>
<el-table-column prop="level" label="告警等级">
<template slot-scope="scope">
<span v-if="scope.row.level == 2"

7
src/views/clientDownFile/downrecord/index.vue
Unescape Escape View File

@ -23,9 +23,12 @@
height="calc(100% - 0px)"
v-loading="recordLoading"
>
<el-table-column label="文件名称">
<el-table-column label="传感器名称">
<template slot-scope="scope">
<span>{{ scope.row.config.sensor.name }}</span>
<span v-if="scope.row.config">{{
scope.row.config.sensor.name
}}</span>
<span v-else>{{ scope.row.configId }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="id" prop="id">

23
src/views/iceserver/index.vue
Unescape Escape View File

@ -73,6 +73,23 @@
</el-table-column>
<el-table-column prop="port" label="port" width="80px">
</el-table-column>
<el-table-column prop="connected" label="连接状态" width="80px">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.connected == 1"
>连接</el-tag
>
<el-tag type="danger" v-else>断开</el-tag>
</template>
</el-table-column>
<el-table-column
prop="retry"
label="重连次数(等待秒数)"
width="80px"
>
<template slot-scope="scope">
{{ scope.row.retry }}({{ scope.row.seconds }})
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="200px">
<template slot-scope="scope">
@ -173,7 +190,7 @@ export default {
this.$message({
duration: 1500,
showClose: true,
message: "服务器开始成功",
message: "订阅成功",
type: "success",
});
this.getIcdListFile();
@ -238,7 +255,7 @@ export default {
this.$message({
duration: 1500,
showClose: true,
message: "服务器开始成功",
message: "订阅成功",
type: "success",
});
this.getLedList();
@ -361,7 +378,7 @@ export default {
}
}
.cardBox2 {
width: 560px;
width: 800px;
margin-top: 20px;
margin-left: 12px;
height: calc(100% - 40px);

Write Preview
Loading…
Cancel
Save