Merge branch 'develop' into developer/yanjiaxu

src/views/processing/review-questionnaire/index.vue

@@ -35,7 +35,10 @@
             </el-row>
           </el-form>
           <!--card统计值-->
-          <el-row :gutter="60" style="display: flex">
+          <el-row
+            :gutter="60"
+            style="display: flex; margin-left: 2rem; margin-right: 2rem"
+          >
             <el-col :span="6">
               <div
                 class="card-statistical-style"
@@ -109,8 +112,8 @@
               border
               style="width: 100%; margin-top: 20px"
             >
-              <el-table-column prop="id" label="标准章节"> </el-table-column>
-              <el-table-column prop="name" label="标准要求"> </el-table-column>
+              <el-table-column prop="id" label="标准章节"></el-table-column>
+              <el-table-column prop="name" label="标准要求"></el-table-column>
               <el-table-column prop="amount1" label="审查要点">
               </el-table-column>
               <el-table-column prop="amount2" label="审查细则">
@@ -119,8 +122,8 @@
               </el-table-column>
               <el-table-column prop="amount3" label="审查结果">
               </el-table-column>
-              <el-table-column prop="amount3" label="记录"> </el-table-column>
-              <el-table-column prop="amount3" label="填写人"> </el-table-column>
+              <el-table-column prop="amount3" label="记录"></el-table-column>
+              <el-table-column prop="amount3" label="填写人"></el-table-column>
             </el-table>
           </div>
           <!--签字确认-->
@@ -155,8 +158,8 @@
             type="primary"
             plain
             @click="goToProcessedReview"
-            >返 回</el-button
-          >
+            >返 回
+          </el-button>
         </div>
       </div>
     </page-standard>
@@ -340,18 +343,18 @@ export default {
 /*主体内容布局*/
 .main-content-style {
   display: flex;
-  align-items: center;
   flex-direction: column;
   width: 100%;
+
   .btn {
-    margin-bottom: 5rem;
+    margin: 0 8rem 8rem 4rem;
     width: 5rem;
   }
 }
 
 /*任务编号,名称,单位样式*/
 .task {
-  padding: 3rem 0rem 1rem 4rem;
+  padding: 3rem 0rem 1rem 6rem;
 
   ::v-deep .el-form-item--medium .el-form-item__label {
     font-size: 1.25rem;
@@ -374,7 +377,7 @@ export default {
 
 /*卡片统计值样式*/
 .card-statistical-style {
-  width: 18rem;
+  //width: 18rem;
   display: flex;
   padding: 1.5rem 2rem 1.5rem 2rem;
   justify-content: space-between;