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

zhanghua

2022-10-26 c889c9e4792506e0a7f457560c0d4110645fae93

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

@@ -33,7 +33,7 @@
                        </div>
                        <div class="upload" v-if="arrive.situationPic.length<4">
                            <el-upload :file-list="fileList" class="upload-demo"
                                action="http://42.193.1.25:8082/sccg/file/medias" multiple :show-file-list="false"
                                action="/sccg/file/medias" multiple :show-file-list="false"
                                :limit="50" :on-success="handleSuccess" list-type="picture" :headers="getToken()">
                                <i class="el-icon-plus"></i>
                            </el-upload>
@@ -97,9 +97,9 @@
                situationExplain: [
                    { trigger: 'blur', validator: checkSit }
                ],
                replyExplain: [
                    { trigger: 'blur', validator: checkReplay }
                ],
                // replyExplain: [
                //     { trigger: 'blur', validator: checkReplay }
                // ],
                situationPic: [
                    { trigger: 'blur', validator: checkSitPic }
                ],
@@ -172,6 +172,7 @@
        img {
            width: 60px;
            height: 60px;
            margin-right: 10px;
        }
        .img{
            height: 60px;