From c88f56fbd311766de4245ba74789eebd7ee65eab Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 05 十二月 2022 16:52:01 +0800
Subject: [PATCH] 驳回处理和bug修改
---
src/components/process/index.vue | 4
src/views/operate/management/myIndex/components/examine/index.vue | 11 +-
src/views/operate/message/myIndex/index.vue | 3
src/components/filePictrue/index.vue | 203 ++++++++++++++++++++++++++------------------------
src/views/operate/myWait/index.vue | 1
src/views/operate/disposal/casepool/dispatch/index.vue | 7 -
6 files changed, 121 insertions(+), 108 deletions(-)
diff --git a/src/components/filePictrue/index.vue b/src/components/filePictrue/index.vue
index dc2885d..5875503 100644
--- a/src/components/filePictrue/index.vue
+++ b/src/components/filePictrue/index.vue
@@ -1,118 +1,125 @@
<template>
- <div class="file-picture">
- <div class="file-tell">
- <div class="tell-title">涓婃姤</div>
- <div class="tell-show" v-for="item in imgSource" :key="item.id">
- <div v-if="item.type == '01'" style="display:flex">
- <div class="my-demo" v-for="childer in item.url">
- <img class="img" :src="childer" alt="">
- <div class="tip">
- <div>銆愬浘鐗囩被鍨嬨�戜笂鎶�</div>
- <div>銆愪笂浼犳椂闂淬�憑{ changeTime(item.createTime) }}</div>
- </div>
- </div>
- </div>
+ <div class="file-picture">
+ <div class="file-tell">
+ <div class="tell-title">涓婃姤</div>
+ <div class="tell-show" v-for="item in imgSource" :key="item.id">
+ <div v-if="item.type == '01'" style="display: flex">
+ <div class="my-demo" v-for="childer in item.url">
+ <img class="img" :src="childer" alt="" />
+ <div class="tip">
+ <div>銆愬浘鐗囩被鍨嬨�戜笂鎶�</div>
+ <div>銆愪笂浼犳椂闂淬�憑{ changeTime(item.createTime) }}</div>
</div>
+ </div>
</div>
- <div class="file-deal">
- <div class="tell-title">澶勭疆</div>
- <div class="tell-show" v-for="item in imgSource" :key="item.id">
- <div v-if="item.type == '02'" class="tell-demo">
- <div class="my-demo" v-for="childer in item.url">
- <img class="img" :src="childer" alt="">
- <div class="tip">
- <!-- <div>銆愬浘鐗囩被鍨嬨�戝缃�</div> -->
- <div>銆愪笂浼犳椂闂淬�憑{ changeTime(item.createTime) }}</div>
- </div>
- </div>
- </div>
- </div>
- </div>
+ </div>
</div>
+ <div class="file-deal">
+ <div class="tell-title">澶勭疆</div>
+ <div class="tell-show" v-for="item in imgSource" :key="item.id">
+ <div v-if="item.type == '02'" class="tell-demo">
+ <div class="my-demo" v-for="childer in item.url">
+ <img class="img" :src="childer" alt="" />
+ <div class="tip">
+ <!-- <div>銆愬浘鐗囩被鍨嬨�戝缃�</div> -->
+ <div>銆愪笂浼犳椂闂淬�憑{ changeTime(item.createTime) }}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</template>
<script>
-import { parseTime } from "@/utils/index"
+import { parseTime } from "@/utils/index";
export default {
- data() {
- return {
- imgSource: []
- }
+ data() {
+ return {
+ imgSource: [],
+ };
+ },
+ props: ["filesPictureVo", "mycode"],
+ created() {
+ const {
+ filesPictureVo: { imageResources: imgList },
+ } = this;
+
+ let pic = this.filesPictureVo.imageResources;
+ pic.forEach((item) => {
+ item.url = item.url.split(",");
+ });
+ this.imgSource = pic;
+ // this.getEventInfo(this.mycode);
+ },
+ methods: {
+ // 鑾峰彇token
+ getToken() {
+ const token = sessionStorage.getItem("token");
+ const tokenHead = sessionStorage.getItem("tokenHead");
+ if (token && tokenHead) {
+ return { Authorization: tokenHead + token };
+ }
},
- props: ['filesPictureVo', 'mycode'],
- created() {
- const { filesPictureVo: { imageResources: imgList } } = this
- this.getEventInfo(this.mycode);
+ changeTime(time) {
+ if (time) {
+ return parseTime(time);
+ }
},
- methods: {
- // 鑾峰彇token
- getToken() {
- const token = sessionStorage.getItem('token');
- const tokenHead = sessionStorage.getItem('tokenHead');
- if (token && tokenHead) {
- return { Authorization: tokenHead + token };
- }
- },
- changeTime(time) {
- if (time) {
- return parseTime(time)
- }
- },
- getEventInfo(mycode) {
- this.$axios({
- method: 'get',
- url: `sccg/base_case/baseCaseDetail/${mycode}`
- })
- .then(res => {
- this.info = res.data;
- this.dialogView = true;
- let pic = res.data.filesPictureVo.imageResources;
- pic.forEach(item => {
- item.url = item.url.split(',')
- })
- this.imgSource = pic;
- })
- },
- }
-}
+ getEventInfo(mycode) {
+ this.$axios({
+ method: "get",
+ url: `sccg/base_case/baseCaseDetail/${mycode}`,
+ }).then((res) => {
+ this.info = res.data;
+ this.dialogView = true;
+ let pic = res.data.filesPictureVo.imageResources;
+ pic.forEach((item) => {
+ item.url = item.url.split(",");
+ });
+ this.imgSource = pic;
+ });
+ },
+ },
+};
</script>
<style lang="scss" scoped>
.file-picture {
- padding-top: 50px;
+ padding-top: 50px;
- .file-tell,
- .file-deal {
- .tell-title {
- line-height: 40px;
- }
-
- .tell-show {
- .tell-demo {
- display: flex;
- flex-wrap: wrap;
- width: 100%;
- }
- }
+ .file-tell,
+ .file-deal {
+ .tell-title {
+ line-height: 40px;
}
- .my-demo {
- position: relative;
- height: 159px;
- margin: 10px;
+ .tell-show {
+ .tell-demo {
+ display: flex;
+ flex-wrap: wrap;
+ width: 100%;
+ }
+ }
+ }
+
+ .my-demo {
+ position: relative;
+ height: 159px;
+ margin: 10px;
+ }
+
+ .tip {
+ div {
+ line-height: 20px;
}
- .tip {
- div {
- line-height: 20px;
- }
+ text-align: left;
+ position: absolute;
+ bottom: 0px;
+ }
- text-align: left;
- position: absolute;
- bottom: 0px;
- }
-
- .img {
- width: 226px;
- height: 159px;
- }
+ .img {
+ width: 226px;
+ height: 159px;
+ }
}
</style>
\ No newline at end of file
diff --git a/src/components/process/index.vue b/src/components/process/index.vue
index 6702405..a142fd9 100644
--- a/src/components/process/index.vue
+++ b/src/components/process/index.vue
@@ -81,7 +81,9 @@
</div>
<div class="desc-content" v-if="active > index">
<div class="desc-content-message">
- {{ item.disposeRecords[0].result || "" }}
+ {{
+ (item.disposeRecords[0] && item.disposeRecords[0].result) || ""
+ }}
</div>
<div class="desc-content-endtime">
{{
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index 8d3eae9..c3dec03 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -87,8 +87,8 @@
<!-- 涓婁紶椤甸潰 -->
<el-dialog :visible.sync="dialogUpload" width="80%" title="涓婁紶澶勭疆缁撴灉" v-if="dialogUpload"
:before-close="handleClose">
- <uploadVio v-if="mystatus === 1" :illegal-type="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">
@@ -180,7 +180,7 @@
caseId: '',
caseCode: null,
vioData: null,
- illegalType: null
+ illData: null
}
},
created() {
@@ -324,7 +324,6 @@
.then(({ baseCase, currentSitVo, filesPictureVo, handlePassVo }) => {
this.vioData = currentSitVo;
this.imageResourceId = filesPictureVo.imageResources[0]?.id;
- this.illegalType = this.mystatus === 1 ? baseCase.violations.typeText : baseCase.illegalBuilding.categoryText;
})
.catch(err => this.$message.error(err))
this.dialogUpload = true;
diff --git a/src/views/operate/management/myIndex/components/examine/index.vue b/src/views/operate/management/myIndex/components/examine/index.vue
index ccd1c49..329b471 100644
--- a/src/views/operate/management/myIndex/components/examine/index.vue
+++ b/src/views/operate/management/myIndex/components/examine/index.vue
@@ -32,18 +32,21 @@
</el-form-item>
</div>
<div class="data-item">
- <el-form-item label="鎵�灞炲尯鍘�:">
+ <!-- <el-form-item label="鎵�灞炲尯鍘�:">
<span class="data-detail">xxxx</span>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鎵�灞炶閬�:">
<span class="data-detail">{{baseCase.streetText}}</span>
</el-form-item>
- </div>
- <div class="data-item">
<el-form-item label="鎵�灞炵ぞ鍖�:">
<span class="data-detail">{{baseCase.communityText}}</span>
</el-form-item>
</div>
+ <!-- <div class="data-item">
+ <el-form-item label="鎵�灞炵ぞ鍖�:">
+ <span class="data-detail">{{baseCase.communityText}}</span>
+ </el-form-item>
+ </div> -->
<div class="data-item">
<el-form-item label="浜嬪彂鍦扮偣:">
<span class="data-detail">{{baseCase.site}}</span>
diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue
index 40cecf7..9663276 100644
--- a/src/views/operate/message/myIndex/index.vue
+++ b/src/views/operate/message/myIndex/index.vue
@@ -240,13 +240,14 @@
getMessageList() {
const messageParam = {
current: this.currentPage,
- size: this.pageSize,
+ pageSize: this.pageSize,
channelCode: this.messageType === '00' ? null : this.messageType,
status: this.messageStatus === 2 ? null : this.messageStatus,
head: this.context,
startTime: this.datetime ? this.datetime[0] : null,
endTime: this.datetime ? this.datetime[1] : null
}
+
getMessageList(messageParam)
.then(({ records, total ,size}) => {
this.tableData = records;
diff --git a/src/views/operate/myWait/index.vue b/src/views/operate/myWait/index.vue
index 52ba065..75bcda1 100644
--- a/src/views/operate/myWait/index.vue
+++ b/src/views/operate/myWait/index.vue
@@ -68,6 +68,7 @@
>
<component
v-if="dialogUpdate"
+ @closeDialog="changeDialog"
@changeDialog="changeDialog"
v-bind:is="currentTabComponent"
:caseId="caseId"
--
Gitblit v1.8.0