Merge commit 'b3071286bcab7239f58a98deae8cb23ad0d8c866' into gzb

public/config.js

@@ -5,6 +5,7 @@ window._config = window.isTest
       baseUrl: "https://mcapitest.xhkjedu.com/",
       baseImageUrl: "https://mcapitest.xhkjedu.com/",
       showImageUrl: "https://mcapitest.xhkjedu.com/",
+      downLoadUrl: "https://mcapitest.xhkjedu.com/",
       wsUrl: "wss://mcwstest.xhkjedu.com/ws",
       axiosApiTimeout: 60, // 接口超时时间 单位秒
       axiosFileTimeout: 120, // 上传文件超时时间 单位秒
@@ -20,6 +21,7 @@ window._config = window.isTest
       baseUrl: "https://mcapi.xhkjedu.com/",
       baseImageUrl: "https://mcapi.xhkjedu.com/",
       showImageUrl: "https://mcapi.xhkjedu.com/",
+      downLoadUrl: "https://mcapitest.xhkjedu.com/",
       wsUrl: "wss://mcws.xhkjedu.com/ws",
       axiosApiTimeout: 20, // 接口超时时间 单位秒
       axiosFileTimeout: 30, // 上传文件超时时间 单位秒

src/api/setting.js

@@ -62,15 +62,15 @@ export const password_delete = (data) => setRequest("password/delete", data);
 /**
  * 8.3.2.1 设备设置管理-详情
  */
-export const deviceSet_detail = (data) => setRequest("deviceSet/detail", data);
+export const schoolSet_detail = (data) => setRequest("schoolSet/detail", data);
 /**
  * 8.3.2.2 设备设置管理-保存
  */
-export const deviceSet_edit = (data) => setRequest("deviceSet/edit", data);
+export const schoolSet_edit = (data) => setRequest("schoolSet/edit", data);
 /**
  * 8.3.2.3 设备设置管理-重置
  */
-export const deviceSet_delete = (data) => setRequest("deviceSet/delete", data);
+export const schoolSet_delete = (data) => setRequest("schoolSet/delete", data);
 /**
  * 8.3.3 设备管理-获取
  */

src/assets/less/common.less

@@ -11,6 +11,11 @@ body,
   font-family: "Microsoft YaHei", "微软雅黑" !important;
   color: #253a70;
   font-size: 14px;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
   user-select: none;
   background: #ffff;
   box-sizing: border-box;

src/components/ImgPreview/ImgPreview.vue

@@ -408,6 +408,11 @@ export default {
   bottom: 0;
   left: 0;
   z-index: 9999;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
   user-select: none;
   overflow: hidden;
   .image_preview {

src/utils/ControlWSMsg.js

@@ -49,6 +49,10 @@ class ControlWSMsg {
   restoreFactory() {
     this.code = 2006;
   }
+  // 解除管控
+  removeControl() {
+    this.code = 2007;
+  }
   toJSONString() {
     let tempObj = {};
     for (let key in this) {

src/views/platformSection/home/index.vue

@@ -217,6 +217,7 @@ export default {
             res.push({
               name: outdata[i].name,
               value: geoCoord.concat(outdata[i].value),
+              numInfo: outdata[i].numInfo,
               //单独修改圆环上的文字
               label: {
                 formatter: () => {
@@ -245,13 +246,22 @@ export default {
           appendTo: "body",
           formatter: (params) => {
             return `${params.name}<div>设备数：${
-              (params.numInfo && params.numInfo.devicenum) || 0
+              (params.data &&
+                params.data.numInfo &&
+                params.data.numInfo.devicenum) ||
+              0
             } 台</div>
             <div>用户数：${
-              (params.numInfo && params.numInfo.usernum) || 0
+              (params.data &&
+                params.data.numInfo &&
+                params.data.numInfo.usernum) ||
+              0
             } 人</div>
             <div>学校数：${
-              (params.numInfo && params.numInfo.schoolnum) || 0
+              (params.data &&
+                params.data.numInfo &&
+                params.data.numInfo.schoolnum) ||
+              0
             } 所</div>`;
           }
         },
@@ -312,6 +322,34 @@ export default {
           },
           {
             type: "scatter",
+            tooltip: {
+              show: true,
+              borderColor: "#6AC8F0",
+              // 将tooltip限制在图表内
+              confine: true,
+              // 将tooltip添加到body下
+              appendTo: "body",
+              formatter: (params) => {
+                return `${params.name}<div>设备数：${
+                  (params.data &&
+                    params.data.numInfo &&
+                    params.data.numInfo.devicenum) ||
+                  0
+                } 台</div>
+            <div>用户数：${
+              (params.data &&
+                params.data.numInfo &&
+                params.data.numInfo.usernum) ||
+              0
+            } 人</div>
+            <div>学校数：${
+              (params.data &&
+                params.data.numInfo &&
+                params.data.numInfo.schoolnum) ||
+              0
+            } 所</div>`;
+              }
+            },
             coordinateSystem: "geo",
             zlevel: 2,
             rippleEffect: {
@@ -323,7 +361,6 @@ export default {
               show: true,
               color: "#fff"
             },
-            // #FF243A
             symbol: "pin", //定位图标样式
             symbolSize: 60,
             //点的名称和经纬度
@@ -682,9 +719,29 @@ export default {
         color:
           this.deviceActivityInfo.doEvent === 2 ? ["#52C41A"] : ["#339DFF"],
         tooltip: {
-          trigger: "item",
-          formatter: (params) => {
-            return `${params.name}：${params.value}次`;
+          trigger: "axis",
+          backgroundColor: "#fff", //背景颜色（此时为默认色）
+          borderWidth: 1, //边框线宽
+          textStyle: {
+            lineHeight: 1.6,
+            color: "#253A70"
+          },
+          axisPointer: {
+            z: 1, //竖线在圆圈后面
+            lineStyle: {
+              color: "#f8f8fd",
+              width: 20,
+              opacity: 0.7
+            }
+          },
+          formatter: (data) => {
+            let date = "";
+            let seriesDom = "";
+            for (const item of data) {
+              date = item.name;
+              seriesDom += `<div><span style="color: #95ABDF">${item.seriesName}</span> ${item.value}次</div>`;
+            }
+            return `${date}${seriesDom}`;
           }
         },
         legend: {
@@ -769,6 +826,7 @@ export default {
                 verticalAlign: "bottom",
                 position: "top",
                 distance: 0,
+                color: "inherit",
                 formatter: `{c}`
               }
             },

src/views/regionSection/home/index.vue

@@ -210,6 +210,7 @@ export default {
             res.push({
               name: outdata[i].name,
               value: geoCoord.concat(outdata[i].value),
+              numInfo: outdata[i].numInfo,
               //单独修改圆环上的文字
               label: {
                 formatter: () => {
@@ -238,13 +239,22 @@ export default {
           appendTo: "body",
           formatter: (params) => {
             return `${params.name}<div>设备数：${
-              (params.numInfo && params.numInfo.devicenum) || 0
+              (params.data &&
+                params.data.numInfo &&
+                params.data.numInfo.devicenum) ||
+              0
             } 台</div>
             <div>用户数：${
-              (params.numInfo && params.numInfo.usernum) || 0
+              (params.data &&
+                params.data.numInfo &&
+                params.data.numInfo.usernum) ||
+              0
             } 人</div>
             <div>学校数：${
-              (params.numInfo && params.numInfo.schoolnum) || 0
+              (params.data &&
+                params.data.numInfo &&
+                params.data.numInfo.schoolnum) ||
+              0
             } 所</div>`;
           }
         },
@@ -305,6 +315,34 @@ export default {
           },
           {
             type: "scatter",
+            tooltip: {
+              show: true,
+              borderColor: "#6AC8F0",
+              // 将tooltip限制在图表内
+              confine: true,
+              // 将tooltip添加到body下
+              appendTo: "body",
+              formatter: (params) => {
+                return `${params.name}<div>设备数：${
+                  (params.data &&
+                    params.data.numInfo &&
+                    params.data.numInfo.devicenum) ||
+                  0
+                } 台</div>
+            <div>用户数：${
+              (params.data &&
+                params.data.numInfo &&
+                params.data.numInfo.usernum) ||
+              0
+            } 人</div>
+            <div>学校数：${
+              (params.data &&
+                params.data.numInfo &&
+                params.data.numInfo.schoolnum) ||
+              0
+            } 所</div>`;
+              }
+            },
             coordinateSystem: "geo",
             zlevel: 2,
             rippleEffect: {
@@ -316,7 +354,6 @@ export default {
               show: true,
               color: "#fff"
             },
-            // #FF243A
             symbol: "pin", //定位图标样式
             symbolSize: 60,
             //点的名称和经纬度
@@ -675,9 +712,29 @@ export default {
         color:
           this.deviceActivityInfo.doEvent === 2 ? ["#52C41A"] : ["#339DFF"],
         tooltip: {
-          trigger: "item",
-          formatter: (params) => {
-            return `${params.name}：${params.value}次`;
+          trigger: "axis",
+          backgroundColor: "#fff", //背景颜色（此时为默认色）
+          borderWidth: 1, //边框线宽
+          textStyle: {
+            lineHeight: 1.6,
+            color: "#253A70"
+          },
+          axisPointer: {
+            z: 1, //竖线在圆圈后面
+            lineStyle: {
+              color: "#f8f8fd",
+              width: 20,
+              opacity: 0.7
+            }
+          },
+          formatter: (data) => {
+            let date = "";
+            let seriesDom = "";
+            for (const item of data) {
+              date = item.name;
+              seriesDom += `<div><span style="color: #95ABDF">${item.seriesName}</span> ${item.value}次</div>`;
+            }
+            return `${date}${seriesDom}`;
           }
         },
         legend: {
@@ -762,6 +819,7 @@ export default {
                 verticalAlign: "bottom",
                 position: "top",
                 distance: 0,
+                color: "inherit",
                 formatter: `{c}`
               }
             },

src/views/schoolSection/applicationManage/greenBrowser.vue

@@ -11,7 +11,7 @@
         />
       </div>
       <div class="search_right">
-        <div class="download_btn">
+        <div class="download_btn" @click="toDownloadBrower()">
           <Icon type="md-download" />
           <div>下载浏览器</div>
         </div>
@@ -180,6 +180,11 @@ export default {
     }
   },
   methods: {
+    toDownloadBrower() {
+      let url =
+        this.$api.downLoadUrl + "upload/greenbrowser/xh_control_browser.apk";
+      window.open(encodeURI(url, "utf-8"), "_blank");
+    },
     // 搜索
     searchList() {
       this.searchForm.page = 1;

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -32,6 +32,7 @@
             <DropdownItem name="5">限制使用</DropdownItem>
             <DropdownItem name="6">更新策略</DropdownItem>
             <DropdownItem name="7">重启设备</DropdownItem>
+            <DropdownItem name="9">解除管控</DropdownItem>
             <DropdownItem name="8">合规处理</DropdownItem>
           </DropdownMenu>
         </Dropdown>
@@ -39,6 +40,7 @@
     </div>
     <div class="table_wrap">
       <Table
+        ref="deviceTable"
         :columns="columns"
         :data="searchForm.list"
         @on-selection-change="selectionChange"
@@ -527,23 +529,44 @@ export default {
           return;
         }
         this.toLogHandle(snList);
+      } else if (name === "9") {
+        // 解除管控
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
+          return;
+        }
+        this.$Modal.confirm({
+          title: "提示",
+          content: "确定对所选设备进行解除管控操作吗？",
+          onOk: () => {
+            this.controlRemovetDevice(snList, useridList);
+          },
+          onCancel: () => {}
+        });
       }
     },
     // 恢复出厂设置
-    controlRestoreFactory(snList, useridList) {
+    controlRestoreFactory(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.restoreFactory();
-      controlWSMsg.send();
-      let form = {
-        pushType: 6,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 6,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 发送消息
     controlSendMessage() {
@@ -563,7 +586,13 @@ export default {
               content: this.controlMessageInfo.content
             })
           );
-          controlWSMsg.send();
+          controlWSMsg.send((isSend) => {
+            if (isSend) {
+              this.$Message.success("推送成功");
+            } else {
+              this.$Message.error("推送失败");
+            }
+          });
           let form = {
             pushType: 1,
             pushObj: 1,
@@ -571,79 +600,130 @@ export default {
             content: this.controlMessageInfo.content
           };
           form.userids = useridList;
+          this.$refs.deviceTable.selectAll(false);
           this.addPushLog(form);
         }
       });
     },
     // 解除限制
-    controlRemoveLimit(snList, useridList) {
+    controlRemoveLimit(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.removeLimit();
-      controlWSMsg.send();
-      let form = {
-        pushType: 2,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 2,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 限制使用
-    controlLimitedUse(snList, useridList) {
+    controlLimitedUse(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.limitedUse();
-      controlWSMsg.send();
-      let form = {
-        pushType: 3,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 3,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 更新策略
-    controlUpdateStrategy(snList, useridList) {
+    controlUpdateStrategy(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.updateStrategy();
-      controlWSMsg.send();
-      let form = {
-        pushType: 4,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 4,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 重启设备
-    controlRebootDevice(snList, useridList) {
+    controlRebootDevice(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.rebootDevice();
-      controlWSMsg.send();
-      let form = {
-        pushType: 4,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 4,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
+    },
+    // 解除管控
+    controlRemovetDevice(snList) {
+      let controlWSMsg = new ControlWSMsg(
+        controlWs.ws,
+        this.userInfo.adminid,
+        snList
+      );
+      controlWSMsg.removeControl();
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 4,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 添加推送日志
     addPushLog(form) {
       logPush_add(form).then((data) => {
         if (data.code === 0) {
-          this.$refs.deviceTable.selectAll(false);
           this.$Message.success(data.msg);
         } else {
           this.$Message.error(data.msg);

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -72,6 +72,7 @@
               <DropdownItem name="5">限制使用</DropdownItem>
               <DropdownItem name="6">更新策略</DropdownItem>
               <DropdownItem name="7">重启设备</DropdownItem>
+              <DropdownItem name="9">解除管控</DropdownItem>
             </DropdownMenu>
           </Dropdown>
         </div>
@@ -1361,23 +1362,44 @@ export default {
           },
           onCancel: () => {}
         });
+      } else if (name === "9") {
+        // 解除管控
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
+          return;
+        }
+        this.$Modal.confirm({
+          title: "提示",
+          content: "确定对所选设备进行解除管控操作吗？",
+          onOk: () => {
+            this.controlRemovetDevice(snList, useridList);
+          },
+          onCancel: () => {}
+        });
       }
     },
     // 恢复出厂设置
-    controlRestoreFactory(snList, useridList) {
+    controlRestoreFactory(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.restoreFactory();
-      controlWSMsg.send();
-      let form = {
-        pushType: 6,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 6,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 发送消息
     controlSendMessage() {
@@ -1397,7 +1419,13 @@ export default {
               content: this.controlMessageInfo.content
             })
           );
-          controlWSMsg.send();
+          controlWSMsg.send((isSend) => {
+            if (isSend) {
+              this.$Message.success("推送成功");
+            } else {
+              this.$Message.error("推送失败");
+            }
+          });
           let form = {
             pushType: 1,
             pushObj: this.controlMessageInfo.classid ? 2 : 1,
@@ -1409,81 +1437,130 @@ export default {
           } else {
             form.userids = useridList;
           }
+          this.$refs.deviceTable.selectAll(false);
           this.addPushLog(form);
         }
       });
     },
     // 解除限制
-    controlRemoveLimit(snList, useridList) {
+    controlRemoveLimit(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.removeLimit();
-      controlWSMsg.send();
-      let form = {
-        pushType: 2,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 2,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 限制使用
-    controlLimitedUse(snList, useridList) {
+    controlLimitedUse(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.limitedUse();
-      controlWSMsg.send();
-      let form = {
-        pushType: 3,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 3,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 更新策略
-    controlUpdateStrategy(snList, useridList) {
+    controlUpdateStrategy(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.updateStrategy();
-      controlWSMsg.send();
-      let form = {
-        pushType: 4,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 4,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 重启设备
-    controlRebootDevice(snList, useridList) {
+    controlRebootDevice(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         snList
       );
       controlWSMsg.rebootDevice();
-      controlWSMsg.send();
-      let form = {
-        pushType: 4,
-        pushObj: 1
-      };
-      form.userids = useridList;
-      this.addPushLog(form);
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 4,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
+    },
+    // 解除管控
+    controlRemovetDevice(snList) {
+      let controlWSMsg = new ControlWSMsg(
+        controlWs.ws,
+        this.userInfo.adminid,
+        snList
+      );
+      controlWSMsg.removeControl();
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.$Message.success("推送成功");
+        } else {
+          this.$Message.error("推送失败");
+        }
+      });
+      this.$refs.deviceTable.selectAll(false);
+      // let form = {
+      //   pushType: 4,
+      //   pushObj: 1
+      // };
+      // form.userids = useridList;
+      // this.addPushLog(form);
     },
     // 添加推送日志
     addPushLog(form) {
       logPush_add(form).then((data) => {
-        if (data.code === 0) {
-          this.$refs.deviceTable.selectAll(false);
-          this.$Message.success(data.msg);
-        } else {
+        if (data.code !== 0) {
           this.$Message.error(data.msg);
         }
       });

src/views/schoolSection/setting/deviceSetting.vue

@@ -36,11 +36,11 @@
       <div class="require">
         限制使用时长后，客户端使用时间到了设备提醒休息，默认允许使用30分钟，这里你可以自行设置(可设置范围20~120分钟)。
       </div>
-      <div class="require">
+      <!-- <div class="require">
         限制安装来源功能开启后，只允许安装<span style="color: #339dff"
           >云鸽</span
         >商店内的应用(该功能仅对华为设备生效)。
-      </div>
+      </div> -->
     </div>
     <div class="form_box" v-if="menuInfo.selected === 1">
       <Form :label-width="80">
@@ -222,7 +222,7 @@
       <Button
         :disabled="
           (menuInfo.selected === 1 && !menuInfo.pswDetail.pwid) ||
-          (menuInfo.selected === 2 && !menuInfo.setDetail.dsid)
+          (menuInfo.selected === 2 && !menuInfo.setDetail.ssid)
         "
         style="margin-right: 20px"
         @click="resetDetail()"
@@ -240,9 +240,9 @@ import {
   password_detail,
   password_edit,
   password_delete,
-  deviceSet_detail,
-  deviceSet_edit,
-  deviceSet_delete
+  schoolSet_detail,
+  schoolSet_edit,
+  schoolSet_delete
 } from "@/api/setting";
 export default {
   data() {
@@ -256,33 +256,33 @@ export default {
           password: null
         },
         setDetail: {
-          dsid: null,
+          ssid: null,
           rversion: null,
-          forceBind: 1,
-          // sdcard: 1,
-          simcard: 1,
-          // dataFlow: 1,
-          logout: 1,
-          cleanup: 1,
-          accelerate: 1,
-          // gesturePwd: 1,
-          // wifiAdvanced: 1,
-          screenshots: 1,
-          // clientAdmin: 1,
-          rotateSetting: 1,
-          gallery: 1,
-          camera: 1,
-          alarmClock: 1,
-          calendar: 1,
-          protectedEyes: 1,
-          // installStore: 1,
-          changePwd: 1,
-          schoolClass: 1,
-          // gps: 1,
-          // privacyStatement: 1,
+          forceBind: 0,
+          // sdcard: 0,
+          simcard: 0,
+          // dataFlow: 0,
+          logout: 0,
+          cleanup: 0,
+          accelerate: 0,
+          // gesturePwd: 0,
+          // wifiAdvanced: 0,
+          screenshots: 0,
+          // clientAdmin: 0,
+          rotateSetting: 0,
+          gallery: 0,
+          camera: 0,
+          alarmClock: 0,
+          calendar: 0,
+          protectedEyes: 0,
+          // installStore: 0,
+          changePwd: 0,
+          schoolClass: 0,
+          // gps: 0,
+          // privacyStatement: 0,
           remindDuration: 1,
           duration: 30
-          // otg: 1
+          // otg: 0
         }
       }
     };
@@ -323,13 +323,13 @@ export default {
           }
         });
       } else if (this.menuInfo.selected === 2) {
-        if (!this.menuInfo.setDetail.dsid) {
+        if (!this.menuInfo.setDetail.ssid) {
           return;
         }
-        deviceSet_delete({
+        schoolSet_delete({
           rtype: this.powerParams.rtype,
           objectid: this.powerParams.objectid,
-          dsid: this.menuInfo.setDetail.dsid,
+          ssid: this.menuInfo.setDetail.ssid,
           rversion: this.menuInfo.setDetail.rversion
         }).then((data) => {
           if (data.code === 0) {
@@ -364,7 +364,7 @@ export default {
       });
     },
     getSetDetail() {
-      deviceSet_detail({
+      schoolSet_detail({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         schoolid: this.powerParams.objectid
@@ -374,33 +374,33 @@ export default {
             this.menuInfo.setDetail = data.obj;
           } else {
             this.menuInfo.setDetail = {
-              dsid: null,
+              ssid: null,
               rversion: null,
-              forceBind: 1,
-              // sdcard: 1,
-              simcard: 1,
-              // dataFlow: 1,
-              logout: 1,
-              cleanup: 1,
-              accelerate: 1,
-              // gesturePwd: 1,
-              // wifiAdvanced: 1,
-              screenshots: 1,
-              // clientAdmin: 1,
-              rotateSetting: 1,
-              gallery: 1,
-              camera: 1,
-              alarmClock: 1,
-              calendar: 1,
-              protectedEyes: 1,
-              // installStore: 1,
-              changePwd: 1,
-              schoolClass: 1,
-              // gps: 1,
-              // privacyStatement: 1,
+              forceBind: 0,
+              // sdcard: 0,
+              simcard: 0,
+              // dataFlow: 0,
+              logout: 0,
+              cleanup: 0,
+              accelerate: 0,
+              // gesturePwd: 0,
+              // wifiAdvanced: 0,
+              screenshots: 0,
+              // clientAdmin: 0,
+              rotateSetting: 0,
+              gallery: 0,
+              camera: 0,
+              alarmClock: 0,
+              calendar: 0,
+              protectedEyes: 0,
+              // installStore: 0,
+              changePwd: 0,
+              schoolClass: 0,
+              // gps: 0,
+              // privacyStatement: 0,
               remindDuration: 1,
               duration: 30
-              // otg: 1
+              // otg: 0
             };
           }
         } else {
@@ -445,11 +445,11 @@ export default {
       });
     },
     saveSetDetail() {
-      deviceSet_edit({
+      schoolSet_edit({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         schoolid: this.powerParams.objectid,
-        dsid: this.menuInfo.setDetail.dsid,
+        ssid: this.menuInfo.setDetail.ssid,
         rversion: this.menuInfo.setDetail.rversion,
         forceBind: this.menuInfo.setDetail.forceBind,
         // sdcard: this.menuInfo.setDetail.sdcard,