From 02129858b17c1934b30d29b87805844479a32c6c Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 03 一月 2024 13:15:08 +0800
Subject: [PATCH] bug
---
src/views/operate/disposal/casepool/pool/index.vue | 10
src/components/illdetail/index.vue | 531 +++++++++++++++++++------------------
vue.config.js | 2
src/components/filePictrue/index.vue | 244 ++++++++--------
4 files changed, 405 insertions(+), 382 deletions(-)
diff --git a/src/components/filePictrue/index.vue b/src/components/filePictrue/index.vue
index d2c5c55..c14fae1 100644
--- a/src/components/filePictrue/index.vue
+++ b/src/components/filePictrue/index.vue
@@ -1,147 +1,153 @@
<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 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>
- </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 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>
- </div>
</template>
<script>
import { parseTime, FILE_ORIGINAL_URL } from "@/utils/index";
export default {
- data() {
- return {
- imgSource: [],
- };
- },
- props: ["filesPictureVo", "mycode"],
- created() {
- const {
- filesPictureVo: { imageResources: imgList },
- } = this;
+ data() {
+ return {
+ imgSource: [],
+ };
+ },
+ props: ["filesPictureVo", "mycode"],
+ created() {
+ const {
+ filesPictureVo: { imageResources: imgList },
+ } = this;
- let pic = this.filesPictureVo.imageResources;
- pic.forEach((item) => {
- if (item.url) {
- if (typeof item.url == "string") {
- let urls = item.url.split(",");
- item.url = [];
- urls.forEach((o) => {
- o = o.replace("[", "").replace("]", "");
- item.url.push(`${FILE_ORIGINAL_URL}sccg/API/img?fileUrl=${o}`);
- });
- }
- } else {
- item.url = [];
- }
- });
- 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 };
- }
- },
- 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;
+ let pic = this.filesPictureVo.imageResources;
pic.forEach((item) => {
- if (item.url) {
- if (typeof item.url == "string") {
- let urls = item.url.split(",");
- item.url = [];
- urls.forEach((o) => {
- o = o.replace("[", "").replace("]", "");
- item.url.push(`${FILE_ORIGINAL_URL}sccg/API/img?fileUrl=${o}`);
- });
+ if (item.url) {
+ if (typeof item.url == "string") {
+ let urls = item.url.split(",");
+ item.url = [];
+ urls.forEach((o) => {
+ o = o.replace("[", "").replace("]", "");
+ if (o !== '') {
+ item.url.push(`${FILE_ORIGINAL_URL}sccg/API/img?fileUrl=${o}`);
+ }
+ });
+ }
+ } else {
+ item.url = [];
}
- } else {
- item.url = [];
- }
});
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 };
+ }
+ },
+ 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) => {
+ if (item.url) {
+ if (typeof item.url == "string") {
+ let urls = item.url.split(",");
+ item.url = [];
+ urls.forEach((o) => {
+ o = o.replace("[", "").replace("]", "");
+ item.url.push(`${FILE_ORIGINAL_URL}sccg/API/img?fileUrl=${o}`);
+ });
+ }
+ } else {
+ item.url = [];
+ }
+ });
+ 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;
+ .file-tell,
+ .file-deal {
+ .tell-title {
+ line-height: 40px;
+ }
+
+ .tell-show {
+ .tell-demo {
+ display: flex;
+ flex-wrap: wrap;
+ width: 100%;
+ }
+ }
}
- .tell-show {
- .tell-demo {
- display: flex;
- flex-wrap: wrap;
- width: 100%;
- }
- }
- }
-
- .my-demo {
- position: relative;
- height: 159px;
- margin: 10px;
- }
-
- .tip {
- div {
- line-height: 20px;
+ .my-demo {
+ position: relative;
+ height: 159px;
+ margin: 10px;
}
- text-align: left;
- position: absolute;
- bottom: 0px;
- }
+ .tip {
+ div {
+ line-height: 20px;
+ }
- .img {
- width: 226px;
- height: 159px;
- }
+ text-align: left;
+ position: absolute;
+ bottom: 0px;
+ }
+
+ .img {
+ width: 226px;
+ height: 159px;
+ }
}
</style>
\ No newline at end of file
diff --git a/src/components/illdetail/index.vue b/src/components/illdetail/index.vue
index 3b6d6cc..7d9891c 100644
--- a/src/components/illdetail/index.vue
+++ b/src/components/illdetail/index.vue
@@ -1,290 +1,299 @@
<template>
- <div class="view">
- <div class="view-data">
- <el-form
- :model="baseCase"
- label-position="right"
- ref="viewForm"
- label-width="160px"
- >
- <div class="data-item">
- <el-form-item label="闂绫诲瀷:">
- <span class="data-detail">杩濆缓</span>
- </el-form-item>
- </div>
- <div class="data-item">
- <el-form-item label="杩濆缓绫诲埆:">
- <span class="data-detail">{{ baseCase.categoryText }}</span>
- </el-form-item>
- </div>
- <div class="data-item">
- <el-form-item label="褰撲簨浜哄鍚�:">
- <span class="data-detail">{{
- baseCase.illegalBuilding.partyName
- }}</span>
- </el-form-item>
- </div>
- <div class="data-item">
- <el-form-item label="褰撲簨浜鸿韩浠借瘉鍙�:">
- <span class="data-detail">{{
- baseCase.illegalBuilding.partyIdCard
- }}</span>
- </el-form-item>
- </div>
- <div class="data-item">
- <el-form-item label="褰撲簨浜鸿仈绯荤數璇�:">
- <span class="data-detail">{{
- baseCase.illegalBuilding.partyPhone
- }}</span>
- </el-form-item>
- </div>
- <div class="data-item">
- <el-form-item label="杩濆缓鍦扮偣:">
- <span class="data-detail">{{ baseCase.site }}</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="韬唤璇佹銆佸弽闈㈢収鐗�:">
- <img :src="baseCase.illegalBuilding.positive" alt="" />
- </el-form-item>
- <el-form-item label-width="0px">
- <img
- style="margin-left: 10px"
- :src="baseCase.illegalBuilding.negative"
- alt=""
- />
- </el-form-item>
- </div>
- <div class="data-item">
- <el-form-item label="鎵ф硶杩濆缓鎯呭喌"> </el-form-item>
- </div>
- <div class="data-item">
- <el-form-item label="杩濆缓鍏蜂綋浣嶇疆:">
- <span class="data-detail">{{
- baseCase.illegalBuilding.position
- }}</span>
- </el-form-item>
- </div>
- <div class="data-item">
- <el-form-item label="杩濇硶寤鸿闀裤�佸銆侀珮:">
- <span class="data-detail">{{
- baseCase.illegalBuilding.buildingLength +
- "m" +
- " " +
- baseCase.illegalBuilding.buildingWidth +
- "m" +
- " " +
- baseCase.illegalBuilding.buildingHigh +
- "m"
- }}</span>
- </el-form-item>
- </div>
- <div class="data-item">
- <el-form-item label="杩濇硶寤鸿闈㈢Н:">
- <span class="data-detail"
- >{{ baseCase.illegalBuilding.buildingArea }}銕�</span
+ <div class="view">
+ <div class="view-data">
+ <el-form
+ :model="baseCase"
+ label-position="right"
+ ref="viewForm"
+ label-width="160px"
>
- </el-form-item>
+ <div class="data-item">
+ <el-form-item label="闂绫诲瀷:">
+ <span class="data-detail">杩濆缓</span>
+ </el-form-item>
+ </div>
+ <div class="data-item">
+ <el-form-item label="杩濆缓绫诲埆:">
+ <span class="data-detail">{{
+ baseCase.categoryText
+ }}</span>
+ </el-form-item>
+ </div>
+ <div class="data-item">
+ <el-form-item label="褰撲簨浜哄鍚�:">
+ <span class="data-detail">{{
+ baseCase.illegalBuilding.partyName
+ }}</span>
+ </el-form-item>
+ </div>
+ <div class="data-item">
+ <el-form-item label="褰撲簨浜鸿韩浠借瘉鍙�:">
+ <span class="data-detail">{{
+ baseCase.illegalBuilding.partyIdCard
+ }}</span>
+ </el-form-item>
+ </div>
+ <div class="data-item">
+ <el-form-item label="褰撲簨浜鸿仈绯荤數璇�:">
+ <span class="data-detail">{{
+ baseCase.illegalBuilding.partyPhone
+ }}</span>
+ </el-form-item>
+ </div>
+ <div class="data-item">
+ <el-form-item label="杩濆缓鍦扮偣:">
+ <span class="data-detail">{{ baseCase.site }}</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="韬唤璇佹銆佸弽闈㈢収鐗�:">
+ <img :src="baseCase.illegalBuilding.positive" alt="" />
+ </el-form-item>
+ <el-form-item label-width="0px">
+ <img
+ style="margin-left: 10px"
+ :src="baseCase.illegalBuilding.negative"
+ alt=""
+ />
+ </el-form-item>
+ </div>
+ <div class="data-item">
+ <el-form-item label="鎵ф硶杩濆缓鎯呭喌"> </el-form-item>
+ </div>
+ <div class="data-item">
+ <el-form-item label="杩濆缓鍏蜂綋浣嶇疆:">
+ <span class="data-detail">{{
+ baseCase.illegalBuilding.position
+ }}</span>
+ </el-form-item>
+ </div>
+ <div class="data-item">
+ <el-form-item label="杩濇硶寤鸿闀裤�佸銆侀珮:">
+ <span class="data-detail">{{
+ baseCase.illegalBuilding.buildingLength +
+ 'm' +
+ ' ' +
+ baseCase.illegalBuilding.buildingWidth +
+ 'm' +
+ ' ' +
+ baseCase.illegalBuilding.buildingHigh +
+ 'm'
+ }}</span>
+ </el-form-item>
+ </div>
+ <div class="data-item">
+ <el-form-item label="杩濇硶寤鸿闈㈢Н:">
+ <span class="data-detail"
+ >{{ baseCase.illegalBuilding.buildingArea }}銕�</span
+ >
+ </el-form-item>
+ </div>
+ <div class="data-item">
+ <el-form-item label="杩濇硶寤虹瓚鏉愭枡:">
+ <span class="data-detail">{{
+ baseCase.illegalBuilding.materials
+ }}</span>
+ </el-form-item>
+ </div>
+ </el-form>
</div>
- <div class="data-item">
- <el-form-item label="杩濇硶寤虹瓚鏉愭枡:">
- <span class="data-detail">{{
- baseCase.illegalBuilding.materials
- }}</span>
- </el-form-item>
+ <div class="view-process">
+ <div class="process-header">
+ <div
+ class="process-title-item"
+ v-for="item in titleList"
+ :key="item.title"
+ @click="changeComponent(item.index)"
+ >
+ <div
+ :class="[
+ 'process-title',
+ activeIndex === item.index ? 'title-active' : ''
+ ]"
+ >
+ {{ item.title }}
+ </div>
+ <div
+ :class="[
+ 'under-line',
+ activeIndex === item.index ? 'line-active' : ''
+ ]"
+ ></div>
+ </div>
+ </div>
+ <div class="show-item">
+ <div class="show-wrap">
+ <MyProcess
+ v-if="activeIndex === 1"
+ :handlePassVo="handlePassVo"
+ :baseCase="baseCase"
+ ></MyProcess>
+ <MyFilePicture
+ v-else-if="activeIndex === 2"
+ :filesPictureVo="filesPictureVo"
+ :pic="pic"
+ :media="media"
+ :mycode="mycode"
+ ></MyFilePicture>
+ <MySovleProblem
+ v-else-if="activeIndex === 3"
+ :baseCase="baseCase"
+ :handlePassVo="handlePassVo"
+ ></MySovleProblem>
+ <MyScene
+ v-else
+ :currentSitVo="currentSitVo"
+ :baseCase="baseCase"
+ ></MyScene>
+ </div>
+ </div>
</div>
- </el-form>
</div>
- <div class="view-process">
- <div class="process-header">
- <div
- class="process-title-item"
- v-for="item in titleList"
- :key="item.title"
- @click="changeComponent(item.index)"
- >
- <div
- :class="[
- 'process-title',
- activeIndex === item.index ? 'title-active' : '',
- ]"
- >
- {{ item.title }}
- </div>
- <div
- :class="[
- 'under-line',
- activeIndex === item.index ? 'line-active' : '',
- ]"
- ></div>
- </div>
- </div>
- <div class="show-item">
- <div class="show-wrap">
- <MyProcess
- v-if="activeIndex === 1"
- :handlePassVo="handlePassVo"
- :baseCase="baseCase"
- ></MyProcess>
- <MyFilePicture
- v-else-if="activeIndex === 2"
- :filesPictureVo="filesPictureVo"
- :pic="pic"
- :media="media"
- :mycode="mycode"
- ></MyFilePicture>
- <MySovleProblem
- v-else-if="activeIndex === 3"
- :baseCase="baseCase"
- :handlePassVo="handlePassVo"
- ></MySovleProblem>
- <MyScene
- v-else
- :currentSitVo="currentSitVo"
- :baseCase="baseCase"
- ></MyScene>
- </div>
- </div>
- </div>
- </div>
</template>
<script>
import MyProcess from "@/components/process";
import MyFilePicture from "@/components/filePictrue";
import MySovleProblem from "@/components/solveProblem";
import MyScene from "@/components/scene";
+import { FILE_ORIGINAL_URL } from "@/utils/index";
export default {
- components: {
- MyProcess,
- MyFilePicture,
- MySovleProblem,
- MyScene,
- },
- data() {
- return {
- myInfo: {},
- activeIndex: 1,
- titleList: [
- {
- title: "鍔炵悊缁忚繃",
- index: 1,
- },
- {
- title: "妗堝嵎鍥剧墖",
- index: 2,
- },
- {
- title: "闂澶勭悊",
- index: 3,
- },
- {
- title: "鐜板満鎯呭喌",
- index: 4,
- },
- ],
- baseCase: {},
- handlePassVo: {},
- currentSitVo: {},
- filesPictureVo: {},
- pic: [],
- media: [],
- };
- },
- created() {
- const { info } = this;
- this.baseCase = info.baseCase;
- this.handlePassVo = info.handlePassVo;
- this.currentSitVo = info.currentSitVo;
- this.filesPictureVo = info.filesPictureVo;
- },
- methods: {
- changeComponent(index) {
- this.activeIndex = index;
+ components: {
+ MyProcess,
+ MyFilePicture,
+ MySovleProblem,
+ MyScene,
},
- },
- props: ["info", "mycode"],
+ data() {
+ return {
+ myInfo: {},
+ activeIndex: 1,
+ titleList: [
+ {
+ title: "鍔炵悊缁忚繃",
+ index: 1,
+ },
+ {
+ title: "妗堝嵎鍥剧墖",
+ index: 2,
+ },
+ {
+ title: "闂澶勭悊",
+ index: 3,
+ },
+ {
+ title: "鐜板満鎯呭喌",
+ index: 4,
+ },
+ ],
+ baseCase: {},
+ handlePassVo: {},
+ currentSitVo: {},
+ filesPictureVo: {},
+ pic: [],
+ media: [],
+ };
+ },
+ created() {
+ const { info } = this;
+ this.baseCase = info.baseCase;
+
+ this.baseCase.illegalBuilding.positive = `${FILE_ORIGINAL_URL}sccg/API/img?fileUrl=${this.baseCase.illegalBuilding.positive}`
+ this.baseCase.illegalBuilding.negative = `${FILE_ORIGINAL_URL}sccg/API/img?fileUrl=${this.baseCase.illegalBuilding.negative}`
+
+ this.handlePassVo = info.handlePassVo;
+ this.currentSitVo = info.currentSitVo;
+ this.filesPictureVo = info.filesPictureVo;
+ },
+ methods: {
+ changeComponent(index) {
+ this.activeIndex = index;
+ },
+ },
+ props: ["info", "mycode"],
};
</script>
<style lang="scss" scoped>
.view {
- display: flex;
- padding: 20px;
+ display: flex;
+ padding: 20px;
- .view-data {
- color: #4b9bb7;
- // flex: 4;
- padding: 0 30px 0 20px;
- img {
- width: 100px;
- height: 100px;
- border-radius: 4px;
- }
- .data-item {
- display: flex;
- // justify-content: space-between;
- line-height: 20px;
+ .view-data {
+ color: #4b9bb7;
+ // flex: 4;
+ padding: 0 30px 0 20px;
+ img {
+ width: 100px;
+ height: 100px;
+ border-radius: 4px;
+ }
+ .data-item {
+ display: flex;
+ // justify-content: space-between;
+ line-height: 20px;
- .data-detail {
- color: #333;
- line-height: 1.8;
- max-width: 240px;
- display: inline-grid;
- }
- }
-
- border: 1px solid #17324c;
- :deep(.el-form-item__label) {
- color: #4b9bb7;
- }
-
- :deep(.el-textarea__inner) {
- background-color: #17324c;
- color: #4b9bb7;
- }
- }
-
- .view-process {
- flex: 6;
- margin-left: 20px;
-
- .process-header {
- display: flex;
- line-height: 40px;
-
- .process-title-item {
- width: 120px;
- text-align: center;
-
- .under-line {
- height: 2px;
- width: 100%;
+ .data-detail {
+ color: #333;
+ line-height: 1.8;
+ max-width: 240px;
+ display: inline-grid;
+ }
}
- .title-active {
- color: #4b9bb7;
+ border: 1px solid #17324c;
+ :deep(.el-form-item__label) {
+ color: #4b9bb7;
}
- .line-active {
- background-color: #4b9bb7;
- border-radius: 20px;
+ :deep(.el-textarea__inner) {
+ background-color: #17324c;
+ color: #4b9bb7;
}
- }
}
- .show-item {
- overflow: hidden;
- height: 600px;
- position: relative;
- .show-wrap {
- overflow: auto;
- height: 600px;
- }
+ .view-process {
+ flex: 6;
+ margin-left: 20px;
+
+ .process-header {
+ display: flex;
+ line-height: 40px;
+
+ .process-title-item {
+ width: 120px;
+ text-align: center;
+
+ .under-line {
+ height: 2px;
+ width: 100%;
+ }
+
+ .title-active {
+ color: #4b9bb7;
+ }
+
+ .line-active {
+ background-color: #4b9bb7;
+ border-radius: 20px;
+ }
+ }
+ }
+
+ .show-item {
+ overflow: hidden;
+ height: 600px;
+ position: relative;
+ .show-wrap {
+ overflow: auto;
+ height: 600px;
+ }
+ }
}
- }
}
</style>
\ No newline at end of file
diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue
index c9f21c7..3119cca 100644
--- a/src/views/operate/disposal/casepool/pool/index.vue
+++ b/src/views/operate/disposal/casepool/pool/index.vue
@@ -129,7 +129,12 @@
min-width="12"
>
</el-table-column>
- <el-table-column prop="state" label="鐘舵��" min-width="8" :formatter="formatPrivilegeType">
+ <el-table-column
+ prop="state"
+ label="鐘舵��"
+ min-width="8"
+ :formatter="formatPrivilegeType"
+ >
</el-table-column>
<el-table-column
prop="operation"
@@ -556,6 +561,8 @@
},
// 鏇存敼涓�绾ф爣绛剧殑閫変腑
changeNavChecked(idx) {
+
+ this.currentPage = 1
this.tagList.forEach((item, index) => {
item.checked = index === idx;
});
@@ -569,6 +576,7 @@
},
// 鏇存敼杩濊/杩濆缓
changeTypeChecked(idx) {
+ this.currentPage = 1
this.typeList.forEach((item, index) => {
item.checked = index === idx;
});
diff --git a/vue.config.js b/vue.config.js
index dd6fdf9..800c996 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -40,7 +40,7 @@
// 璺ㄥ煙閰嶇疆
"/sccg": {
// target: `http://42.193.1.25/`, //娴嬭瘯鐜
- target: `http://111.1.140.92:28081/`,
+ target: `http://111.1.140.92:8082/`,
// target: `http://10.88.10.18:8082/`,
changeOrigin: true
}
--
Gitblit v1.8.0