From 15de314310f14ebd37b820c99a7da81bbbd1cdfd Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 29 十一月 2022 16:50:17 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/disposal/casepool/dispatch/index.vue | 96 ++++++++++++++++++------------------------------
1 files changed, 36 insertions(+), 60 deletions(-)
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index 6314ab2..3bebbe3 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -35,7 +35,7 @@
<el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
</template>
</el-table-column>
- <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="7">
+ <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8">
<template slot-scope="scope">
<span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶'}}</span>
</template>
@@ -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,15 +66,13 @@
</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">
- <span>璋冨害</span>
- <span class="line">|</span>
- <span @click="opernDialog(scope.row)">涓婁紶澶勭疆缁撴灉</span>
+ <span @click="openDialog(scope.row)">涓婁紶澶勭疆缁撴灉</span>
</div>
</div>
</template>
@@ -83,22 +81,22 @@
<!-- 璇︽儏椤靛睍绀� -->
<el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
:before-close="handleClose">
- <MyDetail :info=info v-if="mystatus==1 ? true:false"></MyDetail>
+ <MyDetail :info=info v-if="mystatus===1"></MyDetail>
<MyIllDetail :info=info v-else></MyIllDetail>
</el-dialog>
<!-- 涓婁紶椤甸潰 -->
- <el-dialog :visible.sync="dialogUpload" width="60%" title="涓婁紶澶勭疆缁撴灉" v-if="dialogUpload"
+ <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" :imageResourceId="imageResourceId" :caseId="caseId" :mycode="caseCode" :vioData="vioData" @closeDialog="closeDialog"></uploadVio>
+ <uploadIll v-else :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog" :vioData="vioData" :illData="illData"></uploadIll>
</el-dialog>
<!-- tools -->
<div class="tools">
<div class="funs">
- <div class="funsItem">
+ <div class="funsItem funs-sp">
<el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
</div>
- <div class="funsItem">
+ <div class="funsItem funs-sp">
<el-checkbox v-model="unsame" @change="disSame(tableData)">鍙嶉��</el-checkbox>
</div>
<div class="funsItem">
@@ -111,8 +109,7 @@
</div>
<div class="pagination">
<el-pagination background :current-page="currentPage" layout="prev, pager, next"
- :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage"
- @prev-click="handlePrev" @next-click="handleNext">
+ :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage">
</el-pagination>
</div>
</div>
@@ -125,18 +122,18 @@
import uploadIll from "./updateUser/uploadResult/ill"
import MyDetail from '@/components/detail'
import MyIllDetail from '@/components/illdetail'
+import casequery from "@/api/operate/basecase";
import helper from '@/utils/mydate'
export default {
components: {
- // updateUser,
uploadVio, uploadIll, MyDetail,MyIllDetail
},
data() {
return {
tableData: [],
+ imageResourceId: null,
context: "",
dialogUpload: false,
- // dialogUpdate: false,
dialogView: false,
info: {},
totalNum: null,
@@ -181,6 +178,9 @@
statusArr: [],
mystatus: 1,
caseId: '',
+ caseCode: null,
+ vioData: null,
+ illData: null
}
},
created() {
@@ -195,14 +195,12 @@
methods: {
// 椤堕儴涓嬫媺妗�
setMystatus(value) {
- console.log(value);
this.statusArr[1] = value;
this.changeTypeChecked(value - 1);
this.getUserList();
},
// 鎵归噺鍒犻櫎
mulDelete(idArr) {
- console.log(idArr);
this.$axios({
method: 'delete',
url: 'sccg/violations/batch_delete?ids=' + idArr,
@@ -216,7 +214,6 @@
},
// 鎵ц涓嬫媺妗嗘搷浣�
selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
if (list === 3) {
this.preMyIdx = list;
@@ -236,11 +233,7 @@
list.forEach(item => {
this.tempList.push(item.code);
})
- if (list.length === this.tableData.length) {
- this.all = true;
- } else {
- this.all = false
- }
+ this.all = list.length === this.tableData.length;
},
// 鍏ㄩ��
selectAll() {
@@ -254,16 +247,13 @@
},
// 鍒犻櫎鍗曟潯鏁版嵁
handleDelete({ number }) {
- console.log(number);
this.$confirm('纭鍒犻櫎锛�')
.then(_ => {
- console.log(1);
this.$axios({
method: 'delete',
url: `sccg/violations/delete?id=${number}`,
})
.then(res => {
- console.log(res);
this.$message({
type: res.code === 200 ? 'success' : 'warning',
message: res.message
@@ -277,51 +267,33 @@
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
const { currentPage, pageSize, context, statusArr } = this;
- console.log(statusArr);
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;
- console.log(res);
})
},
// 鏇存敼杩濊/杩濆缓
changeTypeChecked(idx) {
this.typeList.forEach((item, index) => {
- if (index === idx) {
- item.checked = true;
- } else {
- item.checked = false;
- }
+ item.checked = index === idx;
})
this.mystatus = idx + 1;
- console.log(this.mystatus);
this.statusArr[1] = this.typeList[idx].value;
this.getUserList();
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
- this.currentPage = page;
- this.getUserList();
- },
- // 涓婁竴椤电偣鍑讳簨浠�
- handlePrev(page) {
- this.currentPage = page;
- this.getUserList();
- },
- // 涓嬩竴椤电偣鍑讳簨浠�
- handleNext(page) {
this.currentPage = page;
this.getUserList();
},
@@ -329,7 +301,6 @@
this.$confirm('纭鍏抽棴锛�')
.then(_ => {
this.dialogUpload = false;
- // this.dialogUpdate = false;
done();
})
.catch(_ => { });
@@ -348,15 +319,21 @@
this.dialogView = true;
})
},
- opernDialog(data) {
- this.dialogUpload = true;
- this.caseId = data.id;
- // console.log(data);
+ async openDialog(data) {
+ await casequery.getBaseCaseDetail(data.code)
+ .then(({ baseCase, currentSitVo, filesPictureVo, handlePassVo }) => {
+ this.vioData = currentSitVo;
+ this.imageResourceId = filesPictureVo.imageResources[0]?.id;
+ })
+ .catch(err => this.$message.error(err))
+ this.dialogUpload = true;
+ this.caseId = data.id;
+ this.caseCode = data.code;
},
// 鍏抽棴涓婁紶鐣岄潰
- closeDialog({ flag }) {
- this.dialogUpload = flag;
- this.getUserList();
+ closeDialog() {
+ this.dialogUpload = false;
+ this.getUserList();
},
// 澶勭悊鏃堕棿
filterTime(time) {
@@ -373,7 +350,6 @@
header {
background-color: #09152f;
- border: 1pox solid #fff;
.headerContent {
padding: 0 40px;
@@ -433,7 +409,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.btn span:hover {
cursor: pointer;
@@ -467,7 +442,9 @@
justify-content: space-between;
align-items: center;
padding: 0 20px;
-
+ .funs-sp{
+ border: 1px solid #17324c;
+ }
.funs {
display: flex;
@@ -475,7 +452,6 @@
line-height: 28px;
display: flex;
align-items: center;
- border: 1px solid #17324c;
border-radius: 4px;
font-size: 12px;
margin-left: 10px;
--
Gitblit v1.8.0