Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt

Your Name

2022-07-19 4f23d16c5f9788e44b83280bf6d3c2e1d2280a07

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