Merge remote-tracking branch 'remotes/origin/shf' into master

lyfO_o

2022-07-12 c562fa2e66f4972ae23fa57ef7412da6e18991ed

 src/views/accidentHidden/fillProgress.vue

@@ -43,12 +43,12 @@
                        align="center">
                    </el-table-column>
                    <el-table-column
                        prop="Remark "
                        prop="Remark"
                        label="备注"
                        align="center">
                    </el-table-column>
                    <el-table-column
                        v-if="type==1"
                        v-if="type!=1"
                        label="操作"
                        align="center"
                        width="200">