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

panzy

2022-05-21 c1df656dee7e75d109d2bee05f0c129e13e9367a

 src/views/summaryPotentialSafetyHzards/summaryList.vue

@@ -38,7 +38,8 @@
            </el-table-column>
            <el-table-column prop="DTRisk_bankId" label="是否关联" align="center">
                <template slot-scope="scope">
                    <span v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span>
                    <span
                        v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span>
                    <span v-else>已关联</span>
                </template>
            </el-table-column>
@@ -70,11 +71,15 @@
            >
            </el-pagination>
        </div>
        <div class="btn">
            <el-button size="small" @click="close()">关闭</el-button>
        </div>
    </div>
</template>
<script>
import {getPageList,delDanger} from "@/api/sgyhpczl/hiddenDangerRegistration";
import {getPageList} from "@/api/sgyhpczl/safetyHazardAccount";
import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";

export default {
    data() {
        return {
@@ -94,10 +99,13 @@
            YHJBList:[],
            tableData: [],
            listQuery:{


                page:1,
                limit:10,
                type: 0,
                form:{
                    ht_community:"众泰煤焦化"
                    // ht_community:"众泰煤焦化"
                },
            },
            currentPage: 1,
@@ -106,6 +114,12 @@
        };
    },
    mounted(){
        console.log(this.$route.query.searchData);
        var searchData = this.$route.query.searchData;
        for (const argumentsKey in searchData) {
            this.listQuery.form[argumentsKey] = searchData[argumentsKey];
        }
        console.log(this.listQuery)
        this.getPageList()
        this.initYHLX()
        this.initYHJB()
@@ -113,6 +127,7 @@
        this.initJCLB()
        this.initLlr()
        this.initYHBM()

    },
    methods:{
        deleteBatch(){
@@ -288,32 +303,8 @@
                path:"/hiddenDangerAdd"
            })
        },

        // 发送隐患单跳转
        handleClick(row){
            this.$router.push({
                path:"/hiddenDangerList?id="+row.id,
            })
        },
        deleteClick(row){
            this.$confirm('确认删除吗','提示', {
                confirmButtonText: '确认',
                cancelButtonText: '取消',
                type: 'warning'
            })
                .then(()=>{
                    delDanger(row.id).then(() => {
                        this.getPageList()
                        this.$notify({
                            title: "成功",
                            message: "删除成功",
                            type: "success",
                            duration: 2000,
                        });
                    });
                })
                .catch(error =>{
                });
        },
        base(){
            this.$router.push({
                path:"/Dualbase"
@@ -328,16 +319,20 @@
        justify-content: left;
        flex-wrap: wrap;
    }

    .inquire .el-form-item {
        padding: 0 30px;
    }

    .title-center {
        padding: 20px 0;
    }

    .btns {
        background-color: #034ea2;
        border: 1px solid #034ea2;
    }

    .title-center /deep/ .el-radio-button:first-child .el-radio-button__inner {
    border: none;
}
@@ -351,4 +346,8 @@
    background-color: #034ea2;
    background-color: #034ea2;
}
.btn{
    text-align: center;
    margin-top: 20px;
}
</style>