Merge remote-tracking branch 'origin/master'

src/modules/basic/view/campus.vue

@@ -60,7 +60,7 @@
           </el-form-item>
         </ecs-form-search>
 
-        <span>批量操作：</span>
+        <span>操作：</span>
         <el-button
           size="small"
           type="success"
@@ -102,7 +102,7 @@
             <el-row>
               <el-form-item label="中心代码" prop="code">
                 <el-input
-                  :readonly="null != campusForm.id"
+                  :disabled="null != campusForm.id"
                   class="pull_length"
                   v-model="campusForm.code"
                   auto-complete="off"

src/modules/basic/view/course.vue

@@ -96,7 +96,7 @@
 
         <div class="block-seperator"></div>
 
-        <span>批量操作：</span>
+        <span>操作：</span>
         <el-button
           size="small"
           type="success"

src/modules/basic/view/exam_site.vue

@@ -84,7 +84,7 @@
                     v-model="examSiteForm.code"
                     auto-complete="off"
                     placeholder="考点代码"
-                    :readonly="null != examSiteForm.id"
+                    :disabled="null != examSiteForm.id"
                   />
                 </el-form-item>
               </el-row>
@@ -135,7 +135,7 @@
             </el-form>
           </el-dialog>
 
-          <span>批量操作：</span>
+          <span>操作：</span>
           <el-button
             size="small"
             type="danger"

src/modules/basic/view/school.vue

@@ -33,7 +33,7 @@
 
       <div class="block-seperator"></div>
 
-      <span>批量操作：</span>
+      <span>操作：</span>
       <el-button
         size="small"
         type="success"

src/modules/basic/view/specially.vue

@@ -66,7 +66,7 @@
 
       <div class="block-seperator"></div>
 
-      <span>批量操作：</span>
+      <span>操作：</span>
       <el-button
         size="small"
         type="danger"

src/modules/portal/views/Login.vue

@@ -216,7 +216,7 @@ export default {
 
 .right_login {
   width: 480px;
-  height: 350px;
+  height: 330px;
   background-color: #ffffff;
   box-shadow: 0px 7px 20px 0px rgba(77, 124, 196, 0.1);
   border-radius: 38px;
@@ -233,7 +233,7 @@ export default {
   line-height: 24px;
   letter-spacing: 0px;
   color: #666666;
-  margin: 40px 0;
+  margin: 30px 0;
 }
 
 .right_login .username {