From 426c8b34e6c0a6f97de69864c537cf5e0d7dbb08 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期四, 15 十二月 2022 18:13:34 +0800
Subject: [PATCH] 2022-12-15 趋势分析 地图位置 ，弹窗修改
---
src/views/operate/disposal/casepool/dispatch/index.vue | 57 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index cbec1b5..bba9878 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -5,8 +5,8 @@
<div class="search">
<span>绛涢�夋潯浠�:</span>
<div class="option">
- <el-select v-model="mystatus" placeholder="杩濊" @change="setMystatus">
- <el-option v-for="item in typeList" :key="item.label" :label="item.name"
+ <el-select v-model="resource" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in resourceOptions" :key="item.label" :label="item.label"
:value="item.value">
</el-option>
</el-select>
@@ -37,7 +37,7 @@
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8">
<template slot-scope="scope">
- <span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶'}}</span>
+ <span>{{ scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛宸℃煡' }}</span>
</template>
</el-table-column>
<el-table-column :prop="mystatus === 1 ? 'category' :'category'"
@@ -79,19 +79,19 @@
</el-table-column>
</el-table>
<!-- 璇︽儏椤靛睍绀� -->
- <el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
+ <el-dialog :visible.sync="dialogView" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
:before-close="handleClose">
<MyDetail :info=info v-if="mystatus===1"></MyDetail>
<MyIllDetail :info=info v-else></MyIllDetail>
</el-dialog>
<!-- 涓婁紶椤甸潰 -->
- <el-dialog :visible.sync="dialogUpload" width="80%" title="涓婁紶澶勭疆缁撴灉" v-if="dialogUpload"
+ <el-dialog :visible.sync="dialogUpload" title="涓婁紶澶勭疆缁撴灉" v-if="dialogUpload"
:before-close="handleClose">
- <uploadVio v-if="mystatus === 1" :illegalType="illegalType" :imageResourceId="imageResourceId" :caseId="caseId" :vioData="vioData" @closeDialog="closeDialog"></uploadVio>
- <uploadIll v-else :caseId="caseId" :illegal-type="illegalType" :mycode="caseCode" @closeDialog="closeDialog" :vioData="vioData" :imageResourceId="imageResourceId"></uploadIll>
+ <uploadVio v-if="mystatus === 1" :imageResourceId="imageResourceId" :caseId="caseId" :mycode="caseCode" :vioData="vioData" @closeDialog="closeDialog"></uploadVio>
+ <uploadIll v-else :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog" :illData="illData"></uploadIll>
</el-dialog>
<!-- tools -->
- <div class="tools">
+ <!-- <div class="tools">
<div class="funs">
<div class="funsItem funs-sp">
<el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
@@ -112,7 +112,7 @@
:total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage">
</el-pagination>
</div>
- </div>
+ </div> -->
</div>
</main>
</div>
@@ -124,6 +124,9 @@
import MyIllDetail from '@/components/illdetail'
import casequery from "@/api/operate/basecase";
import helper from '@/utils/mydate'
+import basecase from "@/api/operate/basecase";
+import { RESOURCE_OPTIONS } from "@/utils/helper";
+
export default {
components: {
uploadVio, uploadIll, MyDetail,MyIllDetail
@@ -180,7 +183,9 @@
caseId: '',
caseCode: null,
vioData: null,
- illegalType: null
+ illData: null,
+ resource: null,
+ resourceOptions: RESOURCE_OPTIONS
}
},
created() {
@@ -195,8 +200,7 @@
methods: {
// 椤堕儴涓嬫媺妗�
setMystatus(value) {
- this.statusArr[1] = value;
- this.changeTypeChecked(value - 1);
+ this.resource = value;
this.getUserList();
},
// 鎵归噺鍒犻櫎
@@ -262,18 +266,23 @@
this.getUserList();
})
})
- .catch(_ => { console.log(2) });
+ .catch(_ => { });
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
- const { currentPage, pageSize, context, statusArr } = this;
- this.$axios({
- method: 'get',
- url: `sccg/base_case/query?state=${statusArr[0]}¤t=${currentPage}&size=${pageSize}&resource=2&type=${statusArr[1]}`
- }).then(res => {
- this.totalNum = res.data.total;
- this.tableData = res.data.records;
- })
+ const params = {
+ current: this.currentPage,
+ state: this.statusArr[0] ?? null,
+ size: this.pageSize,
+ resource: this.resource,
+ type: this.statusArr[1] ?? null
+ }
+ basecase.baseCasePoolList(params)
+ .then(({ records, total }) => {
+ this.tableData = records;
+ this.totalNum = total;
+ })
+ .catch(err => this.$message.error(err))
},
// 鏇存敼杩濊/杩濆缓
changeTypeChecked(idx) {
@@ -323,8 +332,8 @@
await casequery.getBaseCaseDetail(data.code)
.then(({ baseCase, currentSitVo, filesPictureVo, handlePassVo }) => {
this.vioData = currentSitVo;
+ this.illData = currentSitVo;
this.imageResourceId = filesPictureVo.imageResources[0]?.id;
- this.illegalType = this.mystatus === 1 ? baseCase.violations.actionCause : baseCase.illegalBuilding.categoryText;
})
.catch(err => this.$message.error(err))
this.dialogUpload = true;
@@ -507,6 +516,10 @@
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
+ .el-checkbox{
+ display: none;
+ }
+
}
--
Gitblit v1.8.0