Merge commit '81bb6d99293dd1c5569879668bfdd89a45416e06' into gzb

src/router/school.js

@@ -198,9 +198,10 @@ export default {
       }
     },
     {
-      path: "device",
-      component: () => import("@/views/schoolSection/setting/device.vue"),
-      name: "device",
+      path: "deviceSetting",
+      component: () =>
+        import("@/views/schoolSection/setting/deviceSetting.vue"),
+      name: "deviceSetting",
       meta: {
         keepAlive: true,
         isAuth: true,

src/views/platformSection/index.vue

@@ -48,12 +48,7 @@
             >
           </div>
         </div>
-        <div
-          :class="[
-            'module_item drop_down',
-            logManageSelected ? 'selected' : ''
-          ]"
-        >
+        <div :class="['module_item drop_down', logSelected ? 'selected' : '']">
           <span class="module_title">日志</span>
           <Icon class="arrow_dropdown" type="md-arrow-dropdown" :size="20" />
           <div class="drop_down_list" v-if="routeDropdown">
@@ -97,7 +92,7 @@ export default {
       return this.$route.path.includes("/platform/whitelistLibrary");
     },
     // 日志路由选中
-    logManageSelected() {
+    logSelected() {
       return this.$route.path.includes("/platform/deviceExport");
     }
   },

src/views/schoolSection/index.vue

@@ -5,6 +5,242 @@
         <router-link tag="div" to="/school/home" class="module_item">
           <span>首页</span>
         </router-link>
+        <div
+          :class="[
+            'module_item drop_down',
+            appManageSelected ? 'selected' : ''
+          ]"
+        >
+          <span class="module_title">应用管理</span>
+          <Icon class="arrow_dropdown" type="md-arrow-dropdown" :size="20" />
+          <div class="drop_down_list" v-if="routeDropdown">
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/applicationList"
+              class="drop_down_list_item"
+              >应用列表</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/greenBrowser"
+              class="drop_down_list_item"
+              >绿色浏览器访问网址</router-link
+            >
+          </div>
+        </div>
+        <router-link tag="div" to="/school/userManage" class="module_item">
+          <span>用户管理</span>
+        </router-link>
+        <div
+          :class="['module_item drop_down', strategySelected ? 'selected' : '']"
+        >
+          <span class="module_title">策略</span>
+          <Icon class="arrow_dropdown" type="md-arrow-dropdown" :size="20" />
+          <div class="drop_down_list" v-if="routeDropdown">
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/strategyManage"
+              class="drop_down_list_item"
+              >策略管理</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/strategyTemplate"
+              class="drop_down_list_item"
+              >策略模版</router-link
+            >
+          </div>
+        </div>
+        <router-link
+          tag="div"
+          to="/school/applicationStrategy"
+          class="module_item"
+        >
+          <span>应用策略</span>
+        </router-link>
+        <div
+          :class="[
+            'module_item drop_down',
+            deviceManageSelected ? 'selected' : ''
+          ]"
+        >
+          <span class="module_title">设备管理</span>
+          <Icon class="arrow_dropdown" type="md-arrow-dropdown" :size="20" />
+          <div class="drop_down_list" v-if="routeDropdown">
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/deviceManage"
+              class="drop_down_list_item"
+              >设备管理</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/breakRuleDevice"
+              class="drop_down_list_item"
+              >违规设备</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/outControlDevice"
+              class="drop_down_list_item"
+              >疑似脱管设备</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/removeControlDevice"
+              class="drop_down_list_item"
+              >解除管控设备</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/parentControlDevice"
+              class="drop_down_list_item"
+              >家长管控设备</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/inLineDevice"
+              class="drop_down_list_item"
+              >在线设备</router-link
+            >
+          </div>
+        </div>
+        <div
+          :class="[
+            'module_item drop_down',
+            networkManageSelected ? 'selected' : ''
+          ]"
+        >
+          <span class="module_title">网络管理</span>
+          <Icon class="arrow_dropdown" type="md-arrow-dropdown" :size="20" />
+          <div class="drop_down_list" v-if="routeDropdown">
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/whitelistLibrary"
+              class="drop_down_list_item"
+              >白名单库</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/whitelist"
+              class="drop_down_list_item"
+              >网址白名单</router-link
+            >
+          </div>
+        </div>
+        <div
+          :class="['module_item drop_down', settingSelected ? 'selected' : '']"
+        >
+          <span class="module_title">设置</span>
+          <Icon class="arrow_dropdown" type="md-arrow-dropdown" :size="20" />
+          <div class="drop_down_list" v-if="routeDropdown">
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/wallpaper"
+              class="drop_down_list_item"
+              >壁纸</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/logo"
+              class="drop_down_list_item"
+              >LOGO</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/deviceSetting"
+              class="drop_down_list_item"
+              >设备设置</router-link
+            >
+          </div>
+        </div>
+        <div :class="['module_item drop_down', logSelected ? 'selected' : '']">
+          <span class="module_title">日志</span>
+          <Icon class="arrow_dropdown" type="md-arrow-dropdown" :size="20" />
+          <div class="drop_down_list" v-if="routeDropdown">
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/admin"
+              class="drop_down_list_item"
+              >管理员日志</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/devicePush"
+              class="drop_down_list_item"
+              >设备推送日志</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/deviceLocation"
+              class="drop_down_list_item"
+              >设备位置日志</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/deviceEvents"
+              class="drop_down_list_item"
+              >设备事件日志</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/violatingDevice"
+              class="drop_down_list_item"
+              >违规设备日志</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/applicationDownload"
+              class="drop_down_list_item"
+              >应用下载日志</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/appLaunch"
+              class="drop_down_list_item"
+              >应用启动日志</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/deviceInstallation"
+              class="drop_down_list_item"
+              >设备已安装应用</router-link
+            >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/school/deviceExport"
+              class="drop_down_list_item"
+              >设备导出</router-link
+            >
+          </div>
+        </div>
+        <router-link tag="div" to="/school/notice" class="module_item">
+          <span>公告</span>
+        </router-link>
       </div>
       <div class="out_region" @click="exitToPreviousLevel()">退出学校</div>
     </div>
@@ -21,6 +257,62 @@ export default {
       routeDropdown: true
     };
   },
+  computed: {
+    // 应用管理路由选中
+    appManageSelected() {
+      return (
+        this.$route.path.includes("/school/applicationList") ||
+        this.$route.path.includes("/school/greenBrowser")
+      );
+    },
+    // 策略路由选中
+    strategySelected() {
+      return (
+        this.$route.path.includes("/school/strategyManage") ||
+        this.$route.path.includes("/school/strategyTemplate")
+      );
+    },
+    // 设备管理路由选中
+    deviceManageSelected() {
+      return (
+        this.$route.path.includes("/school/deviceManage") ||
+        this.$route.path.includes("/school/breakRuleDevice") ||
+        this.$route.path.includes("/school/outControlDevice") ||
+        this.$route.path.includes("/school/removeControlDevice") ||
+        this.$route.path.includes("/school/parentControlDevice") ||
+        this.$route.path.includes("/school/inLineDevice")
+      );
+    },
+    // 网络管理路由选中
+    networkManageSelected() {
+      return (
+        this.$route.path.includes("/school/whitelistLibrary") ||
+        this.$route.path.includes("/school/whitelist")
+      );
+    },
+    // 设置路由选中
+    settingSelected() {
+      return (
+        this.$route.path.includes("/school/wallpaper") ||
+        this.$route.path.includes("/school/logo") ||
+        this.$route.path.includes("/school/deviceSetting")
+      );
+    },
+    // 日志路由选中
+    logSelected() {
+      return (
+        this.$route.path.includes("/school/admin") ||
+        this.$route.path.includes("/school/devicePush") ||
+        this.$route.path.includes("/school/deviceLocation") ||
+        this.$route.path.includes("/school/deviceEvents") ||
+        this.$route.path.includes("/school/violatingDevice") ||
+        this.$route.path.includes("/school/applicationDownload") ||
+        this.$route.path.includes("/school/appLaunch") ||
+        this.$route.path.includes("/school/deviceInstallation") ||
+        this.$route.path.includes("/school/deviceExport")
+      );
+    }
+  },
   methods: {
     // 选中菜单后隐藏下拉
     routeDropdownChange() {

src/views/schoolSection/setting/deviceSetting.vue

@@ -0,0 +1,14 @@
+<template>
+  <div class="main_root"></div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  methods: {}
+};
+</script>
+
+<style lang="less" scoped></style>

src/views/schoolSection/setting/logo.vue

@@ -0,0 +1,14 @@
+<template>
+  <div class="main_root"></div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  methods: {}
+};
+</script>
+
+<style lang="less" scoped></style>

src/views/schoolSection/setting/wallpaper.vue

@@ -0,0 +1,14 @@
+<template>
+  <div class="main_root"></div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  methods: {}
+};
+</script>
+
+<style lang="less" scoped></style>