Merge branch 'master' of 49.232.152.146:qangqi/dd_school

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

 <template>
     <div class="app-container">
         <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
-            <el-form ref="queryParams" :model="queryParams" label-width="96px">
+            <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="任教学科" prop="teachingSubject">
@@ -281,6 +281,7 @@
                 display: flex;
                 align-items: center;
                 justify-content: center;
+                margin-bottom: 10px;
               ">
                             <el-upload v-loading="uploadLoading" class="avatar-uploader" action="#" accept="image/*"
                                 :show-file-list="false" :on-success="handleAvatarSuccess"
@@ -1427,22 +1428,28 @@ export default {
     margin-bottom: -5px;
 } */
 
-.custom-margin {
-    margin: -10px 0px;
-}
+//.custom-margin {
+//    margin: -10px 0px;
+//}
 
-.custom-evenly {
-    margin-top: -40px !important;
-    text-align: right !important;
+//.custom-evenly {
+//    margin-top: -40px !important;
+//    text-align: right !important;
+//}
+::v-deep .el-form-item{
+  margin-bottom: 0px;
 }
 ::v-deep .el-input--medium .el-input__inner {
   height: 26px;
   line-height: 26px;
 }
 ::v-deep .el-dialog__body{
-  padding: 20px
+  padding: 10px 20px
 }
 ::v-deep .el-dialog:not(.is-fullscreen) {
   margin-top: 4vh !important;
 }
+.search ::v-deep .el-form-item__content{
+  width: 200px
+}
 </style>