From f86cb647ca0ae91519216af19c1ec876874ffb81 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 26 十月 2022 11:24:33 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master
---
src/components/detail/index.vue | 12 +
src/components/illdetail/index.vue | 456 ++++++++++++++++++++++++++++----------------------
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue | 6
src/views/operate/disposal/casepool/pool/createUser/vio/index.vue | 12
src/views/operate/management/myIndex/components/examine/index.vue | 6
src/views/operate/management/myIndex/components/illExamine/index.vue | 4
src/components/dispatch/index.vue | 2
src/views/operate/management/myIndex/components/illclosure/index.vue | 4
src/components/solveProblem/index.vue | 2
src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue | 6
10 files changed, 288 insertions(+), 222 deletions(-)
diff --git a/src/components/detail/index.vue b/src/components/detail/index.vue
index 851e74d..0d2f3bb 100644
--- a/src/components/detail/index.vue
+++ b/src/components/detail/index.vue
@@ -38,11 +38,17 @@
</div>
</div>
<div class="data-item">
- <div class="data-item__left">
+ <!-- <div class="data-item__left">
<label class="data-title">
鎵�灞炲尯鍘�:
</label>
<span class="data-detail">xxx</span>
+ </div> -->
+ <div class="data-item__left">
+ <label class="data-title">
+ 鎵�灞炶閬�:
+ </label>
+ <span class="data-detail">{{baseCase.streetText}}</span>
</div>
<div class="data-item__right">
<label class="data-title">
@@ -51,14 +57,14 @@
<span class="data-detail">{{baseCase.communityText}}</span>
</div>
</div>
- <div class="data-item">
+ <!-- <div class="data-item">
<div class="data-item__left">
<label class="data-title">
鎵�灞炶閬�:
</label>
<span class="data-detail">{{baseCase.streetText}}</span>
</div>
- </div>
+ </div> -->
<div class="data-item">
<div class="data-item__left">
<label class="data-title">
diff --git a/src/components/dispatch/index.vue b/src/components/dispatch/index.vue
index 978fe10..d44b36d 100644
--- a/src/components/dispatch/index.vue
+++ b/src/components/dispatch/index.vue
@@ -310,7 +310,7 @@
getSoilCarList() {
this.$axios({
method: "get",
- url: `sccg/car_Manage/query_slag?current=1&size=1000`,
+ url: `sccg/car_Manage/query_enforce?current=1&size=1000`,
}).then((res) => {
this.carOptions = res.data.records;
console.log(res);
diff --git a/src/components/illdetail/index.vue b/src/components/illdetail/index.vue
index 700cca5..85a20ec 100644
--- a/src/components/illdetail/index.vue
+++ b/src/components/illdetail/index.vue
@@ -1,216 +1,276 @@
<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>
- <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>
- <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 :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 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>
+ <el-form-item label="杩濆缓绫诲埆:">
+ <span class="data-detail">{{ baseCase.categoryText }}</span>
+ </el-form-item>
</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" ></MyFilePicture>
- <MySovleProblem v-else-if="activeIndex === 3" :baseCase="baseCase" :handlePassVo="handlePassVo"></MySovleProblem>
- <MyScene v-else :currentSitVo="currentSitVo" :baseCase="baseCase"></MyScene>
- </div>
- </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>
+ <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="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"
+ ></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 MyProcess from "@/components/process";
+import MyFilePicture from "@/components/filePictrue";
+import MySovleProblem from "@/components/solveProblem";
+import MyScene from "@/components/scene";
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:{}
-
- }
- },
- created() {
- console.log('created');
- const {info} = this;
- this.baseCase = info.baseCase;
- this.handlePassVo = info.handlePassVo;
- this.currentSitVo = info.currentSitVo;
- this.filesPictureVo = info.filesPictureVo;
- console.log(info);
- },
- methods: {
- changeComponent(index) {
- this.activeIndex = index;
+ 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: {},
+ };
+ },
+ created() {
+ console.log("created");
+ const { info } = this;
+ this.baseCase = info.baseCase;
+ this.handlePassVo = info.handlePassVo;
+ this.currentSitVo = info.currentSitVo;
+ this.filesPictureVo = info.filesPictureVo;
+ console.log(info);
+ },
+ methods: {
+ changeComponent(index) {
+ this.activeIndex = index;
},
- props: ['info']
-}
+ },
+ props: ["info"],
+};
</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;
- }
-
- border: 1px solid #17324c;
- :deep(.el-form-item__label) {
- color: #4b9bb7;
- }
-
- :deep(.el-textarea__inner) {
- background-color: #17324c;
- color: #4b9bb7;
- }
+ .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-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: scroll;
- height: 600px;
- }
- }
+ 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%;
+ }
+
+ .title-active {
+ color: #4b9bb7;
+ }
+
+ .line-active {
+ background-color: #4b9bb7;
+ border-radius: 20px;
+ }
+ }
+ }
+
+ .show-item {
+ overflow: hidden;
+ height: 600px;
+ position: relative;
+ .show-wrap {
+ overflow: scroll;
+ height: 600px;
+ }
+ }
+ }
}
</style>
\ No newline at end of file
diff --git a/src/components/solveProblem/index.vue b/src/components/solveProblem/index.vue
index 05d47c5..b997b5e 100644
--- a/src/components/solveProblem/index.vue
+++ b/src/components/solveProblem/index.vue
@@ -50,7 +50,7 @@
filterPerson(name) {
const { dispatchInfo } = this;
if (name === '璋冨害') {
- return '銆愭淳閬ｆ剰瑙併��' + dispatchInfo.dispatchOpinion
+ return '銆愭淳閬ｆ剰瑙併��'
} else if (name === '鏍告煡') {
return '銆愭牳鏌ョ粨鏋溿��'
} else if (name === '缁撴') {
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
index 985462f..a632347 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
@@ -104,9 +104,9 @@
situationExplain: [
{ trigger: 'blur', validator: checkSit }
],
- replyExplain: [
- { trigger: 'blur', validator: checkReplay }
- ],
+ // replyExplain: [
+ // { trigger: 'blur', validator: checkReplay }
+ // ],
situationPic: [
{ trigger: 'blur', validator: checkSitPic }
],
diff --git a/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue b/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
index 9d89388..01dbc8f 100644
--- a/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
+++ b/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
@@ -90,9 +90,9 @@
</el-form-item>
<el-form-item class="optionItems" label="杩濇硶寤鸿闀裤�佸銆侀珮:" prop="buildingLength">
<div class="area">
- <el-input placeholder="鍗曚綅绫�" v-model="ill.buildingLength"></el-input>
- <el-input placeholder="鍗曚綅绫�" v-model="ill.buildingWidth"></el-input>
- <el-input placeholder="鍗曚綅绫�" v-model="ill.buildingHigh"></el-input>
+ <el-input placeholder="闀� 鍗曚綅绫�" v-model="ill.buildingLength"></el-input>
+ <el-input placeholder="瀹� 鍗曚綅绫�" v-model="ill.buildingWidth"></el-input>
+ <el-input placeholder="楂� 鍗曚綅绫�" v-model="ill.buildingHigh"></el-input>
</div>
</el-form-item>
<el-form-item class="optionItems" label="杩濇硶寤鸿闈㈢Н:" prop="buildingArea">
diff --git a/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue b/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
index b3348c0..3471e50 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
@@ -294,12 +294,12 @@
required: true, trigger: 'blur', validator: checkCause,
}
],
- //杞︾墝鍙�
- carNumber: [
- {
- required: true, trigger: 'blur', validator: checkCarNumber
- }
- ],
+ // //杞︾墝鍙�
+ // carNumber: [
+ // {
+ // required: true, trigger: 'blur', validator: checkCarNumber
+ // }
+ // ],
//澶х被
categoryId: [
{
diff --git a/src/views/operate/management/myIndex/components/examine/index.vue b/src/views/operate/management/myIndex/components/examine/index.vue
index bd96ba7..483743f 100644
--- a/src/views/operate/management/myIndex/components/examine/index.vue
+++ b/src/views/operate/management/myIndex/components/examine/index.vue
@@ -54,16 +54,16 @@
<span class="data-detail">{{baseCase.violations.description}}</span>
</el-form-item>
</div>
- <div class="data-item">
+ <!-- <div class="data-item">
<el-form-item label="澶勭疆鏂瑰紡:">
<span class="data-detail">xxxxxxx</span>
</el-form-item>
- </div>
+ </div>
<div class="data-item">
<el-form-item label="澶勭疆鎵嬫:">
<span class="data-detail">xxxxxxx</span>
</el-form-item>
- </div>
+ </div>-->
<!-- 瀹℃牳鎰忚 -->
<el-form-item label="瀹℃牳鎰忚" prop="auditOpinion">
<el-input type="textarea" placeholder="璇疯緭鍏ュ鏍告剰瑙�" v-model="baseCase.auditOpinion"></el-input>
diff --git a/src/views/operate/management/myIndex/components/illExamine/index.vue b/src/views/operate/management/myIndex/components/illExamine/index.vue
index 49b5785..1dfd4a4 100644
--- a/src/views/operate/management/myIndex/components/illExamine/index.vue
+++ b/src/views/operate/management/myIndex/components/illExamine/index.vue
@@ -53,7 +53,7 @@
<span class="data-detail">{{baseCase.illegalBuilding.description}}</span>
</el-form-item>
</div>
- <div class="data-item">
+ <!-- <div class="data-item">
<el-form-item label="澶勭疆鏂瑰紡:">
<span class="data-detail">xxxxxxx</span>
</el-form-item>
@@ -62,7 +62,7 @@
<el-form-item label="澶勭疆鎵嬫:">
<span class="data-detail">xxxxxxx</span>
</el-form-item>
- </div>
+ </div> -->
<!-- 瀹℃牳鎰忚 -->
<el-form-item label="瀹℃牳鎰忚" prop="auditOpinion">
<el-input type="textarea" placeholder="璇疯緭鍏ュ鏍告剰瑙�" v-model="baseCase.auditOpinion"></el-input>
diff --git a/src/views/operate/management/myIndex/components/illclosure/index.vue b/src/views/operate/management/myIndex/components/illclosure/index.vue
index c0e087d..513b04b 100644
--- a/src/views/operate/management/myIndex/components/illclosure/index.vue
+++ b/src/views/operate/management/myIndex/components/illclosure/index.vue
@@ -53,7 +53,7 @@
<span class="data-detail">{{baseCase.illegalBuilding.description}}</span>
</el-form-item>
</div>
- <div class="data-item">
+ <!-- <div class="data-item">
<el-form-item label="澶勭疆鏂瑰紡:">
<span class="data-detail">xxxxxxx</span>
</el-form-item>
@@ -62,7 +62,7 @@
<el-form-item label="澶勭疆鎵嬫:">
<span class="data-detail">xxxxxxx</span>
</el-form-item>
- </div>
+ </div> -->
<!-- 瀹℃牳鎰忚 -->
<el-form-item label="瀹℃牳鎰忚" prop="auditOpinion">
<el-input type="textarea" placeholder="璇疯緭鍏ュ鏍告剰瑙�" v-model="baseCase.auditOpinion"></el-input>
--
Gitblit v1.8.0