Browse Source

1.提示文字优化;

2.设备管理的解除锁定放到列表操作中;
3.个人策略没有调用添加接口
master
wangzhonglu 3 days ago
parent
commit
4800907a35

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

573
         }
573
         }
574
         this.$Modal.confirm({
574
         this.$Modal.confirm({
575
           title: "提示",
575
           title: "提示",
576
-          content: "确定对所选设备进行重启设备操作吗?",
576
+          content: "确定要重启设备吗?",
577
           onOk: () => {
577
           onOk: () => {
578
             this.controlRebootDevice(snList, useridList);
578
             this.controlRebootDevice(snList, useridList);
579
           },
579
           },

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

115
               <div v-if="row.sn" @click="toView(row)">查看</div>
115
               <div v-if="row.sn" @click="toView(row)">查看</div>
116
               <div @click="toStrategy(row)">策略</div>
116
               <div @click="toStrategy(row)">策略</div>
117
               <div v-if="row.sn" @click="toPsw(row)">设备密码</div>
117
               <div v-if="row.sn" @click="toPsw(row)">设备密码</div>
118
-              <div v-if="row.sn" @click="toUnbind(row)">解除绑定</div>
118
+              <div v-if="row.sn" @click="toRemoveLimit(row)">解除锁定</div>
119
             </div>
119
             </div>
120
           </template>
120
           </template>
121
         </Table>
121
         </Table>
176
       class="modal4"
176
       class="modal4"
177
       :mask-closable="false"
177
       :mask-closable="false"
178
       v-model="devicePswInfo.show"
178
       v-model="devicePswInfo.show"
179
-      title="设备密码"
179
+      :title="devicePswInfo.username"
180
     >
180
     >
181
       <div class="device_psw">
181
       <div class="device_psw">
182
         <div class="device_psw_title">设备密码</div>
182
         <div class="device_psw_title">设备密码</div>
626
       },
626
       },
627
       devicePswInfo: {
627
       devicePswInfo: {
628
         show: false,
628
         show: false,
629
+        username: null,
629
         controlPwd: null,
630
         controlPwd: null,
630
         logoutPwd: null
631
         logoutPwd: null
631
       },
632
       },
1250
         if (data.code === 0) {
1251
         if (data.code === 0) {
1251
           this.devicePswInfo = {
1252
           this.devicePswInfo = {
1252
             show: true,
1253
             show: true,
1254
+            username: row.username,
1253
             controlPwd: data.obj.controlPwd,
1255
             controlPwd: data.obj.controlPwd,
1254
             logoutPwd: data.obj.logoutPwd
1256
             logoutPwd: data.obj.logoutPwd
1255
           };
1257
           };
1259
       });
1261
       });
1260
     },
1262
     },
1261
     // 解除绑定
1263
     // 解除绑定
1262
-    toUnbind(row) {
1264
+    toRemoveLimit(row) {
1263
       this.$Modal.confirm({
1265
       this.$Modal.confirm({
1264
         title: "提示",
1266
         title: "提示",
1265
-        content: "确定对所选设备进行解除绑定操作吗?",
1267
+        content: "确定要解除锁定吗?",
1266
         onOk: () => {
1268
         onOk: () => {
1267
-          this.controlRemoveBind([row.sn], [row.userid]);
1269
+          this.controlRemoveLimit([row.sn], [row.userid]);
1268
         },
1270
         },
1269
         onCancel: () => {}
1271
         onCancel: () => {}
1270
       });
1272
       });
1323
         }
1325
         }
1324
         this.$Modal.confirm({
1326
         this.$Modal.confirm({
1325
           title: "提示",
1327
           title: "提示",
1326
-          content: "确定对所选设备进行恢复出厂设置操作吗?",
1328
+          content: "确定要恢复出厂设置吗?",
1327
           onOk: () => {
1329
           onOk: () => {
1328
             this.controlRestoreFactory(snList, useridList);
1330
             this.controlRestoreFactory(snList, useridList);
1329
           },
1331
           },
1373
         }
1375
         }
1374
         this.$Modal.confirm({
1376
         this.$Modal.confirm({
1375
           title: "提示",
1377
           title: "提示",
1376
-          content: "确定对所选设备进行解除锁定操作吗?",
1378
+          content: "确定要解除锁定吗?",
1377
           onOk: () => {
1379
           onOk: () => {
1378
             this.controlRemoveLimit(snList, useridList);
1380
             this.controlRemoveLimit(snList, useridList);
1379
           },
1381
           },
1387
         }
1389
         }
1388
         this.$Modal.confirm({
1390
         this.$Modal.confirm({
1389
           title: "提示",
1391
           title: "提示",
1390
-          content: "确定对所选设备进行锁定操作吗?",
1392
+          content: "确定要锁定吗?",
1391
           onOk: () => {
1393
           onOk: () => {
1392
             this.controlLimitedUse(snList, useridList);
1394
             this.controlLimitedUse(snList, useridList);
1393
           },
1395
           },
1401
         }
1403
         }
1402
         this.$Modal.confirm({
1404
         this.$Modal.confirm({
1403
           title: "提示",
1405
           title: "提示",
1404
-          content: "确定对所选设备进行更新策略操作吗?",
1406
+          content: "确定要更新策略吗?",
1405
           onOk: () => {
1407
           onOk: () => {
1406
             this.controlUpdateStrategy(snList, useridList);
1408
             this.controlUpdateStrategy(snList, useridList);
1407
           },
1409
           },
1415
         }
1417
         }
1416
         this.$Modal.confirm({
1418
         this.$Modal.confirm({
1417
           title: "提示",
1419
           title: "提示",
1418
-          content: "确定对所选设备进行重启设备操作吗?",
1420
+          content: "确定要重启设备吗?",
1419
           onOk: () => {
1421
           onOk: () => {
1420
             this.controlRebootDevice(snList, useridList);
1422
             this.controlRebootDevice(snList, useridList);
1421
           },
1423
           },
1429
         }
1431
         }
1430
         this.$Modal.confirm({
1432
         this.$Modal.confirm({
1431
           title: "提示",
1433
           title: "提示",
1432
-          content: "确定对所选设备进行解除绑定操作吗?",
1434
+          content: "确定要解除绑定吗?",
1433
           onOk: () => {
1435
           onOk: () => {
1434
             this.controlRemoveBind(snList, useridList);
1436
             this.controlRemoveBind(snList, useridList);
1435
           },
1437
           },
1444
         }
1446
         }
1445
         this.$Modal.confirm({
1447
         this.$Modal.confirm({
1446
           title: "提示",
1448
           title: "提示",
1447
-          content: "确定对所选设备进行解除管控操作吗?",
1449
+          content: "确定要解除管控吗?",
1448
           onOk: () => {
1450
           onOk: () => {
1449
             this.controlRemoveDevice(snList, useridList);
1451
             this.controlRemoveDevice(snList, useridList);
1450
           },
1452
           },

+ 2
- 2
src/views/schoolSection/strategy/personalStrategy.vue View File

778
         form.padid = this.strategyInfo.padid;
778
         form.padid = this.strategyInfo.padid;
779
         form.rversion = this.strategyInfo.rversion;
779
         form.rversion = this.strategyInfo.rversion;
780
       }
780
       }
781
-      let api = !isNaN(this.strategyInfo.padid) ? stPad_edit : stPad_add;
781
+      let api = this.strategyInfo.padid ? stPad_edit : stPad_add;
782
       api(form).then((res) => {
782
       api(form).then((res) => {
783
         if (res.code === 0) {
783
         if (res.code === 0) {
784
           this.$Message.success(res.msg);
784
           this.$Message.success(res.msg);
889
           //数据回显
889
           //数据回显
890
           this.strategyInfo.model = "edit";
890
           this.strategyInfo.model = "edit";
891
           this.strategyInfo.username = row.username;
891
           this.strategyInfo.username = row.username;
892
-          this.strategyInfo.padid = res.obj.padid;
892
+          this.strategyInfo.padid = row.padid;
893
           this.strategyInfo.userid = row.userid;
893
           this.strategyInfo.userid = row.userid;
894
           this.strategyInfo.rversion = res.obj.rversion;
894
           this.strategyInfo.rversion = res.obj.rversion;
895
           this.strategyInfo.hastime = res.obj.hastime ? true : false;
895
           this.strategyInfo.hastime = res.obj.hastime ? true : false;

Loading…
Cancel
Save