应用管理

public/iconfont/demo_index.html

@@ -54,6 +54,36 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xeb2a;</span>
+                <div class="name">时间</div>
+                <div class="code-name">&amp;#xeb2a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe669;</span>
+                <div class="name">设置</div>
+                <div class="code-name">&amp;#xe669;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe74e;</span>
+                <div class="name">违规管理</div>
+                <div class="code-name">&amp;#xe74e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe601;</span>
+                <div class="name">wifi</div>
+                <div class="code-name">&amp;#xe601;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe67e;</span>
+                <div class="name">应用策略</div>
+                <div class="code-name">&amp;#xe67e;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe703;</span>
                 <div class="name">关注-已关注</div>
@@ -204,9 +234,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1712026774551') format('woff2'),
-       url('iconfont.woff?t=1712026774551') format('woff'),
-       url('iconfont.ttf?t=1712026774551') format('truetype');
+  src: url('iconfont.woff2?t=1712125751952') format('woff2'),
+       url('iconfont.woff?t=1712125751952') format('woff'),
+       url('iconfont.ttf?t=1712125751952') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -232,6 +262,51 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-shijian"></span>
+            <div class="name">
+              时间
+            </div>
+            <div class="code-name">.icon-shijian
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shezhi"></span>
+            <div class="name">
+              设置
+            </div>
+            <div class="code-name">.icon-shezhi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-weiguiguanli"></span>
+            <div class="name">
+              违规管理
+            </div>
+            <div class="code-name">.icon-weiguiguanli
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-wifi"></span>
+            <div class="name">
+              wifi
+            </div>
+            <div class="code-name">.icon-wifi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yingyongcelve"></span>
+            <div class="name">
+              应用策略
+            </div>
+            <div class="code-name">.icon-yingyongcelve
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-guanzhu-yiguanzhu"></span>
             <div class="name">
@@ -457,6 +532,46 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shijian"></use>
+                </svg>
+                <div class="name">时间</div>
+                <div class="code-name">#icon-shijian</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shezhi"></use>
+                </svg>
+                <div class="name">设置</div>
+                <div class="code-name">#icon-shezhi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-weiguiguanli"></use>
+                </svg>
+                <div class="name">违规管理</div>
+                <div class="code-name">#icon-weiguiguanli</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-wifi"></use>
+                </svg>
+                <div class="name">wifi</div>
+                <div class="code-name">#icon-wifi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yingyongcelve"></use>
+                </svg>
+                <div class="name">应用策略</div>
+                <div class="code-name">#icon-yingyongcelve</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-guanzhu-yiguanzhu"></use>

public/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4468064 */
-  src: url('iconfont.woff2?t=1712026774551') format('woff2'),
-       url('iconfont.woff?t=1712026774551') format('woff'),
-       url('iconfont.ttf?t=1712026774551') format('truetype');
+  src: url('iconfont.woff2?t=1712125751952') format('woff2'),
+       url('iconfont.woff?t=1712125751952') format('woff'),
+       url('iconfont.ttf?t=1712125751952') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,26 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-shijian:before {
+  content: "\eb2a";
+}
+
+.icon-shezhi:before {
+  content: "\e669";
+}
+
+.icon-weiguiguanli:before {
+  content: "\e74e";
+}
+
+.icon-wifi:before {
+  content: "\e601";
+}
+
+.icon-yingyongcelve:before {
+  content: "\e67e";
+}
+
 .icon-guanzhu-yiguanzhu:before {
   content: "\e703";
 }

public/iconfont/iconfont.json

@@ -5,6 +5,41 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "5387666",
+      "name": "时间",
+      "font_class": "shijian",
+      "unicode": "eb2a",
+      "unicode_decimal": 60202
+    },
+    {
+      "icon_id": "10984138",
+      "name": "设置",
+      "font_class": "shezhi",
+      "unicode": "e669",
+      "unicode_decimal": 58985
+    },
+    {
+      "icon_id": "25595644",
+      "name": "违规管理",
+      "font_class": "weiguiguanli",
+      "unicode": "e74e",
+      "unicode_decimal": 59214
+    },
+    {
+      "icon_id": "36916199",
+      "name": "wifi",
+      "font_class": "wifi",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "37574735",
+      "name": "应用策略",
+      "font_class": "yingyongcelve",
+      "unicode": "e67e",
+      "unicode_decimal": 59006
+    },
     {
       "icon_id": "9974412",
       "name": "关注-已关注",

src/views/regionSection/applicationManage/applicationGroup.vue

@@ -110,18 +110,27 @@
     </Modal>
     <!-- 查看 -->
     <Modal
-      class="modal1"
+      class="modal1 view"
       :mask-closable="false"
       v-model="viewInfo.show"
       title="查看"
     >
-      <div class="view_title">河南星火燎原软件科技有限公司</div>
-      <Table
-        style="border: 1px solid #e8eaec; border-bottom: none"
-        :columns="viewInfo.columns"
-        :data="viewInfo.list"
-      >
-      </Table>
+      <div class="view_title">{{ viewInfo.appgroupName }}</div>
+      <div class="view_content">
+        <div class="view_title">图标</div>
+        <div class="app_img">
+          <img
+            v-if="viewInfo.iconPath"
+            :src="$api.showImageUrl + viewInfo.iconPath"
+          />
+        </div>
+      </div>
+      <div class="view_content" style="margin-top: 20px">
+        <div class="view_title">描述</div>
+        <div class="view_comm">
+          {{ viewInfo.comm }}
+        </div>
+      </div>
       <div slot="footer" style="text-align: center">
         <Button @click="viewInfo.show = false">关闭</Button>
       </div>
@@ -166,31 +175,9 @@ export default {
       // 查看
       viewInfo: {
         show: false,
-        areaname: "",
-        list: [],
-        columns: [
-          {
-            title: "序号",
-            type: "index",
-            width: 70,
-            align: "center"
-          },
-          {
-            title: "名称",
-            key: "admin",
-            align: "center"
-          },
-          {
-            title: "账号",
-            key: "loginname",
-            align: "center"
-          },
-          {
-            title: "手机号码",
-            key: "phone",
-            align: "center"
-          }
-        ]
+        appgroupName: "",
+        iconPath: "",
+        comm: ""
       },
       rules: {
         appgroupName: [
@@ -384,21 +371,13 @@ export default {
       });
     },
     // 查看
-    toView() {
-      this.viewInfo.show = true;
-      this.viewInfo.areaname = "河南星火燎原软件科技有限公司";
-      this.viewInfo.list = [
-        {
-          admin: "周文彦",
-          loginname: "zhouwenyan@xhkjedu.com",
-          phone: "15610230213"
-        },
-        {
-          admin: "齐思宇",
-          loginname: "zhouwenyan@xhkjedu.com",
-          phone: "15610230213"
-        }
-      ];
+    toView(row) {
+      this.viewInfo = {
+        show: true,
+        appgroupName: row.appgroupName,
+        iconPath: row.iconPath,
+        comm: row.comm
+      };
     },
     // 编辑
     toEdit(row) {
@@ -490,21 +469,6 @@ export default {
       color: #7c8db5;
     }
   }
-  .app_img {
-    margin-top: 10px;
-    width: 90px;
-    height: 90px;
-    border-radius: 20px;
-    opacity: 1;
-    border: 1px solid #e5e5e5;
-    background: #ffffff;
-    overflow: hidden;
-    img {
-      width: 100%;
-      height: 100%;
-      object-fit: cover;
-    }
-  }
 }
 .table_wrap {
   .iconPath {
@@ -522,4 +486,35 @@ export default {
     }
   }
 }
+.app_img {
+  margin-top: 10px;
+  width: 90px;
+  height: 90px;
+  border-radius: 20px;
+  opacity: 1;
+  border: 1px solid #e5e5e5;
+  background: #ffffff;
+  overflow: hidden;
+  img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
+}
+.view {
+  .view_content {
+    display: flex;
+    line-height: 30px;
+    .view_title {
+      width: 70px;
+      font-weight: 500;
+      font-size: 16px;
+      flex: none;
+      margin: 0 10px;
+    }
+    .view_comm {
+      line-height: 30px;
+    }
+  }
+}
 </style>

src/views/regionSection/applicationManage/applicationManage.vue

@@ -5,10 +5,12 @@
         <Select
           :transfer="true"
           v-model="searchForm.appgroupid"
+          @on-change="searchList()"
           style="width: 120px; margin: 0 10px"
           placeholder="请选择分组"
         >
           <template v-if="group_list.length > 0">
+            <Option :value="0">所有分组</Option>
             <Option
               v-for="item in group_list"
               :value="item.appgroupid"
@@ -46,10 +48,10 @@
         <template slot-scope="{ row }" slot="appType">
           <div>{{ row.appType === 1 ? "推荐应用" : "必装应用" }}</div>
         </template>
-        <template slot-scope="{ row }" slot="enable">
+        <template slot-scope="{ row }" slot="enabled">
           <i-switch
             size="large"
-            v-model="row.enable"
+            v-model="row.enabled"
             :true-value="1"
             :false-value="2"
             @on-change="enabledChange(row)"
@@ -168,7 +170,7 @@
             </Select>
           </FormItem>
           <FormItem label="状态" style="width: 300px">
-            <RadioGroup v-model="wallpaperInfo.enable">
+            <RadioGroup v-model="wallpaperInfo.enabled">
               <Radio :label="1">启用</Radio>
               <Radio :label="2">禁用</Radio>
             </RadioGroup>
@@ -524,7 +526,7 @@
           <div class="view_comm">
             <div class="view_titles">
               {{ viewInfo.appName
-              }}<span v-if="viewInfo.enable === 1" class="qy">启用</span>
+              }}<span v-if="viewInfo.enabled === 1" class="qy">启用</span>
             </div>
             <div class="view_item">
               <span>版本号码</span>{{ viewInfo.versionNum }}
@@ -692,6 +694,7 @@ export default {
       showLoading: false,
       searchForm: {
         appName: "",
+        appgroupid: 0,
         page: 1,
         size: 10,
         list: [],
@@ -703,7 +706,7 @@ export default {
         appid: null,
         appName: "",
         appgroupid: "",
-        enable: 1,
+        enabled: 1,
         appType: 1,
         forced: 1,
         whited: 1,
@@ -730,7 +733,7 @@ export default {
         show: false,
         appName: "",
         appgroupName: "",
-        enable: 1,
+        enabled: 1,
         appType: 1,
         forced: 1,
         whited: 1,
@@ -834,7 +837,7 @@ export default {
         },
         {
           title: "状态",
-          slot: "enable",
+          slot: "enabled",
           width: 100,
           align: "center"
         },
@@ -906,7 +909,7 @@ export default {
             show: true,
             appName: res.obj.appName,
             appgroupName: row.appgroupName,
-            enable: res.obj.enable,
+            enabled: res.obj.enabled,
             appType: res.obj.appType,
             forced: res.obj.forced,
             whited: res.obj.whited,
@@ -954,7 +957,7 @@ export default {
       });
     },
     enabledChange(row) {
-      let api = row.enable === 1 ? app_edit_enable : app_edit_unenable;
+      let api = row.enabled === 1 ? app_edit_enable : app_edit_unenable;
       api({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
@@ -1127,6 +1130,7 @@ 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);
         }
@@ -1253,6 +1257,7 @@ export default {
       app_list({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
+        appgroupid: this.searchForm.appgroupid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         appName: this.searchForm.appName
@@ -1272,13 +1277,12 @@ export default {
     },
     // 新建
     toAdd() {
-      this.$refs.addForm.resetFields();
       this.wallpaperInfo = {
         show: true,
         appid: null,
         appName: "",
         appgroupid: "",
-        enable: 1,
+        enabled: 1,
         appType: 1,
         forced: 1,
         whited: 1,
@@ -1301,10 +1305,12 @@ export default {
         schoolids: []
       };
       this.school_list = JSON.parse(JSON.stringify(this.curRegion));
+      this.$nextTick(() => {
+        this.$refs.addForm.resetFields();
+      });
     },
     // 保存新建
     saveAddInfo() {
-      console.log(this.wallpaperInfo);
       this.$refs.addForm.validate((valid) => {
         if (valid) {
           if (!this.wallpaperInfo.appgroupid) {
@@ -1352,7 +1358,7 @@ export default {
             rtype: this.powerParams.rtype,
             objectid: this.powerParams.objectid,
             appName: this.wallpaperInfo.appName,
-            enable: this.wallpaperInfo.enable,
+            enabled: this.wallpaperInfo.enabled,
             appType: this.wallpaperInfo.appType,
             forced: this.wallpaperInfo.forced,
             whited: this.wallpaperInfo.whited,
@@ -1430,7 +1436,7 @@ export default {
             rversion: res.obj.rversion,
             appName: res.obj.appName,
             appgroupid: res.obj.appgroupid,
-            enable: res.obj.enable,
+            enabled: res.obj.enabled,
             appType: res.obj.appType,
             forced: res.obj.forced,
             whited: res.obj.whited,
@@ -1485,12 +1491,8 @@ export default {
                 v.title = v.schoolName;
                 return v;
               });
-
-              console.log(this.select_schools);
             }
           });
-
-          console.log(res.obj);
           console.log(this.wallpaperInfo);
         } else {
           this.$Message.error(res.msg);

src/views/regionSection/regionManage/adminManage.vue

@@ -38,6 +38,15 @@
     </div>
     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
+        <template slot-scope="{ row }" slot="atype">
+          {{
+            row.atype === 1
+              ? "平台管理员"
+              : row.atype === 2
+              ? "区域管理员"
+              : "学校管理员"
+          }}
+        </template>
         <template slot-scope="{ row }" slot="enabledSlot">
           <i-switch
             size="large"
@@ -386,6 +395,11 @@ export default {
           width: 80,
           align: "center"
         },
+        {
+          title: "类型",
+          slot: "atype",
+          align: "center"
+        },
         {
           title: "区域名称",
           key: "regionName",
@@ -431,7 +445,8 @@ export default {
       region_list_sel_qy({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
-        regionid: this.powerParams.objectid }).then((data) => {
+        regionid: this.powerParams.objectid
+      }).then((data) => {
         if (data.code === 0) {
           this.searchForm.dropList = data.obj;
         } else {
@@ -605,7 +620,8 @@ export default {
       admin_detail({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
-        adminid: row.adminid }).then((res) => {
+        adminid: row.adminid
+      }).then((res) => {
         if (res.code === 0) {
           this.adminInfo = {
             show: true,

src/views/regionSection/regionManage/schoolManage.vue

@@ -567,9 +567,11 @@ export default {
     },
     // 获取搜索区域列表
     getSearchRegionList() {
-      region_list_sel_qy({  rtype: this.powerParams.rtype,
+      region_list_sel_qy({
+        rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
-        regionid: this.powerParams.objectid }).then((data) => {
+        regionid: this.powerParams.objectid
+      }).then((data) => {
         if (data.code === 0) {
           this.searchForm.dropList = data.obj;
         } else {
@@ -598,7 +600,7 @@ export default {
       school_list({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
-        regionid: this.powerParams.objectid,
+        regionid: this.searchForm.regionid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         areaCode: this.searchForm.areaCodes,
@@ -762,18 +764,19 @@ export default {
       school_detail({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
-        schoolid: row.schoolid }).then((res) => {
+        schoolid: row.schoolid
+      }).then((res) => {
         if (res.code === 0) {
           let str = res.obj.areaCode;
           let obj1 = { areaCode: "" },
             obj2 = { areaCode: "" };
           if (str) {
             //获取省市区
-            let obj1 = this.areaList.filter((v) =>
+            obj1 = this.areaList.filter((v) =>
               v.areaCode.includes(str.substring(0, 2))
             )[0];
             this.marketList = obj1.childList;
-            let obj2 = obj1.childList.filter((v) =>
+            obj2 = obj1.childList.filter((v) =>
               v.areaCode.includes(str.substring(0, 4))
             )[0];
             this.regionList = obj2.childList;

src/views/schoolSection/applicationManage/applicationList.vue

@@ -5,10 +5,12 @@
         <Select
           :transfer="true"
           v-model="searchForm.appgroupid"
+          @on-change="searchList()"
           style="width: 120px"
           placeholder="请选择分组"
         >
           <template v-if="group_list.length > 0">
+            <Option :value="0">所有分组</Option>
             <Option
               v-for="item in group_list"
               :value="item.appgroupid"
@@ -21,6 +23,7 @@
           :transfer="true"
           v-model="searchForm.appType"
           style="width: 120px; margin: 0 10px"
+          @on-change="searchList()"
           placeholder="请选择类型"
         >
           <template v-if="appType_list.length > 0">
@@ -61,10 +64,10 @@
         <template slot-scope="{ row }" slot="appType">
           <div>{{ row.appType === 1 ? "推荐应用" : "必装应用" }}</div>
         </template>
-        <template slot-scope="{ row }" slot="enable">
+        <template slot-scope="{ row }" slot="enabled">
           <i-switch
             size="large"
-            v-model="row.enable"
+            v-model="row.enabled"
             :true-value="1"
             :false-value="2"
             @on-change="enabledChange(row)"
@@ -184,7 +187,7 @@
             </Select>
           </FormItem>
           <FormItem label="状态" style="width: 300px">
-            <RadioGroup v-model="wallpaperInfo.enable">
+            <RadioGroup v-model="wallpaperInfo.enabled">
               <Radio :label="1">启用</Radio>
               <Radio :label="2">禁用</Radio>
             </RadioGroup>
@@ -493,7 +496,7 @@
           <div class="view_comm">
             <div class="view_titles">
               {{ viewInfo.appName
-              }}<span v-if="viewInfo.enable === 1" class="qy">启用</span>
+              }}<span v-if="viewInfo.enabled === 1" class="qy">启用</span>
             </div>
             <div class="view_item">
               <span>版本号码</span>{{ viewInfo.versionNum }}
@@ -551,8 +554,8 @@
             <div class="view_t">应用截图</div>
             <div class="view_img">
               <img
-                v-for="img in viewInfo.appImg"
-                :key="img"
+                v-for="(img, idx) in viewInfo.appImg"
+                :key="idx"
                 :src="$api.showImageUrl + img"
               />
             </div>
@@ -655,6 +658,7 @@ export default {
       ],
       searchForm: {
         appName: "",
+        appgroupid: 0,
         appType: 0,
         page: 1,
         size: 10,
@@ -666,8 +670,8 @@ export default {
         show: false,
         appid: null,
         appName: "",
-        appgroupid: "",
-        enable: 1,
+        appgroupid: 0,
+        enabled: 1,
         appType: 1,
         forced: 1,
         whited: 1,
@@ -694,7 +698,7 @@ export default {
         show: false,
         appName: "",
         appgroupName: "",
-        enable: 1,
+        enabled: 1,
         appType: 1,
         forced: 1,
         whited: 1,
@@ -798,7 +802,7 @@ export default {
         },
         {
           title: "状态",
-          slot: "enable",
+          slot: "enabled",
           width: 100,
           align: "center"
         },
@@ -870,7 +874,7 @@ export default {
             show: true,
             appName: res.obj.appName,
             appgroupName: row.appgroupName,
-            enable: res.obj.enable,
+            enabled: res.obj.enabled,
             appType: res.obj.appType,
             forced: res.obj.forced,
             whited: res.obj.whited,
@@ -918,7 +922,7 @@ export default {
       });
     },
     enabledChange(row) {
-      let api = row.enable === 1 ? app_edit_enable : app_edit_unenable;
+      let api = row.enabled === 1 ? app_edit_enable : app_edit_unenable;
       api({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
@@ -1160,6 +1164,7 @@ export default {
       app_list({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
+        appgroupid: this.searchForm.appgroupid,
         page: this.searchForm.page,
         size: this.searchForm.size,
         appName: this.searchForm.appName,
@@ -1186,7 +1191,7 @@ export default {
         appid: null,
         appName: "",
         appgroupid: "",
-        enable: 1,
+        enabled: 1,
         appType: 1,
         forced: 1,
         whited: 1,
@@ -1247,7 +1252,7 @@ export default {
             rtype: this.powerParams.rtype,
             objectid: this.powerParams.objectid,
             appName: this.wallpaperInfo.appName,
-            enable: this.wallpaperInfo.enable,
+            enabled: this.wallpaperInfo.enabled,
             appType: this.wallpaperInfo.appType,
             forced: this.wallpaperInfo.forced,
             whited: this.wallpaperInfo.whited,
@@ -1304,7 +1309,7 @@ export default {
             rversion: res.obj.rversion,
             appName: res.obj.appName,
             appgroupid: res.obj.appgroupid,
-            enable: res.obj.enable,
+            enabled: res.obj.enabled,
             appType: res.obj.appType,
             forced: res.obj.forced,
             whited: res.obj.whited,

src/views/schoolSection/strategy/personalStrategy.vue

@@ -1,11 +1,18 @@
 <template>
-  <div class="index2">2</div>
+  <div class="index2">
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
+  </div>
 </template>
 
 <script>
 export default {
   data() {
-    return {};
+    return {
+      showLoading: false
+    };
   },
   methods: {}
 };

src/views/schoolSection/strategy/publicStrategy.vue

@@ -2,7 +2,7 @@
   <div class="index1">
     <div class="strategy_list">
       <div class="strategy_title">
-        <div><span></span>时间限制策略</div>
+        <div><span style="font-size: 26px" class="ivu-icon iconfont icon-shijian"></span>时间限制策略</div>
         <div>
           <span>修改</span>
           <span>重置</span>
@@ -12,9 +12,8 @@
     </div>
     <div class="strategy_list">
       <div class="strategy_title">
-        <div><span></span>应用策略</div>
-        <div>
-        </div>
+        <div><span class="ivu-icon iconfont icon-yingyongcelve"></span>应用策略</div>
+        <div></div>
       </div>
       <div class="strategy_content">
         <div class="strategy_top">授权应用</div>
@@ -23,34 +22,71 @@
     </div>
     <div class="strategy_list">
       <div class="strategy_title">
-        <div><span></span>设备策略</div>
-        <div>
-        </div>
+        <div><span class="ivu-icon iconfont icon-shezhi"></span>设备策略</div>
+        <div></div>
       </div>
     </div>
     <div class="strategy_list">
       <div class="strategy_title">
-        <div><span></span>Wifi白名单策略</div>
-        <div>
-        </div>
+        <div><span style="font-size: 18px" class="ivu-icon iconfont icon-wifi"></span>Wifi白名单策略</div>
+        <div></div>
       </div>
     </div>
     <div class="strategy_list">
       <div class="strategy_title">
-        <div><span></span>违规处理</div>
-        <div>
-        </div>
+        <div><span class="ivu-icon iconfont icon-weiguiguanli"></span>违规处理</div>
+        <div></div>
       </div>
     </div>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
 <script>
+import { stApp_detail_obj } from "@/api/stPad";
+
 export default {
+  props: ["curClass"],
   data() {
-    return {};
+    return {
+      showLoading: false
+    };
   },
-  methods: {}
+  watch: {
+    curClass: {
+      handler() {
+        this.init();
+      },
+      deep: true
+    }
+  },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
+  created() {},
+  methods: {
+    init() {
+      console.log(this.curClass)
+      this.showLoading = true;
+      stApp_detail_obj({
+        rtype: this.powerParams.rtype,
+        objectid: this.curClass.id,
+        sttype: this.curClass.type
+      }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          console.log(res.obj);
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    }
+  }
 };
 </script>
 
@@ -68,6 +104,11 @@ export default {
       align-items: center;
       div:first-of-type {
         font-weight: bold;
+        span{
+          font-size: 22px;
+          color: #339dff;
+          margin-right: 4px;
+        }
       }
       div:last-of-type {
         span {

src/views/schoolSection/strategy/strategyManage.vue

@@ -1,15 +1,31 @@
 <template>
   <div class="main_root">
     <div class="schoolInfo">
-      <div class="schoolname">{{ schoolInfo.name }}</div>
+      <div
+        @click="curClass = schoolInfo"
+        :class="[
+          'schoolname',
+          curClass.id === schoolInfo.id && curClass.type === schoolInfo.type
+            ? 'active'
+            : ''
+        ]"
+      >
+        {{ schoolInfo.name }}
+        <span class="ivu-icon iconfont icon-ding-mianxing"></span>
+      </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)"
           >
             {{ item.name }}
+            <span class="ivu-icon iconfont icon-ding-mianxing"></span>
           </div>
         </div>
       </div>
@@ -23,9 +39,13 @@
           个人策略
         </div>
       </div>
-      <PublicStrategy v-if="strategy === 1"></PublicStrategy>
+      <PublicStrategy :curClass="curClass" v-if="strategy === 1"></PublicStrategy>
       <PersonalStrategy v-else></PersonalStrategy>
     </div>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
@@ -44,12 +64,21 @@ export default {
       showLoading: false,
       schoolInfo: {
         name: "",
+        id: 0,
         children: []
       },
-      curClass: {},
+      curClass: {
+        id: 0,
+        name: ""
+      },
       strategy: 1
     };
   },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
   created() {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
@@ -63,7 +92,7 @@ export default {
     },
     init() {
       this.showLoading = true;
-      class_list({ schoolid: 1 }).then((res) => {
+      class_list({ schoolid: this.powerParams.objectid }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
           this.schoolInfo = res.obj;
@@ -95,9 +124,16 @@ export default {
     background-color: white;
     .schoolname {
       font-size: 16px;
-      line-height: 40px;
+      line-height: 30px;
       font-weight: bold;
       text-align: center;
+      cursor: pointer;
+      position: relative;
+      margin-bottom: 10px;
+    }
+    .active {
+      border-radius: 6px;
+      background: #dbeeff;
     }
     .class_list {
       div {
@@ -105,6 +141,7 @@ export default {
         height: 30px;
         text-align: center;
         cursor: pointer;
+        position: relative;
       }
       .active {
         border-radius: 6px;
@@ -112,6 +149,13 @@ export default {
       }
     }
   }
+  .icon-ding-mianxing {
+    color: #339dff;
+    font-size: 18px;
+    position: absolute;
+    right: 10px;
+    top: 6px;
+  }
   .user_list {
     width: calc(100% - 216px);
     padding: 16px;

src/views/schoolSection/strategy/strategyTemplate.vue

@@ -37,6 +37,10 @@
         show-sizer
       ></Page>
     </div>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
@@ -45,6 +49,7 @@
 export default {
   data() {
     return {
+      showLoading: false,
       searchForm: {
         name: "",
         page: 1,

src/views/schoolSection/userManage/userManage.vue

@@ -296,6 +296,10 @@
         </div>
       </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>
+    </Spin>
   </div>
 </template>
 
@@ -738,8 +742,6 @@ export default {
     init() {
       this.showLoading = true;
       class_list({
-        rtype: this.powerParams.rtype,
-        objectid: this.powerParams.objectid,
         schoolid: this.powerParams.objectid
       }).then((res) => {
         this.showLoading = false;