Merge remote-tracking branch 'origin/gzb' into wzl

src/views/platformSection/home/index.vue

@@ -854,7 +854,7 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    &.last-child {
+    &:last-of-type {
       margin-bottom: 0;
     }
     .cell_item {
@@ -896,7 +896,7 @@ export default {
       }
       .content_main {
         width: 100%;
-        height: calc(100% - 48px);
+        height: calc(100% - 64px);
         #controlVersionEcharts,
         #appVersionEcharts {
           display: inline-block;

src/views/regionSection/applicationManage/applicationGroup.vue

@@ -210,13 +210,11 @@ export default {
         {
           title: "图标",
           slot: "iconPath",
-          width: 120,
           align: "center"
         },
         {
           title: "创建人",
           key: "createname",
-          width: 140,
           align: "center"
         },
         {
@@ -228,7 +226,6 @@ export default {
         {
           title: "操作人",
           key: "updatename",
-          width: 140,
           align: "center"
         },
         {

src/views/regionSection/applicationManage/applicationManage.vue

@@ -914,24 +914,22 @@ export default {
         {
           title: "应用",
           slot: "appName",
-          align: "center"
+          align: "center",
+          minWidth: 160
         },
         {
           title: "分组",
           key: "appgroupName",
-          align: "center",
-          width: 120
+          align: "center"
         },
         {
           title: "属性应用",
           slot: "appType",
-          align: "center",
-          width: 100
+          align: "center"
         },
         {
           title: "状态",
           slot: "enabled",
-          width: 100,
           align: "center"
         },
         {
@@ -943,8 +941,7 @@ export default {
         {
           title: "可信任",
           slot: "trusted",
-          align: "center",
-          width: 80
+          align: "center"
         },
         {
           title: "操作时间",
@@ -993,7 +990,7 @@ export default {
       this.viewInfo.appAbbr = obj.appAbbr;
       this.viewInfo.appDeveloper = obj.appDeveloper;
       this.viewInfo.appIcon = obj.appIcon;
-      this.viewInfo.appImg = obj.appImg.split(";");
+      this.viewInfo.appImg = obj.appImg?obj.appImg.split(";"):[];
       this.viewInfo.appPackage = obj.appPackage;
       this.viewInfo.appRenew = obj.appRenew;
       this.viewInfo.appSize = obj.appSize;
@@ -1473,6 +1470,7 @@ export default {
         deviceids: [],
         schoolids: []
       };
+      this.file_list = [];
       this.school_list = JSON.parse(JSON.stringify(this.curRegion));
       this.$nextTick(() => {
         this.$refs.addForm.resetFields();
@@ -1734,7 +1732,7 @@ export default {
     }
     .app_comm {
       flex: none;
-      width: 120px;
+      min-width: 120px;
       margin-left: 10px;
       text-align: left;
       div {

src/views/regionSection/home/index.vue

@@ -847,7 +847,7 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    &.last-child {
+    &:last-of-type{
       margin-bottom: 0;
     }
     .cell_item {
@@ -889,7 +889,7 @@ export default {
       }
       .content_main {
         width: 100%;
-        height: calc(100% - 48px);
+        height: calc(100% - 64px);
         #controlVersionEcharts,
         #appVersionEcharts {
           display: inline-block;

src/views/regionSection/notice/index.vue

@@ -111,19 +111,19 @@ export default {
         {
           title: "发布人",
           key: "createname",
-          width: 140,
+          width: 200,
           align: "center"
         },
         {
           title: "时间",
           key: "updatetime",
-          width: 190,
+          width: 220,
           align: "center"
         },
         {
           title: "操作",
           slot: "actionSlot",
-          width: 90,
+          width: 120,
           align: "center"
         }
       ]

src/views/regionSection/regionManage/regionManage.vue

@@ -471,25 +471,21 @@ export default {
         {
           title: "创建人",
           key: "createname",
-          width: 140,
           align: "center"
         },
         {
           title: "创建时间",
           key: "createtime",
-          width: 190,
           align: "center"
         },
         {
           title: "操作人",
           key: "updatename",
-          width: 140,
           align: "center"
         },
         {
           title: "操作时间",
           key: "updatetime",
-          width: 190,
           align: "center"
         },
         {

src/views/regionSection/search/allApps.vue

@@ -601,24 +601,22 @@ export default {
         {
           title: "应用",
           slot: "appName",
-          align: "center"
+          align: "center",
+          minWidth: 160
         },
         {
           title: "分组",
           key: "appgroupName",
-          width: 140,
           align: "center"
         },
         {
           title: "属性应用",
           slot: "appType",
-          width: 120,
           align: "center"
         },
         {
           title: "状态",
           slot: "enabled",
-          width: 100,
           align: "center"
         },
         {
@@ -630,7 +628,6 @@ export default {
         {
           title: "操作人",
           key: "updatename",
-          width: 120,
           align: "center"
         },
         {
@@ -816,7 +813,7 @@ export default {
       this.viewInfo.appAbbr = obj.appAbbr;
       this.viewInfo.appDeveloper = obj.appDeveloper;
       this.viewInfo.appIcon = obj.appIcon;
-      this.viewInfo.appImg = obj.appImg.split(";");
+      this.viewInfo.appImg = obj.appImg?obj.appImg.split(";"):[];
       this.viewInfo.appPackage = obj.appPackage;
       this.viewInfo.appRenew = obj.appRenew;
       this.viewInfo.appSize = obj.appSize;
@@ -961,7 +958,7 @@ export default {
     }
     .app_comm {
       flex: none;
-      width: 120px;
+      min-width: 120px;
       margin-left: 10px;
       text-align: left;
       div {

src/views/regionSection/search/allWhitelists.vue

@@ -122,8 +122,8 @@ export default {
         {
           title: "名称",
           key: "whiteName",
-          width: 180,
-          align: "center"
+          align: "center",
+          width: 300
         },
         {
           title: "网址",

src/views/regionSection/search/clientVersion.vue

@@ -90,13 +90,11 @@ export default {
         {
           title: "设备数",
           key: "num",
-          width: 140,
           align: "center"
         },
         {
           title: "学校设备总数",
           key: "totalnum",
-          width: 140,
           align: "center"
         }
       ]

src/views/regionSection/search/deviceModel.vue

@@ -74,19 +74,16 @@ export default {
         {
           title: "Rom版本",
           key: "romVersion",
-          width: 190,
           align: "center"
         },
         {
           title: "设备数",
           key: "num",
-          width: 140,
           align: "center"
         },
         {
           title: "学校设备总数",
           key: "totalnum",
-          width: 140,
           align: "center"
         }
       ]

src/views/schoolSection/applicationManage/applicationList.vue

@@ -879,24 +879,22 @@ export default {
         {
           title: "应用",
           slot: "appName",
-          align: "center"
+          align: "center",
+          minWidth: 160
         },
         {
           title: "分组",
           key: "appgroupName",
-          align: "center",
-          width: 120
+          align: "center"
         },
         {
           title: "属性应用",
           slot: "appType",
-          align: "center",
-          width: 100
+          align: "center"
         },
         {
           title: "状态",
           slot: "enabled",
-          width: 100,
           align: "center"
         },
         {
@@ -908,8 +906,7 @@ export default {
         {
           title: "可信任",
           slot: "trusted",
-          align: "center",
-          width: 80
+          align: "center"
         },
         {
           title: "操作时间",
@@ -958,7 +955,7 @@ export default {
       this.viewInfo.appAbbr = obj.appAbbr;
       this.viewInfo.appDeveloper = obj.appDeveloper;
       this.viewInfo.appIcon = obj.appIcon;
-      this.viewInfo.appImg = obj.appImg.split(";");
+      this.viewInfo.appImg = obj.appImg?obj.appImg.split(";"):[];
       this.viewInfo.appPackage = obj.appPackage;
       this.viewInfo.appRenew = obj.appRenew;
       this.viewInfo.appSize = obj.appSize;
@@ -1595,7 +1592,7 @@ export default {
     }
     .app_comm {
       flex: none;
-      width: 120px;
+      min-width: 120px;
       margin-left: 10px;
       text-align: left;
       div {

src/views/schoolSection/home/index.vue

@@ -967,7 +967,7 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    &.last-child {
+    &:last-of-type {
       margin-bottom: 0;
     }
     .cell_item {
@@ -1006,7 +1006,7 @@ export default {
       }
       .content_main {
         width: 100%;
-        height: calc(100% - 48px);
+        height: calc(100% - 64px);
         &.online_devices {
           display: flex;
           justify-content: space-between;

src/views/schoolSection/notice/notice.vue

@@ -114,19 +114,19 @@ export default {
         {
           title: "发布人",
           key: "createname",
-          width: 140,
+          width: 200,
           align: "center"
         },
         {
           title: "时间",
           key: "updatetime",
-          width: 190,
+          width: 220,
           align: "center"
         },
         {
           title: "操作",
           slot: "actionSlot",
-          width: 90,
+          width: 120,
           align: "center"
         }
       ]

src/views/schoolSection/strategy/personalStrategy.vue

@@ -483,14 +483,12 @@ export default {
         {
           title: "所属用户组",
           key: "classname",
-          align: "center",
-          width: 140
+          align: "center"
         },
         {
           title: "操作时间",
           key: "updatetime",
-          align: "center",
-          width: 180
+          align: "center"
         },
         {
           title: "操作",

src/views/schoolSection/strategy/strategyTemplate.vue

@@ -494,13 +494,11 @@ export default {
         {
           title: "操作人",
           key: "updatename",
-          width: 180,
           align: "center"
         },
         {
           title: "操作时间",
           key: "updatetime",
-          width: 220,
           align: "center"
         },
         {

src/views/schoolSection/userManage/userManage.vue

@@ -444,17 +444,17 @@ export default {
       wait_flag: false,
       showLoading: false,
       care_list: [
-        { id: 0, title: "请选择关注状态" },
+        { id: 0, title: "关注状态" },
         { id: 1, title: "重点关注" },
         { id: 2, title: "不关注" }
       ],
       enabled_list: [
-        { id: 0, title: "请选择启动状态" },
+        { id: 0, title: "启动状态" },
         { id: 1, title: "启用" },
         { id: 2, title: "禁用" }
       ],
       control_list: [
-        { id: 0, title: "请选择管控状态" },
+        { id: 0, title: "管控状态" },
         { id: 1, title: "管控中" },
         { id: 2, title: "解除管控" }
       ],
@@ -550,19 +550,16 @@ export default {
         {
           title: "姓名",
           key: "username",
-          align: "center",
-          width: 140
+          align: "center"
         },
         {
           title: "班级",
           key: "classname",
-          align: "center",
-          width: 140
+          align: "center"
         },
         {
           title: "状态",
           slot: "enabled",
-          width: 100,
           align: "center"
         },
         {