pc-master #154

Merged
xiaomeng merged 3 commits from pc-master into portal 2024-06-25 07:08:20 +00:00
Showing only changes of commit 28233bc38a - Show all commits

View File

@ -411,15 +411,9 @@
<el-table :data="tableData" :row-class-name="tableRowClassName" height="520" <el-table :data="tableData" :row-class-name="tableRowClassName" height="520"
style="width: 100%"> style="width: 100%">
<el-table-column prop="environmentId" label="报警名称"> <el-table-column prop="environmentName" label="报警名称">
<template slot-scope="scope">
<div>
{{ typeSelList[scope.row.environmentId - 1].name }}
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="environmentId" label="判断条件"> <el-table-column prop="environmentId" label="判断条件">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
{{ typeSelList1[scope.row.unit - 1].name }} {{ typeSelList1[scope.row.unit - 1].name }}