Переглянути джерело

设备已安装日志接口替换

gzb
wangzhonglu 9 місяці тому
джерело
коміт
acf227bdb2

+ 10
- 0
src/api/log.js Переглянути файл

@@ -77,6 +77,16 @@ export const logAppDown_list_install = (data) =>
77 77
  */
78 78
 export const logAppDown_list_install_all = (data) =>
79 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 91
  * 7.9.1 设备导出-列表(平台、区域)
82 92
  */

+ 2
- 1
src/views/platformSection/regionManage/adminManage.vue Переглянути файл

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

+ 3
- 8
src/views/regionSection/log/deviceInstallation.vue Переглянути файл

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

+ 3
- 14
src/views/schoolSection/log/deviceInstallation.vue Переглянути файл

@@ -47,10 +47,7 @@
47 47
 <script>
48 48
 import { dateFormat } from "@/utils";
49 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 51
 export default {
55 52
   data() {
56 53
     return {
@@ -156,13 +153,9 @@ export default {
156 153
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
157 154
       let _enddate = this.searchForm.dataRange[1];
158 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 157
         rtype: this.powerParams.rtype,
163 158
         objectid: this.powerParams.objectid,
164
-        regionid: _regionids.pop(),
165
-        schoolid: this.powerParams.objectid,
166 159
         page: this.searchForm.page,
167 160
         size: this.searchForm.size,
168 161
         begindate: _begindate,
@@ -182,13 +175,9 @@ export default {
182 175
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
183 176
       let _enddate = this.searchForm.dataRange[1];
184 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 179
         rtype: this.powerParams.rtype,
189 180
         objectid: this.powerParams.objectid,
190
-        regionid: _regionids.pop(),
191
-        schoolid: this.powerParams.objectid,
192 181
         begindate: _begindate,
193 182
         enddate: _enddate,
194 183
         name: this.searchForm.name

Завантаження…
Відмінити
Зберегти