Browse Source

去除解除管控

wzl
wangzhonglu 1 day ago
parent
commit
ec63bb60bd

+ 3
- 3
public/config.js View File

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

+ 2
- 2
src/router/school.js View File

207
         title: "疑似脱管设备"
207
         title: "疑似脱管设备"
208
       }
208
       }
209
     },
209
     },
210
-    {
210
+    /* {
211
       path: "removeControlDevice",
211
       path: "removeControlDevice",
212
       component: () =>
212
       component: () =>
213
         import("@/views/schoolSection/deviceManage/removeControlDevice.vue"),
213
         import("@/views/schoolSection/deviceManage/removeControlDevice.vue"),
217
         isAuth: true,
217
         isAuth: true,
218
         title: "解除管控设备"
218
         title: "解除管控设备"
219
       }
219
       }
220
-    },
220
+    }, */
221
     {
221
     {
222
       path: "inLineDevice",
222
       path: "inLineDevice",
223
       component: () =>
223
       component: () =>

+ 2
- 2
src/utils/ControlWSMsg.js View File

50
     this.code = 2006;
50
     this.code = 2006;
51
   }
51
   }
52
   // 解除管控
52
   // 解除管控
53
-  removeControl() {
53
+  /* removeControl() {
54
     this.code = 2007;
54
     this.code = 2007;
55
-  }
55
+  } */
56
   // 解除绑定
56
   // 解除绑定
57
   removeBind() {
57
   removeBind() {
58
     this.code = 2008;
58
     this.code = 2008;

+ 1
- 1
src/utils/index.js View File

741
   4: "更新策略",
741
   4: "更新策略",
742
   5: "重启设备",
742
   5: "重启设备",
743
   6: "恢复出厂",
743
   6: "恢复出厂",
744
-  7: "解除管控",
744
+  // 7: "解除管控",
745
   8: "解除绑定"
745
   8: "解除绑定"
746
 };
746
 };

+ 6
- 5
src/views/schoolSection/deviceManage/breakRuleDevice.vue View File

39
             <DropdownItem name="5">锁定</DropdownItem>
39
             <DropdownItem name="5">锁定</DropdownItem>
40
             <DropdownItem name="6">更新策略</DropdownItem>
40
             <DropdownItem name="6">更新策略</DropdownItem>
41
             <DropdownItem name="7">重启设备</DropdownItem>
41
             <DropdownItem name="7">重启设备</DropdownItem>
42
-            <DropdownItem name="9">解除管控</DropdownItem>
42
+            <!-- <DropdownItem name="9">解除管控</DropdownItem> -->
43
             <DropdownItem name="8">合规处理</DropdownItem>
43
             <DropdownItem name="8">合规处理</DropdownItem>
44
           </DropdownMenu>
44
           </DropdownMenu>
45
         </Dropdown>
45
         </Dropdown>
586
           return;
586
           return;
587
         }
587
         }
588
         this.toLogHandle(snList);
588
         this.toLogHandle(snList);
589
-      } else if (name === "9") {
589
+      }
590
+      /*  else if (name === "9") {
590
         // 解除管控
591
         // 解除管控
591
         if (snList.length === 0) {
592
         if (snList.length === 0) {
592
           this.$Message.error("请勾选至少一个设备。");
593
           this.$Message.error("请勾选至少一个设备。");
600
           },
601
           },
601
           onCancel: () => {}
602
           onCancel: () => {}
602
         });
603
         });
603
-      }
604
+      } */
604
     },
605
     },
605
     // 恢复出厂设置
606
     // 恢复出厂设置
606
     controlRestoreFactory(snList, useridList) {
607
     controlRestoreFactory(snList, useridList) {
755
       this.addPushLog(form);
756
       this.addPushLog(form);
756
     },
757
     },
757
     // 解除管控
758
     // 解除管控
758
-    controlRemoveDevice(snList, useridList) {
759
+    /* controlRemoveDevice(snList, useridList) {
759
       let controlWSMsg = new ControlWSMsg(
760
       let controlWSMsg = new ControlWSMsg(
760
         controlWs.ws,
761
         controlWs.ws,
761
         this.userInfo.adminid,
762
         this.userInfo.adminid,
776
       };
777
       };
777
       form.userids = useridList;
778
       form.userids = useridList;
778
       this.addPushLog(form);
779
       this.addPushLog(form);
779
-    },
780
+    }, */
780
     // 添加推送日志
781
     // 添加推送日志
781
     addPushLog(form) {
782
     addPushLog(form) {
782
       if (form.userids && form.userids.length === 0) {
783
       if (form.userids && form.userids.length === 0) {

+ 13
- 12
src/views/schoolSection/deviceManage/deviceManage.vue View File

79
               <DropdownItem name="5">锁定</DropdownItem>
79
               <DropdownItem name="5">锁定</DropdownItem>
80
               <DropdownItem name="6">更新策略</DropdownItem>
80
               <DropdownItem name="6">更新策略</DropdownItem>
81
               <DropdownItem name="7">重启设备</DropdownItem>
81
               <DropdownItem name="7">重启设备</DropdownItem>
82
-              <DropdownItem name="9">解除管控</DropdownItem>
82
+              <!-- <DropdownItem name="9">解除管控</DropdownItem> -->
83
               <DropdownItem name="10">解除绑定</DropdownItem>
83
               <DropdownItem name="10">解除绑定</DropdownItem>
84
             </DropdownMenu>
84
             </DropdownMenu>
85
           </Dropdown>
85
           </Dropdown>
1421
           },
1421
           },
1422
           onCancel: () => {}
1422
           onCancel: () => {}
1423
         });
1423
         });
1424
-      } else if (name === "9") {
1425
-        // 解除管控
1424
+      } else if (name === "10") {
1425
+        // 解除绑定
1426
         if (snList.length === 0) {
1426
         if (snList.length === 0) {
1427
           this.$Message.error("请勾选至少一个设备。");
1427
           this.$Message.error("请勾选至少一个设备。");
1428
           return;
1428
           return;
1429
         }
1429
         }
1430
         this.$Modal.confirm({
1430
         this.$Modal.confirm({
1431
           title: "提示",
1431
           title: "提示",
1432
-          content: "确定对所选设备进行解除管控操作吗?",
1432
+          content: "确定对所选设备进行解除绑定操作吗?",
1433
           onOk: () => {
1433
           onOk: () => {
1434
-            this.controlRemoveDevice(snList, useridList);
1434
+            this.controlRemoveBind(snList, useridList);
1435
           },
1435
           },
1436
           onCancel: () => {}
1436
           onCancel: () => {}
1437
         });
1437
         });
1438
-      } else if (name === "10") {
1439
-        // 解除绑定
1438
+      }
1439
+      /*  else if (name === "9") {
1440
+        // 解除管控
1440
         if (snList.length === 0) {
1441
         if (snList.length === 0) {
1441
           this.$Message.error("请勾选至少一个设备。");
1442
           this.$Message.error("请勾选至少一个设备。");
1442
           return;
1443
           return;
1443
         }
1444
         }
1444
         this.$Modal.confirm({
1445
         this.$Modal.confirm({
1445
           title: "提示",
1446
           title: "提示",
1446
-          content: "确定对所选设备进行解除绑定操作吗?",
1447
+          content: "确定对所选设备进行解除管控操作吗?",
1447
           onOk: () => {
1448
           onOk: () => {
1448
-            this.controlRemoveBind(snList, useridList);
1449
+            this.controlRemoveDevice(snList, useridList);
1449
           },
1450
           },
1450
           onCancel: () => {}
1451
           onCancel: () => {}
1451
         });
1452
         });
1452
-      }
1453
+      } */
1453
     },
1454
     },
1454
     // 延时刷新
1455
     // 延时刷新
1455
     delayedRefresh() {
1456
     delayedRefresh() {
1623
       this.delayedRefresh();
1624
       this.delayedRefresh();
1624
     },
1625
     },
1625
     // 解除管控
1626
     // 解除管控
1626
-    controlRemoveDevice(snList, useridList) {
1627
+    /* controlRemoveDevice(snList, useridList) {
1627
       let controlWSMsg = new ControlWSMsg(
1628
       let controlWSMsg = new ControlWSMsg(
1628
         controlWs.ws,
1629
         controlWs.ws,
1629
         this.userInfo.adminid,
1630
         this.userInfo.adminid,
1645
       form.userids = useridList;
1646
       form.userids = useridList;
1646
       this.addPushLog(form);
1647
       this.addPushLog(form);
1647
       this.delayedRefresh();
1648
       this.delayedRefresh();
1648
-    },
1649
+    }, */
1649
     // 解除绑定
1650
     // 解除绑定
1650
     controlRemoveBind(snList, useridList) {
1651
     controlRemoveBind(snList, useridList) {
1651
       this.$refs.deviceTable.selectAll(false);
1652
       this.$refs.deviceTable.selectAll(false);

+ 3
- 3
src/views/schoolSection/index.vue View File

120
               class="drop_down_list_item"
120
               class="drop_down_list_item"
121
               >疑似脱管设备</router-link
121
               >疑似脱管设备</router-link
122
             >
122
             >
123
-            <router-link
123
+            <!-- <router-link
124
               @click.native="routeDropdownChange()"
124
               @click.native="routeDropdownChange()"
125
               tag="div"
125
               tag="div"
126
               to="/school/removeControlDevice"
126
               to="/school/removeControlDevice"
127
               class="drop_down_list_item"
127
               class="drop_down_list_item"
128
               >解除管控设备</router-link
128
               >解除管控设备</router-link
129
-            >
129
+            > -->
130
             <router-link
130
             <router-link
131
               @click.native="routeDropdownChange()"
131
               @click.native="routeDropdownChange()"
132
               tag="div"
132
               tag="div"
314
         this.$route.path.includes("/school/deviceManage") ||
314
         this.$route.path.includes("/school/deviceManage") ||
315
         this.$route.path.includes("/school/breakRuleDevice") ||
315
         this.$route.path.includes("/school/breakRuleDevice") ||
316
         this.$route.path.includes("/school/outControlDevice") ||
316
         this.$route.path.includes("/school/outControlDevice") ||
317
-        this.$route.path.includes("/school/removeControlDevice") ||
317
+        // this.$route.path.includes("/school/removeControlDevice") ||
318
         this.$route.path.includes("/school/inLineDevice")
318
         this.$route.path.includes("/school/inLineDevice")
319
       );
319
       );
320
     },
320
     },

+ 2
- 2
src/views/schoolSection/userManage/userManage.vue View File

63
               >{{ item.title }}</Option
63
               >{{ item.title }}</Option
64
             >
64
             >
65
           </Select>
65
           </Select>
66
-          <Select
66
+          <!-- <Select
67
             :transfer="true"
67
             :transfer="true"
68
             v-model="searchForm.control"
68
             v-model="searchForm.control"
69
             style="width: 140px; margin-right: 10px"
69
             style="width: 140px; margin-right: 10px"
75
               :key="item.id"
75
               :key="item.id"
76
               >{{ item.title }}</Option
76
               >{{ item.title }}</Option
77
             >
77
             >
78
-          </Select>
78
+          </Select> -->
79
           <Input
79
           <Input
80
             v-model="searchForm.username"
80
             v-model="searchForm.username"
81
             placeholder="请输入姓名"
81
             placeholder="请输入姓名"

Loading…
Cancel
Save