Browse Source

设备位置日志更换接口

gzb
guozhongbo 8 months ago
parent
commit
5ebf915f57

+ 6
- 6
src/api/log.js View File

17
  */
17
  */
18
 export const logPush_add = (data) => setRequest("logPush/add", data);
18
 export const logPush_add = (data) => setRequest("logPush/add", data);
19
 /**
19
 /**
20
- * 7.3.1 设备位置日志-列表
20
+ * 7.3.1.2 设备位置日志-列表(分页)
21
  */
21
  */
22
-export const logDeviceLogin_list = (data) =>
23
-  setRequest("logDeviceLogin/list", data);
22
+export const userPosition_list = (data) =>
23
+  setRequest("userPosition/list", data);
24
 /**
24
 /**
25
- * 7.3.2 设备位置日志-所有(导出)
25
+ * 7.3.2.2 设备位置日志-所有(导出)
26
  */
26
  */
27
-export const logDeviceLogin_list_all = (data) =>
28
-  setRequest("logDeviceLogin/list_all", data);
27
+export const userPosition_list_all = (data) =>
28
+  setRequest("userPosition/list_all", data);
29
 /**
29
 /**
30
  * 7.4.1 设备事件日志-列表
30
  * 7.4.1 设备事件日志-列表
31
  */
31
  */

+ 5
- 5
src/views/regionSection/log/deviceLocation.vue View File

50
 
50
 
51
 <script>
51
 <script>
52
 import { dateFormat } from "@/utils";
52
 import { dateFormat } from "@/utils";
53
-import {logDeviceLogin_list, logDeviceLogin_list_all} from "@/api/log";
53
+import { userPosition_list, userPosition_list_all } from "@/api/log";
54
 import { exportToExcel } from "@/utils/exportToExcel";
54
 import { exportToExcel } from "@/utils/exportToExcel";
55
 export default {
55
 export default {
56
   data() {
56
   data() {
109
         },
109
         },
110
         {
110
         {
111
           title: "地址",
111
           title: "地址",
112
-          key: "ipAddress",
112
+          key: "address",
113
           align: "center"
113
           align: "center"
114
         },
114
         },
115
         {
115
         {
156
       let _enddate = this.searchForm.dataRange[1];
156
       let _enddate = this.searchForm.dataRange[1];
157
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
157
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
158
       this.showLoading = true;
158
       this.showLoading = true;
159
-      logDeviceLogin_list({
159
+      userPosition_list({
160
         rtype: this.powerParams.rtype,
160
         rtype: this.powerParams.rtype,
161
         objectid: this.powerParams.objectid,
161
         objectid: this.powerParams.objectid,
162
         regionid: this.powerParams.objectid,
162
         regionid: this.powerParams.objectid,
181
       let _enddate = this.searchForm.dataRange[1];
181
       let _enddate = this.searchForm.dataRange[1];
182
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
182
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
183
       this.showLoading = true;
183
       this.showLoading = true;
184
-      logDeviceLogin_list_all({
184
+      userPosition_list_all({
185
         rtype: this.powerParams.rtype,
185
         rtype: this.powerParams.rtype,
186
         objectid: this.powerParams.objectid,
186
         objectid: this.powerParams.objectid,
187
         regionid: this.powerParams.objectid,
187
         regionid: this.powerParams.objectid,
201
                     姓名: item.username,
201
                     姓名: item.username,
202
                     学校名称: item.schoolName,
202
                     学校名称: item.schoolName,
203
                     班级: item.classname,
203
                     班级: item.classname,
204
-                    地址: item.ipAddress,
204
+                    地址: item.address,
205
                     时间: item.createtime
205
                     时间: item.createtime
206
                   };
206
                   };
207
                 }),
207
                 }),

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

47
 <script>
47
 <script>
48
 import { dateFormat } from "@/utils";
48
 import { dateFormat } from "@/utils";
49
 import { exportToExcel } from "@/utils/exportToExcel";
49
 import { exportToExcel } from "@/utils/exportToExcel";
50
-import { logDeviceLogin_list, logDeviceLogin_list_all } from "@/api/log";
50
+import { userPosition_list, userPosition_list_all } from "@/api/log";
51
 export default {
51
 export default {
52
   data() {
52
   data() {
53
     return {
53
     return {
145
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
145
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
146
       let _regionids = this.$store.state.userPower.regionids;
146
       let _regionids = this.$store.state.userPower.regionids;
147
       _regionids = [..._regionids];
147
       _regionids = [..._regionids];
148
-      logDeviceLogin_list({
148
+      userPosition_list({
149
         rtype: this.powerParams.rtype,
149
         rtype: this.powerParams.rtype,
150
         objectid: this.powerParams.objectid,
150
         objectid: this.powerParams.objectid,
151
         regionid: _regionids.pop(),
151
         regionid: _regionids.pop(),
171
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
171
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
172
       let _regionids = this.$store.state.userPower.regionids;
172
       let _regionids = this.$store.state.userPower.regionids;
173
       _regionids = [..._regionids];
173
       _regionids = [..._regionids];
174
-      logDeviceLogin_list_all({
174
+      userPosition_list_all({
175
         rtype: this.powerParams.rtype,
175
         rtype: this.powerParams.rtype,
176
         objectid: this.powerParams.objectid,
176
         objectid: this.powerParams.objectid,
177
         regionid: _regionids.pop(),
177
         regionid: _regionids.pop(),

Loading…
Cancel
Save