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

lyfO_o

2022-06-09 44d7a737dc0d63ad1dd7c52d45fc2233d1950173

 src/views/hiddenDangerManagement/index.vue

@@ -181,7 +181,7 @@

            </el-col>
        </el-row>
        <el-table :data="tableData" ref="dataTable" style="width: 100%">
        <el-table :data="tableData" ref="dataTable" style="width: 100%" v-loading="loading">
            <el-table-column type="selection" width="55" align="center"></el-table-column>
            <el-table-column prop="number" label="编号" align="center" width="120">
                <template slot-scope="scope">
@@ -251,7 +251,7 @@
            <el-table-column label="初始警情" align="center" prop="warningLevel"></el-table-column>
            <el-table-column label="当前警情" align="center" prop="curWarningLevel"></el-table-column>
            <!-- <el-table-column label="流程操作" align="center"> </el-table-column> -->
            <el-table-column label="基本操作" align="center">
            <el-table-column label="基本操作" align="center" fixed="right">
                <template slot-scope="scope">
                    <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
                    <el-button type="text" @click="handleDelete(scope.row)" size="small">删除</el-button>
@@ -304,6 +304,7 @@
            YHBMList: [],
            YHJBList: [],
            tableData: [],
            loading:false,
            listQuery: {
                page: 1,
                limit: 10,
@@ -396,7 +397,9 @@
        getPageList() {
            this.listQuery.page = 1
            this.checkTime()
            this.loading = true
            getPageList(this.listQuery).then(res => {
                this.loading = false
                if (res.data.ok == 1) {
                    this.tableData = res.data.data.items
                    this.recordTotal = res.data.data.total
@@ -499,11 +502,13 @@
            window.open(href, '_blank');
        },
        exportData() {
            var requestData = this.listQuery;
            this.listLoading = true
            var requestData = JSON.parse(JSON.stringify(this.listQuery));
            //删除分页参数
            this.$delete(requestData, 'page')
            this.$delete(requestData, 'limit')
            self_export_do(requestData).then(res => {
                this.listLoading = false
                var blob = new Blob([res.data])
                var downloadElement = document.createElement('a')
                var href = window.URL.createObjectURL(blob) //创建下载的链接
@@ -660,9 +665,10 @@
            })
        },
        showDetails(row){
            //hiddenDangerManagement
            this.$router.push({
                path: "/dangerDetails",
                query:{"id":row.id}
                query: {"id": row.id, "route": "/hiddenDangerManagement"}
            })
        }
    }