Merge commit 'd51cedcb58315e6126139ca16a3be97f62edb539' into gzb

src/components/TimeStrategy/TimeStrategy.vue

         if (!_timeInfo[timeItem.week]) {
           _timeInfo[timeItem.week] = [];
         }
+        if (timeItem.stoptime === "23:59") {
+          timeItem.stoptime = "24:00";
+        }
         let _starttimeArr = timeItem.starttime.split(":");
         let _stoptimeArr = timeItem.stoptime.split(":");
         let _startHalfHour = Number(_starttimeArr[0]) * 2;
           _times.push({
             week: weekValue,
             starttime: _dayTimeInfo.starttime,
-            stoptime: _dayTimeInfo.stoptime
+            stoptime:
+              _dayTimeInfo.stoptime === "24:00"
+                ? "23:59"
+                : _dayTimeInfo.stoptime
           });
         }
       }
       let _hour = parseInt(halfHour / 2);
       _hour = _hour > 9 ? _hour : `0${_hour}`;
       let _minute = halfHour % 2 === 0 ? "00" : "30";
+      if (_hour === 24 && _minute === "00") {
+        return `${weekItemLabel} 23:59`;
+      }
       return `${weekItemLabel} ${_hour}:${_minute}`;
     },
     // 设置时间策略

src/utils/ControlWSMsg.js

     // {msg}
     this.body = { msg };
   }
-  // 限制使用
+  // 锁定
   limitedUse() {
     this.code = 2002;
   }
-  // 解除限制
+  // 解除锁定
   removeLimit() {
     this.code = 2003;
   }

src/utils/index.js

  */
 export const pushTypeInfo = {
   1: "发送消息",
-  2: "解除限制",
-  3: "限制使用",
+  2: "解除锁定",
+  3: "锁定",
   4: "更新策略",
   5: "重启设备",
   6: "恢复出厂"

src/views/regionSection/log/deviceEvents.vue

     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
         <template slot-scope="{ row }" slot="doEventSlot">
-          <!-- 1发送消息 2解除限制 3限制使用 4更新策略 5重启设备 6恢复出厂 -->
+          <!-- 1发送消息 2解除锁定 3锁定 4更新策略 5重启设备 6恢复出厂 -->
           <div>{{ doEventInfo[row.doEvent] }}</div>
         </template>
         <template slot-scope="{ row }" slot="violatedSlot">

src/views/regionSection/log/devicePush.vue

     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
         <template slot-scope="{ row }" slot="pushTypeSlot">
-          <!-- 1发送消息 2解除限制 3限制使用 4更新策略 5重启设备 6恢复出厂 -->
+          <!-- 1发送消息 2解除锁定 3锁定 4更新策略 5重启设备 6恢复出厂 -->
           <div>{{ pushTypeInfo[row.pushType] }}</div>
         </template>
       </Table>

src/views/schoolSection/applicationStrategy/appStrategyTemplateAdd.vue

   display: flex;
   justify-content: flex-end;
   align-items: center;
-  margin-top: 16px;
-  margin-right: 16px;
+  margin: 16px;
   .primary_btn {
     margin-left: 16px;
   }

src/views/schoolSection/applicationStrategy/appStrategyTemplateView.vue

   display: flex;
   justify-content: center;
   align-items: center;
-  margin-top: 16px;
-  margin-right: 16px;
+  margin: 16px;
 }
 </style>

src/views/schoolSection/deviceManage/breakRuleDevice.vue

           <DropdownMenu slot="list">
             <DropdownItem name="1">恢复出厂</DropdownItem>
             <DropdownItem name="2">发送消息</DropdownItem>
-            <DropdownItem name="4">解除限制</DropdownItem>
-            <DropdownItem name="5">限制使用</DropdownItem>
+            <DropdownItem name="4">解除锁定</DropdownItem>
+            <DropdownItem name="5">锁定</DropdownItem>
             <DropdownItem name="6">更新策略</DropdownItem>
             <DropdownItem name="7">重启设备</DropdownItem>
             <DropdownItem name="9">解除管控</DropdownItem>
           useridList
         };
       } else if (name === "4") {
-        // 解除限制
+        // 解除锁定
         if (snList.length === 0) {
           this.$Message.error("请勾选至少一个设备。");
           return;
         }
         this.$Modal.confirm({
           title: "提示",
-          content: "确定对所选设备进行解除限制操作吗？",
+          content: "确定对所选设备进行解除锁定操作吗？",
           onOk: () => {
             this.controlRemoveLimit(snList, useridList);
           },
           onCancel: () => {}
         });
       } else if (name === "5") {
-        // 限制使用
+        // 锁定
         if (snList.length === 0) {
           this.$Message.error("请勾选至少一个设备。");
           return;
         }
         this.$Modal.confirm({
           title: "提示",
-          content: "确定对所选设备进行限制使用操作吗？",
+          content: "确定对所选设备进行锁定操作吗？",
           onOk: () => {
             this.controlLimitedUse(snList, useridList);
           },
         }
       });
     },
-    // 解除限制
+    // 解除锁定
     controlRemoveLimit(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
       // form.userids = useridList;
       // this.addPushLog(form);
     },
-    // 限制使用
+    // 锁定
     controlLimitedUse(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,

src/views/schoolSection/deviceManage/deviceManage.vue

               <DropdownItem name="3" v-if="searchForm.classid"
                 >整班发送消息</DropdownItem
               >
-              <DropdownItem name="4">解除限制</DropdownItem>
-              <DropdownItem name="5">限制使用</DropdownItem>
+              <DropdownItem name="4">解除锁定</DropdownItem>
+              <DropdownItem name="5">锁定</DropdownItem>
               <DropdownItem name="6">更新策略</DropdownItem>
               <DropdownItem name="7">重启设备</DropdownItem>
               <DropdownItem name="9">解除管控</DropdownItem>
                   <Checkbox
                     :disabled="true"
                     style="margin: 0 40px"
-                    label="限制使用"
+                    label="锁定"
                   ></Checkbox>
                   <Checkbox :disabled="true" label="恢复出厂设置"></Checkbox>
                 </CheckboxGroup>
           }
         });
       } else if (name === "4") {
-        // 解除限制
+        // 解除锁定
         if (snList.length === 0) {
           this.$Message.error("请勾选至少一个设备。");
           return;
         }
         this.$Modal.confirm({
           title: "提示",
-          content: "确定对所选设备进行解除限制操作吗？",
+          content: "确定对所选设备进行解除锁定操作吗？",
           onOk: () => {
             this.controlRemoveLimit(snList, useridList);
           },
           onCancel: () => {}
         });
       } else if (name === "5") {
-        // 限制使用
+        // 锁定
         if (snList.length === 0) {
           this.$Message.error("请勾选至少一个设备。");
           return;
         }
         this.$Modal.confirm({
           title: "提示",
-          content: "确定对所选设备进行限制使用操作吗？",
+          content: "确定对所选设备进行锁定操作吗？",
           onOk: () => {
             this.controlLimitedUse(snList, useridList);
           },
         }
       });
     },
-    // 解除限制
+    // 解除锁定
     controlRemoveLimit(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
       // form.userids = useridList;
       // this.addPushLog(form);
     },
-    // 限制使用
+    // 锁定
     controlLimitedUse(snList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,

src/views/schoolSection/log/deviceEvents.vue

     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
         <template slot-scope="{ row }" slot="doEventSlot">
-          <!-- 1发送消息 2解除限制 3限制使用 4更新策略 5重启设备 6恢复出厂 -->
+          <!-- 1发送消息 2解除锁定 3锁定 4更新策略 5重启设备 6恢复出厂 -->
           <div>{{ doEventInfo[row.doEvent] }}</div>
         </template>
         <template slot-scope="{ row }" slot="violatedSlot">

src/views/schoolSection/log/devicePush.vue

     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
         <template slot-scope="{ row }" slot="pushTypeSlot">
-          <!-- 1发送消息 2解除限制 3限制使用 4更新策略 5重启设备 6恢复出厂 -->
+          <!-- 1发送消息 2解除锁定 3锁定 4更新策略 5重启设备 6恢复出厂 -->
           <div>{{ pushTypeInfo[row.pushType] }}</div>
         </template>
       </Table>

src/views/schoolSection/setting/deviceSetting.vue

         禁用注销开启后，该单位的所有设备一旦登录成功，必须输入管理员密码才能退出登录。
       </div>
       <div class="require">
-        限制使用时长后，客户端使用时间到了设备提醒休息，默认允许使用30分钟，这里你可以自行设置(可设置范围20~120分钟)。
+        锁定时长后，客户端使用时间到了设备提醒休息，默认允许使用30分钟，这里你可以自行设置(可设置范围20~120分钟)。
       </div>
       <!-- <div class="require">
         限制安装来源功能开启后，只允许安装<span style="color: #339dff"

src/views/schoolSection/setting/wallpaper.vue

         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
             <div @click="toView(row)">查看</div>
-            <div v-if="userInfo.adminid === row.updateid" @click="toEdit(row)">
+            <div
+              v-if="
+                powerParams.rtype === row.wlevel &&
+                userInfo.adminid === row.updateid
+              "
+              @click="toEdit(row)"
+            >
               编辑
             </div>
             <div
-              v-if="userInfo.adminid === row.updateid"
+              v-if="
+                powerParams.rtype === row.wlevel &&
+                userInfo.adminid === row.updateid
+              "
               class="action_del"
               @click="toDel(row)"
             >

src/views/schoolSection/strategy/personalStrategy.vue

                 <Checkbox
                   :disabled="strategyInfo.model === 'see'"
                   style="margin: 0 40px"
-                  label="限制使用"
+                  label="锁定"
                 ></Checkbox>
                 <Checkbox
                   :disabled="strategyInfo.model === 'see'"

src/views/schoolSection/strategy/publicStrategy.vue

             <Checkbox
               :disabled="curState === 1"
               style="margin: 0 40px"
-              label="限制使用"
+              label="锁定"
             ></Checkbox>
             <Checkbox
               :disabled="curState === 1"

src/views/schoolSection/strategy/strategyTemplate.vue

                 <Checkbox
                   :disabled="strategyInfo.model === '查看'"
                   style="margin: 0 40px"
-                  label="限制使用"
+                  label="锁定"
                 ></Checkbox>
                 <Checkbox
                   :disabled="strategyInfo.model === '查看'"