设备位置日志更换接口

src/api/log.js

@@ -17,15 +17,15 @@ export const logPush_list = (data) => setRequest("logPush/list", data);
  */
 export const logPush_add = (data) => setRequest("logPush/add", data);
 /**
- * 7.3.1 设备位置日志-列表
+ * 7.3.1.2 设备位置日志-列表（分页）
  */
-export const logDeviceLogin_list = (data) =>
-  setRequest("logDeviceLogin/list", data);
+export const userPosition_list = (data) =>
+  setRequest("userPosition/list", data);
 /**
- * 7.3.2 设备位置日志-所有（导出）
+ * 7.3.2.2 设备位置日志-所有（导出）
  */
-export const logDeviceLogin_list_all = (data) =>
-  setRequest("logDeviceLogin/list_all", data);
+export const userPosition_list_all = (data) =>
+  setRequest("userPosition/list_all", data);
 /**
  * 7.4.1 设备事件日志-列表
  */

src/views/regionSection/log/deviceLocation.vue

@@ -50,7 +50,7 @@
 
 <script>
 import { dateFormat } from "@/utils";
-import {logDeviceLogin_list, logDeviceLogin_list_all} from "@/api/log";
+import { userPosition_list, userPosition_list_all } from "@/api/log";
 import { exportToExcel } from "@/utils/exportToExcel";
 export default {
   data() {
@@ -109,7 +109,7 @@ export default {
         },
         {
           title: "地址",
-          key: "ipAddress",
+          key: "address",
           align: "center"
         },
         {
@@ -156,7 +156,7 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       this.showLoading = true;
-      logDeviceLogin_list({
+      userPosition_list({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: this.powerParams.objectid,
@@ -181,7 +181,7 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       this.showLoading = true;
-      logDeviceLogin_list_all({
+      userPosition_list_all({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: this.powerParams.objectid,
@@ -201,7 +201,7 @@ export default {
                     姓名: item.username,
                     学校名称: item.schoolName,
                     班级: item.classname,
-                    地址: item.ipAddress,
+                    地址: item.address,
                     时间: item.createtime
                   };
                 }),

src/views/schoolSection/log/deviceLocation.vue

@@ -47,7 +47,7 @@
 <script>
 import { dateFormat } from "@/utils";
 import { exportToExcel } from "@/utils/exportToExcel";
-import { logDeviceLogin_list, logDeviceLogin_list_all } from "@/api/log";
+import { userPosition_list, userPosition_list_all } from "@/api/log";
 export default {
   data() {
     return {
@@ -145,7 +145,7 @@ export default {
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       let _regionids = this.$store.state.userPower.regionids;
       _regionids = [..._regionids];
-      logDeviceLogin_list({
+      userPosition_list({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: _regionids.pop(),
@@ -171,7 +171,7 @@ export default {
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       let _regionids = this.$store.state.userPower.regionids;
       _regionids = [..._regionids];
-      logDeviceLogin_list_all({
+      userPosition_list_all({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: _regionids.pop(),