Merge commit '62f5e267ada39c740f21cd4337a66cb52d0abc8e' into gzb

src/api/ra.js

@@ -28,3 +28,15 @@ export const ra_list_ad = (data) => setRequest("ra/list_ad", data);
  * 12.1.6 平台/区域--设备活跃度
  */
 export const ra_list_da = (data) => setRequest("ra/list_da", data);
+/**
+ * 13.3.1 学校--设备用户
+ */
+export const ra_get_du = (data) => setRequest("ra/get_du", data);
+/**
+ * 13.3.2 学校--在线设备
+ */
+export const ra_list_dn = (data) => setRequest("ra/list_dn", data);
+/**
+ * 13.3.3 学校--增长趋势
+ */
+export const ra_list_dut = (data) => setRequest("ra/list_dut", data);

src/views/schoolSection/home/index.vue

@@ -43,10 +43,24 @@ export default {
       border: 1px solid #e9f0f9;
       background-color: #fff;
       &.left_w {
-        width: 41.667%;
+        width: 40%;
       }
       &.right_w {
-        width: calc(58.333% - 10px);
+        width: calc(60% - 10px);
+      }
+      .cell_header {
+        position: relative;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin: 16px;
+        font-size: 16px;
+        line-height: 1;
+        font-weight: bold;
+      }
+      .content_main {
+        width: 100%;
+        height: calc(100% - 48px);
       }
     }
   }

src/views/schoolSection/log/deviceInstallation.vue

@@ -47,7 +47,10 @@
 <script>
 import { dateFormat } from "@/utils";
 import { exportToExcel } from "@/utils/exportToExcel";
-import { logAppStart_list_install } from "@/api/log";
+import {
+  logAppDown_list_install,
+  logAppDown_list_install_all
+} from "@/api/log";
 export default {
   data() {
     return {
@@ -155,7 +158,7 @@ export default {
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       let _regionids = this.$store.state.userPower.regionids;
       _regionids = [..._regionids];
-      logAppStart_list_install({
+      logAppDown_list_install({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: _regionids.pop(),
@@ -181,7 +184,7 @@ export default {
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       let _regionids = this.$store.state.userPower.regionids;
       _regionids = [..._regionids];
-      logAppStart_list_install({
+      logAppDown_list_install_all({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: _regionids.pop(),