Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master

wl

2022-10-26 f86cb647ca0ae91519216af19c1ec876874ffb81

Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master

 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">

 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);

 src/components/illdetail/index.vue

@@ -1,7 +1,12 @@
<template>
    <div class="view">
        <div class="view-data">
            <el-form :model="baseCase" label-position="right" ref="viewForm" label-width="160px">
      <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>
@@ -12,17 +17,23 @@
                </div>
                <div class="data-item">
                    <el-form-item label="当事人姓名:">
                        <span class="data-detail">{{baseCase.illegalBuilding.partyName}}</span>
            <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>
            <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>
            <span class="data-detail">{{
              baseCase.illegalBuilding.partyPhone
            }}</span>
                    </el-form-item>
                </div>
                <div class="data-item">
@@ -34,100 +45,149 @@
                    </el-form-item>
                </div>
                <div class="data-item">
                    <el-form-item label="身份证正反面照片:">
                        <img :src="baseCase.illegalBuilding.positive" alt="">
          <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="">
            <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>
          <el-form-item label="执法违建情况"> </el-form-item>
                </div>
                <div class="data-item">
                    <el-form-item label="违建具体位置:">
                        <span class="data-detail">{{baseCase.illegalBuilding.position}}</span>
            <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>
            <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>
            <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>
            <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
          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>
          <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
    MyProcess,
    MyFilePicture,
    MySovleProblem,
    MyScene,
    },
    data() {
        return {
            myInfo: {

            },
      myInfo: {},
            activeIndex: 1,
            titleList: [
                {
                    title: '办理经过',
          title: "办理经过",
                    index: 1,
                },
                {
                    title: '案卷图片',
          title: "案卷图片",
                    index: 2,
                },
                {
                    title: '问题处理',
          title: "问题处理",
                    index: 3,
                },
                {
                    title: '现场情况',
          title: "现场情况",
                    index: 4,
                },
            ], 
            baseCase:{},
            handlePassVo:{},
            currentSitVo:{},
            filesPictureVo:{}
            
        }
      filesPictureVo: {},
    };
    }, 
    created() {
        console.log('created');
    console.log("created");
        const {info} = this; 
        this.baseCase = info.baseCase;
        this.handlePassVo = info.handlePassVo;
@@ -140,8 +200,8 @@
            this.activeIndex = index;
        },
    },
    props: ['info']
}
  props: ["info"],
};
</script>
<style lang="scss" scoped>
.view {

 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 === '结案') {

 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 }
                ],

 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">

 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: [
                    {

 src/views/operate/management/myIndex/components/examine/index.vue

@@ -54,7 +54,7 @@
                        <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>
@@ -63,7 +63,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>

 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>

 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>