Browse Source

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

gzb
wangzhonglu 8 months ago
parent
commit
1cb85fc9fd

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

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

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

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

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

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

Loading…
Cancel
Save