1.提示文字优化；

2.设备管理的解除锁定放到列表操作中；
3.个人策略没有调用添加接口

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -573,7 +573,7 @@ export default {
         }
         this.$Modal.confirm({
           title: "提示",
-          content: "确定对所选设备进行重启设备操作吗？",
+          content: "确定要重启设备吗？",
           onOk: () => {
             this.controlRebootDevice(snList, useridList);
           },

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -115,7 +115,7 @@
               <div v-if="row.sn" @click="toView(row)">查看</div>
               <div @click="toStrategy(row)">策略</div>
               <div v-if="row.sn" @click="toPsw(row)">设备密码</div>
-              <div v-if="row.sn" @click="toUnbind(row)">解除绑定</div>
+              <div v-if="row.sn" @click="toRemoveLimit(row)">解除锁定</div>
             </div>
           </template>
         </Table>
@@ -176,7 +176,7 @@
       class="modal4"
       :mask-closable="false"
       v-model="devicePswInfo.show"
-      title="设备密码"
+      :title="devicePswInfo.username"
     >
       <div class="device_psw">
         <div class="device_psw_title">设备密码</div>
@@ -626,6 +626,7 @@ export default {
       },
       devicePswInfo: {
         show: false,
+        username: null,
         controlPwd: null,
         logoutPwd: null
       },
@@ -1250,6 +1251,7 @@ export default {
         if (data.code === 0) {
           this.devicePswInfo = {
             show: true,
+            username: row.username,
             controlPwd: data.obj.controlPwd,
             logoutPwd: data.obj.logoutPwd
           };
@@ -1259,12 +1261,12 @@ export default {
       });
     },
     // 解除绑定
-    toUnbind(row) {
+    toRemoveLimit(row) {
       this.$Modal.confirm({
         title: "提示",
-        content: "确定对所选设备进行解除绑定操作吗？",
+        content: "确定要解除锁定吗？",
         onOk: () => {
-          this.controlRemoveBind([row.sn], [row.userid]);
+          this.controlRemoveLimit([row.sn], [row.userid]);
         },
         onCancel: () => {}
       });
@@ -1323,7 +1325,7 @@ export default {
         }
         this.$Modal.confirm({
           title: "提示",
-          content: "确定对所选设备进行恢复出厂设置操作吗？",
+          content: "确定要恢复出厂设置吗？",
           onOk: () => {
             this.controlRestoreFactory(snList, useridList);
           },
@@ -1373,7 +1375,7 @@ export default {
         }
         this.$Modal.confirm({
           title: "提示",
-          content: "确定对所选设备进行解除锁定操作吗？",
+          content: "确定要解除锁定吗？",
           onOk: () => {
             this.controlRemoveLimit(snList, useridList);
           },
@@ -1387,7 +1389,7 @@ export default {
         }
         this.$Modal.confirm({
           title: "提示",
-          content: "确定对所选设备进行锁定操作吗？",
+          content: "确定要锁定吗？",
           onOk: () => {
             this.controlLimitedUse(snList, useridList);
           },
@@ -1401,7 +1403,7 @@ export default {
         }
         this.$Modal.confirm({
           title: "提示",
-          content: "确定对所选设备进行更新策略操作吗？",
+          content: "确定要更新策略吗？",
           onOk: () => {
             this.controlUpdateStrategy(snList, useridList);
           },
@@ -1415,7 +1417,7 @@ export default {
         }
         this.$Modal.confirm({
           title: "提示",
-          content: "确定对所选设备进行重启设备操作吗？",
+          content: "确定要重启设备吗？",
           onOk: () => {
             this.controlRebootDevice(snList, useridList);
           },
@@ -1429,7 +1431,7 @@ export default {
         }
         this.$Modal.confirm({
           title: "提示",
-          content: "确定对所选设备进行解除绑定操作吗？",
+          content: "确定要解除绑定吗？",
           onOk: () => {
             this.controlRemoveBind(snList, useridList);
           },
@@ -1444,7 +1446,7 @@ export default {
         }
         this.$Modal.confirm({
           title: "提示",
-          content: "确定对所选设备进行解除管控操作吗？",
+          content: "确定要解除管控吗？",
           onOk: () => {
             this.controlRemoveDevice(snList, useridList);
           },

src/views/schoolSection/strategy/personalStrategy.vue

@@ -778,7 +778,7 @@ export default {
         form.padid = this.strategyInfo.padid;
         form.rversion = this.strategyInfo.rversion;
       }
-      let api = !isNaN(this.strategyInfo.padid) ? stPad_edit : stPad_add;
+      let api = this.strategyInfo.padid ? stPad_edit : stPad_add;
       api(form).then((res) => {
         if (res.code === 0) {
           this.$Message.success(res.msg);
@@ -889,7 +889,7 @@ export default {
           //数据回显
           this.strategyInfo.model = "edit";
           this.strategyInfo.username = row.username;
-          this.strategyInfo.padid = res.obj.padid;
+          this.strategyInfo.padid = row.padid;
           this.strategyInfo.userid = row.userid;
           this.strategyInfo.rversion = res.obj.rversion;
           this.strategyInfo.hastime = res.obj.hastime ? true : false;