Merge remote-tracking branch 'origin/master'

luobisheng

2022-11-16 1ac7fb3108bc16afad227a3f700a73ec1eb1b3ef

 src/views/operate/disposal/casepool/dispatch/index.vue

@@ -58,7 +58,7 @@
                        </template>
                    </el-table-column>
                    <el-table-column :prop="mystatus === 1 ? 'street' :'buildingArea'"
                        :label="mystatus===1 ? '所属区域' : '违法建筑面积'" min-width="10">
                        :label="mystatus===1 ? '所属区域' : '违法建筑面积'" min-width="12">
                    </el-table-column>
                    <el-table-column prop="alarmTime" label="报警时间" min-width="15" v-if="mystatus===1">
                        <template slot-scope="scope">
@@ -66,9 +66,9 @@
                        </template>
                    </el-table-column>
                    <el-table-column :prop="mystatus === 1 ? 'continueTime' :'materials'"
                        :label="mystatus===1 ? '持续时间' : '违法建筑材料'" min-width="10">
                        :label="mystatus===1 ? '持续时间' : '违法建筑材料'" min-width="12">
                    </el-table-column>
                    <el-table-column prop="operation" label="操作" min-width="20">
                    <el-table-column prop="operation" label="操作" min-width="15">
                        <template slot-scope="scope">
                            <div class="operation">
                                <div class="btn">
@@ -87,8 +87,8 @@
                <!-- 上传页面 -->
                <el-dialog :visible.sync="dialogUpload" width="80%" title="上传处置结果" v-if="dialogUpload"
                    :before-close="handleClose">
                    <uploadVio v-if="mystatus === 1" :caseId="caseId" @closeDialog="closeDialog"></uploadVio>
                    <uploadIll v-else :caseId="caseId" @closeDialog="closeDialog"></uploadIll>
                    <uploadVio v-if="mystatus === 1" :caseId="caseId" :mycode="caseCode"  @closeDialog="closeDialog"></uploadVio>
                    <uploadIll v-else :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog"></uploadIll>
                </el-dialog>
                <!-- tools -->
                <div class="tools">
@@ -179,6 +179,7 @@
            statusArr: [],
            mystatus: 1,
            caseId: '',
            caseCode:null,
        }
    },
    created() {
@@ -261,7 +262,6 @@
                        url: `sccg/violations/delete?id=${number}`,
                    })
                        .then(res => {
                            console.log(res);
                            this.$message({
                                type: res.code === 200 ? 'success' : 'warning',
                                message: res.message
@@ -275,14 +275,12 @@
        // 获取用户列表
        getUserList() {
            const { currentPage, pageSize, context, statusArr } = this;
            console.log(statusArr);
            this.$axios({
                method: 'get',
                url: `sccg/base_case/query?state=${statusArr[0]}&current=${currentPage}&size=${pageSize}&resource=2&type=${statusArr[1]}`
            }).then(res => {
                this.totalNum = res.data.total;
                this.tableData = res.data.records;
                console.log(res);
            })
        },
        // 更改违规/违建
@@ -349,6 +347,7 @@
        opernDialog(data) {
            this.dialogUpload = true;
            this.caseId = data.id;
            this.caseCode = data.code
            // console.log(data); 
        },
        // 关闭上传界面