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

wl

2022-10-27 6cde85d8030db64ae1e499178529ab8a9ec80fe1

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

 src/components/Upload/index.vue

@@ -27,8 +27,8 @@
            if (rawFile.type !== 'image/png' && rawFile.type !== 'image/svg+xml' && rawFile.type !== 'image/jpg' && rawFile.type !== 'image/jpeg') {
                this.$message.error('图片必须是 jpg/svg/jpeg/png 格式!')
                return false
            } else if (rawFile.size / 105 / 105 > 2) {
                this.$message.error('上传图片不能超过 2MB!')
            } else if (rawFile.size / 1024  / 1024  > 5) {
                this.$message.error('上传图片不能超过 5MB!')
                return false
            }
            return true

 src/components/filePictrue/index.vue

@@ -103,6 +103,7 @@
    .my-demo {
        position: relative;
        height: 159px;
        padding: 10px;
    }

    .tip {

 src/components/myUpload/index.vue

@@ -46,8 +46,8 @@
            if (rawFile.type !== 'image/png' && rawFile.type !== 'image/svg+xml' && rawFile.type !== 'image/jpg' && rawFile.type !== 'image/jpeg') {
                this.$message.error('图片必须是 jpg/svg/jpeg/png 格式!')
                return false
            } else if (rawFile.size / 105 / 105 > 2) {
                this.$message.error('上传图片不能超过 2MB!')
            } else if (rawFile.size / 1024 / 1024 > 5) {
                this.$message.error('上传图片不能超过 5MB!')
                return false
            }
            return true

 src/components/scene/index.vue

@@ -50,7 +50,7 @@
                <el-form-item label="当事人信息:">
                    <el-input disabled v-model="investigation.type"></el-input>
                </el-form-item>
                <el-form-item label="情况描述:">
                <el-form-item label="处置结果:">
                    <el-input disabled v-model="investigation.description"></el-input>
                </el-form-item>
                <el-form-item label="照片附件:">

 src/components/solveProblem/index.vue

@@ -37,9 +37,7 @@
        const { handlePassVo: mylist, baseCase } = this;
        console.log(baseCase, mylist);
        if (mylist) {
            this.list = mylist.workflowConfigSteps.filter(item => {
                return item.id !== 2
            });
            this.list = mylist.workflowConfigSteps;
        }
        if (baseCase.dispatchInfo) {
            this.dispatchInfo = baseCase.dispatchInfo;
@@ -51,9 +49,11 @@
            const { dispatchInfo } = this;
            if (name === '调度') {
                return '【派遣意见】' 
            } else if (name === '核查') {
            } else if (name === '处理') {
                return '【处理结果】'
            }else if (name === '核查') {
                return '【核查结果】'
            } else if (name === '结案') {
            }  else if (name === '结案') {
                return '【评定结果】'
            }
            return

 src/views/operate/car/myIndex/create/law/index.vue

@@ -193,7 +193,6 @@
    // 添加车辆
    handleCar() {
      this.$refs.user.validate((valid) => {
          debugger;
        if (valid) {
          const { car } = this;
          this.$axios({

 src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue

@@ -31,9 +31,9 @@
                    <el-input suffix-icon="el-icon-s-order" v-model="evidence.userInfo" @focus="openDialog"></el-input>
                </el-form-item>
                <!-- 情况描述 -->
                <el-form-item label="情况描述:" prop="description">
                <el-form-item label="处置结果:" prop="description">
                    <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" maxlength="200" show-word-limit
                        v-model="evidence.description" placeholder="请输入情况描述,限制200字以内"></el-input>
                        v-model="evidence.description" placeholder="请输入处置结果,限制200字以内"></el-input>
                </el-form-item>
                <!-- 照片附件 -->
                <el-form-item label="照片附件:" prop="pic">

 src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue

@@ -48,7 +48,7 @@
                        </el-select>
                    </el-form-item>
                    <!-- 身份证正反面照片 -->
                    <el-form-item class="optionItems" label="身份证正反面照片:" prop="positive">
                    <el-form-item class="optionItems" label="身份证正、反面照片:" prop="positive">
                        <template>
                            <div class="idcard">
                                <el-upload class="upload-demo" :show-file-list="false"

 src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/evidence/index.vue

@@ -29,9 +29,9 @@
                    <el-input suffix-icon="el-icon-s-order" @focus="openDialog"></el-input>
                </el-form-item>
                <!-- 情况描述 -->
                <el-form-item label="情况描述:" prop="description">
                <el-form-item label="处置结果:" prop="description">
                    <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" maxlength="200" show-word-limit
                        v-model="evidence.description" placeholder="请输入情况描述,限制200字以内"></el-input>
                        v-model="evidence.description" placeholder="请输入处置结果,限制200字以内"></el-input>
                </el-form-item>
                <!-- 照片附件 -->
                <el-form-item label="照片附件:" prop="photo">

 src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/components/evidence/index.vue

@@ -29,9 +29,9 @@
                    <el-input suffix-icon="el-icon-s-order" @focus="openDialog"></el-input>
                </el-form-item>
                <!-- 情况描述 -->
                <el-form-item label="情况描述:" prop="description">
                <el-form-item label="处置结果:" prop="description">
                    <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" maxlength="200" show-word-limit
                        v-model="evidence.description" placeholder="请输入情况描述,限制200字以内"></el-input>
                        v-model="evidence.description" placeholder="请输入处置结果,限制200字以内"></el-input>
                </el-form-item>
                <!-- 照片附件 -->
                <el-form-item label="照片附件:" prop="photo">

 src/views/operate/disposal/casepool/pool/createUser/ill/index.vue

@@ -63,7 +63,7 @@
                        </el-form-item>
                    </div>
                    <!-- 身份证正反面照片 -->
                    <el-form-item class="optionItems" label="身份证正反面照片:" prop="positive">
                    <el-form-item class="optionItems" label="身份证正、反面照片:" prop="positive">
                        <template>
                            <div class="idcard">
                                <el-upload class="upload-demo" :show-file-list="false"

 src/views/operate/log/index.vue

@@ -63,7 +63,6 @@
        <!-- 数据展示 -->
        <el-table
          ref="multipleTable"
          :default-sort="{ prop: 'createTime' }"
          :header-cell-style="{
            background: '#06122c',
            'font-size': '12px',