Browse Source

设备已安装日志接口替换

gzb
wangzhonglu 9 months ago
parent
commit
acf227bdb2

+ 10
- 0
src/api/log.js View File

77
  */
77
  */
78
 export const logAppDown_list_install_all = (data) =>
78
 export const logAppDown_list_install_all = (data) =>
79
   setRequest("logAppDown/list_install_all", data);
79
   setRequest("logAppDown/list_install_all", data);
80
+/**
81
+ * 7.8.2.2 设备已安装应用-列表
82
+ */
83
+export const logAppInstall_list = (data) =>
84
+  setRequest("logAppInstall/list", data);
85
+/**
86
+ * 7.8.2.3 设备已安装应用-列表(导出)
87
+ */
88
+export const logAppInstall_list_all = (data) =>
89
+  setRequest("logAppInstall/list_all", data);
80
 /**
90
 /**
81
  * 7.9.1 设备导出-列表(平台、区域)
91
  * 7.9.1 设备导出-列表(平台、区域)
82
  */
92
  */

+ 2
- 1
src/views/platformSection/regionManage/adminManage.vue View File

582
             enabled: this.adminInfo.enabled,
582
             enabled: this.adminInfo.enabled,
583
             regionid: this.adminInfo.regionid,
583
             regionid: this.adminInfo.regionid,
584
             address: this.adminInfo.address,
584
             address: this.adminInfo.address,
585
-            atype: this.adminInfo.atype,
585
+            atype: 1,
586
             comm: this.adminInfo.comm
586
             comm: this.adminInfo.comm
587
           };
587
           };
588
           if (this.adminInfo.adminid) {
588
           if (this.adminInfo.adminid) {
589
             form.adminid = this.adminInfo.adminid;
589
             form.adminid = this.adminInfo.adminid;
590
+            form.adminid = this.adminInfo.atype;
590
           }
591
           }
591
           api(form).then((data) => {
592
           api(form).then((data) => {
592
             if (data.code === 0) {
593
             if (data.code === 0) {

+ 3
- 8
src/views/regionSection/log/deviceInstallation.vue View File

50
 
50
 
51
 <script>
51
 <script>
52
 import { dateFormat } from "@/utils";
52
 import { dateFormat } from "@/utils";
53
-import {
54
-  logAppDown_list_install,
55
-  logAppDown_list_install_all
56
-} from "@/api/log";
53
+import { logAppInstall_list, logAppInstall_list_all } from "@/api/log";
57
 import { exportToExcel } from "@/utils/exportToExcel";
54
 import { exportToExcel } from "@/utils/exportToExcel";
58
 export default {
55
 export default {
59
   data() {
56
   data() {
170
       let _enddate = this.searchForm.dataRange[1];
167
       let _enddate = this.searchForm.dataRange[1];
171
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
168
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
172
       this.showLoading = true;
169
       this.showLoading = true;
173
-      logAppDown_list_install({
170
+      logAppInstall_list({
174
         rtype: this.powerParams.rtype,
171
         rtype: this.powerParams.rtype,
175
         objectid: this.powerParams.objectid,
172
         objectid: this.powerParams.objectid,
176
-        regionid: this.powerParams.objectid,
177
         page: this.searchForm.page,
173
         page: this.searchForm.page,
178
         size: this.searchForm.size,
174
         size: this.searchForm.size,
179
         begindate: _begindate,
175
         begindate: _begindate,
195
       let _enddate = this.searchForm.dataRange[1];
191
       let _enddate = this.searchForm.dataRange[1];
196
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
192
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
197
       this.showLoading = true;
193
       this.showLoading = true;
198
-      logAppDown_list_install_all({
194
+      logAppInstall_list_all({
199
         rtype: this.powerParams.rtype,
195
         rtype: this.powerParams.rtype,
200
         objectid: this.powerParams.objectid,
196
         objectid: this.powerParams.objectid,
201
-        regionid: this.powerParams.objectid,
202
         begindate: _begindate,
197
         begindate: _begindate,
203
         enddate: _enddate,
198
         enddate: _enddate,
204
         name: this.searchForm.name
199
         name: this.searchForm.name

+ 3
- 14
src/views/schoolSection/log/deviceInstallation.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 {
51
-  logAppDown_list_install,
52
-  logAppDown_list_install_all
53
-} from "@/api/log";
50
+import { logAppInstall_list, logAppInstall_list_all } from "@/api/log";
54
 export default {
51
 export default {
55
   data() {
52
   data() {
56
     return {
53
     return {
156
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
153
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
157
       let _enddate = this.searchForm.dataRange[1];
154
       let _enddate = this.searchForm.dataRange[1];
158
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
155
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
159
-      let _regionids = this.$store.state.userPower.regionids;
160
-      _regionids = [..._regionids];
161
-      logAppDown_list_install({
156
+      logAppInstall_list({
162
         rtype: this.powerParams.rtype,
157
         rtype: this.powerParams.rtype,
163
         objectid: this.powerParams.objectid,
158
         objectid: this.powerParams.objectid,
164
-        regionid: _regionids.pop(),
165
-        schoolid: this.powerParams.objectid,
166
         page: this.searchForm.page,
159
         page: this.searchForm.page,
167
         size: this.searchForm.size,
160
         size: this.searchForm.size,
168
         begindate: _begindate,
161
         begindate: _begindate,
182
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
175
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
183
       let _enddate = this.searchForm.dataRange[1];
176
       let _enddate = this.searchForm.dataRange[1];
184
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
177
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
185
-      let _regionids = this.$store.state.userPower.regionids;
186
-      _regionids = [..._regionids];
187
-      logAppDown_list_install_all({
178
+      logAppInstall_list_all({
188
         rtype: this.powerParams.rtype,
179
         rtype: this.powerParams.rtype,
189
         objectid: this.powerParams.objectid,
180
         objectid: this.powerParams.objectid,
190
-        regionid: _regionids.pop(),
191
-        schoolid: this.powerParams.objectid,
192
         begindate: _begindate,
181
         begindate: _begindate,
193
         enddate: _enddate,
182
         enddate: _enddate,
194
         name: this.searchForm.name
183
         name: this.searchForm.name

Loading…
Cancel
Save