Merge remote-tracking branch 'origin/master'

monitor_ui/src/views/index.vue

@@ -9,7 +9,7 @@
             </p>
 
             <template>
-              <el-table :data="tableData" border @cell-click="cellClick">
+              <el-table :data="tableData" border @cell-click="cellClick" height="265">
                 <el-table-column label="部门ID" align="center" prop="deptId" v-if="false"></el-table-column>
                 <el-table-column label="县区名称" align="center" prop="qx">
                   <template slot-scope="scope">