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

src/assets/less/common.less

@@ -491,3 +491,17 @@ fieldset[disabled] .ivu-input,
     }
   }
 }
+//开关组件
+.ivu-switch {
+  .ivu-switch-inner{
+    color: #798cb5;
+  }
+}
+.ivu-switch-checked {
+  border-color: #339dff;
+  background-color: #339dff;
+  .ivu-switch-inner{
+    color: white;
+  }
+}
+

src/views/regionSection/applicationManage/applicationManage.vue

@@ -37,8 +37,8 @@
               <img :src="$api.showImageUrl + row.appIcon" />
             </div>
             <div class="app_comm">
-              <div>
-                {{ row.appName }}
+              <div :title="row.appName">
+                <div class="apptitle">{{ row.appName }}</div>
                 <div v-if="row.belong === 1" class="app_tag">公共</div>
                 <div v-else-if="row.belong === 2" class="web_tag">私有</div>
               </div>
@@ -305,7 +305,7 @@
               </uploader>
             </div>
             <div class="upProgress" v-if="file_list.length > 0">
-              <div v-for="file in file_list" key="file1">
+              <div v-for="(file, index) in file_list" :key="index">
                 <div class="file_name" :title="wallpaperInfo.appPackage">
                   <div class="show_name">
                     {{ wallpaperInfo.appPackage }}
@@ -812,7 +812,7 @@ export default {
           {
             title: "序号",
             type: "index",
-            width: 70,
+            width: 60,
             align: "center"
           },
           {
@@ -895,7 +895,7 @@ export default {
         {
           title: "序号",
           align: "center",
-          width: 70,
+          Width: 50,
           render: (h, params) => {
             return h(
               "span",
@@ -909,45 +909,48 @@ export default {
           title: "应用",
           slot: "appName",
           align: "center",
-          minWidth: 160
+          minWidth: 250
         },
         {
           title: "分组",
           key: "appgroupName",
-          align: "center"
+          align: "center",
+          minWidth: 80
         },
         {
           title: "属性应用",
           slot: "appType",
-          align: "center"
+          align: "center",
+          minWidth: 80
         },
         {
           title: "状态",
           slot: "enabled",
-          align: "center"
+          align: "center",
+          minWidth: 50
         },
         {
           title: "网址白名单例外",
           slot: "whited",
           align: "center",
-          width: 140
+          minWidth: 80
         },
         {
           title: "操作时间",
           key: "updatetime",
           align: "center",
-          width: 180
+          width: 150
         },
         {
           title: "统计",
           slot: "countSlot",
           align: "center",
-          width: 160
+          width: 120
         },
         {
           title: "操作",
           slot: "actionSlot",
-          width: 180,
+          width: 140,
           align: "center"
         }
       ]
@@ -981,10 +984,8 @@ export default {
         (v) => v.versionName === this.viewInfo.versionName
       )[0];
       this.viewInfo.apkPath = obj.apkPath;
-      this.viewInfo.appAbbr = obj.appAbbr;
       this.viewInfo.appDeveloper = obj.appDeveloper;
       this.viewInfo.appIcon = obj.appIcon;
-      this.viewInfo.appImg = obj.appImg ? obj.appImg.split(";") : [];
       this.viewInfo.appPackage = obj.appPackage;
       this.viewInfo.appRenew = obj.appRenew;
       this.viewInfo.appSize = obj.appSize;
@@ -1519,7 +1520,8 @@ export default {
             appName: this.wallpaperInfo.appName,
             enabled: this.wallpaperInfo.enabled,
             appType: this.wallpaperInfo.appType,
-            forced: this.wallpaperInfo.appType === 1?0:this.wallpaperInfo.forced,
+            forced:
+              this.wallpaperInfo.appType === 1 ? 0 : this.wallpaperInfo.forced,
             whited: this.wallpaperInfo.whited,
             showico: this.wallpaperInfo.showico,
             strategy: this.wallpaperInfo.strategy,
@@ -1714,6 +1716,7 @@ export default {
       border: 1px solid #e5e5e5;
       background: #ffffff;
       padding: 10px;
+      margin-top: 8px;
       img {
         width: 38px;
         height: 38px;
@@ -1722,19 +1725,26 @@ export default {
     }
     .app_comm {
       flex: none;
-      min-width: 120px;
       margin-left: 10px;
       text-align: left;
       div {
+        display: flex;
+        align-items: center;
         color: #339dff;
       }
+      .apptitle {
+        display: inline-block;
+        max-width: 140px;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
       .app_tag {
         display: inline-block;
         margin-left: 4px;
         width: 32px;
         text-align: center;
         color: #fff;
-        line-height: 1.6;
         font-size: 12px;
         border-radius: 5px;
         background-color: #7854f6;

src/views/regionSection/regionManage/adminManage.vue

@@ -419,7 +419,7 @@ export default {
         {
           title: "序号",
           align: "center",
-          width: 70,
+          width: 50,
           render: (h, params) => {
             return h(
               "span",
@@ -442,7 +442,6 @@ export default {
         {
           title: "手机号码",
           key: "phone",
-          width: 135,
           align: "center"
         },
         {
@@ -464,19 +463,19 @@ export default {
         {
           title: "最后登录IP",
           key: "lastip",
-          width: 150,
+          width: 130,
           align: "center"
         },
         {
           title: "最后登录时间",
           key: "lasttime",
-          width: 190,
+          width: 150,
           align: "center"
         },
         {
           title: "操作",
           slot: "actionSlot",
-          width: 180,
+          width: 140,
           align: "center"
         }
       ],

src/views/regionSection/regionManage/regionManage.vue

@@ -22,7 +22,13 @@
             </div>
             <div @click="toView(row)">查看</div>
             <div @click="toEdit(row)">编辑</div>
-            <div class="action_del" @click="toDel(row)">删除</div>
+            <div
+              v-if="row.regionid != powerParams.objectid"
+              class="action_del"
+              @click="toDel(row)"
+            >
+              删除
+            </div>
             <div @click="toSet(row)">设置</div>
           </div>
         </template>
@@ -491,7 +497,7 @@ export default {
         {
           title: "操作",
           slot: "actionSlot",
-          width: 280,
+          width: 230,
           align: "center"
         }
       ],

src/views/regionSection/regionManage/schoolManage.vue

@@ -410,7 +410,7 @@ export default {
         {
           title: "序号",
           align: "center",
-          width: 70,
+          width: 50,
           render: (h, params) => {
             return h(
               "span",
@@ -445,7 +445,6 @@ export default {
         {
           title: "所属区域",
           key: "regionName",
-          width: 150,
           align: "center"
         },
         {
@@ -457,13 +456,13 @@ export default {
         {
           title: "操作时间",
           key: "updatetime",
-          width: 190,
+          width: 150,
           align: "center"
         },
         {
           title: "操作",
           slot: "actionSlot",
-          width: 180,
+          width: 140,
           align: "center"
         }
       ],

src/views/regionSection/search/allApps.vue

@@ -23,8 +23,8 @@
               <img :src="$api.showImageUrl + row.appIcon" />
             </div>
             <div class="app_comm">
-              <div>
-                {{ row.appName }}
+              <div :title="row.appName">
+                <div class="apptitle">{{ row.appName }}</div>
                 <div v-if="row.belong === 1" class="app_tag">公共</div>
                 <div v-else-if="row.belong === 2" class="web_tag">私有</div>
               </div>
@@ -440,7 +440,7 @@ export default {
         {
           title: "序号",
           align: "center",
-          width: 70,
+          width: 50,
           render: (h, params) => {
             return h(
               "span",
@@ -454,50 +454,54 @@ export default {
           title: "应用",
           slot: "appName",
           align: "center",
-          minWidth: 160
+          minWidth: 250
         },
         {
           title: "分组",
           key: "appgroupName",
-          align: "center"
+          align: "center",
+          minWidth: 80
         },
         {
           title: "属性应用",
           slot: "appType",
-          align: "center"
+          align: "center",
+          minWidth: 80
         },
         {
           title: "状态",
           slot: "enabled",
-          align: "center"
+          align: "center",
+          minWidth: 50
         },
         {
           title: "网址白名单例外",
           slot: "whited",
-          width: 140,
+          minWidth: 80,
           align: "center"
         },
         {
           title: "操作人",
           key: "updatename",
-          align: "center"
+          align: "center",
+          minWidth: 100
         },
         {
           title: "操作时间",
           key: "updatetime",
-          width: 180,
+          width: 150,
           align: "center"
         },
         {
           title: "统计",
           slot: "countSlot",
-          width: 160,
+          width: 120,
           align: "center"
         },
         {
           title: "操作",
           slot: "actionSlot",
-          width: 130,
+          width: 100,
           align: "center"
         }
       ]
@@ -662,10 +666,8 @@ export default {
         (v) => v.versionName === this.viewInfo.versionName
       )[0];
       this.viewInfo.apkPath = obj.apkPath;
-      this.viewInfo.appAbbr = obj.appAbbr;
       this.viewInfo.appDeveloper = obj.appDeveloper;
       this.viewInfo.appIcon = obj.appIcon;
-      this.viewInfo.appImg = obj.appImg ? obj.appImg.split(";") : [];
       this.viewInfo.appPackage = obj.appPackage;
       this.viewInfo.appRenew = obj.appRenew;
       this.viewInfo.appSize = obj.appSize;
@@ -707,7 +709,6 @@ export default {
             devices: res.obj.devices,
             schools: res.obj.schools
           };
-          console.log(this.viewInfo)
         } else {
           this.$Message.error(res.msg);
         }
@@ -810,12 +811,20 @@ export default {
     }
     .app_comm {
       flex: none;
-      min-width: 120px;
       margin-left: 10px;
       text-align: left;
       div {
+        display: flex;
+        align-items: center;
         color: #339dff;
       }
+      .apptitle {
+        display: inline-block;
+        max-width: 140px;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
       .app_tag {
         display: inline-block;
         margin-left: 4px;

src/views/regionSection/search/allUsers.vue

@@ -76,19 +76,16 @@ export default {
         {
           title: "学生姓名",
           key: "username",
-          width: 140,
           align: "center"
         },
         {
           title: "状态",
           slot: "enabled",
-          width: 190,
           align: "center"
         },
         {
           title: "学校名称",
           key: "schoolName",
-          width: 140,
           align: "center"
         },
         {

src/views/schoolSection/applicationManage/applicationList.vue

@@ -53,8 +53,8 @@
               <img :src="$api.showImageUrl + row.appIcon" />
             </div>
             <div class="app_comm">
-              <div>
-                {{ row.appName }}
+              <div :title="row.appName">
+                <div class="apptitle">{{ row.appName }}</div>
                 <div v-if="row.belong === 1" class="app_tag">公共</div>
                 <div v-else-if="row.belong === 2" class="web_tag">私有</div>
               </div>
@@ -862,7 +862,7 @@ export default {
         {
           title: "序号",
           align: "center",
-          width: 70,
+          width: 50,
           render: (h, params) => {
             return h(
               "span",
@@ -876,45 +876,48 @@ export default {
           title: "应用",
           slot: "appName",
           align: "center",
-          minWidth: 160
+          minWidth: 250
         },
         {
           title: "分组",
           key: "appgroupName",
-          align: "center"
+          align: "center",
+          minWidth: 80
         },
         {
           title: "属性应用",
           slot: "appType",
-          align: "center"
+          align: "center",
+          minWidth: 80
         },
         {
           title: "状态",
           slot: "enabled",
-          align: "center"
+          align: "center",
+          minWidth: 50
         },
         {
           title: "网址白名单例外",
           slot: "whited",
           align: "center",
-          width: 140
+          width: 80
         },
         {
           title: "操作时间",
           key: "updatetime",
           align: "center",
-          width: 180
+          width: 150
         },
         {
           title: "统计",
           slot: "countSlot",
           align: "center",
-          width: 160
+          width: 120
         },
         {
           title: "操作",
           slot: "actionSlot",
-          width: 180,
+          width: 140,
           align: "center"
         }
       ]
@@ -948,10 +951,8 @@ export default {
         (v) => v.versionName === this.viewInfo.versionName
       )[0];
       this.viewInfo.apkPath = obj.apkPath;
-      this.viewInfo.appAbbr = obj.appAbbr;
       this.viewInfo.appDeveloper = obj.appDeveloper;
       this.viewInfo.appIcon = obj.appIcon;
-      this.viewInfo.appImg = obj.appImg ? obj.appImg.split(";") : [];
       this.viewInfo.appPackage = obj.appPackage;
       this.viewInfo.appRenew = obj.appRenew;
       this.viewInfo.appSize = obj.appSize;
@@ -1101,7 +1102,7 @@ export default {
               {
                 title: "序号",
                 type: "index",
-                width: 70,
+                width: 50,
                 align: "center"
               },
               {
@@ -1589,8 +1590,17 @@ export default {
       margin-left: 10px;
       text-align: left;
       div {
+        display: flex;
+        align-items: center;
         color: #339dff;
       }
+      .apptitle {
+        display: inline-block;
+        max-width: 140px;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
       .app_tag {
         display: inline-block;
         margin-left: 4px;

src/views/schoolSection/applicationManage/greenBrowser.vue

@@ -138,13 +138,13 @@ export default {
         {
           title: "操作时间",
           key: "updatetime",
-          width: 190,
+          width: 160,
           align: "center"
         },
         {
           title: "操作",
           slot: "actionSlot",
-          width: 140,
+          width: 120,
           align: "center"
         }
       ],

src/views/schoolSection/strategy/personalStrategy.vue

@@ -460,7 +460,7 @@ export default {
         {
           title: "序号",
           align: "center",
-          width: 70,
+          width: 50,
           render: (h, params) => {
             return h(
               "span",
@@ -488,13 +488,14 @@ export default {
         {
           title: "操作时间",
           key: "updatetime",
-          align: "center"
+          align: "center",
+          width: 150
         },
         {
           title: "操作",
           slot: "operation",
           align: "center",
-          width: 220
+          width: 160
         }
       ]
     };

src/views/schoolSection/strategy/strategyTemplate.vue

@@ -504,7 +504,7 @@ export default {
         {
           title: "操作",
           slot: "actionSlot",
-          width: 280,
+          width: 220,
           align: "center"
         }
       ]

src/views/schoolSection/userManage/userManage.vue

@@ -121,10 +121,8 @@
           <template slot-scope="{ row }" slot="actionSlot">
             <div class="action_list">
               <div class="action_del" @click="toDel(row)">删除</div>
-              <div class="action_success pointer" @click="toCare(row)">
-                <span v-if="row.care === 2">重点关注</span>
-                <span v-else>取消关注</span>
-              </div>
+              <div v-if="row.care === 2" @click="toCare(row)">重点关注</div>
+              <div v-else class="action_del" @click="toCare(row)">取消关注</div>
             </div>
           </template>
         </Table>
@@ -566,12 +564,12 @@ export default {
           title: "最后登录时间",
           key: "lasttime",
           align: "center",
-          width: 180
+          width: 150
         },
         {
           title: "操作",
           slot: "actionSlot",
-          width: 240,
+          width: 160,
           align: "center"
         }
       ],