zhanghua
2022-12-05 c88f56fbd311766de4245ba74789eebd7ee65eab
驳回处理和bug修改
6个文件已修改
229 ■■■■ 已修改文件
src/components/filePictrue/index.vue 203 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/process/index.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/disposal/casepool/dispatch/index.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/management/myIndex/components/examine/index.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/message/myIndex/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/myWait/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
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">
              {{
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;
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>
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;
src/views/operate/myWait/index.vue
@@ -68,6 +68,7 @@
        >
          <component
            v-if="dialogUpdate"
            @closeDialog="changeDialog"
            @changeDialog="changeDialog"
            v-bind:is="currentTabComponent"
            :caseId="caseId"