去除解除管控

public/config.js

@@ -23,12 +23,12 @@ window._config = window.isTest
       showImageUrl: "https://mcapi.xhkjedu.com/",
       downLoadUrl: "https://mcapitest.xhkjedu.com/",
       wsUrl: "wss://mcws.xhkjedu.com/ws",
-      axiosApiTimeout: 20, // 接口超时时间 单位秒
-      axiosFileTimeout: 30, // 上传文件超时时间 单位秒
+      axiosApiTimeout: 60, // 接口超时时间 单位秒
+      axiosFileTimeout: 120, // 上传文件超时时间 单位秒
       // 开发者
       developer: "河南星火燎原软件科技有限公司",
       // 联系我们
       contactUs: "https://www.xhkjedu.com/",
       versionname: "正式 v1.0.3",
-      secret: true
+      secret: false
     };

src/router/school.js

@@ -207,7 +207,7 @@ export default {
         title: "疑似脱管设备"
       }
     },
-    {
+    /* {
       path: "removeControlDevice",
       component: () =>
         import("@/views/schoolSection/deviceManage/removeControlDevice.vue"),
@@ -217,7 +217,7 @@ export default {
         isAuth: true,
         title: "解除管控设备"
       }
-    },
+    }, */
     {
       path: "inLineDevice",
       component: () =>

src/utils/ControlWSMsg.js

@@ -50,9 +50,9 @@ class ControlWSMsg {
     this.code = 2006;
   }
   // 解除管控
-  removeControl() {
+  /* removeControl() {
     this.code = 2007;
-  }
+  } */
   // 解除绑定
   removeBind() {
     this.code = 2008;

src/utils/index.js

@@ -741,6 +741,6 @@ export const pushTypeInfo = {
   4: "更新策略",
   5: "重启设备",
   6: "恢复出厂",
-  7: "解除管控",
+  // 7: "解除管控",
   8: "解除绑定"
 };

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -39,7 +39,7 @@
             <DropdownItem name="5">锁定</DropdownItem>
             <DropdownItem name="6">更新策略</DropdownItem>
             <DropdownItem name="7">重启设备</DropdownItem>
-            <DropdownItem name="9">解除管控</DropdownItem>
+            <!-- <DropdownItem name="9">解除管控</DropdownItem> -->
             <DropdownItem name="8">合规处理</DropdownItem>
           </DropdownMenu>
         </Dropdown>
@@ -586,7 +586,8 @@ export default {
           return;
         }
         this.toLogHandle(snList);
-      } else if (name === "9") {
+      }
+      /*  else if (name === "9") {
         // 解除管控
         if (snList.length === 0) {
           this.$Message.error("请勾选至少一个设备。");
@@ -600,7 +601,7 @@ export default {
           },
           onCancel: () => {}
         });
-      }
+      } */
     },
     // 恢复出厂设置
     controlRestoreFactory(snList, useridList) {
@@ -755,7 +756,7 @@ export default {
       this.addPushLog(form);
     },
     // 解除管控
-    controlRemoveDevice(snList, useridList) {
+    /* controlRemoveDevice(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
@@ -776,7 +777,7 @@ export default {
       };
       form.userids = useridList;
       this.addPushLog(form);
-    },
+    }, */
     // 添加推送日志
     addPushLog(form) {
       if (form.userids && form.userids.length === 0) {

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -79,7 +79,7 @@
               <DropdownItem name="5">锁定</DropdownItem>
               <DropdownItem name="6">更新策略</DropdownItem>
               <DropdownItem name="7">重启设备</DropdownItem>
-              <DropdownItem name="9">解除管控</DropdownItem>
+              <!-- <DropdownItem name="9">解除管控</DropdownItem> -->
               <DropdownItem name="10">解除绑定</DropdownItem>
             </DropdownMenu>
           </Dropdown>
@@ -1421,35 +1421,36 @@ export default {
           },
           onCancel: () => {}
         });
-      } else if (name === "9") {
-        // 解除管控
+      } else if (name === "10") {
+        // 解除绑定
         if (snList.length === 0) {
           this.$Message.error("请勾选至少一个设备。");
           return;
         }
         this.$Modal.confirm({
           title: "提示",
-          content: "确定对所选设备进行解除管控操作吗？",
+          content: "确定对所选设备进行解除绑定操作吗？",
           onOk: () => {
-            this.controlRemoveDevice(snList, useridList);
+            this.controlRemoveBind(snList, useridList);
           },
           onCancel: () => {}
         });
-      } else if (name === "10") {
-        // 解除绑定
+      }
+      /*  else if (name === "9") {
+        // 解除管控
         if (snList.length === 0) {
           this.$Message.error("请勾选至少一个设备。");
           return;
         }
         this.$Modal.confirm({
           title: "提示",
-          content: "确定对所选设备进行解除绑定操作吗？",
+          content: "确定对所选设备进行解除管控操作吗？",
           onOk: () => {
-            this.controlRemoveBind(snList, useridList);
+            this.controlRemoveDevice(snList, useridList);
           },
           onCancel: () => {}
         });
-      }
+      } */
     },
     // 延时刷新
     delayedRefresh() {
@@ -1623,7 +1624,7 @@ export default {
       this.delayedRefresh();
     },
     // 解除管控
-    controlRemoveDevice(snList, useridList) {
+    /* controlRemoveDevice(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
@@ -1645,7 +1646,7 @@ export default {
       form.userids = useridList;
       this.addPushLog(form);
       this.delayedRefresh();
-    },
+    }, */
     // 解除绑定
     controlRemoveBind(snList, useridList) {
       this.$refs.deviceTable.selectAll(false);

src/views/schoolSection/index.vue

@@ -120,13 +120,13 @@
               class="drop_down_list_item"
               >疑似脱管设备</router-link
             >
-            <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"
@@ -314,7 +314,7 @@ export default {
         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/removeControlDevice") ||
         this.$route.path.includes("/school/inLineDevice")
       );
     },

src/views/schoolSection/userManage/userManage.vue

@@ -63,7 +63,7 @@
               >{{ item.title }}</Option
             >
           </Select>
-          <Select
+          <!-- <Select
             :transfer="true"
             v-model="searchForm.control"
             style="width: 140px; margin-right: 10px"
@@ -75,7 +75,7 @@
               :key="item.id"
               >{{ item.title }}</Option
             >
-          </Select>
+          </Select> -->
           <Input
             v-model="searchForm.username"
             placeholder="请输入姓名"