Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf

shj

2022-05-13 97f21296e89d2e4fe7ae2fd00ab63696365b1da2

Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf

 src/views/hiddenDangerRectification/index.vue

@@ -151,7 +151,11 @@
        </el-row>
        <el-table :data="tableData" ref="dangerRectificationTable" style="width: 100%">
            <el-table-column type="selection" width="55" align="center"></el-table-column>
            <el-table-column prop="number" label="编号" align="center" width="120"></el-table-column>
            <el-table-column prop="number" label="编号" align="center" width="120">
                <template slot-scope="scope">
                    <div class="blue-font-color" @click="showDetails(scope.row)">{{ scope.row.number }}</div>
                </template>
            </el-table-column>
            <el-table-column prop="check_branch" label="检查部门" align="center" width="120"></el-table-column>
            <el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
            <el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
@@ -162,13 +166,33 @@
                        <label>{{ scope.row.check_class}}</label>
                    </template>
                </el-table-column>
                <el-table-column prop="address" label="地点" align="center"></el-table-column>
                <el-table-column prop="ht_content" label="内容" align="center"></el-table-column>
                <el-table-column prop="address" label="地点"   align="center"></el-table-column>
                <el-table-column prop="ht_content" label="内容" width="150" align="center">
                    <template slot-scope="scope">
                        <el-popover trigger="hover" placement="top">
                            <p>{{ scope.row.ht_content }}</p>
                            <div slot="reference" class="name-wrapper">{{
                                    scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
                                }}
                            </div>
                        </el-popover>
                    </template>
                </el-table-column>
                <el-table-column prop="ht_typesub" label="类别" align="center"></el-table-column>
                <el-table-column prop="ht_level" label="级别" align="center"></el-table-column>
            </el-table-column>
            <el-table-column label="整改计划" align="center">
                <el-table-column prop="measure" label="整改措施" align="center"></el-table-column>
                <el-table-column prop="measure" label="整改措施" width="150" align="center">
                    <template slot-scope="scope">
                        <el-popover trigger="hover" placement="top">
                            <p>{{ scope.row.measure }}</p>
                            <div slot="reference" class="name-wrapper">{{
                                    scope.row.measure != null && scope.row.measure.length > 10 ? scope.row.measure.substring(0, 8) + "...." : scope.row.measure
                                }}
                            </div>
                        </el-popover>
                    </template>
                </el-table-column>
                <el-table-column prop="ht_branch" label="隐患部门" align="center"></el-table-column>
                <el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column>
                <el-table-column prop="alter_time" label="限改时间" width="120" :formatter="formatColumnDate" align="center"></el-table-column>
@@ -597,6 +621,12 @@
            }).catch(err => {
                console.log(err)
            })
        },
        showDetails(row){
            this.$router.push({
                path: "/dangerDetails",
                query:{"id":row.id}
            })
        }
    }
};
@@ -626,7 +656,10 @@
    max-height: 80px;
    overflow-y: auto
}

.blue-font-color:hover{
    cursor: pointer;
    color: blue;
}
/deep/ .el-dialog .button .el-form-item__content {
    margin-left: 0;
}