Merge branch 'master' of 49.232.152.146:qangqi/dd_school

ruoyi-ui/src/views/smartSchool/electronicArchives/basicInformation/index.vue

@@ -126,7 +126,7 @@
             </el-col>
         </el-row>
         <el-table :data="informationList" @selection-change="handleSelectionChange"
-            :default-sort="{ prop: 'toSecondMiddleSchoolTime', order: 'descending' }">
+            :default-sort="{ prop: 'toSecondMiddleSchoolTime', order: 'descending' }" :row-style="{height: '0'}" :cell-style="{padding: '3px'}">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column type="index" label="序号" width="55" align="center" fixed="left" />
             <el-table-column label="姓名" align="center" prop="name" sortable fixed="left" width="100" />
@@ -147,8 +147,8 @@
                     <span>{{ parseTime(scope.row.fileBirthDate, "{y}-{m}-{d}") }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="到市二中工作时间" align="center" prop="toSecondMiddleSchoolTime" sortable width="148px" />
-            <el-table-column label="到市二中工作年限" align="center" prop="toSecondAge" sortable width="148px" />
+            <el-table-column label="到市二中工作时间" align="center" prop="toSecondMiddleSchoolTime" sortable width="155px" />
+            <el-table-column label="到市二中工作年限" align="center" prop="toSecondAge" sortable width="155px" />
             <el-table-column label="现职称" align="center" prop="currentProfessionalTitle" sortable width="100px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.current_professional" :value="scope.row.currentProfessionalTitle" />
@@ -161,7 +161,7 @@
                     <dict-tag :options="dict.type.duty_situation" :value="scope.row.onDutySituation" />
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width ">
+            <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="150px">
                 <template slot-scope="scope">
                     <el-button v-hasPermi="['system:student:edit']" size="mini" type="text"
                         @click="handleUpdate(scope.row)">修改</el-button>
@@ -201,7 +201,7 @@
             </div>
         </el-dialog>
         <!-- 添加对话框 -->
-        <el-dialog title="详细信息" :visible.sync="open" width="60%">
+        <el-dialog title="详细信息" :visible.sync="open" width="80%">
             <el-form ref="form" :model="form" :rules="rules" label-width="138px">
                 <el-row type="flex" justify="space-between">
                     <el-col :span="16">
@@ -276,8 +276,8 @@
                     </el-col>
                     <el-col :span="6" class="custom-margin">
                         <el-card style="
-                height: 200px;
-                width: 220px;
+                height: 180px;
+                width: 200px;
                 display: flex;
                 align-items: center;
                 justify-content: center;
@@ -520,7 +520,7 @@
             </div>
         </el-dialog>
         <!-- 修改对话框 -->
-        <el-dialog title="详细信息" :visible.sync="look" width="950px" append-to-body>
+        <el-dialog title="详细信息" :visible.sync="look" width="80%" append-to-body>
             <el-form ref="form" :model="form" :rules="rules" label-width="138px">
                 <el-row type="flex" justify="space-between">
                     <el-col :span="16">
@@ -1428,11 +1428,21 @@ export default {
 } */
 
 .custom-margin {
-    margin: -6px 0px;
+    margin: -10px 0px;
 }
 
 .custom-evenly {
     margin-top: -40px !important;
     text-align: right !important;
 }
+::v-deep .el-input--medium .el-input__inner {
+  height: 26px;
+  line-height: 26px;
+}
+::v-deep .el-dialog__body{
+  padding: 20px
+}
+::v-deep .el-dialog:not(.is-fullscreen) {
+  margin-top: 4vh !important;
+}
 </style>