Merge branch 'master' of http://47.112.200.206:3000/aijia/kmt

# Conflicts:
#	src/components/MenuComponent.vue

src/pages/home/SchoolManager.vue

@@ -15,7 +15,7 @@
       <!--数据监控-->
       <el-col :span="18" class="main" v-if="modelindex == 0">
         <el-row :gutter="20" class="main-header">
-          <el-col :span="2">
+          <el-col :span="2" :offset="1">
             <div class="main-header-item">在线：{{monitorTeacherList.onlineCount}}人</div>
           </el-col>
           <el-col :span="2">
@@ -27,7 +27,7 @@
               <span @click="isShow(monitorTeacherList,2)" class="main-header-link">去分配</span>
             </div>
           </el-col>
-          <el-col :span="8" :offset="0">
+          <el-col :span="8" :offset="6">
             <el-input placeholder="请输入老师名字" v-model="filters.inputValue" class="input-with-select">
               <el-select
                 v-model="filters.OptionsValue"
@@ -60,14 +60,14 @@
               <el-button @click="InfoWatch" slot="append" icon="el-icon-search"></el-button>
             </el-input>
           </el-col>
-          <div class="block">
-            <el-date-picker
-              v-model="filters.MaxtimeValue"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="date"
-              placeholder="选择日期"
-            ></el-date-picker>
-          </div>
+          <!--<div class="block">-->
+            <!--<el-date-picker-->
+              <!--v-model="filters.MaxtimeValue"-->
+              <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+              <!--type="date"-->
+              <!--placeholder="选择日期"-->
+            <!--&gt;</el-date-picker>-->
+          <!--</div>-->
         </el-row>
         <el-row :gutter="20" class="main-header">
           <el-col :span="24">