样式优化；设备管理-违规设备-违规详情根据处理状态搜索

src/utils/index.js

@@ -728,8 +728,8 @@ export const breakRuleDoEvent = {
   105: "插入SD卡",
   106: "拔出SD卡",
   111: "设备ROOT",
-  211: "安装应用",
-  212: "卸载应用"
+  211: "安装非应用商店应用",
+  212: "卸载强制安装应用"
 };
 /**
  * 所有设备推送类型

src/views/platformSection/networkManage/whitelistLibrary.vue

@@ -86,7 +86,11 @@
               placeholder="请输入版本名称"
             ></Input>
           </FormItem>
-          <FormItem label="包名" prop="website" style="width: calc(50% - 10px)">
+          <FormItem
+            label="包名"
+            prop="website"
+            style="margin-right: 0; width: 50%"
+          >
             <Input
               v-model="whiteLibraryInfo.website"
               placeholder="请输入包名"
@@ -138,7 +142,7 @@
           >
           <FormItem
             label="包名"
-            style="margin-bottom: 0; width: calc(50% - 10px)"
+            style="margin-bottom: 0; margin-right: 0; width: 50%"
             >{{ viewInfo.website }}</FormItem
           >
         </template>

src/views/regionSection/log/violatingDevice.vue

@@ -42,7 +42,7 @@
     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
         <template slot-scope="{ row }" slot="doEventSlot">
-          <div>{{ doEventInfo[row.doEvent] }}</div>
+          <div>{{ breakRuleDoEvent[row.doEvent] }}</div>
         </template>
         <template slot-scope="{ row }" slot="noticedSlot">
           <div class="action_list">
@@ -102,7 +102,7 @@
 </template>
 
 <script>
-import { dateFormat, doEventInfo, breakRuleDoEvent } from "@/utils";
+import { dateFormat, breakRuleDoEvent } from "@/utils";
 import {
   logdoperate_list_violate,
   logdoperate_list_violate_all
@@ -112,7 +112,6 @@ export default {
   data() {
     return {
       showLoading: false,
-      doEventInfo,
       breakRuleDoEvent,
       searchForm: {
         dataRange: [],
@@ -284,7 +283,7 @@ export default {
                     登录名: item.loginname,
                     姓名: item.username,
                     设备号: item.sn,
-                    事件: this.doEventInfo[item.doEvent],
+                    事件: this.breakRuleDoEvent[item.doEvent],
                     通知: item.noticed === 1 ? "是" : "否",
                     锁定: item.locked === 1 ? "是" : "否",
                     重置: item.reseted === 1 ? "是" : "否",

src/views/schoolSection/applicationStrategy/appStrategyManageEdit.vue

@@ -340,7 +340,7 @@ export default {
   justify-content: space-between;
   margin: 16px 16px 0;
   .add_strategy_left {
-    width: calc(50% - 20px);
+    width: calc(55% - 20px);
     .name_form {
       display: flex;
       justify-content: flex-start;
@@ -378,7 +378,7 @@ export default {
     }
   }
   .add_strategy_right {
-    width: 50%;
+    width: 45%;
     // max-height: 400px;
     overflow: auto;
     .optional_applications {

src/views/schoolSection/applicationStrategy/appStrategyTemplateAdd.vue

@@ -318,7 +318,7 @@ export default {
   justify-content: space-between;
   margin: 16px 16px 0;
   .add_strategy_left {
-    width: calc(50% - 20px);
+    width: calc(55% - 20px);
     .name_form {
       display: flex;
       justify-content: flex-start;
@@ -356,7 +356,7 @@ export default {
     }
   }
   .add_strategy_right {
-    width: 50%;
+    width: 45%;
     // max-height: 400px;
     overflow: auto;
     .optional_applications {

src/views/schoolSection/applicationStrategy/appStrategyTemplateEdit.vue

@@ -341,7 +341,7 @@ export default {
   justify-content: space-between;
   margin: 16px 16px 0;
   .add_strategy_left {
-    width: calc(50% - 20px);
+    width: calc(55% - 20px);
     .name_form {
       display: flex;
       justify-content: flex-start;
@@ -379,7 +379,7 @@ export default {
     }
   }
   .add_strategy_right {
-    width: 50%;
+    width: 45%;
     // max-height: 400px;
     overflow: auto;
     .optional_applications {

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -128,7 +128,7 @@
       <div class="table_wrap_modal">
         <Table :columns="detailColumns" :data="logDetailInfo.events">
           <template slot-scope="{ row }" slot="doEventSlot">
-            <div>{{ doEventInfo[row.doEvent] }}</div>
+            <div>{{ breakRuleDoEvent[row.doEvent] }}</div>
           </template>
         </Table>
       </div>
@@ -140,7 +140,7 @@
 </template>
 
 <script>
-import { doEventInfo } from "@/utils";
+import { breakRuleDoEvent } from "@/utils";
 import ControlWs from "@/utils/ControlWs";
 let controlWs = new ControlWs();
 import ControlWSMsg from "@/utils/ControlWSMsg";
@@ -152,7 +152,7 @@ import {
 export default {
   data() {
     return {
-      doEventInfo,
+      breakRuleDoEvent,
       userInfo: {},
       // ws连接后回发信息
       wsEnterInfo: {
@@ -163,7 +163,7 @@ export default {
       },
       searchForm: {
         name: "",
-        // 是否处理：0否 1是
+        // 是否处理：0否 1是 -1全部
         handled: 0,
         page: 1,
         size: 10,
@@ -393,6 +393,7 @@ export default {
       device_manager_detail_vd({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
+        handled: this.searchForm.handled,
         size: 20,
         name: row.sn
       }).then((data) => {

src/views/schoolSection/log/violatingDevice.vue

@@ -42,7 +42,7 @@
     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
         <template slot-scope="{ row }" slot="doEventSlot">
-          <div>{{ doEventInfo[row.doEvent] }}</div>
+          <div>{{ breakRuleDoEvent[row.doEvent] }}</div>
         </template>
         <template slot-scope="{ row }" slot="noticedSlot">
           <div class="action_list">
@@ -98,7 +98,7 @@
 </template>
 
 <script>
-import { dateFormat, doEventInfo, breakRuleDoEvent } from "@/utils";
+import { dateFormat, breakRuleDoEvent } from "@/utils";
 import { exportToExcel } from "@/utils/exportToExcel";
 import {
   logdoperate_list_violate,
@@ -107,7 +107,6 @@ import {
 export default {
   data() {
     return {
-      doEventInfo,
       breakRuleDoEvent,
       searchForm: {
         dataRange: [],
@@ -290,7 +289,7 @@ export default {
                     登录名: item.loginname,
                     姓名: item.username,
                     设备号: item.sn,
-                    事件: this.doEventInfo[item.doEvent],
+                    事件: this.breakRuleDoEvent[item.doEvent],
                     通知: item.noticed === 1 ? "是" : "否",
                     锁定: item.locked === 1 ? "是" : "否",
                     重置: item.reseted === 1 ? "是" : "否",