Merge remote-tracking branch 'origin/gzb' into wzl

src/views/regionSection/applicationManage/applicationManage.vue

@@ -989,7 +989,6 @@ export default {
       let obj = this.viewInfo.apphistorys.filter(
         (v) => v.versionName === this.viewInfo.versionName
       )[0];
-      console.log(obj);
       this.viewInfo.apkPath = obj.apkPath;
       this.viewInfo.appAbbr = obj.appAbbr;
       this.viewInfo.appDeveloper = obj.appDeveloper;
@@ -1037,7 +1036,6 @@ export default {
             devices: res.obj.devices,
             schools: res.obj.schools
           };
-          console.log(this.viewInfo);
         } else {
           this.$Message.error(res.msg);
         }
@@ -1058,7 +1056,6 @@ export default {
             appName: res.obj.appName,
             devices: res.obj.devices
           };
-          console.log(this.deviceInfo);
         } else {
           this.$Message.error(res.msg);
         }
@@ -1084,7 +1081,6 @@ export default {
     },
     installChange() {
       //安装统计切换版本
-      console.log(this.installInfo.versionName);
       let obj = this.installInfo.apphistorys.filter(
         (v) => v.versionName === this.installInfo.versionName
       )[0];
@@ -1097,7 +1093,6 @@ export default {
       }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
-          console.log(res.obj);
           this.installInfo.list = res.obj;
         } else {
           this.$Message.error(res.msg);
@@ -1125,7 +1120,6 @@ export default {
           });
           qrcode._el.title = "";
         });
-        console.log(this.downloadInfo);
       } else if (type === 2) {
         //获取历史版本
         this.showLoading = true;
@@ -1143,7 +1137,6 @@ export default {
         });
         this.showLoading = false;
         if (res1.code === 0) {
-          console.log(res1.obj);
           this.installInfo = {
             show: true,
             appName: row.appName,
@@ -1203,7 +1196,6 @@ export default {
     //选中区域学校
     getSelectedNodes(data) {
       this.select_schools = data.filter((v) => v.schoolid);
-      console.log(this.select_schools);
     },
     getUploadProgress(file) {
       let progress = file.progress();
@@ -1299,7 +1291,6 @@ export default {
     },
     CheckboxDevice(dgroupid, val) {
       this.deviceids[dgroupid] = val;
-      console.log(this.deviceids);
     },
     init() {
       //获取分组列表
@@ -1312,7 +1303,6 @@ export default {
       }).then((res) => {
         if (res.code === 0) {
           this.group_list = res.obj.data;
-          console.log(this.group_list);
         } else {
           this.$Message.error(res.msg);
         }
@@ -1363,7 +1353,6 @@ export default {
         if (res.code === 0) {
           this.getHandleData(res.obj[0]);
           this.school_list = res.obj;
-          console.log(this.school_list);
         } else {
           this.$Message.error(res.msg);
         }
@@ -1451,7 +1440,6 @@ export default {
           if (document.querySelector(".section_main")) {
             document.querySelector(".section_main").scrollTop = 0;
           }
-          console.log(this.searchForm.list);
         } else {
           this.$Message.error(res.msg);
         }
@@ -1568,14 +1556,12 @@ export default {
             form.appid = this.wallpaperInfo.appid;
             form.rversion = this.wallpaperInfo.rversion;
           }
-          console.log(form);
           let api = this.wallpaperInfo.appid ? app_edit : app_add;
           this.showLoading = true;
           api(form).then((res) => {
             this.showLoading = false;
             if (res.code === 0) {
               this.wallpaperInfo.show = false;
-              console.log(res.obj);
               this.$Message.success(res.msg);
               this.searchList();
             } else {
@@ -1679,7 +1665,6 @@ export default {
               });
             }
           });
-          console.log(this.wallpaperInfo);
         } else {
           this.$Message.error(res.msg);
         }

src/views/schoolSection/applicationManage/applicationList.vue

@@ -287,7 +287,7 @@
               </uploader>
             </div>
             <div class="upProgress" v-if="file_list.length > 0">
-              <div v-for="file in file_list" key="file1">
+              <div v-for="(file, index) in file_list" :key="index">
                 <div class="file_name" :title="wallpaperInfo.appPackage">
                   <div class="show_name">
                     {{ wallpaperInfo.appPackage }}
@@ -488,7 +488,7 @@
               :src="$api.showImageUrl + viewInfo.appIcon"
             />
           </div>
-          <div class="appIcon" @click="download(viewInfo.appIcon)">
+          <div class="appIcon" @click="download(viewInfo.apkPath)">
             <Icon type="md-download" />下载
           </div>
         </div>
@@ -499,7 +499,20 @@
               }}<span v-if="viewInfo.enabled === 1" class="qy">启用</span>
             </div>
             <div class="view_item">
-              <span>版本号码</span>{{ viewInfo.versionNum }}
+              <span>版本号码</span>
+              <Select
+                :transfer="true"
+                v-model="viewInfo.versionName"
+                @on-change="viewInfoChange()"
+                style="width: 120px"
+              >
+                <Option
+                  v-for="item in viewInfo.apphistorys"
+                  :value="item.versionName"
+                  :key="item.versionName"
+                  >{{ item.versionName }}</Option
+                >
+              </Select>
             </div>
           </div>
           <div class="view_comm">
@@ -594,6 +607,44 @@
         <Button @click="viewInfo.show = false">关闭</Button>
       </div>
     </Modal>
+    <!-- 安装统计 -->
+    <Modal
+      class="modal1"
+      :mask-closable="false"
+      v-model="installInfo.show"
+      title="安装统计"
+    >
+      <div v-if="installInfo.show">
+        <div class="install_title">
+          {{ installInfo.appName }}
+          <div class="history">
+            <div>版本号码</div>
+            <Select
+              :transfer="true"
+              v-model="installInfo.versionName"
+              @on-change="installChange()"
+              style="width: 120px; margin-left: 10px"
+            >
+              <Option
+                v-for="item in installInfo.apphistorys"
+                :value="item.versionName"
+                :key="item.versionName"
+                >{{ item.versionName }}</Option
+              >
+            </Select>
+          </div>
+        </div>
+        <Table
+          style="border: 1px solid #e8eaec; border-bottom: none"
+          :columns="installInfo.columns"
+          :data="installInfo.list"
+        ></Table>
+      </div>
+
+      <div slot="footer" style="text-align: center">
+        <Button @click="installInfo.show = false">关闭</Button>
+      </div>
+    </Modal>
     <Spin fix v-if="showLoading" style="background-color: transparent">
       <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
       <div>加载中</div>
@@ -609,9 +660,11 @@ import {
   app_add,
   app_delete,
   app_detail,
+  app_detail_history,
   app_edit,
   app_edit_enable,
   app_edit_unenable,
+  app_install_statistic,
   app_list,
   appgroup_list,
   device_list
@@ -764,6 +817,46 @@ export default {
       select_schools: [],
       deviceids: {}, //设备类型
       userInfo: {},
+      installInfo: {
+        show: false,
+        appName: "",
+        versionName: null,
+        apphistorys: [],
+        list: [],
+        columns: [
+          {
+            title: "序号",
+            type: "index",
+            width: 70,
+            align: "center"
+          },
+          {
+            title: "区域名称",
+            key: "regionName",
+            align: "center"
+          },
+          {
+            title: "设备总数",
+            key: "total",
+            align: "center"
+          },
+          {
+            title: "已安装设备数",
+            key: "installNum",
+            align: "center"
+          },
+          {
+            title: "未安装设备总数",
+            key: "unInstallNum",
+            align: "center"
+          },
+          {
+            title: "安装比例",
+            key: "installRate",
+            align: "center"
+          }
+        ]
+      },
       deviceInfo: {
         show: false,
         appName: "",
@@ -856,6 +949,21 @@ export default {
     download(url) {
       window.location.href = this.$api.showImageUrl + url;
     },
+    viewInfoChange() {
+      //查看切换版本
+      let obj = this.viewInfo.apphistorys.filter(
+        (v) => v.versionName === this.viewInfo.versionName
+      )[0];
+      this.viewInfo.apkPath = obj.apkPath;
+      this.viewInfo.appAbbr = obj.appAbbr;
+      this.viewInfo.appDeveloper = obj.appDeveloper;
+      this.viewInfo.appIcon = obj.appIcon;
+      this.viewInfo.appImg = obj.appImg.split(";");
+      this.viewInfo.appPackage = obj.appPackage;
+      this.viewInfo.appRenew = obj.appRenew;
+      this.viewInfo.appSize = obj.appSize;
+      this.viewInfo.versionNum = obj.versionNum;
+    },
     // 查看
     toView(row) {
       app_detail({
@@ -866,6 +974,7 @@ export default {
         if (res.code === 0) {
           this.viewInfo = {
             show: true,
+            apphistorys: res.obj.apphistorys,
             appName: res.obj.appName,
             appgroupName: row.appgroupName,
             enabled: res.obj.enabled,
@@ -931,41 +1040,107 @@ export default {
         }
       });
     },
-    countSlot(row, type) {
+    installChange() {
+      //安装统计切换版本
+      let obj = this.installInfo.apphistorys.filter(
+        (v) => v.versionName === this.installInfo.versionName
+      )[0];
+      this.showLoading = true;
+      app_install_statistic({
+        appPackage: obj.appPackage,
+        versionName: obj.versionName,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid
+      }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          this.installInfo.list = res.obj;
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
+    async countSlot(row, type) {
       console.log(row);
       if (type === 1) {
         //下载
-        app_detail({
-          rtype: this.powerParams.rtype,
-          objectid: this.powerParams.objectid,
-          appid: row.appid
-        }).then((res) => {
-          if (res.code === 0) {
-            this.downloadInfo = {
-              show: true,
-              appName: res.obj.appName,
-              apkPath: this.$api.showImageUrl + res.obj.apkPath
-            };
-            this.$nextTick(() => {
-              let qrcodeEl = this.$refs.ScanShare;
-              if (!qrcodeEl) {
-                return;
-              }
-              qrcodeEl.innerHTML = "";
-              let qrcode = new QRCode(qrcodeEl, {
-                width: 140,
-                height: 140,
-                text: this.$api.showImageUrl + this.downloadInfo.apkPath
-              });
-              qrcode._el.title = "";
-            });
-            console.log(this.downloadInfo);
-          } else {
-            this.$Message.error(res.msg);
+        this.downloadInfo = {
+          show: true,
+          appName: row.appName,
+          apkPath: row.apkPath
+        };
+        this.$nextTick(() => {
+          let qrcodeEl = this.$refs.ScanShare;
+          if (!qrcodeEl) {
+            return;
           }
+          qrcodeEl.innerHTML = "";
+          let qrcode = new QRCode(qrcodeEl, {
+            width: 140,
+            height: 140,
+            text: this.$api.showImageUrl + this.downloadInfo.apkPath
+          });
+          qrcode._el.title = "";
         });
       } else if (type === 2) {
+        //获取历史版本
+        this.showLoading = true;
+        let res = await app_detail_history({ appid: row.appid });
+        if (res.code != 0) {
+          this.$Message.error(res.msg);
+        }
         //安装统计
+        let res1 = await app_install_statistic({
+          appPackage: row.appPackage,
+          versionName: row.versionName,
+          rtype: this.powerParams.rtype,
+          objectid: this.powerParams.objectid
+        });
+        this.showLoading = false;
+        if (res1.code === 0) {
+          this.installInfo = {
+            show: true,
+            appName: row.appName,
+            apphistorys: res.obj,
+            versionName: row.versionName,
+            list: res1.obj,
+            columns: [
+              {
+                title: "序号",
+                type: "index",
+                width: 70,
+                align: "center"
+              },
+              {
+                title: "区域名称",
+                key: "regionName",
+                align: "center"
+              },
+              {
+                title: "设备总数",
+                key: "total",
+                align: "center"
+              },
+              {
+                title: "已安装设备数",
+                key: "installNum",
+                align: "center"
+              },
+              {
+                title: "未安装设备总数",
+                key: "unInstallNum",
+                align: "center"
+              },
+              {
+                title: "安装比例",
+                key: "installRate",
+                align: "center"
+              }
+            ]
+          };
+        } else {
+          this.$Message.error(res1.msg);
+        }
       }
     },
     //删除截图
@@ -1404,7 +1579,7 @@ export default {
     display: flex;
     margin: 16px 0;
     .app_logo {
-      flex-wrap: none;
+      flex: none;
       width: 56px;
       height: 56px;
       border-radius: 20px;
@@ -1465,7 +1640,6 @@ export default {
 }
 .view_devices {
   .view_list {
-    margin-bottom: 20px;
     line-height: 32px;
   }
   .dgname {
@@ -1692,4 +1866,21 @@ export default {
     }
   }
 }
+.install_title {
+  margin-bottom: 16px;
+  font-size: 18px;
+  font-weight: bold;
+  text-align: center;
+  position: relative;
+}
+.history {
+  position: absolute;
+  top: 0;
+  right: 0;
+  display: flex;
+  font-size: 16px;
+  font-weight: 400;
+  font-family: "SourceHanSansCN";
+  align-items: center;
+}
 </style>

src/views/schoolSection/strategy/personalStrategy.vue

@@ -84,7 +84,11 @@
                 <div class="day" v-for="item in weeks" :key="item.id">
                   <div class="day_title">{{ item.title }}</div>
                   <div class="day_content">
-                    <div class="time" v-for="sitem in getDay(item.id)">
+                    <div
+                      class="time"
+                      v-for="(sitem, index) in getDay(item.id)"
+                      :key="index"
+                    >
                       {{ getTime(sitem.starttime) }}-{{
                         getTime(sitem.stoptime)
                       }}
@@ -222,7 +226,7 @@
           </div>
           <div class="nodata" v-else>未设置Wifi白名单</div>
         </div>
-        <div class="strategy_list">
+        <div class="strategy_list" style="padding-bottom: 16px">
           <div class="strategy_title">
             <div>
               <span class="ivu-icon iconfont icon-weiguiguanli"></span>违规处理
@@ -330,7 +334,6 @@ import {
   stPad_add,
   stPad_add_quote,
   stPad_delete,
-  stPad_detail,
   stPad_detail_web,
   stPad_edit,
   stPad_list,
@@ -586,7 +589,6 @@ export default {
   },
   created() {
     this.init();
-    console.log(this.curClass);
   },
   methods: {
     stPadChange(row) {
@@ -670,7 +672,6 @@ export default {
           this.strategyInfo.padWifis = res.obj.padWifis || [];
           this.strategyInfo.padTimes = res.obj.padTimes || [];
           this.stPadInfo.show = false;
-          console.log(this.strategyInfo);
         } else {
           this.$Message.error(res.msg);
         }
@@ -823,13 +824,11 @@ export default {
         form.rversion = this.strategyInfo.rversion;
       }
       let api = this.strategyInfo.model === "edit" ? stPad_edit : stPad_add;
-      console.log(form);
       api(form).then((res) => {
         if (res.code === 0) {
           this.$Message.success(res.msg);
           this.searchList();
           this.strategyInfo.show = false;
-          console.log(res.obj);
         } else {
           this.$Message.error(res.msg);
         }
@@ -870,6 +869,7 @@ export default {
       this.strategyInfo.padWifis = Array.from(
         new Set(this.strategyInfo.padWifis)
       );
+      this.ssidName = "";
     },
     async init() {
       //获取应用列表
@@ -940,7 +940,6 @@ export default {
           this.strategyInfo.padWifis = res.obj.padWifis || [];
           this.strategyInfo.padTimes = res.obj.padTimes || [];
           this.strategyInfo.show = true;
-          console.log(this.strategyInfo);
         } else {
           this.$Message.error(res.msg);
         }
@@ -948,7 +947,6 @@ export default {
     },
     toEdit(row) {
       this.initData();
-      console.log(row);
       if (!row.padid) {
         this.strategyInfo = {
           model: "add", //添加
@@ -974,7 +972,6 @@ export default {
       stPad_detail_web({ objectid: row.userid }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
-          console.log(res.obj);
           //数据回显
           this.strategyInfo.model = "edit";
           this.strategyInfo.username = row.username;
@@ -1022,7 +1019,6 @@ export default {
             });
           }
           this.strategyInfo.show = true;
-          console.log(this.strategyInfo);
         } else {
           this.$Message.error(res.msg);
         }
@@ -1082,7 +1078,6 @@ export default {
           if (document.querySelector(".section_main")) {
             document.querySelector(".section_main").scrollTop = 0;
           }
-          console.log(this.searchForm.list);
         } else {
           this.$Message.error(res.msg);
         }
@@ -1227,7 +1222,8 @@ export default {
     .nodata {
       color: #798cb5;
       font-size: 16px;
-      line-height: 30px;
+      line-height: 40px;
+      padding-left: 20px;
     }
   }
   .showtime {

src/views/schoolSection/strategy/publicStrategy.vue

@@ -36,7 +36,11 @@
             <div class="day" v-for="item in weeks" :key="item.id">
               <div class="day_title">{{ item.title }}</div>
               <div class="day_content">
-                <div class="time" v-for="sitem in getDay(item.id)">
+                <div
+                  class="time"
+                  v-for="(sitem, index) in getDay(item.id)"
+                  :key="index"
+                >
                   {{ getTime(sitem.starttime) }}-{{ getTime(sitem.stoptime) }}
                 </div>
               </div>
@@ -164,7 +168,7 @@
       </div>
       <div class="nodata" v-else>未设置Wifi白名单</div>
     </div>
-    <div class="strategy_list">
+    <div class="strategy_list" style="padding-bottom: 16px">
       <div class="strategy_title">
         <div>
           <span class="ivu-icon iconfont icon-weiguiguanli"></span>违规处理
@@ -233,12 +237,7 @@
       v-model="stPadInfo.show"
       title="引用"
     >
-      <Table
-        v-if="stPadInfo.show"
-        class="table"
-        :columns="columns1"
-        :data="stPadInfo.list"
-      >
+      <Table v-if="stPadInfo.show" :columns="columns1" :data="stPadInfo.list">
         <template slot-scope="{ row }" slot="active">
           <Radio @on-change="stPadChange(row)" v-model="row.checked"></Radio>
         </template>
@@ -535,7 +534,6 @@ export default {
           }
           this.curState = 2; //编辑状态
           this.stPadInfo.show = false;
-          console.log(this.stPadInfo);
         } else {
           this.$Message.error(res.msg);
         }
@@ -694,7 +692,6 @@ export default {
         form.rversion = this.strategyInfo.rversion;
       }
       let api = hasSave ? stPad_edit : stPad_add;
-      console.log(hasSave, form);
       api(form).then((res) => {
         if (res.code === 0) {
           this.$Message.success(res.msg);
@@ -741,6 +738,7 @@ export default {
       this.strategyInfo.padWifis = Array.from(
         new Set(this.strategyInfo.padWifis)
       );
+      this.ssidName = "";
     },
     async detail() {
       this.showLoading = true;
@@ -796,6 +794,8 @@ export default {
                 arr.length > 0 ? arr[0].handleMethod.split(";") : [];
             });
           }
+          this.strategyInfo.padWifis = res.obj.padWifis || [];
+          this.strategyInfo.padTimes = res.obj.padTimes || [];
         } else {
           this.strategyInfo.hastime = false;
           this.strategyInfo.hasapp = false;
@@ -804,7 +804,6 @@ export default {
           this.strategyInfo.hasviolate = false;
         }
         this.curState = 1; //查看状态
-        console.log(this.strategyInfo);
       } else {
         this.$Message.error(res.msg);
       }
@@ -975,7 +974,8 @@ export default {
     .nodata {
       color: #798cb5;
       font-size: 16px;
-      line-height: 30px;
+      line-height: 40px;
+      padding-left: 20px;
     }
   }
 }

src/views/schoolSection/strategy/strategyManage.vue

@@ -141,6 +141,8 @@ export default {
   display: flex;
   .schoolInfo {
     width: 200px;
+    flex: none;
+    overflow-y: auto;
     border-radius: 15px;
     margin-right: 16px;
     height: 100%;

src/views/schoolSection/strategy/strategyTemplate.vue

@@ -120,7 +120,11 @@
                 <div class="day" v-for="item in weeks" :key="item.id">
                   <div class="day_title">{{ item.title }}</div>
                   <div class="day_content">
-                    <div class="time" v-for="sitem in getDay(item.id)">
+                    <div
+                      class="time"
+                      v-for="(sitem, index) in getDay(item.id)"
+                      :key="index"
+                    >
                       {{ getTime(sitem.starttime) }}-{{
                         getTime(sitem.stoptime)
                       }}
@@ -748,6 +752,7 @@ export default {
       this.strategyInfo.padWifis = Array.from(
         new Set(this.strategyInfo.padWifis)
       );
+      this.ssidName = "";
     },
     saveEmpowerInfo() {
       //保存授权
@@ -815,12 +820,13 @@ export default {
       stPad_list({
         size: this.searchForm.size,
         page: this.searchForm.page,
+        name: this.searchForm.name,
         schoolid: this.powerParams.objectid
       }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
           this.searchForm.list = res.obj.data;
-          this.searchForm.total = res.total;
+          this.searchForm.total = res.obj.total;
         } else {
           this.$Message.error(res.msg);
         }
@@ -887,7 +893,7 @@ export default {
           this.strategyInfo.haswifi = res.obj.haswifi ? true : false;
           this.strategyInfo.hasviolate = res.obj.hasviolate ? true : false;
           if (this.strategyInfo.hastime) {
-            this.strategyInfo.padTimes = res.obj.padTimes;
+            this.strategyInfo.padTimes = res.obj.padTimes || [];
           }
           if (this.strategyInfo.hasapp) {
             //回显应用策略
@@ -907,8 +913,8 @@ export default {
               item.enabled = obj.enabled;
             });
           }
-          if (this.strategyInfo.hastime) {
-            this.strategyInfo.padWifis = res.obj.padWifis;
+          if (this.strategyInfo.padWifis) {
+            this.strategyInfo.padWifis = res.obj.padWifis || [];
           }
           if (this.strategyInfo.hasviolate) {
             //回显违规处理

src/views/schoolSection/userManage/userManage.vue

@@ -1,11 +1,25 @@
 <template>
   <div class="main_root">
     <div class="schoolInfo">
-      <div class="schoolname">{{ schoolInfo.name }}</div>
+      <div
+        class="schoolname"
+        :class="[
+          curClass.id === schoolInfo.id && curClass.type === schoolInfo.type
+            ? 'active'
+            : ''
+        ]"
+        @click="selectClass(schoolInfo)"
+      >
+        {{ schoolInfo.name }}
+      </div>
       <div class="class_list">
         <div v-for="item in schoolInfo.children" :key="item.id">
           <div
-            :class="[curClass.id === item.id ? 'active' : '']"
+            :class="[
+              curClass.id === item.id && curClass.type === item.type
+                ? 'active'
+                : ''
+            ]"
             :title="item.name"
             @click="selectClass(item)"
           >
@@ -54,8 +68,8 @@
             >
           </Select>
           <Input
-            v-model="searchForm.appName"
-            placeholder="请输入名称"
+            v-model="searchForm.username"
+            placeholder="请输入姓名"
             search
             @on-search="searchList()"
             style="width: 150px"
@@ -394,6 +408,7 @@ export default {
       ],
       curClass: {
         id: 0,
+        type: 1,
         name: ""
       },
       addInfo: {
@@ -750,9 +765,7 @@ export default {
         this.showLoading = false;
         if (res.code === 0) {
           this.schoolInfo = res.obj;
-          if (this.schoolInfo.children.length > 0) {
-            this.curClass = this.schoolInfo.children[0];
-          }
+          this.curClass = res.obj;
         } else {
           this.$Message.error(res.msg);
         }
@@ -777,14 +790,14 @@ export default {
     // 获取列表
     getList() {
       this.showLoading = true;
-      console.log(this.powerParams)
+      console.log(this.powerParams);
       user_list({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         schoolid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
-        classid: this.curClass.id,
+        classid: this.curClass.type === 2 ? this.curClass.id : null,
         care: this.searchForm.care,
         enabled: this.searchForm.enabled,
         control: this.searchForm.control,
@@ -812,9 +825,11 @@ export default {
   display: flex;
   .schoolInfo {
     width: 200px;
+    flex: none;
     border-radius: 15px;
     margin-right: 16px;
     height: 100%;
+    overflow-y: auto;
     padding: 10px;
     background-color: white;
     .schoolname {
@@ -822,6 +837,7 @@ export default {
       line-height: 40px;
       font-weight: bold;
       text-align: center;
+      cursor: pointer;
     }
     .class_list {
       div {
@@ -830,10 +846,10 @@ export default {
         text-align: center;
         cursor: pointer;
       }
-      .active {
-        border-radius: 6px;
-        background: #dbeeff;
-      }
+    }
+    .active {
+      border-radius: 6px;
+      background: #dbeeff;
     }
   }
   .user_list {