dedsudiyu лет назад: 2
Родитель
Сommit
c7215e04e2

+ 24 - 5
src/views/comprehensive/personnel/student/addPage.vue

@@ -2,7 +2,6 @@
   <div class="student-add-page">
     <div class="top-title-box">
       <p>{{titleName}}</p>
-      <p @click="outPageButton">返回</p>
     </div>
     <el-form :model="form" class="top-info-box" ref="form" :inline="true" :rules="rules" label-width="120px">
       <div class="left-info-box">
@@ -235,10 +234,18 @@
         </el-form-item>
       </div>
     </el-form>
+    <div class="bottom-button-box" v-if="editType">
+      <p class="null-p"></p>
+      <p class="button-p-1 reset-button-one" @click="outPageButton">返回</p>
+      <p class="null-p"></p>
+    </div>
     <div class="bottom-button-box" v-if="!editType">
-      <addPageSubPageSZDX v-if="versionField() === 'suZhouDaXue'"></addPageSubPageSZDX>
-      <addPageSubPagePublic v-else></addPageSubPagePublic>
+      <p class="null-p"></p>
+      <p class="button-p-1 reset-button-one" @click="outPageButton">返回</p>
+      <addPageSubPageSZDX class="button-p-2" v-if="versionField() === 'suZhouDaXue'"></addPageSubPageSZDX>
+      <addPageSubPagePublic class="button-p-2" v-else></addPageSubPagePublic>
       <!--<p class="inquire-button-one" @click="upDataClick">提交</p>-->
+      <p class="null-p"></p>
     </div>
     <el-dialog title="添加班级" :visible.sync="gradeOpen" width="600px" append-to-body class="teacher-revise-dialog-box" :close-on-click-modal="false">
       <el-form :model="gradeForm" ref="gradeForm" :inline="true" :rules="rules" class="addCheckPage-min">
@@ -898,6 +905,7 @@ export default {
     }
   }
   .top-info-box{
+    flex:1;
     display: flex;
     padding:40px 20px 0;
     .left-info-box{
@@ -1202,10 +1210,21 @@ export default {
   }
   .bottom-button-box{
     display: flex;
-    width:100px;
+    width:600px;
     margin:30px auto 10px;
-    p:nth-child(1){
+    .null-p{
+      flex:1;
+    }
+    .button-p-1{
+      width:100px;
+      margin-right:20px;
+    }
+    .button-p-2{
       width:100px;
+      margin-right:20px;
+    }
+    .button-p-3{
+      width:180px;
     }
   }
 }

+ 21 - 7
src/views/comprehensive/personnel/teacher/addPage.vue

@@ -3,7 +3,6 @@
     <div class="public-form-box scrollbar-box">
       <div class="top-title-box">
         <p>{{titleName}}</p>
-        <p @click="outPageButton">返回</p>
       </div>
       <el-form :model="form" class="top-info-box" ref="form" :inline="true" :rules="rules" label-width="120px">
         <div class="left-info-box">
@@ -392,11 +391,19 @@
         </div>
       </el-dialog>
     </div>
+    <div class="bottom-button-box" v-if="editType">
+      <p class="null-p"></p>
+      <p class="button-p-1 reset-button-one" @click="outPageButton">返回</p>
+      <p class="null-p"></p>
+    </div>
     <div class="bottom-button-box" v-if="!editType">
-      <addPageSubPageSZDX v-if="versionField() === 'suZhouDaXue'"></addPageSubPageSZDX>
-      <addPageSubPagePublic v-else></addPageSubPagePublic>
+      <p class="null-p"></p>
+      <p class="button-p-1 reset-button-one" @click="outPageButton">返回</p>
+      <addPageSubPageSZDX class="button-p-2" v-if="versionField() === 'suZhouDaXue'"></addPageSubPageSZDX>
+      <addPageSubPagePublic class="button-p-2" v-else></addPageSubPagePublic>
       <!--<p class="inquire-button-one" @click="upDataButton">提交</p>-->
-      <p class="add-button-one-150" v-if="form.status == 0 && form.nature == 0" @click="saveDataButton">另存为权限模板</p>
+      <p class="button-p-3 add-button-one-150" v-if="form.status == 0 && form.nature == 0" @click="saveDataButton">另存为权限模板</p>
+      <p class="null-p"></p>
     </div>
   </div>
 </template>
@@ -1661,13 +1668,20 @@ export default {
   }
   .bottom-button-box{
     display: flex;
-    width:300px;
+    width:600px;
     margin:30px auto 10px;
-    p:nth-child(1){
+    .null-p{
+      flex:1;
+    }
+    .button-p-1{
       width:100px;
       margin-right:20px;
     }
-    p:nth-child(2){
+    .button-p-2{
+      width:100px;
+      margin-right:20px;
+    }
+    .button-p-3{
       width:180px;
     }
   }

+ 1 - 0
src/views/safetyCheck/worktable/hiddenDangerStatisticsEcharts.vue

@@ -220,6 +220,7 @@
               {
                 name: '隐患',
                 type: 'bar',
+                barWidth:15,
                 data: data.num,
                 itemStyle: {
                   emphasis: {

+ 1 - 0
src/views/safetyCheck/worktable/toDoListBox.vue

@@ -370,6 +370,7 @@
             color:#0183FA;
           }
           p:nth-child(2){
+            width:100px;
             padding:0 12px;
             line-height:30px;
             border:1px solid #E0E0E0;