Merge remote-tracking branch 'origin/master'

zss

2024-01-18 c205e0765ae18536a5b15b5ecbd5d3d0558b57fc

 src/views/quality/teststandard/index.vue

@@ -24,7 +24,7 @@
                <el-col :span="8">
                  <span>标准参数</span>
                </el-col>
                <el-col :span="8" :offset="4">
                <!-- <el-col :span="8" :offset="4">
                  <el-button
                    v-if="permissions.quality_teststandard_layout"
                    style="float: right; padding: 3px 0"
@@ -33,8 +33,8 @@
                  >
                    布局
                  </el-button>
                </el-col>
                <el-col :span="2">
                </el-col> -->
                <el-col :span="14">
                  <el-button
                    style="float: right; padding: 3px 0"
                    type="text"