flx:修改bug
This commit is contained in:
parent
e76fc2656d
commit
aac2b9c088
@ -2083,8 +2083,10 @@ export default {
|
||||
flex-wrap: wrap;
|
||||
padding-bottom: 20px;
|
||||
height: initial !important;
|
||||
> .box {
|
||||
> .box:nth-child(n + 3) {
|
||||
margin-top: 20px;
|
||||
}
|
||||
> .box {
|
||||
background: #ffffff;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
.header_title {
|
||||
|
||||
@ -104,6 +104,7 @@
|
||||
: 'danger'
|
||||
"
|
||||
plain
|
||||
class="delete_btn"
|
||||
@click="deleteAttendanceBatch"
|
||||
>批量删除</el-button
|
||||
>
|
||||
@ -146,9 +147,9 @@
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<template v-if="queryParams.controlListType == 1">
|
||||
<el-dropdown-item command="1">风险点清单</el-dropdown-item>
|
||||
<el-dropdown-item command="2">辨识清单</el-dropdown-item>
|
||||
</template>
|
||||
<template v-if="queryParams.controlListType == 2">
|
||||
<el-dropdown-item command="2">辨识清单</el-dropdown-item>
|
||||
<el-dropdown-item command="3">危险源清单</el-dropdown-item>
|
||||
<el-dropdown-item command="10">区域二维码</el-dropdown-item>
|
||||
</template>
|
||||
@ -686,11 +687,10 @@
|
||||
label="管控责任人"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
{{
|
||||
scope.row.controlWorkerNames
|
||||
? scope.row.controlWorkerNames
|
||||
: "--"
|
||||
}}
|
||||
<span v-if="scope.row.controlWorkerNames">
|
||||
{{ scope.row.controlWorkerNames }}
|
||||
</span>
|
||||
<div class="color_e400" v-else>未设置</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" prop="workable" label="管控情况">
|
||||
@ -727,9 +727,10 @@
|
||||
align="center"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
{{
|
||||
scope.row.checkWorkerNames ? scope.row.checkWorkerNames : "--"
|
||||
}}
|
||||
<span v-if="scope.row.checkWorkerNames">
|
||||
{{ scope.row.checkWorkerNames }}
|
||||
</span>
|
||||
<div class="color_e400" v-else>未设置</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@ -844,11 +845,10 @@
|
||||
label="管控责任人"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
{{
|
||||
scope.row.controlWorkerNames
|
||||
? scope.row.controlWorkerNames
|
||||
: "--"
|
||||
}}
|
||||
<span v-if="scope.row.controlWorkerNames">
|
||||
{{ scope.row.controlWorkerNames }}
|
||||
</span>
|
||||
<div class="color_e400" v-else>未设置</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" prop="workable" label="管控情况">
|
||||
@ -886,9 +886,10 @@
|
||||
align="center"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
{{
|
||||
scope.row.checkWorkerNames ? scope.row.checkWorkerNames : "--"
|
||||
}}
|
||||
<span v-if="scope.row.checkWorkerNames">
|
||||
{{ scope.row.checkWorkerNames }}
|
||||
</span>
|
||||
<div class="color_e400" v-else>未设置</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@ -1105,7 +1106,6 @@
|
||||
value: 'id',
|
||||
label: 'enterpriseName',
|
||||
}"
|
||||
clearable
|
||||
></el-cascader>
|
||||
</el-form-item>
|
||||
<el-form-item label="管控责任人" prop="controlWorkerIds">
|
||||
@ -1253,6 +1253,7 @@
|
||||
? 'info'
|
||||
: 'danger'
|
||||
"
|
||||
class="delete_btn"
|
||||
plain
|
||||
@click="deleteAttendanceBatchSourceDanger"
|
||||
>批量删除</el-button
|
||||
|
||||
@ -1898,8 +1898,10 @@ export default {
|
||||
flex-wrap: wrap;
|
||||
padding-bottom: 20px;
|
||||
height: initial !important;
|
||||
> .box {
|
||||
.box1:nth-child(n + 3) {
|
||||
margin-top: 20px;
|
||||
}
|
||||
> .box {
|
||||
background: #ffffff;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
.header_title {
|
||||
|
||||
@ -90,14 +90,12 @@
|
||||
>
|
||||
<el-table-column type="selection" align="center" width="55"></el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
align="center"
|
||||
prop="riskPointName"
|
||||
label="风险分类"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
align="center"
|
||||
prop="riskDescription"
|
||||
label="风险情况描述"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user