Merge remote-tracking branch 'origin/shf' into shf

panzy

2022-05-21 c1df656dee7e75d109d2bee05f0c129e13e9367a

 src/views/delayHiddenDangerRectification/index.vue

@@ -159,7 +159,11 @@
        </el-row>
        <el-table ref="dataTable" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
            <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>
@@ -171,12 +175,32 @@
                    </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="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="限改时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
@@ -407,7 +431,7 @@
        sendBath() {
            var selectData = this.$refs.dataTable.selection;
            if (selectData.length < 1) {
                this.$message({type: 'warn', message: "请选择需要发送的数据！", duration: 3000})
                this.$message({type: 'warning', message: "请选择需要发送的数据！", duration: 3000})
                return;
            }
            var selectIds = "";
@@ -468,7 +492,12 @@
            let dt = new Date(data)
            return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
        },

        showDetails(row){
            this.$router.push({
                path: "/dangerDetails",
                query:{"id":row.id}
            })
        },
        //方法区
        formatColumnDate(row, column) {
            // 获取单元格数据
@@ -501,4 +530,8 @@
    background-color: #034ea2;
    border: 1px solid #034ea2;
}
.blue-font-color:hover{
    cursor: pointer;
    color: blue;
}
</style>