统计优化

src/api/admin.js

@@ -47,4 +47,4 @@ export const admin_edit_pwd = (data) => setRequest("admin/edit_pwd", data);
 /**
  * 1.2.4个人中心--修改手机号
  */
-export const admin_edit_phone = (data) => setRequest("admin/edit_phone", data);
+export const admin_edit_phone = (data) => setRequest("admin/edit_phone", data);

src/api/region.js

@@ -25,7 +25,8 @@ export const region_list_rs = (data) => setRequest("region/list_rs", data);
 /**
  * 2.1.6 区域--树形
  */
-export const region_list_sel_tree = (data) => setRequest("region/list_sel_tree", data);
+export const region_list_sel_tree = (data) =>
+  setRequest("region/list_sel_tree", data);
 /**
  * 2.2区域--添加
  */

src/assets/less/common.less

@@ -360,14 +360,17 @@ fieldset[disabled] .ivu-input,
   border-radius: 8px;
 }
 .ivu-modal-confirm-footer .ivu-btn.ivu-btn-text {
-  margin-right: 16px;
   color: #7c8db5;
   border: 1px solid #b8c2d9;
   border-radius: 8px;
 }
+.ivu-modal-confirm-footer button + button,
+.ivu-modal-footer button + button {
+  margin-left: 16px;
+}
 .main_root {
   //margin: 0 16px 10px;
- height: calc(100% - 10px);
+  height: calc(100% - 10px);
   border-radius: 15px;
   border: 1px solid #e9f0f9;
   background-color: #fff;
@@ -467,4 +470,4 @@ fieldset[disabled] .ivu-input,
       display: none;
     }
   }
-}
+}

src/views/platformSection/deviceManage/deviceManageExport/deviceManageExport.vue

@@ -160,11 +160,13 @@ export default {
         },
         {
           title: "设备号",
+          width: 170,
           key: "sn",
           align: "center"
         },
         {
           title: "设备型号",
+          width: 150,
           key: "deviceModel",
           align: "center"
         },

src/views/platformSection/deviceManage/deviceManageImport/detail.vue

@@ -213,6 +213,7 @@ export default {
         },
         {
           title: "设备号",
+          width: 170,
           key: "sn",
           align: "center"
         },

src/views/platformSection/home/index.vue

@@ -104,6 +104,8 @@ import coordChinaMap from "@/assets/echartsMap/coordChinaMap.json";
 export default {
   data() {
     return {
+      // 图表实例
+      echartsInstances: [],
       // 概况信息
       regionOverviewInfo: {
         usernum: 0,
@@ -122,21 +124,25 @@ export default {
         },
         {
           title: "区域名称",
+          minWidth: 100,
           key: "regionName",
           align: "center"
         },
         {
           title: "学校数",
+          width: 80,
           key: "schoolnum",
           align: "center"
         },
         {
           title: "设备数",
+          width: 80,
           key: "devicenum",
           align: "center"
         },
         {
           title: "用户数",
+          width: 80,
           key: "usernum",
           align: "center"
         }
@@ -170,7 +176,20 @@ export default {
     this.getAppDownloadList();
     this.getDeviceActivityList();
   },
+  mounted() {
+    window.addEventListener("resize", this.echartsResize);
+  },
+  beforeDestroy() {
+    window.removeEventListener("resize", this.echartsResize);
+  },
   methods: {
+    echartsResize() {
+      this.echartsInstances.forEach((eInstance) => {
+        if (eInstance && eInstance.getOption()) {
+          eInstance.resize();
+        }
+      });
+    },
     // 概况信息
     getRegionOverview() {
       ra_list_rv({
@@ -371,6 +390,7 @@ export default {
       const eInstance = echarts.init(document.getElementById("mapAreaEcharts"));
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     },
     // 设备类型信息
     getDeviceModelList() {
@@ -442,6 +462,7 @@ export default {
       );
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     },
     // 客户端版本-管控应用
     getControlVersionList() {
@@ -511,6 +532,7 @@ export default {
       );
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     },
     // 客户端版本-应用商店
     getAppVersionList() {
@@ -580,6 +602,7 @@ export default {
       );
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     },
     // 应用下载
     getAppDownloadList() {
@@ -692,6 +715,7 @@ export default {
       );
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     },
     // 设备活跃度
     getDeviceActivityList() {
@@ -839,6 +863,7 @@ export default {
       );
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     }
   }
 };

src/views/platformSection/regionManage/adminManage.vue

@@ -231,9 +231,12 @@
           style="margin-bottom: 0; width: calc(50% - 10px)"
           >{{ viewInfo.phone }}</FormItem
         >
-        <FormItem label="所属区域" style="margin-bottom: 0; width: 100%">{{
-          viewInfo.regionName
-        }}</FormItem>
+        <FormItem
+          label="所属区域"
+          style="margin-bottom: 0; width: 100%"
+          v-if="viewInfo.atype !== 1"
+          >{{ viewInfo.regionName }}</FormItem
+        >
         <FormItem label="地址" style="margin-bottom: 0; width: 100%">{{
           viewInfo.address
         }}</FormItem>
@@ -255,7 +258,8 @@ import {
   admin_edit,
   admin_delete,
   admin_enable,
-  admin_disabled
+  admin_disabled,
+  admin_detail
 } from "@/api/admin";
 import { region_list_sel_pt } from "@/api/region";
 import { login_msg_code } from "@/api/login";
@@ -361,6 +365,7 @@ export default {
       // 查看
       viewInfo: {
         show: false,
+        atype: null,
         enabled: "",
         aname: "",
         loginname: "",
@@ -605,36 +610,49 @@ export default {
     },
     // 查看
     toView(row) {
-      this.viewInfo = {
-        show: true,
-        enabled: row.enabled,
-        aname: row.aname,
-        loginname: row.loginname,
-        phone: row.phone,
-        regionName: row.regionName,
-        address: row.address,
-        comm: row.comm
-      };
+      admin_detail({ adminid: row.adminid }).then((data) => {
+        if (data.code === 0) {
+          this.viewInfo = {
+            show: true,
+            atype: data.obj.atype,
+            enabled: data.obj.enabled,
+            aname: data.obj.aname,
+            loginname: data.obj.loginname,
+            phone: data.obj.phone,
+            regionName: data.obj.regionName,
+            address: data.obj.address,
+            comm: data.obj.comm
+          };
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
     },
     // 编辑
     toEdit(row) {
-      this.adminInfo = {
-        show: true,
-        timer: null,
-        second: 60,
-        adminid: row.adminid,
-        atype: row.atype,
-        aname: row.aname,
-        loginname: row.loginname,
-        loginpwd: row.loginpwd,
-        loginpwd1: row.loginpwd1,
-        phone: row.phone,
-        msgcode: row.msgcode,
-        enabled: row.enabled,
-        regionid: row.regionid,
-        address: row.address,
-        comm: row.comm
-      };
+      admin_detail({ adminid: row.adminid }).then((data) => {
+        if (data.code === 0) {
+          this.adminInfo = {
+            show: true,
+            timer: null,
+            second: 60,
+            adminid: data.obj.adminid,
+            atype: data.obj.atype,
+            aname: data.obj.aname,
+            loginname: data.obj.loginname,
+            loginpwd: data.obj.loginpwd,
+            loginpwd1: data.obj.loginpwd1,
+            phone: data.obj.phone,
+            msgcode: data.obj.msgcode,
+            enabled: data.obj.enabled,
+            regionid: data.obj.regionid,
+            address: data.obj.address,
+            comm: data.obj.comm
+          };
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
     },
     // 删除
     toDel(row) {

src/views/platformSection/regionManage/regionManage.vue

@@ -187,19 +187,6 @@
             placeholder="请输入6位区域码"
           ></Input>
         </FormItem>
-        <FormItem label="地址" prop="address" style="width: 100%">
-          <Input
-            v-model="modifyRegion.address"
-            placeholder="请输入地址"
-          ></Input>
-        </FormItem>
-        <FormItem label="描述信息" prop="comm" style="width: 100%">
-          <Input
-            type="textarea"
-            v-model="modifyRegion.comm"
-            placeholder="请输入描述信息"
-          ></Input>
-        </FormItem>
       </Form>
       <div slot="footer">
         <Button @click="modifyRegion.show = false">取消</Button>
@@ -216,15 +203,9 @@
       title="查看"
     >
       <div class="view_title">{{ viewInfo.regionName }}</div>
-      <!-- <Form :label-width="80">
-        <FormItem label="区域码" style="margin-bottom: 0">{{
-          viewInfo.regionCode
-        }}</FormItem>
-        <FormItem label="地址" style="margin-bottom: 0">{{
-          viewInfo.address
-        }}</FormItem>
-        <FormItem label="描述信息">{{ viewInfo.comm }}</FormItem>
-      </Form> -->
+      <Form :label-width="65">
+        <FormItem label="区域码">{{ viewInfo.regionCode }}</FormItem>
+      </Form>
       <Table
         style="border: 1px solid #e8eaec; border-bottom: none"
         :columns="viewInfo.columns"
@@ -296,8 +277,6 @@ export default {
         regionid: null,
         regionName: "",
         regionCode: "",
-        address: "",
-        comm: "",
         rversion: null
       },
       // 查看
@@ -305,8 +284,6 @@ export default {
         show: false,
         regionName: "",
         regionCode: "",
-        address: "",
-        comm: "",
         list: [],
         columns: [
           {
@@ -590,8 +567,6 @@ export default {
             objectid: this.powerParams.objectid,
             regionName: this.modifyRegion.regionName,
             regionCode: this.modifyRegion.regionCode,
-            address: this.modifyRegion.address,
-            comm: this.modifyRegion.comm,
             regionid: this.modifyRegion.regionid,
             rversion: this.modifyRegion.rversion
           }).then((data) => {
@@ -627,8 +602,6 @@ export default {
           this.viewInfo.show = true;
           this.viewInfo.regionName = row.regionName;
           this.viewInfo.regionCode = row.regionCode;
-          this.viewInfo.address = row.address;
-          this.viewInfo.comm = row.comm;
           this.viewInfo.list = data.obj;
         } else {
           this.$Message.error(data.msg);
@@ -642,8 +615,6 @@ export default {
         regionid: row.regionid,
         regionName: row.regionName,
         regionCode: row.regionCode,
-        address: row.address,
-        comm: row.comm,
         rversion: row.rversion
       };
     },

src/views/regionSection/home/index.vue

@@ -98,6 +98,8 @@ import coordChinaMap from "@/assets/echartsMap/coordChinaMap.json";
 export default {
   data() {
     return {
+      // 图表实例
+      echartsInstances: [],
       // 概况信息
       regionOverviewInfo: {
         usernum: 0,
@@ -163,7 +165,20 @@ export default {
     this.getAppDownloadList();
     this.getDeviceActivityList();
   },
+  mounted() {
+    window.addEventListener("resize", this.echartsResize);
+  },
+  beforeDestroy() {
+    window.removeEventListener("resize", this.echartsResize);
+  },
   methods: {
+    echartsResize() {
+      this.echartsInstances.forEach((eInstance) => {
+        if (eInstance && eInstance.getOption()) {
+          eInstance.resize();
+        }
+      });
+    },
     // 概况信息
     getRegionOverview() {
       ra_list_sv({
@@ -364,6 +379,7 @@ export default {
       const eInstance = echarts.init(document.getElementById("mapAreaEcharts"));
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     },
     // 设备类型信息
     getDeviceModelList() {
@@ -435,6 +451,7 @@ export default {
       );
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     },
     // 客户端版本-管控应用
     getControlVersionList() {
@@ -504,6 +521,7 @@ export default {
       );
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     },
     // 客户端版本-应用商店
     getAppVersionList() {
@@ -573,6 +591,7 @@ export default {
       );
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     },
     // 应用下载
     getAppDownloadList() {
@@ -685,6 +704,7 @@ export default {
       );
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     },
     // 设备活跃度
     getDeviceActivityList() {
@@ -832,6 +852,7 @@ export default {
       );
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     }
   }
 };
@@ -847,7 +868,7 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    &:last-of-type{
+    &:last-of-type {
       margin-bottom: 0;
     }
     .cell_item {

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -239,6 +239,7 @@ export default {
         // },
         {
           title: "设备号",
+          width: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -687,11 +687,13 @@ export default {
         },
         {
           title: "设备型号",
+          width: 150,
           key: "deviceModel",
           align: "center"
         },
         {
           title: "设备号",
+          width: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/deviceManage/inLineDevice.vue

@@ -111,11 +111,13 @@ export default {
         },
         {
           title: "设备型号",
+          width: 150,
           key: "deviceModel",
           align: "center"
         },
         {
           title: "设备号",
+          width: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/deviceManage/outControlDevice.vue

@@ -112,11 +112,13 @@ export default {
         },
         {
           title: "设备型号",
+          width: 150,
           key: "deviceModel",
           align: "center"
         },
         {
           title: "设备号",
+          width: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/deviceManage/removeControlDevice.vue

@@ -87,11 +87,13 @@ export default {
         },
         {
           title: "设备型号",
+          width: 150,
           key: "deviceModel",
           align: "center"
         },
         {
           title: "设备号",
+          width: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/home/index.vue

@@ -143,6 +143,8 @@ import * as echarts from "echarts";
 export default {
   data() {
     return {
+      // 图表实例
+      echartsInstances: [],
       // 设备用户信息
       deviceUserInfo: {},
       // 设备类型信息
@@ -177,7 +179,20 @@ export default {
       return this.$store.getters.powerParams;
     }
   },
+  mounted() {
+    window.addEventListener("resize", this.echartsResize);
+  },
+  beforeDestroy() {
+    window.removeEventListener("resize", this.echartsResize);
+  },
   methods: {
+    echartsResize() {
+      this.echartsInstances.forEach((eInstance) => {
+        if (eInstance && eInstance.getOption()) {
+          eInstance.resize();
+        }
+      });
+    },
     // 设备用户信息
     getDeviceUserList() {
       ra_get_du({
@@ -264,6 +279,7 @@ export default {
       );
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     },
     // 设备类型信息
     getDeviceModelList() {
@@ -335,6 +351,7 @@ export default {
       );
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     },
     // 客户端版本-管控应用
     getControlVersionList() {
@@ -404,6 +421,7 @@ export default {
       );
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     },
     // 客户端版本-应用商店
     getAppVersionList() {
@@ -473,6 +491,7 @@ export default {
       );
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     },
     // 增长趋势
     getGrowthTrendList() {
@@ -632,6 +651,7 @@ export default {
       );
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     },
     getOnlineDeviceList() {
       ra_list_dn({
@@ -805,6 +825,7 @@ export default {
       const eInstance = echarts.init(document.getElementById(domId));
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     },
     // 设备活跃度
     getDeviceActivityList() {
@@ -952,6 +973,7 @@ export default {
       );
       eInstance.clear();
       eInstance.setOption(options);
+      this.echartsInstances.push(eInstance);
     }
   }
 };

src/views/schoolSection/log/appLaunch.vue

@@ -99,6 +99,7 @@ export default {
         },
         {
           title: "设备号",
+          width: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/applicationDownload.vue

@@ -91,6 +91,7 @@ export default {
         },
         {
           title: "设备号",
+          width: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/deviceEvents.vue

@@ -122,6 +122,7 @@ export default {
         },
         {
           title: "设备号",
+          width: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/deviceExport.vue

@@ -82,11 +82,13 @@ export default {
         },
         {
           title: "设备号",
+          width: 170,
           key: "sn",
           align: "center"
         },
         {
           title: "设备型号",
+          width: 150,
           key: "deviceModel",
           align: "center"
         },

src/views/schoolSection/log/deviceInstallation.vue

@@ -95,6 +95,7 @@ export default {
         },
         {
           title: "设备号",
+          width: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/deviceLocation.vue

@@ -75,6 +75,7 @@ export default {
         },
         {
           title: "设备号",
+          width: 170,
           key: "sn",
           align: "center"
         },
@@ -100,6 +101,7 @@ export default {
         },
         {
           title: "地址",
+          width: 210,
           key: "address",
           align: "center"
         },

src/views/schoolSection/log/devicePush.vue

@@ -119,6 +119,7 @@ export default {
         },
         {
           title: "设备号",
+          width: 170,
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/violatingDevice.vue

@@ -154,6 +154,7 @@ export default {
         },
         {
           title: "设备号",
+          width: 170,
           key: "sn",
           align: "center"
         },