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

src/api/stPad.js

@@ -30,3 +30,65 @@ export const stPad_edit_enable = (data) =>
  */
 export const stPad_edit_unenable = (data) =>
   setRequest("stPad/edit_unenable", data);
+/**
+ * 6.1.8 平板策略-授权
+ */
+export const stPad_add_empower = (data) =>
+  setRequest("stPad/add_empower", data);
+/**
+ * 6.1.9 平板策略-学校班级详情
+ */
+export const stPad_detail_obj = (data) => setRequest("stPad/detail_obj", data);
+/**
+ * 6.1.10 平板策略-个人策略
+ */
+export const stPad_list_user = (data) => setRequest("stPad/list_user", data);
+/**
+ * 6.1.11 平板策略-平板用户
+ */
+export const stPad_detail_pad = (data) => setRequest("stPad/detail_pad", data);
+/**
+ * 6.2.1 应用策略-公共策略列表
+ */
+export const stApp_list = (data) => setRequest("stApp/list", data);
+/**
+ * 6.2.1 应用策略-选择列表
+ */
+export const stApp_list_sel = (data) => setRequest("stApp/list_sel", data);
+/**
+ * 6.2.2 应用策略-新增
+ */
+export const stApp_add = (data) => setRequest("stApp/add", data);
+/**
+ * 6.2.3 应用策略-更新
+ */
+export const stApp_edit = (data) => setRequest("stApp/edit", data);
+/**
+ * 6.2.3.2 应用策略-启用
+ */
+export const stApp_enable = (data) => setRequest("stApp/enable", data);
+/**
+ * v6.2.3.3 应用策略-禁用
+ */
+export const stApp_disabled = (data) => setRequest("stApp/disabled", data);
+/**
+ * 6.2.4 应用策略-删除
+ */
+export const stApp_delete = (data) => setRequest("stApp/delete", data);
+/**
+ * 6.2.5 应用策略-详情
+ */
+export const stApp_detail = (data) => setRequest("stApp/detail", data);
+/**
+ * 6.2.6 应用策略-授权
+ */
+export const stApp_add_empower = (data) =>
+  setRequest("stApp/add_empower", data);
+/**
+ * 6.2.7 应用策略-学校/班级引用详情
+ */
+export const stApp_detail_obj = (data) => setRequest("stApp/detail_obj", data);
+/**
+ * 6.2.8 应用策略--平板用户
+ */
+export const stApp_list_pad = (data) => setRequest("stApp/list_pad", data);

src/views/schoolSection/strategy/personalStrategy.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="main_root"></div>
+  <div class="index2">2</div>
 </template>
 
 <script>

src/views/schoolSection/strategy/publicStrategy.vue

@@ -1,5 +1,48 @@
 <template>
-  <div class="main_root"></div>
+  <div class="index1">
+    <div class="strategy_list">
+      <div class="strategy_title">
+        <div><span></span>时间限制策略</div>
+        <div>
+          <span>修改</span>
+          <span>重置</span>
+          <span>引用</span>
+        </div>
+      </div>
+    </div>
+    <div class="strategy_list">
+      <div class="strategy_title">
+        <div><span></span>应用策略</div>
+        <div>
+        </div>
+      </div>
+      <div class="strategy_content">
+        <div class="strategy_top">授权应用</div>
+        <div class="strategy_bottom"></div>
+      </div>
+    </div>
+    <div class="strategy_list">
+      <div class="strategy_title">
+        <div><span></span>设备策略</div>
+        <div>
+        </div>
+      </div>
+    </div>
+    <div class="strategy_list">
+      <div class="strategy_title">
+        <div><span></span>Wifi白名单策略</div>
+        <div>
+        </div>
+      </div>
+    </div>
+    <div class="strategy_list">
+      <div class="strategy_title">
+        <div><span></span>违规处理</div>
+        <div>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -11,4 +54,32 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.index1 {
+  height: calc(100% - 40px);
+  overflow-y: auto;
+  .strategy_list {
+    font-family: "SourceHanSansCN";
+    .strategy_title {
+      height: 40px;
+      font-size: 16px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      div:first-of-type {
+        font-weight: bold;
+      }
+      div:last-of-type {
+        span {
+          color: #7c8db5;
+          margin-left: 20px;
+          &:hover {
+            color: #339dff;
+            cursor: pointer;
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/views/schoolSection/strategy/strategyManage.vue

@@ -1,14 +1,157 @@
 <template>
-  <div class="main_root"></div>
+  <div class="main_root">
+    <div class="schoolInfo">
+      <div class="schoolname">{{ schoolInfo.name }}</div>
+      <div class="class_list">
+        <div v-for="item in schoolInfo.children" :key="item.id">
+          <div
+            :class="[curClass.id === item.id ? 'active' : '']"
+            :title="item.name"
+            @click="selectClass(item)"
+          >
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="user_list">
+      <div class="login_type">
+        <div @click="strategy = 1" :class="[strategy == 1 ? 'active' : '']">
+          公共策略
+        </div>
+        <div @click="strategy = 2" :class="[strategy == 2 ? 'active' : '']">
+          个人策略
+        </div>
+      </div>
+      <PublicStrategy v-if="strategy === 1"></PublicStrategy>
+      <PersonalStrategy v-else></PersonalStrategy>
+    </div>
+  </div>
 </template>
 
 <script>
+import { class_list } from "@/api/school";
+import PublicStrategy from "./publicStrategy.vue";
+import PersonalStrategy from "./personalStrategy";
 export default {
+  components: {
+    PublicStrategy,
+    PersonalStrategy
+  },
   data() {
-    return {};
+    return {
+      userInfo: {},
+      showLoading: false,
+      schoolInfo: {
+        name: "",
+        children: []
+      },
+      curClass: {},
+      strategy: 1
+    };
+  },
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    this.init();
   },
-  methods: {}
+  methods: {
+    selectClass(item) {
+      this.curClass = item;
+      console.log(this.curClass);
+    },
+    init() {
+      this.showLoading = true;
+      class_list({ schoolid: 1 }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          this.schoolInfo = res.obj;
+          if (this.schoolInfo.children.length > 0) {
+            this.curClass = this.schoolInfo.children[0];
+          }
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    }
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.main_root {
+  width: calc(100% - 32px);
+  height: calc(100% - 60px);
+  background-color: transparent;
+  border: none;
+  display: flex;
+  .schoolInfo {
+    width: 200px;
+    border-radius: 15px;
+    margin-right: 16px;
+    height: 100%;
+    padding: 10px;
+    background-color: white;
+    .schoolname {
+      font-size: 16px;
+      line-height: 40px;
+      font-weight: bold;
+      text-align: center;
+    }
+    .class_list {
+      div {
+        line-height: 30px;
+        height: 30px;
+        text-align: center;
+        cursor: pointer;
+      }
+      .active {
+        border-radius: 6px;
+        background: #dbeeff;
+      }
+    }
+  }
+  .user_list {
+    width: calc(100% - 216px);
+    padding: 16px;
+    height: 100%;
+    overflow-y: auto;
+    border-radius: 15px;
+    background-color: white;
+    .login_type {
+      padding-left: 5px;
+      margin-bottom: 16px;
+      height: 30px;
+      display: flex;
+      align-items: center;
+      margin-bottom: 10px;
+      div {
+        width: 66px;
+        text-align: center;
+        color: #7c8db5;
+        font-size: 16px;
+        font-family: "SourceHanSansCN";
+        cursor: pointer;
+        &:first-of-type {
+          margin-right: 20px;
+        }
+      }
+      .active {
+        color: #339dff;
+        position: relative;
+        &::after {
+          display: block;
+          content: "";
+          height: 2px;
+          width: 76px;
+          background-color: #339dff;
+          position: absolute;
+          top: 24px;
+          left: -5px;
+        }
+      }
+    }
+  }
+}
+</style>