Browse Source

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

gzb
wangzhonglu 8 months ago
parent
commit
310830f9e7

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

728
   105: "插入SD卡",
728
   105: "插入SD卡",
729
   106: "拔出SD卡",
729
   106: "拔出SD卡",
730
   111: "设备ROOT",
730
   111: "设备ROOT",
731
-  211: "安装应用",
732
-  212: "卸载应用"
731
+  211: "安装非应用商店应用",
732
+  212: "卸载强制安装应用"
733
 };
733
 };
734
 /**
734
 /**
735
  * 所有设备推送类型
735
  * 所有设备推送类型

+ 6
- 2
src/views/platformSection/networkManage/whitelistLibrary.vue View File

86
               placeholder="请输入版本名称"
86
               placeholder="请输入版本名称"
87
             ></Input>
87
             ></Input>
88
           </FormItem>
88
           </FormItem>
89
-          <FormItem label="包名" prop="website" style="width: calc(50% - 10px)">
89
+          <FormItem
90
+            label="包名"
91
+            prop="website"
92
+            style="margin-right: 0; width: 50%"
93
+          >
90
             <Input
94
             <Input
91
               v-model="whiteLibraryInfo.website"
95
               v-model="whiteLibraryInfo.website"
92
               placeholder="请输入包名"
96
               placeholder="请输入包名"
138
           >
142
           >
139
           <FormItem
143
           <FormItem
140
             label="包名"
144
             label="包名"
141
-            style="margin-bottom: 0; width: calc(50% - 10px)"
145
+            style="margin-bottom: 0; margin-right: 0; width: 50%"
142
             >{{ viewInfo.website }}</FormItem
146
             >{{ viewInfo.website }}</FormItem
143
           >
147
           >
144
         </template>
148
         </template>

+ 3
- 4
src/views/regionSection/log/violatingDevice.vue View File

42
     <div class="table_wrap">
42
     <div class="table_wrap">
43
       <Table :columns="columns" :data="searchForm.list">
43
       <Table :columns="columns" :data="searchForm.list">
44
         <template slot-scope="{ row }" slot="doEventSlot">
44
         <template slot-scope="{ row }" slot="doEventSlot">
45
-          <div>{{ doEventInfo[row.doEvent] }}</div>
45
+          <div>{{ breakRuleDoEvent[row.doEvent] }}</div>
46
         </template>
46
         </template>
47
         <template slot-scope="{ row }" slot="noticedSlot">
47
         <template slot-scope="{ row }" slot="noticedSlot">
48
           <div class="action_list">
48
           <div class="action_list">
102
 </template>
102
 </template>
103
 
103
 
104
 <script>
104
 <script>
105
-import { dateFormat, doEventInfo, breakRuleDoEvent } from "@/utils";
105
+import { dateFormat, breakRuleDoEvent } from "@/utils";
106
 import {
106
 import {
107
   logdoperate_list_violate,
107
   logdoperate_list_violate,
108
   logdoperate_list_violate_all
108
   logdoperate_list_violate_all
112
   data() {
112
   data() {
113
     return {
113
     return {
114
       showLoading: false,
114
       showLoading: false,
115
-      doEventInfo,
116
       breakRuleDoEvent,
115
       breakRuleDoEvent,
117
       searchForm: {
116
       searchForm: {
118
         dataRange: [],
117
         dataRange: [],
284
                     登录名: item.loginname,
283
                     登录名: item.loginname,
285
                     姓名: item.username,
284
                     姓名: item.username,
286
                     设备号: item.sn,
285
                     设备号: item.sn,
287
-                    事件: this.doEventInfo[item.doEvent],
286
+                    事件: this.breakRuleDoEvent[item.doEvent],
288
                     通知: item.noticed === 1 ? "是" : "否",
287
                     通知: item.noticed === 1 ? "是" : "否",
289
                     锁定: item.locked === 1 ? "是" : "否",
288
                     锁定: item.locked === 1 ? "是" : "否",
290
                     重置: item.reseted === 1 ? "是" : "否",
289
                     重置: item.reseted === 1 ? "是" : "否",

+ 2
- 2
src/views/schoolSection/applicationStrategy/appStrategyManageEdit.vue View File

340
   justify-content: space-between;
340
   justify-content: space-between;
341
   margin: 16px 16px 0;
341
   margin: 16px 16px 0;
342
   .add_strategy_left {
342
   .add_strategy_left {
343
-    width: calc(50% - 20px);
343
+    width: calc(55% - 20px);
344
     .name_form {
344
     .name_form {
345
       display: flex;
345
       display: flex;
346
       justify-content: flex-start;
346
       justify-content: flex-start;
378
     }
378
     }
379
   }
379
   }
380
   .add_strategy_right {
380
   .add_strategy_right {
381
-    width: 50%;
381
+    width: 45%;
382
     // max-height: 400px;
382
     // max-height: 400px;
383
     overflow: auto;
383
     overflow: auto;
384
     .optional_applications {
384
     .optional_applications {

+ 2
- 2
src/views/schoolSection/applicationStrategy/appStrategyTemplateAdd.vue View File

318
   justify-content: space-between;
318
   justify-content: space-between;
319
   margin: 16px 16px 0;
319
   margin: 16px 16px 0;
320
   .add_strategy_left {
320
   .add_strategy_left {
321
-    width: calc(50% - 20px);
321
+    width: calc(55% - 20px);
322
     .name_form {
322
     .name_form {
323
       display: flex;
323
       display: flex;
324
       justify-content: flex-start;
324
       justify-content: flex-start;
356
     }
356
     }
357
   }
357
   }
358
   .add_strategy_right {
358
   .add_strategy_right {
359
-    width: 50%;
359
+    width: 45%;
360
     // max-height: 400px;
360
     // max-height: 400px;
361
     overflow: auto;
361
     overflow: auto;
362
     .optional_applications {
362
     .optional_applications {

+ 2
- 2
src/views/schoolSection/applicationStrategy/appStrategyTemplateEdit.vue View File

341
   justify-content: space-between;
341
   justify-content: space-between;
342
   margin: 16px 16px 0;
342
   margin: 16px 16px 0;
343
   .add_strategy_left {
343
   .add_strategy_left {
344
-    width: calc(50% - 20px);
344
+    width: calc(55% - 20px);
345
     .name_form {
345
     .name_form {
346
       display: flex;
346
       display: flex;
347
       justify-content: flex-start;
347
       justify-content: flex-start;
379
     }
379
     }
380
   }
380
   }
381
   .add_strategy_right {
381
   .add_strategy_right {
382
-    width: 50%;
382
+    width: 45%;
383
     // max-height: 400px;
383
     // max-height: 400px;
384
     overflow: auto;
384
     overflow: auto;
385
     .optional_applications {
385
     .optional_applications {

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

128
       <div class="table_wrap_modal">
128
       <div class="table_wrap_modal">
129
         <Table :columns="detailColumns" :data="logDetailInfo.events">
129
         <Table :columns="detailColumns" :data="logDetailInfo.events">
130
           <template slot-scope="{ row }" slot="doEventSlot">
130
           <template slot-scope="{ row }" slot="doEventSlot">
131
-            <div>{{ doEventInfo[row.doEvent] }}</div>
131
+            <div>{{ breakRuleDoEvent[row.doEvent] }}</div>
132
           </template>
132
           </template>
133
         </Table>
133
         </Table>
134
       </div>
134
       </div>
140
 </template>
140
 </template>
141
 
141
 
142
 <script>
142
 <script>
143
-import { doEventInfo } from "@/utils";
143
+import { breakRuleDoEvent } from "@/utils";
144
 import ControlWs from "@/utils/ControlWs";
144
 import ControlWs from "@/utils/ControlWs";
145
 let controlWs = new ControlWs();
145
 let controlWs = new ControlWs();
146
 import ControlWSMsg from "@/utils/ControlWSMsg";
146
 import ControlWSMsg from "@/utils/ControlWSMsg";
152
 export default {
152
 export default {
153
   data() {
153
   data() {
154
     return {
154
     return {
155
-      doEventInfo,
155
+      breakRuleDoEvent,
156
       userInfo: {},
156
       userInfo: {},
157
       // ws连接后回发信息
157
       // ws连接后回发信息
158
       wsEnterInfo: {
158
       wsEnterInfo: {
163
       },
163
       },
164
       searchForm: {
164
       searchForm: {
165
         name: "",
165
         name: "",
166
-        // 是否处理:0否 1是
166
+        // 是否处理:0否 1是 -1全部
167
         handled: 0,
167
         handled: 0,
168
         page: 1,
168
         page: 1,
169
         size: 10,
169
         size: 10,
393
       device_manager_detail_vd({
393
       device_manager_detail_vd({
394
         rtype: this.powerParams.rtype,
394
         rtype: this.powerParams.rtype,
395
         objectid: this.powerParams.objectid,
395
         objectid: this.powerParams.objectid,
396
+        handled: this.searchForm.handled,
396
         size: 20,
397
         size: 20,
397
         name: row.sn
398
         name: row.sn
398
       }).then((data) => {
399
       }).then((data) => {

+ 3
- 4
src/views/schoolSection/log/violatingDevice.vue View File

42
     <div class="table_wrap">
42
     <div class="table_wrap">
43
       <Table :columns="columns" :data="searchForm.list">
43
       <Table :columns="columns" :data="searchForm.list">
44
         <template slot-scope="{ row }" slot="doEventSlot">
44
         <template slot-scope="{ row }" slot="doEventSlot">
45
-          <div>{{ doEventInfo[row.doEvent] }}</div>
45
+          <div>{{ breakRuleDoEvent[row.doEvent] }}</div>
46
         </template>
46
         </template>
47
         <template slot-scope="{ row }" slot="noticedSlot">
47
         <template slot-scope="{ row }" slot="noticedSlot">
48
           <div class="action_list">
48
           <div class="action_list">
98
 </template>
98
 </template>
99
 
99
 
100
 <script>
100
 <script>
101
-import { dateFormat, doEventInfo, breakRuleDoEvent } from "@/utils";
101
+import { dateFormat, breakRuleDoEvent } from "@/utils";
102
 import { exportToExcel } from "@/utils/exportToExcel";
102
 import { exportToExcel } from "@/utils/exportToExcel";
103
 import {
103
 import {
104
   logdoperate_list_violate,
104
   logdoperate_list_violate,
107
 export default {
107
 export default {
108
   data() {
108
   data() {
109
     return {
109
     return {
110
-      doEventInfo,
111
       breakRuleDoEvent,
110
       breakRuleDoEvent,
112
       searchForm: {
111
       searchForm: {
113
         dataRange: [],
112
         dataRange: [],
290
                     登录名: item.loginname,
289
                     登录名: item.loginname,
291
                     姓名: item.username,
290
                     姓名: item.username,
292
                     设备号: item.sn,
291
                     设备号: item.sn,
293
-                    事件: this.doEventInfo[item.doEvent],
292
+                    事件: this.breakRuleDoEvent[item.doEvent],
294
                     通知: item.noticed === 1 ? "是" : "否",
293
                     通知: item.noticed === 1 ? "是" : "否",
295
                     锁定: item.locked === 1 ? "是" : "否",
294
                     锁定: item.locked === 1 ? "是" : "否",
296
                     重置: item.reseted === 1 ? "是" : "否",
295
                     重置: item.reseted === 1 ? "是" : "否",

Loading…
Cancel
Save