Browse Source

socket连接优化;违规设备显示优化

gzb
wangzhonglu 8 months ago
parent
commit
1cb85fc9fd

+ 1
- 1
src/utils/ControlWs.js View File

@@ -96,4 +96,4 @@ class ControlWs {
96 96
     }, 2000);
97 97
   }
98 98
 }
99
-export default new ControlWs();
99
+export default ControlWs;

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

@@ -129,7 +129,8 @@
129 129
 
130 130
 <script>
131 131
 import { doEventInfo } from "@/utils";
132
-import controlWs from "@/utils/ControlWs";
132
+import ControlWs from "@/utils/ControlWs";
133
+let controlWs = new ControlWs();
133 134
 import ControlWSMsg from "@/utils/ControlWSMsg";
134 135
 import { logPush_add, logdoperate_edit_handled } from "@/api/log";
135 136
 import {
@@ -204,7 +205,7 @@ export default {
204 205
             );
205 206
           }
206 207
         },
207
-        {
208
+        /* {
208 209
           title: "登录账号",
209 210
           key: "loginname",
210 211
           align: "center"
@@ -213,7 +214,7 @@ export default {
213 214
           title: "姓名",
214 215
           key: "username",
215 216
           align: "center"
216
-        },
217
+        }, */
217 218
         {
218 219
           title: "设备名称",
219 220
           key: "device",
@@ -241,7 +242,7 @@ export default {
241 242
           align: "center"
242 243
         },
243 244
         {
244
-          title: "违规数量",
245
+          title: "累计违规数量",
245 246
           key: "num",
246 247
           align: "center"
247 248
         },

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

@@ -529,7 +529,8 @@ import BmGeolocation from "vue-baidu-map/components/controls/Geolocation";
529 529
 import BmMarker from "vue-baidu-map/components/overlays/Marker";
530 530
 import BmInfoWindow from "vue-baidu-map/components/overlays/InfoWindow";
531 531
 import * as echarts from "echarts";
532
-import controlWs from "@/utils/ControlWs";
532
+import ControlWs from "@/utils/ControlWs";
533
+let controlWs = new ControlWs();
533 534
 import ControlWSMsg from "@/utils/ControlWSMsg";
534 535
 import { exportToExcel } from "@/utils/exportToExcel";
535 536
 import { class_list, user_list_cs } from "@/api/school";

+ 2
- 2
src/views/schoolSection/log/deviceLocation.vue View File

@@ -100,7 +100,7 @@ export default {
100 100
         },
101 101
         {
102 102
           title: "地址",
103
-          key: "ipAddress",
103
+          key: "address",
104 104
           align: "center"
105 105
         },
106 106
         {
@@ -191,7 +191,7 @@ export default {
191 191
                     姓名: item.username,
192 192
                     学校名称: item.schoolName,
193 193
                     班级: item.classname,
194
-                    地址: item.ipAddress,
194
+                    地址: item.address,
195 195
                     时间: item.createtime
196 196
                   };
197 197
                 }),

Loading…
Cancel
Save