Browse Source

Merge commit '62f5e267ada39c740f21cd4337a66cb52d0abc8e' into gzb

gzb
guozhongbo 9 months ago
parent
commit
78e2abd258

+ 12
- 0
src/api/ra.js View File

28
  * 12.1.6 平台/区域--设备活跃度
28
  * 12.1.6 平台/区域--设备活跃度
29
  */
29
  */
30
 export const ra_list_da = (data) => setRequest("ra/list_da", data);
30
 export const ra_list_da = (data) => setRequest("ra/list_da", data);
31
+/**
32
+ * 13.3.1 学校--设备用户
33
+ */
34
+export const ra_get_du = (data) => setRequest("ra/get_du", data);
35
+/**
36
+ * 13.3.2 学校--在线设备
37
+ */
38
+export const ra_list_dn = (data) => setRequest("ra/list_dn", data);
39
+/**
40
+ * 13.3.3 学校--增长趋势
41
+ */
42
+export const ra_list_dut = (data) => setRequest("ra/list_dut", data);

+ 16
- 2
src/views/schoolSection/home/index.vue View File

43
       border: 1px solid #e9f0f9;
43
       border: 1px solid #e9f0f9;
44
       background-color: #fff;
44
       background-color: #fff;
45
       &.left_w {
45
       &.left_w {
46
-        width: 41.667%;
46
+        width: 40%;
47
       }
47
       }
48
       &.right_w {
48
       &.right_w {
49
-        width: calc(58.333% - 10px);
49
+        width: calc(60% - 10px);
50
+      }
51
+      .cell_header {
52
+        position: relative;
53
+        display: flex;
54
+        justify-content: space-between;
55
+        align-items: center;
56
+        margin: 16px;
57
+        font-size: 16px;
58
+        line-height: 1;
59
+        font-weight: bold;
60
+      }
61
+      .content_main {
62
+        width: 100%;
63
+        height: calc(100% - 48px);
50
       }
64
       }
51
     }
65
     }
52
   }
66
   }

+ 6
- 3
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 { logAppStart_list_install } from "@/api/log";
50
+import {
51
+  logAppDown_list_install,
52
+  logAppDown_list_install_all
53
+} from "@/api/log";
51
 export default {
54
 export default {
52
   data() {
55
   data() {
53
     return {
56
     return {
155
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
158
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
156
       let _regionids = this.$store.state.userPower.regionids;
159
       let _regionids = this.$store.state.userPower.regionids;
157
       _regionids = [..._regionids];
160
       _regionids = [..._regionids];
158
-      logAppStart_list_install({
161
+      logAppDown_list_install({
159
         rtype: this.powerParams.rtype,
162
         rtype: this.powerParams.rtype,
160
         objectid: this.powerParams.objectid,
163
         objectid: this.powerParams.objectid,
161
         regionid: _regionids.pop(),
164
         regionid: _regionids.pop(),
181
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
184
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
182
       let _regionids = this.$store.state.userPower.regionids;
185
       let _regionids = this.$store.state.userPower.regionids;
183
       _regionids = [..._regionids];
186
       _regionids = [..._regionids];
184
-      logAppStart_list_install({
187
+      logAppDown_list_install_all({
185
         rtype: this.powerParams.rtype,
188
         rtype: this.powerParams.rtype,
186
         objectid: this.powerParams.objectid,
189
         objectid: this.powerParams.objectid,
187
         regionid: _regionids.pop(),
190
         regionid: _regionids.pop(),

Loading…
Cancel
Save