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

src/api/appgroup.js

@@ -85,6 +85,16 @@ export const app_edit_enable = (data) => setRequest("app/edit_enable", data);
  */
 export const app_edit_unenable = (data) =>
   setRequest("app/edit_unenable", data);
+/**
+ * 5.2.12 应用-历史版本
+ */
+export const app_detail_history = (data) =>
+  setRequest("app/detail_history", data);
+/**
+ * 5.2.13 应用-安装统计
+ */
+export const app_install_statistic = (data) =>
+  setRequest("app/install_statistic", data);
 /**
  * 5.3 设备-列表(分组下设备)
  */

src/api/region.js

@@ -30,6 +30,10 @@ export const region_add = (data) => setRequest("region/add", data);
  * 2.3区域--更新
  */
 export const region_edit = (data) => setRequest("region/edit", data);
+/**
+ * 2.1.3.2区域--设置
+ */
+export const region_set = (data) => setRequest("region/set", data);
 /**
  * 2.4区域--删除
  */

src/api/setting.js

@@ -20,6 +20,21 @@ export const wallpaper_detail = (data) => setRequest("wallpaper/detail", data);
  * 8.1.5 壁纸-删除
  */
 export const wallpaper_delete = (data) => setRequest("wallpaper/delete", data);
+/**
+ *8.1.6 壁纸-是否有添加
+ */
+export const wallpaper_add_has = (data) =>
+  setRequest("wallpaper/add_has", data);
+/**
+ * 8.1.7 壁纸-选择设备
+ */
+export const wallpaper_list_device = (data) =>
+  setRequest("wallpaper/list_device", data);
+/**
+ * 8.1.9 壁纸-选择设备包含自己
+ */
+export const wallpaper_list_devicewp = (data) =>
+  setRequest("wallpaper/list_devicewp", data);
 /**
  * 8.2.1 LOGO-详情
  */

src/views/regionSection/applicationManage/applicationManage.vue

@@ -109,6 +109,44 @@
         show-sizer
       ></Page>
     </div>
+    <!-- 安装统计 -->
+    <Modal
+      class="modal1"
+      :mask-closable="false"
+      v-model="installInfo.show"
+      title="安装统计"
+    >
+      <div v-if="installInfo.show">
+        <div class="install_title">
+          {{ installInfo.appName }}
+          <div class="history">
+            <div>版本号码</div>
+            <Select
+              :transfer="true"
+              v-model="installInfo.versionName"
+              @on-change="installChange()"
+              style="width: 120px; margin-left: 10px"
+            >
+              <Option
+                v-for="item in installInfo.apphistorys"
+                :value="item.versionName"
+                :key="item.versionName"
+                >{{ item.versionName }}</Option
+              >
+            </Select>
+          </div>
+        </div>
+        <Table
+          style="border: 1px solid #e8eaec; border-bottom: none"
+          :columns="installInfo.columns"
+          :data="installInfo.list"
+        ></Table>
+      </div>
+
+      <div slot="footer" style="text-align: center">
+        <Button @click="installInfo.show = false">关闭</Button>
+      </div>
+    </Modal>
     <!-- 下载 -->
     <Modal
       class="modal_tip download"
@@ -529,7 +567,20 @@
               }}<span v-if="viewInfo.enabled === 1" class="qy">启用</span>
             </div>
             <div class="view_item">
-              <span>版本号码</span>{{ viewInfo.versionNum }}
+              <span>版本号码</span>
+              <Select
+                :transfer="true"
+                v-model="viewInfo.versionName"
+                @on-change="viewInfoChange()"
+                style="width: 120px"
+              >
+                <Option
+                  v-for="item in viewInfo.apphistorys"
+                  :value="item.versionName"
+                  :key="item.versionName"
+                  >{{ item.versionName }}</Option
+                >
+              </Select>
             </div>
           </div>
           <div class="view_comm">
@@ -649,9 +700,11 @@ import {
   app_add,
   app_delete,
   app_detail,
+  app_detail_history,
   app_edit,
   app_edit_enable,
   app_edit_unenable,
+  app_install_statistic,
   app_list,
   appgroup_list,
   device_list
@@ -755,6 +808,46 @@ export default {
         deviceids: [],
         schoolids: []
       },
+      installInfo: {
+        show: false,
+        appName: "",
+        versionName: null,
+        apphistorys: [],
+        list: [],
+        columns: [
+          {
+            title: "序号",
+            type: "index",
+            width: 70,
+            align: "center"
+          },
+          {
+            title: "区域名称",
+            key: "regionName",
+            align: "center"
+          },
+          {
+            title: "设备总数",
+            key: "total",
+            align: "center"
+          },
+          {
+            title: "已安装设备数",
+            key: "installNum",
+            align: "center"
+          },
+          {
+            title: "未安装设备总数",
+            key: "unInstallNum",
+            align: "center"
+          },
+          {
+            title: "安装比例",
+            key: "installRate",
+            align: "center"
+          }
+        ]
+      },
       rules: {
         appName: [
           {
@@ -891,16 +984,35 @@ export default {
     download(url) {
       window.location.href = this.$api.showImageUrl + url;
     },
+    viewInfoChange() {
+      //查看切换版本
+      let obj = this.viewInfo.apphistorys.filter(
+        (v) => v.versionName === this.viewInfo.versionName
+      )[0];
+      console.log(obj);
+      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.split(";");
+      this.viewInfo.appPackage = obj.appPackage;
+      this.viewInfo.appRenew = obj.appRenew;
+      this.viewInfo.appSize = obj.appSize;
+      this.viewInfo.versionNum = obj.versionNum;
+    },
     // 查看
     toView(row) {
+      this.showLoading = true;
       app_detail({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         appid: row.appid
       }).then((res) => {
+        this.showLoading = false;
         if (res.code === 0) {
           this.viewInfo = {
             show: true,
+            apphistorys: res.obj.apphistorys,
             appName: res.obj.appName,
             appgroupName: row.appgroupName,
             enabled: res.obj.enabled,
@@ -933,11 +1045,13 @@ export default {
     },
     //查看型号
     see_device(row) {
+      this.showLoading = true;
       app_detail({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         appid: row.appid
       }).then((res) => {
+        this.showLoading = false;
         if (res.code === 0) {
           this.deviceInfo = {
             show: true,
@@ -952,12 +1066,14 @@ export default {
     },
     enabledChange(row) {
       let api = row.enabled === 1 ? app_edit_enable : app_edit_unenable;
+      this.showLoading = true;
       api({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         appid: row.appid,
         rversion: row.rversion
       }).then((data) => {
+        this.showLoading = false;
         this.searchList();
         if (data.code === 0) {
           this.$Message.success(data.msg);
@@ -966,41 +1082,111 @@ export default {
         }
       });
     },
-    countSlot(row, type) {
-      console.log(row);
+    installChange() {
+      //安装统计切换版本
+      console.log(this.installInfo.versionName);
+      let obj = this.installInfo.apphistorys.filter(
+        (v) => v.versionName === this.installInfo.versionName
+      )[0];
+      this.showLoading = true;
+      app_install_statistic({
+        appPackage: obj.appPackage,
+        versionName: obj.versionName,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid
+      }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          console.log(res.obj);
+          this.installInfo.list = res.obj;
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
+    async countSlot(row, type) {
       if (type === 1) {
         //下载
-        app_detail({
-          rtype: this.powerParams.rtype,
-          objectid: this.powerParams.objectid,
-          appid: row.appid
-        }).then((res) => {
-          if (res.code === 0) {
-            this.downloadInfo = {
-              show: true,
-              appName: res.obj.appName,
-              apkPath: res.obj.apkPath
-            };
-            this.$nextTick(() => {
-              let qrcodeEl = this.$refs.ScanShare;
-              if (!qrcodeEl) {
-                return;
-              }
-              qrcodeEl.innerHTML = "";
-              let qrcode = new QRCode(qrcodeEl, {
-                width: 140,
-                height: 140,
-                text: this.$api.showImageUrl + this.downloadInfo.apkPath
-              });
-              qrcode._el.title = "";
-            });
-            console.log(this.downloadInfo);
-          } else {
-            this.$Message.error(res.msg);
+        this.downloadInfo = {
+          show: true,
+          appName: row.appName,
+          apkPath: row.apkPath
+        };
+        this.$nextTick(() => {
+          let qrcodeEl = this.$refs.ScanShare;
+          if (!qrcodeEl) {
+            return;
           }
+          qrcodeEl.innerHTML = "";
+          let qrcode = new QRCode(qrcodeEl, {
+            width: 140,
+            height: 140,
+            text: this.$api.showImageUrl + this.downloadInfo.apkPath
+          });
+          qrcode._el.title = "";
         });
+        console.log(this.downloadInfo);
       } else if (type === 2) {
+        //获取历史版本
+        this.showLoading = true;
+        let res = await app_detail_history({ appid: row.appid });
+        if (res.code === 0) {
+        } else {
+          this.$Message.error(res.msg);
+        }
         //安装统计
+        let res1 = await app_install_statistic({
+          appPackage: row.appPackage,
+          versionName: row.versionName,
+          rtype: this.powerParams.rtype,
+          objectid: this.powerParams.objectid
+        });
+        this.showLoading = false;
+        if (res1.code === 0) {
+          console.log(res1.obj);
+          this.installInfo = {
+            show: true,
+            appName: row.appName,
+            apphistorys: res.obj,
+            versionName: row.versionName,
+            list: res1.obj,
+            columns: [
+              {
+                title: "序号",
+                type: "index",
+                width: 70,
+                align: "center"
+              },
+              {
+                title: "区域名称",
+                key: "regionName",
+                align: "center"
+              },
+              {
+                title: "设备总数",
+                key: "total",
+                align: "center"
+              },
+              {
+                title: "已安装设备数",
+                key: "installNum",
+                align: "center"
+              },
+              {
+                title: "未安装设备总数",
+                key: "unInstallNum",
+                align: "center"
+              },
+              {
+                title: "安装比例",
+                key: "installRate",
+                align: "center"
+              }
+            ]
+          };
+        } else {
+          this.$Message.error(res1.msg);
+        }
       }
     },
     //删除截图
@@ -1071,6 +1257,7 @@ export default {
         formData.append("filename", `${file.resourcename}.${file.suffix}`);
         formData.append("savefolder", "app");
         // 进行post 请求
+        that.showLoading = true;
         axios({
           method: "post",
           timeout: 1000 * window._config.axiosFileTimeout,
@@ -1081,6 +1268,7 @@ export default {
           }
         })
           .then((response) => {
+            that.showLoading = false;
             let res = response.data;
             if (res.code === 0) {
               that.wallpaperInfo.apkPath = res.obj.apkPath;
@@ -1382,7 +1570,9 @@ export default {
           }
           console.log(form);
           let api = this.wallpaperInfo.appid ? app_edit : app_add;
+          this.showLoading = true;
           api(form).then((res) => {
+            this.showLoading = false;
             if (res.code === 0) {
               this.wallpaperInfo.show = false;
               console.log(res.obj);
@@ -1417,11 +1607,13 @@ export default {
 
     // 编辑
     toEdit(row) {
+      this.showLoading = true;
       app_detail({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         appid: row.appid
       }).then((res) => {
+        this.showLoading = false;
         if (res.code === 0) {
           this.school_list = JSON.parse(JSON.stringify(this.curRegion));
           this.wallpaperInfo = {
@@ -1499,12 +1691,14 @@ export default {
         title: "提示",
         content: "您确定删除选中数据吗？",
         onOk: () => {
+          this.showLoading = true;
           app_delete({
             rtype: this.powerParams.rtype,
             objectid: this.powerParams.objectid,
             appid: row.appid,
             rversion: row.rversion
           }).then((res) => {
+            this.showLoading = false;
             if (res.code === 0) {
               this.$Message.success(res.msg);
               this.searchList();
@@ -1541,7 +1735,7 @@ export default {
     display: flex;
     margin: 16px 0;
     .app_logo {
-      flex-wrap: none;
+      flex: none;
       width: 56px;
       height: 56px;
       border-radius: 20px;
@@ -1582,11 +1776,22 @@ export default {
     cursor: not-allowed;
   }
 }
-.view_title {
+.install_title {
   margin-bottom: 16px;
   font-size: 18px;
   font-weight: bold;
   text-align: center;
+  position: relative;
+}
+.history {
+  position: absolute;
+  top: 0;
+  right: 0;
+  display: flex;
+  font-size: 16px;
+  font-weight: 400;
+  font-family: "SourceHanSansCN";
+  align-items: center;
 }
 .view_content {
   display: flex;
@@ -1602,7 +1807,6 @@ export default {
 }
 .view_devices {
   .view_list {
-    margin-bottom: 20px;
     line-height: 32px;
   }
   .dgname {

src/views/regionSection/home/index.vue

@@ -1,5 +1,9 @@
 <template>
-  <div class="main_root">区域首页</div>
+  <div class="main_root">
+    <div class="content">
+      <div></div>
+    </div>
+  </div>
 </template>
 
 <script>

src/views/regionSection/log/appLaunch.vue

@@ -95,7 +95,7 @@ export default {
         },
         {
           title: "姓名",
-          key: "aname",
+          key: "username",
           align: "center"
         },
         {

src/views/regionSection/log/applicationDownload.vue

@@ -87,7 +87,7 @@ export default {
         },
         {
           title: "姓名",
-          key: "aname",
+          key: "username",
           align: "center"
         },
         {

src/views/regionSection/log/deviceEvents.vue

@@ -73,6 +73,7 @@
 <script>
 import { dateFormat, doEventInfo } from "@/utils";
 import { logdoperate_list_event } from "@/api/log";
+import { exportToExcel } from "@/utils/exportToExcel";
 export default {
   data() {
     return {
@@ -203,7 +204,53 @@ export default {
         }
       });
     },
-    toExport() {}
+    toExport() {
+      let _begindate = this.searchForm.dataRange[0];
+      _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
+      let _enddate = this.searchForm.dataRange[1];
+      _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      logdoperate_list_event({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
+        doEvent: this.searchForm.doEvent,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name
+      }).then((data) => {
+        if (data.code === 0) {
+          exportToExcel(
+            [
+              {
+                list: data.obj.data.map((item) => {
+                  return {
+                    学校名称: item.schoolName,
+                    班级: item.classname,
+                    登录名: item.loginname,
+                    姓名: item.username,
+                    设备号码: item.sn,
+                    事件: this.doEventInfo[item.doEvent],
+                    描述: item.comm,
+                    // 0不违规1违规
+                    违规:
+                      item.violated === 1
+                        ? "违规"
+                        : item.violated === 0
+                        ? "不违规"
+                        : "",
+                    时间: item.createtime
+                  };
+                }),
+                name: "设备事件日志"
+              }
+            ],
+            "设备事件日志"
+          );
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
   }
 };
 </script>

src/views/regionSection/log/deviceInstallation.vue

@@ -47,6 +47,7 @@
 <script>
 import { dateFormat } from "@/utils";
 import { logAppStart_list_install } from "@/api/log";
+import { exportToExcel } from "@/utils/exportToExcel";
 export default {
   data() {
     return {
@@ -179,7 +180,47 @@ export default {
         }
       });
     },
-    toExport() {}
+    toExport() {
+      let _begindate = this.searchForm.dataRange[0];
+      _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
+      let _enddate = this.searchForm.dataRange[1];
+      _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      logAppStart_list_install({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name
+      }).then((data) => {
+        if (data.code === 0) {
+          exportToExcel(
+            [
+              {
+                list: data.obj.data.map((item) => {
+                  return {
+                    学校名称: item.schoolName,
+                    班级: item.classname,
+                    登录名: item.loginname,
+                    姓名: item.username,
+                    设备号码: item.sn,
+                    应用名称: item.appName,
+                    应用包名: item.appPackage,
+                    版本名称: item.versionName,
+                    版本号: item.versionNum,
+                    上报时间: item.createtime
+                  };
+                }),
+                name: "设备已安装应用"
+              }
+            ],
+            "设备已安装应用"
+          );
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
   }
 };
 </script>

src/views/regionSection/log/deviceLocation.vue

@@ -47,6 +47,7 @@
 <script>
 import { dateFormat } from "@/utils";
 import { logDeviceLogin_list } from "@/api/log";
+import { exportToExcel } from "@/utils/exportToExcel";
 export default {
   data() {
     return {
@@ -81,12 +82,14 @@ export default {
         {
           title: "登录名",
           key: "loginname",
-          align: "center"
+          align: "center",
+          width: 160
         },
         {
           title: "姓名",
           key: "username",
-          align: "center"
+          align: "center",
+          width: 160
         },
         {
           title: "学校名称",
@@ -96,7 +99,8 @@ export default {
         {
           title: "班级",
           key: "classname",
-          align: "center"
+          align: "center",
+          width: 160
         },
         {
           title: "地址",
@@ -164,7 +168,44 @@ export default {
         }
       });
     },
-    toExport() {}
+    toExport() {
+      let _begindate = this.searchForm.dataRange[0];
+      _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
+      let _enddate = this.searchForm.dataRange[1];
+      _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      logDeviceLogin_list({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name
+      }).then((data) => {
+        if (data.code === 0) {
+          exportToExcel(
+            [
+              {
+                list: data.obj.data.map((item) => {
+                  return {
+                    设备号码: item.sn,
+                    登录名: item.loginname,
+                    姓名: item.username,
+                    学校名称: item.schoolName,
+                    班级: item.classname,
+                    地址: item.ipAddress,
+                    时间: item.createtime
+                  };
+                }),
+                name: "设备位置日志"
+              }
+            ],
+            "设备位置日志"
+          );
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
   }
 };
 </script>

src/views/regionSection/log/devicePush.vue

@@ -83,7 +83,7 @@ export default {
         },
         {
           title: "姓名",
-          key: "aname",
+          key: "username",
           align: "center"
         },
         {

src/views/regionSection/log/violatingDevice.vue

@@ -101,6 +101,7 @@
 <script>
 import { dateFormat, doEventInfo } from "@/utils";
 import { logdoperate_list_violate } from "@/api/log";
+import { exportToExcel } from "@/utils/exportToExcel";
 export default {
   data() {
     return {
@@ -246,7 +247,50 @@ export default {
         }
       });
     },
-    toExport() {}
+    toExport() {
+      let _begindate = this.searchForm.dataRange[0];
+      _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
+      let _enddate = this.searchForm.dataRange[1];
+      _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      logdoperate_list_violate({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        regionid: this.powerParams.objectid,
+        doEvent: this.searchForm.doEvent,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name
+      }).then((data) => {
+        if (data.code === 0) {
+          exportToExcel(
+            [
+              {
+                list: data.obj.data.map((item) => {
+                  return {
+                    学校名称: item.schoolName,
+                    班级: item.classname,
+                    登录名: item.loginname,
+                    姓名: item.username,
+                    设备号码: item.sn,
+                    事件: this.doEventInfo[item.doEvent],
+                    通知: item.noticed === 1 ? "是" : "否",
+                    锁定: item.locked === 1 ? "是" : "否",
+                    重置: item.reseted === 1 ? "是" : "否",
+                    发邮件: item.emailed === 1 ? "是" : "否",
+                    处理结果: item.handled === 1 ? "是" : "否",
+                    时间: item.createtime
+                  };
+                }),
+                name: "违规设备日志"
+              }
+            ],
+            "违规设备日志"
+          );
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
   }
 };
 </script>

src/views/regionSection/regionManage/regionManage.vue

@@ -18,6 +18,7 @@
             <div @click="toView(row)">查看</div>
             <div @click="toEdit(row)">编辑</div>
             <div class="action_del" @click="toDel(row)">删除</div>
+            <div @click="toSet(row)">设置</div>
           </div>
         </template>
       </Table>
@@ -179,6 +180,80 @@
         <Button @click="viewInfo.show = false">关闭</Button>
       </div>
     </Modal>
+    <!-- 设置 -->
+    <Modal
+      class="modal1"
+      :mask-closable="false"
+      v-model="authInfo.show"
+      title="设置"
+    >
+      <div v-if="authInfo.show">
+        <Form
+          ref="authInfo"
+          :model="authInfo"
+          :rules="rules1"
+          :label-width="110"
+        >
+          <FormItem label="单点登录" prop="sso" class="require">
+            <RadioGroup v-model="authInfo.sso">
+              <Radio :label="1">平台</Radio>
+              <Radio :label="2">自定义</Radio>
+            </RadioGroup>
+          </FormItem>
+          <div class="platformLogin" v-if="authInfo.sso === 1">
+            <img src="../../../assets/img/platformLogin.png" />
+            <p>当前已选择平台登录</p>
+          </div>
+          <div v-else>
+            <FormItem label="认证地址" prop="authUrl">
+              <Input
+                v-model.trim="authInfo.authUrl"
+                placeholder="请输入认证地址"
+              ></Input>
+            </FormItem>
+            <FormItem label="认证密钥" prop="authKey">
+              <Input
+                v-model.trim="authInfo.authKey"
+                placeholder="请输入认证密钥"
+              ></Input>
+            </FormItem>
+            <FormItem label="认证类型" class="require">
+              <RadioGroup v-model="authInfo.authType">
+                <Radio :label="1">账号</Radio>
+                <Radio :label="2">学号</Radio>
+                <Radio :label="3">手机号码</Radio>
+                <Radio :label="4">身份证号码</Radio>
+              </RadioGroup>
+            </FormItem>
+            <FormItem label="请求说明">
+              <Table
+                style="border: 1px solid #e8eaec; border-bottom: none"
+                :columns="columns1"
+                :data="request_list"
+              ></Table>
+            </FormItem>
+            <FormItem label="返回说明">
+              <div style="line-height: 36px; margin-bottom: 10px">
+                以json格式返回数据
+              </div>
+              <Table
+                style="border: 1px solid #e8eaec; border-bottom: none"
+                :columns="columns1"
+                :data="response_list"
+              ></Table>
+            </FormItem>
+          </div>
+        </Form>
+      </div>
+      <div slot="footer" style="text-align: right">
+        <Button @click="authInfo.show = false">关闭</Button>
+        <Button @click="saveauthInfo()" type="primary">保存</Button>
+      </div>
+    </Modal>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
@@ -190,7 +265,8 @@ import {
   region_add,
   region_edit,
   region_list_qy,
-  region_detail
+  region_detail,
+  region_set
 } from "@/api/region";
 import { login_msg_code } from "@/api/login";
 export default {
@@ -214,6 +290,7 @@ export default {
       callback();
     };
     return {
+      showLoading: false,
       searchForm: {
         regionName: "",
         page: 1,
@@ -273,6 +350,31 @@ export default {
           }
         ]
       },
+      authInfo: {
+        show: false,
+        regionid: null,
+        rversion: null,
+        sso: null,
+        authUrl: null,
+        authKey: null,
+        authType: null
+      },
+      rules1: {
+        authUrl: [
+          {
+            required: true,
+            message: "请输入认证地址",
+            trigger: "blur"
+          }
+        ],
+        authKey: [
+          {
+            required: true,
+            message: "请输入认证密钥",
+            trigger: "blur"
+          }
+        ]
+      },
       rules: {
         regionName: [
           {
@@ -356,9 +458,122 @@ export default {
         {
           title: "操作",
           slot: "actionSlot",
-          width: 220,
+          width: 280,
           align: "center"
         }
+      ],
+      columns1: [
+        {
+          title: "参数",
+          key: "data",
+          align: "center",
+          width: 180
+        },
+        {
+          title: "类型",
+          key: "type",
+          width: 120,
+          align: "center"
+        },
+        {
+          title: "是否必填",
+          key: "Required",
+          width: 120,
+          align: "center"
+        },
+        {
+          title: "说明",
+          key: "comm",
+          align: "center"
+        }
+      ],
+      request_list: [
+        {
+          data: "loginname",
+          type: "string",
+          Required: "是",
+          comm: "认证类型对应的值"
+        },
+        {
+          data: "loginpwd",
+          type: "string",
+          Required: "是",
+          comm: "认证密码"
+        }
+      ],
+      response_list: [
+        {
+          data: "code",
+          type: "int",
+          Required: "是",
+          comm: "0正常，1错误"
+        },
+        {
+          data: "msg",
+          type: "string",
+          Required: "是",
+          comm: "成功/失败(有失败信息)"
+        },
+        {
+          data: "schoolid",
+          type: "int",
+          Required: "是",
+          comm: "学校ID"
+        },
+        {
+          data: "schoolname",
+          type: "string",
+          Required: "是",
+          comm: "学校名称"
+        },
+        {
+          data: "classid",
+          type: "int",
+          Required: "是",
+          comm: "班级ID"
+        },
+        {
+          data: "classname",
+          type: "string",
+          Required: "是",
+          comm: "班级名称"
+        },
+        {
+          data: "userid",
+          type: "int",
+          Required: "是",
+          comm: "用户ID"
+        },
+        {
+          data: "usename",
+          type: "string",
+          Required: "是",
+          comm: "用户姓名"
+        },
+        {
+          data: "userphone",
+          type: "string",
+          Required: "是",
+          comm: "手机号码"
+        },
+        {
+          data: "studentno",
+          type: "string",
+          Required: "是",
+          comm: "学号"
+        },
+        {
+          data: "loginname",
+          type: "string",
+          Required: "是",
+          comm: "账号"
+        },
+        {
+          data: "cardid",
+          type: "string",
+          Required: "是",
+          comm: "身份证号"
+        }
       ]
     };
   },
@@ -374,6 +589,17 @@ export default {
     }
   },
   methods: {
+    toSet(row) {
+      this.authInfo = {
+        show: true,
+        regionid: row.regionid,
+        rversion: row.rversion,
+        sso: row.sso,
+        authUrl: row.authUrl,
+        authKey: row.authKey,
+        authType: row.authType
+      };
+    },
     // 获取短信验证码
     getMsgCode() {
       if (this.regionInfo.second < 60) {
@@ -390,9 +616,11 @@ export default {
         return;
       }
       this.setRegionSecond();
+      this.showLoading = true;
       login_msg_code({
         phone: this.regionInfo.admin.phone
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           this.$Message.success(data.msg);
         } else {
@@ -429,6 +657,7 @@ export default {
     },
     // 获取列表
     getList() {
+      this.showLoading = true;
       region_list_qy({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
@@ -437,10 +666,11 @@ export default {
         size: this.searchForm.size,
         regionName: this.searchForm.regionName
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
           this.searchForm.total = data.obj.total;
-          console.log(this.searchForm.list)
+          console.log(this.searchForm.list);
         } else {
           this.$Message.error(data.msg);
         }
@@ -468,6 +698,35 @@ export default {
         }
       };
     },
+    //设置
+    saveauthInfo() {
+      this.$refs.authInfo.validate((valid) => {
+        if (valid) {
+          let form = {
+            sso: this.authInfo.sso,
+            regionid: this.authInfo.regionid,
+            rversion: this.authInfo.rversion
+          };
+          if (form.sso === 2) {
+            form.authUrl = this.authInfo.authUrl;
+            form.authKey = this.authInfo.authKey;
+            form.authType = this.authInfo.authType;
+          }
+          console.log(form);
+          this.showLoading = true;
+          region_set(form).then((data) => {
+            this.showLoading = false;
+            this.authInfo.show = false;
+            if (data.code === 0) {
+              this.searchList();
+              this.$Message.success(data.msg);
+            } else {
+              this.$Message.error(data.msg);
+            }
+          });
+        }
+      });
+    },
     // 保存新建
     saveAddInfo() {
       this.$refs.addForm.validate((valid) => {
@@ -488,6 +747,7 @@ export default {
             clearInterval(this.regionInfo.timer);
             this.regionInfo.timer = null;
           }
+          this.showLoading = true;
           region_add({
             regionName: this.regionInfo.regionName,
             rtype: this.powerParams.rtype,
@@ -501,6 +761,7 @@ export default {
               msgcode: this.regionInfo.admin.msgcode
             }
           }).then((data) => {
+            this.showLoading = false;
             if (data.code === 0) {
               this.regionInfo.show = false;
               this.searchList();
@@ -516,6 +777,7 @@ export default {
     saveModifyInfo() {
       this.$refs.modifyForm.validate((valid) => {
         if (valid) {
+          this.showLoading = true;
           region_edit({
             rtype: this.powerParams.rtype,
             objectid: this.powerParams.objectid,
@@ -523,6 +785,7 @@ export default {
             regionName: this.modifyRegion.regionName,
             rversion: this.modifyRegion.rversion
           }).then((data) => {
+            this.showLoading = false;
             this.modifyRegion.show = false;
             if (data.code === 0) {
               this.searchList();
@@ -547,11 +810,13 @@ export default {
     },
     // 查看管理员列表
     toView(row) {
+      this.showLoading = true;
       region_list_admin({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: row.regionid
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           this.viewInfo.show = true;
           this.viewInfo.regionName = row.regionName;
@@ -563,11 +828,13 @@ export default {
     },
     // 编辑
     toEdit(row) {
+      this.showLoading = true;
       region_detail({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: row.regionid
       }).then((res) => {
+        this.showLoading = false;
         if (res.code === 0) {
           this.modifyRegion = {
             show: true,
@@ -586,12 +853,14 @@ export default {
         title: "提示",
         content: "您确定删除选中数据吗？",
         onOk: () => {
+          this.showLoading = true;
           region_delete({
             rtype: this.powerParams.rtype,
             objectid: this.powerParams.objectid,
             regionid: row.regionid,
             rversion: row.rversion
           }).then((data) => {
+            this.showLoading = false;
             if (data.code === 0) {
               this.searchList();
               this.$Message.success(data.msg);
@@ -639,4 +908,19 @@ export default {
   font-weight: bold;
   text-align: center;
 }
+.platformLogin {
+  text-align: center;
+  padding-bottom: 40px;
+  img {
+    width: 212px;
+    height: 212px;
+    margin: 0 auto;
+    object-fit: cover;
+  }
+  p {
+    line-height: 30px;
+    font-size: 14px;
+    color: #7c8db5;
+  }
+}
 </style>

src/views/regionSection/search/allApps.vue

@@ -25,17 +25,19 @@
             <div class="app_comm">
               <div>{{ row.appName }}</div>
               <span>版本: {{ row.versionName }}</span>
-              <div>授权型号: {{ row.devicenum }}个</div>
+              <div @click="see_device(row)" style="cursor: pointer">
+                授权型号: {{ row.devicenum }}个
+              </div>
             </div>
           </div>
         </template>
         <template slot-scope="{ row }" slot="appType">
           <div>{{ row.appType === 1 ? "推荐应用" : "必装应用" }}</div>
         </template>
-        <template slot-scope="{ row }" slot="enable">
+        <template slot-scope="{ row }" slot="enabled">
           <i-switch
             size="large"
-            v-model="row.enable"
+            v-model="row.enabled"
             :true-value="1"
             :false-value="2"
             @on-change="enabledChange(row)"
@@ -93,6 +95,388 @@
         show-sizer
       ></Page>
     </div>
+    <!-- 安装统计 -->
+    <Modal
+      class="modal1"
+      :mask-closable="false"
+      v-model="installInfo.show"
+      title="安装统计"
+    >
+      <div v-if="installInfo.show">
+        <div class="install_title">
+          {{ installInfo.appName }}
+          <div class="history">
+            <div>版本号码</div>
+            <Select
+              :transfer="true"
+              v-model="installInfo.versionName"
+              @on-change="installChange()"
+              style="width: 120px; margin-left: 10px"
+            >
+              <Option
+                v-for="item in installInfo.apphistorys"
+                :value="item.versionName"
+                :key="item.versionName"
+                >{{ item.versionName }}</Option
+              >
+            </Select>
+          </div>
+        </div>
+        <Table
+          style="border: 1px solid #e8eaec; border-bottom: none"
+          :columns="installInfo.columns"
+          :data="installInfo.list"
+        ></Table>
+      </div>
+
+      <div slot="footer" style="text-align: center">
+        <Button @click="installInfo.show = false">关闭</Button>
+      </div>
+    </Modal>
+    <!-- 授权型号 -->
+    <Modal
+      class="modal1 view"
+      :mask-closable="false"
+      v-model="deviceInfo.show"
+      title="授权型号"
+    >
+      <div class="view_content" v-if="deviceInfo.show">
+        <div class="view_title">名称</div>
+        <div class="view_devices" style="width: 100%">
+          <Input style="width: 100%" disabled v-model="deviceInfo.appName" />
+        </div>
+      </div>
+      <div class="view_content" style="margin-top: 20px">
+        <div class="view_title">适配类型</div>
+        <div class="view_devices">
+          <div
+            class="view_list"
+            v-for="item in deviceInfo.devices"
+            :key="item.dgroupid"
+          >
+            <div class="dgname">{{ item.dgname }}</div>
+            <div class="devices">
+              <span v-for="sitem in item.devices" :key="sitem.deviceid">{{
+                sitem.deviceModel
+              }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div slot="footer" style="text-align: center">
+        <Button @click="deviceInfo.show = false">关闭</Button>
+      </div>
+    </Modal>
+    <!-- 下载 -->
+    <Modal
+      class="modal_tip download"
+      :mask-closable="false"
+      v-model="downloadInfo.show"
+      title="下载"
+    >
+      <div class="content" v-if="downloadInfo.show">
+        <div class="title">{{ downloadInfo.appName }}</div>
+        <div class="qrcode">
+          <div id="ScanShare" ref="ScanShare"></div>
+          <p>扫描二维码进行下载</p>
+        </div>
+        <div class="download" @click="download(downloadInfo.apkPath)">
+          <Icon type="md-download" />点击下载
+        </div>
+      </div>
+
+      <div slot="footer" style="text-align: center">
+        <Button @click="downloadInfo.show = false">关闭</Button>
+      </div>
+    </Modal>
+    <!-- 查看 -->
+    <Modal
+      class="modal1"
+      :mask-closable="false"
+      v-model="viewInfo.show"
+      title="查看"
+    >
+      <div class="view_conten" v-if="viewInfo.show">
+        <div class="view_logo">
+          <div>
+            <img
+              v-if="viewInfo.appIcon"
+              :src="$api.showImageUrl + viewInfo.appIcon"
+            />
+          </div>
+          <div class="appIcon" @click="download(viewInfo.appIcon)">
+            <Icon type="md-download" />下载
+          </div>
+        </div>
+        <div class="view_conter">
+          <div class="view_comm">
+            <div class="view_titles">
+              {{ viewInfo.appName
+              }}<span v-if="viewInfo.enabled === 1" class="qy">启用</span>
+            </div>
+            <div class="view_item">
+              <span>版本号码</span>
+              <Select
+                :transfer="true"
+                v-model="viewInfo.versionName"
+                @on-change="viewInfoChange()"
+                style="width: 120px"
+              >
+                <Option
+                  v-for="item in viewInfo.apphistorys"
+                  :value="item.versionName"
+                  :key="item.versionName"
+                  >{{ item.versionName }}</Option
+                >
+              </Select>
+            </div>
+          </div>
+          <div class="view_comm">
+            <div class="view_item">
+              <span>版本名称</span>{{ viewInfo.versionName }}
+            </div>
+            <div class="view_item">
+              <span>分组</span>{{ viewInfo.appgroupName }}
+            </div>
+            <div class="view_item">
+              <span>开发者</span>{{ viewInfo.appDeveloper }}
+            </div>
+          </div>
+          <div class="view_comm">
+            <div class="view_item">
+              <span>强制安装</span>{{ viewInfo.forced === 0 ? "否" : "是" }}
+            </div>
+            <div class="view_item">
+              <span>可信任</span>{{ viewInfo.trusted === 0 ? "否" : "是" }}
+            </div>
+            <div class="view_item">
+              <span>隐藏图标</span>{{ viewInfo.showico === 0 ? "否" : "是" }}
+            </div>
+          </div>
+          <div class="view_comm">
+            <div class="view_item">
+              <span>应用属性</span
+              >{{ viewInfo.appType === 1 ? "推荐应用" : "必装应用" }}
+            </div>
+            <div class="view_item">
+              <span>应用大小</span>{{ viewInfo.appSize }}
+            </div>
+            <div class="view_item">
+              <span>应用包名</span>{{ viewInfo.appPackage }}
+            </div>
+          </div>
+          <div class="view_comm">
+            <div class="view_item">
+              <span style="width: 120px">网址白名单例外</span
+              >{{ viewInfo.whited === 0 ? "否" : "是" }}
+            </div>
+            <div class="view_item">
+              <span style="width: 120px">允许清空缓存</span
+              >{{ viewInfo.cached === 0 ? "否" : "是" }}
+            </div>
+            <div class="view_item">
+              <span style="width: 120px">添加到已有策略</span
+              >{{ viewInfo.strategy === 0 ? "否" : "是" }}
+            </div>
+          </div>
+          <div class="view_com">
+            <div class="view_t">应用截图</div>
+            <div class="view_img">
+              <img
+                v-for="img in viewInfo.appImg"
+                :key="img"
+                :src="$api.showImageUrl + img"
+              />
+            </div>
+          </div>
+          <div class="view_com">
+            <div class="view_t">应用简介</div>
+            <div>{{ viewInfo.appAbbr }}</div>
+          </div>
+          <div class="view_com">
+            <div class="view_t">更新</div>
+            <div>{{ viewInfo.appRenew }}</div>
+          </div>
+          <div class="view_com">
+            <div class="view_t">授权型号</div>
+            <div class="view_devices">
+              <div
+                class="view_list"
+                v-for="item in viewInfo.devices"
+                :key="item.dgroupid"
+              >
+                <div class="dgname" style="line-height: 40px">
+                  {{ item.dgname }}
+                </div>
+                <div class="devices">
+                  <span v-for="sitem in item.devices" :key="sitem.deviceid">{{
+                    sitem.deviceModel
+                  }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="view_com">
+            <div class="view_t">选择学校</div>
+            <div class="view_devices">
+              <div class="devices">
+                <span v-for="item in viewInfo.schools" :key="item.schoolid">{{
+                  item.schoolName
+                }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div slot="footer" style="text-align: center">
+        <Button @click="viewInfo.show = false">关闭</Button>
+      </div>
+    </Modal>
+    <!-- 查看 -->
+    <Modal
+      class="modal1"
+      :mask-closable="false"
+      v-model="viewInfo.show"
+      title="查看"
+    >
+      <div class="view_conten" v-if="viewInfo.show">
+        <div class="view_logo">
+          <div>
+            <img
+              v-if="viewInfo.appIcon"
+              :src="$api.showImageUrl + viewInfo.appIcon"
+            />
+          </div>
+          <div class="appIcon" @click="download(viewInfo.appIcon)">
+            <Icon type="md-download" />下载
+          </div>
+        </div>
+        <div class="view_conter">
+          <div class="view_comm">
+            <div class="view_titles">
+              {{ viewInfo.appName
+              }}<span v-if="viewInfo.enabled === 1" class="qy">启用</span>
+            </div>
+            <div class="view_item">
+              <span>版本号码</span>
+              <Select
+                :transfer="true"
+                v-model="viewInfo.versionName"
+                @on-change="viewInfoChange()"
+                style="width: 120px"
+              >
+                <Option
+                  v-for="item in viewInfo.apphistorys"
+                  :value="item.versionName"
+                  :key="item.versionName"
+                  >{{ item.versionName }}</Option
+                >
+              </Select>
+            </div>
+          </div>
+          <div class="view_comm">
+            <div class="view_item">
+              <span>版本名称</span>{{ viewInfo.versionName }}
+            </div>
+            <div class="view_item">
+              <span>分组</span>{{ viewInfo.appgroupName }}
+            </div>
+            <div class="view_item">
+              <span>开发者</span>{{ viewInfo.appDeveloper }}
+            </div>
+          </div>
+          <div class="view_comm">
+            <div class="view_item">
+              <span>强制安装</span>{{ viewInfo.forced === 0 ? "否" : "是" }}
+            </div>
+            <div class="view_item">
+              <span>可信任</span>{{ viewInfo.trusted === 0 ? "否" : "是" }}
+            </div>
+            <div class="view_item">
+              <span>隐藏图标</span>{{ viewInfo.showico === 0 ? "否" : "是" }}
+            </div>
+          </div>
+          <div class="view_comm">
+            <div class="view_item">
+              <span>应用属性</span
+              >{{ viewInfo.appType === 1 ? "推荐应用" : "必装应用" }}
+            </div>
+            <div class="view_item">
+              <span>应用大小</span>{{ viewInfo.appSize }}
+            </div>
+            <div class="view_item">
+              <span>应用包名</span>{{ viewInfo.appPackage }}
+            </div>
+          </div>
+          <div class="view_comm">
+            <div class="view_item">
+              <span style="width: 120px">网址白名单例外</span
+              >{{ viewInfo.whited === 0 ? "否" : "是" }}
+            </div>
+            <div class="view_item">
+              <span style="width: 120px">允许清空缓存</span
+              >{{ viewInfo.cached === 0 ? "否" : "是" }}
+            </div>
+            <div class="view_item">
+              <span style="width: 120px">添加到已有策略</span
+              >{{ viewInfo.strategy === 0 ? "否" : "是" }}
+            </div>
+          </div>
+          <div class="view_com">
+            <div class="view_t">应用截图</div>
+            <div class="view_img">
+              <img
+                v-for="img in viewInfo.appImg"
+                :key="img"
+                :src="$api.showImageUrl + img"
+              />
+            </div>
+          </div>
+          <div class="view_com">
+            <div class="view_t">应用简介</div>
+            <div>{{ viewInfo.appAbbr }}</div>
+          </div>
+          <div class="view_com">
+            <div class="view_t">更新</div>
+            <div>{{ viewInfo.appRenew }}</div>
+          </div>
+          <div class="view_com">
+            <div class="view_t">授权型号</div>
+            <div class="view_devices">
+              <div
+                class="view_list"
+                v-for="item in viewInfo.devices"
+                :key="item.dgroupid"
+              >
+                <div class="dgname" style="line-height: 40px">
+                  {{ item.dgname }}
+                </div>
+                <div class="devices">
+                  <span v-for="sitem in item.devices" :key="sitem.deviceid">{{
+                    sitem.deviceModel
+                  }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="view_com">
+            <div class="view_t">选择学校</div>
+            <div class="view_devices">
+              <div class="devices">
+                <span v-for="item in viewInfo.schools" :key="item.schoolid">{{
+                  item.schoolName
+                }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div slot="footer" style="text-align: center">
+        <Button @click="viewInfo.show = false">关闭</Button>
+      </div>
+    </Modal>
     <Spin fix v-if="showLoading" style="background-color: transparent">
       <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
       <div>加载中</div>
@@ -102,11 +486,96 @@
 
 <script>
 import { search_list_app } from "@/api/region";
-import { app_edit_enable, app_edit_unenable } from "@/api/appgroup";
+import {
+  app_delete,
+  app_detail,
+  app_detail_history,
+  app_edit_enable,
+  app_edit_unenable,
+  app_install_statistic
+} from "@/api/appgroup";
+import QRCode from "qrcodejs2";
 export default {
   data() {
     return {
       showLoading: false,
+      downloadInfo: {
+        show: false,
+        appName: "",
+        apkPath: ""
+      },
+      deviceInfo: {
+        show: false,
+        appName: "",
+        devices: []
+      },
+      // 查看
+      viewInfo: {
+        show: false,
+        appName: "",
+        appgroupName: "",
+        enabled: 1,
+        appType: 1,
+        forced: 1,
+        whited: 1,
+        trusted: 1,
+        showico: 1,
+        cached: 1,
+        strategy: 1,
+        apkPath: "",
+        appIcon: "",
+        appImg: [],
+        versionName: "",
+        versionNum: "",
+        appSize: "",
+        appDeveloper: "",
+        appPackage: "",
+        appAbbr: "",
+        appRenew: "",
+        targetSchool: 2,
+        deviceids: [],
+        schoolids: []
+      },
+      installInfo: {
+        show: false,
+        appName: "",
+        versionName: null,
+        apphistorys: [],
+        list: [],
+        columns: [
+          {
+            title: "序号",
+            type: "index",
+            width: 70,
+            align: "center"
+          },
+          {
+            title: "区域名称",
+            key: "regionName",
+            align: "center"
+          },
+          {
+            title: "设备总数",
+            key: "total",
+            align: "center"
+          },
+          {
+            title: "已安装设备数",
+            key: "installNum",
+            align: "center"
+          },
+          {
+            title: "未安装设备总数",
+            key: "unInstallNum",
+            align: "center"
+          },
+          {
+            title: "安装比例",
+            key: "installRate",
+            align: "center"
+          }
+        ]
+      },
       searchForm: {
         name: "",
         title: "",
@@ -148,7 +617,7 @@ export default {
         },
         {
           title: "状态",
-          slot: "enable",
+          slot: "enabled",
           width: 120,
           align: "center"
         },
@@ -194,8 +663,33 @@ export default {
     this.searchList();
   },
   methods: {
+    //下载logo
+    download(url) {
+      window.location.href = this.$api.showImageUrl + url;
+    },
+    //查看型号
+    see_device(row) {
+      this.showLoading = true;
+      app_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        appid: row.appid
+      }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          this.deviceInfo = {
+            show: true,
+            appName: res.obj.appName,
+            devices: res.obj.devices
+          };
+          console.log(this.deviceInfo);
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
     enabledChange(row) {
-      let api = row.enable === 1 ? app_edit_enable : app_edit_unenable;
+      let api = row.enabled === 1 ? app_edit_enable : app_edit_unenable;
       this.showLoading = true;
       api({
         rtype: this.powerParams.rtype,
@@ -212,9 +706,197 @@ export default {
         }
       });
     },
-    countSlot() {},
-    toView() {},
-    toDel() {},
+    installChange() {
+      //安装统计切换版本
+      console.log(this.installInfo.versionName);
+      let obj = this.installInfo.apphistorys.filter(
+        (v) => v.versionName === this.installInfo.versionName
+      )[0];
+      this.showLoading = true;
+      app_install_statistic({
+        appPackage: obj.appPackage,
+        versionName: obj.versionName,
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid
+      }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          console.log(res.obj);
+          this.installInfo.list = res.obj;
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
+    async countSlot(row, type) {
+      if (type === 1) {
+        //下载
+        this.downloadInfo = {
+          show: true,
+          appName: row.appName,
+          apkPath: row.apkPath
+        };
+        this.$nextTick(() => {
+          let qrcodeEl = this.$refs.ScanShare;
+          if (!qrcodeEl) {
+            return;
+          }
+          qrcodeEl.innerHTML = "";
+          let qrcode = new QRCode(qrcodeEl, {
+            width: 140,
+            height: 140,
+            text: this.$api.showImageUrl + this.downloadInfo.apkPath
+          });
+          qrcode._el.title = "";
+        });
+        console.log(this.downloadInfo);
+      } else if (type === 2) {
+        //获取历史版本
+        this.showLoading = true;
+        let res = await app_detail_history({ appid: row.appid });
+        if (res.code === 0) {
+        } else {
+          this.$Message.error(res.msg);
+        }
+        //安装统计
+        let res1 = await app_install_statistic({
+          appPackage: row.appPackage,
+          versionName: row.versionName,
+          rtype: this.powerParams.rtype,
+          objectid: this.powerParams.objectid
+        });
+        this.showLoading = false;
+        if (res1.code === 0) {
+          console.log(res1.obj);
+          this.installInfo = {
+            show: true,
+            appName: row.appName,
+            apphistorys: res.obj,
+            versionName: row.versionName,
+            list: res1.obj,
+            columns: [
+              {
+                title: "序号",
+                type: "index",
+                width: 70,
+                align: "center"
+              },
+              {
+                title: "区域名称",
+                key: "regionName",
+                align: "center"
+              },
+              {
+                title: "设备总数",
+                key: "total",
+                align: "center"
+              },
+              {
+                title: "已安装设备数",
+                key: "installNum",
+                align: "center"
+              },
+              {
+                title: "未安装设备总数",
+                key: "unInstallNum",
+                align: "center"
+              },
+              {
+                title: "安装比例",
+                key: "installRate",
+                align: "center"
+              }
+            ]
+          };
+        } else {
+          this.$Message.error(res1.msg);
+        }
+      }
+    },
+    viewInfoChange() {
+      //查看切换版本
+      let obj = this.viewInfo.apphistorys.filter(
+        (v) => v.versionName === this.viewInfo.versionName
+      )[0];
+      console.log(obj);
+      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.split(";");
+      this.viewInfo.appPackage = obj.appPackage;
+      this.viewInfo.appRenew = obj.appRenew;
+      this.viewInfo.appSize = obj.appSize;
+      this.viewInfo.versionNum = obj.versionNum;
+    },
+    // 查看
+    toView(row) {
+      this.showLoading = true;
+      app_detail({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        appid: row.appid
+      }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          this.viewInfo = {
+            show: true,
+            apphistorys: res.obj.apphistorys,
+            appName: res.obj.appName,
+            appgroupName: row.appgroupName,
+            enabled: res.obj.enabled,
+            appType: res.obj.appType,
+            forced: res.obj.forced,
+            whited: res.obj.whited,
+            trusted: res.obj.trusted,
+            showico: res.obj.showico,
+            cached: res.obj.cached,
+            strategy: res.obj.strategy,
+            apkPath: res.obj.apkPath,
+            appIcon: res.obj.appIcon,
+            appImg: res.obj.appImg ? res.obj.appImg.split(";") : [],
+            versionName: res.obj.versionName,
+            versionNum: res.obj.versionNum,
+            appSize: res.obj.appSize,
+            appDeveloper: res.obj.appDeveloper,
+            appPackage: res.obj.appPackage,
+            appAbbr: res.obj.appAbbr,
+            appRenew: res.obj.appRenew,
+            targetSchool: res.obj.targetSchool,
+            devices: res.obj.devices,
+            schools: res.obj.schools
+          };
+          console.log(this.viewInfo);
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
+    // 删除
+    toDel(row) {
+      this.$Modal.confirm({
+        title: "提示",
+        content: "您确定删除选中数据吗？",
+        onOk: () => {
+          this.showLoading = true;
+          app_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
+            appid: row.appid,
+            rversion: row.rversion
+          }).then((res) => {
+            this.showLoading = false;
+            if (res.code === 0) {
+              this.$Message.success(res.msg);
+              this.searchList();
+            } else {
+              this.$Message.error(res.msg);
+            }
+          });
+        },
+        onCancel: () => {}
+      });
+    },
     // 搜索
     searchList() {
       this.searchForm.page = 1;
@@ -297,4 +979,138 @@ export default {
     }
   }
 }
+.view_content {
+  display: flex;
+  .view_title {
+    width: 90px;
+    text-align: right;
+    flex: none;
+    font-size: 16px;
+    margin: 0 10px;
+    line-height: 32px;
+    height: 32px;
+  }
+}
+.download {
+  .content {
+    text-align: center;
+    .title {
+      font-size: 18px;
+      font-weight: bold;
+      margin-bottom: 30px;
+    }
+    .qrcode {
+      width: 172px;
+      padding: 16px;
+      margin: 0 auto;
+      border: 2px solid #ffffff;
+      background: #ffffff4d;
+      box-shadow: 0 10px 30px 0 #339dff26;
+      #ScanShare {
+        width: 140px;
+        height: 140px;
+        margin-bottom: 10px;
+      }
+    }
+    .download {
+      margin-top: 40px;
+      &:hover {
+        cursor: pointer;
+        color: #339cff;
+      }
+    }
+  }
+}
+.install_title {
+  margin-bottom: 16px;
+  font-size: 18px;
+  font-weight: bold;
+  text-align: center;
+  position: relative;
+}
+.history {
+  position: absolute;
+  top: 0;
+  right: 0;
+  display: flex;
+  font-size: 16px;
+  font-weight: 400;
+  font-family: "SourceHanSansCN";
+  align-items: center;
+}
+.view_conten {
+  display: flex;
+  .view_logo {
+    width: 90px;
+    height: 90px;
+    margin-right: 20px;
+    border: 1px solid #e5e5e5;
+    background-color: white;
+    border-radius: 20px;
+    padding: 15px;
+    img {
+      width: 60px;
+      height: 60px;
+      object-fit: cover;
+    }
+    .appIcon {
+      margin-top: 10px;
+      color: #96abdf;
+      line-height: 30px;
+      &:hover {
+        cursor: pointer;
+        color: #339cff;
+      }
+    }
+  }
+  .view_conter {
+    width: calc(100% - 110px);
+    font-size: 16px;
+    .view_comm {
+      display: flex;
+      justify-content: space-between;
+      line-height: 40px;
+      .view_titles {
+        font-size: 20px;
+        font-weight: bold;
+        .qy {
+          background-color: #52c41a;
+          border-radius: 6px;
+          font-size: 10px;
+          color: white;
+          margin-left: 10px;
+          padding: 4px 6px;
+        }
+      }
+      .view_item {
+        width: 33%;
+        span {
+          display: inline-block;
+          width: 70px;
+          margin-right: 20px;
+        }
+      }
+    }
+    .view_com {
+      display: flex;
+      line-height: 40px;
+      .view_t {
+        width: 70px;
+        flex: none;
+        margin-right: 20px;
+        text-align: right;
+      }
+      .view_img {
+        display: flex;
+        padding-top: 10px;
+        img {
+          width: 90px;
+          height: 80px;
+          object-fit: cover;
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}
 </style>

src/views/regionSection/search/allWhitelists.vue

@@ -157,7 +157,7 @@ export default {
         },
         {
           title: "所属区域",
-          key: "name",
+          key: "regionName",
           align: "center"
         },
         {

src/views/regionSection/setting/logo.vue

@@ -103,9 +103,7 @@ export default {
     init() {
       logo_detail({
         rtype: this.powerParams.rtype,
-        objectid: this.powerParams.objectid,
-        regionid: this.powerParams.objectid,
-        llevel: 2
+        objectid: this.powerParams.objectid
       }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
@@ -143,7 +141,6 @@ export default {
         .then((res) => {
           this.showLoading = false;
           if (res.data.code === 0) {
-            console.log(res.data);
             this.form.logoPath = res.data.obj;
             this.$Message.success(res.data.msg);
           } else {
@@ -167,7 +164,6 @@ export default {
         this.showLoading = false;
         if (res.code === 0) {
           this.form.logoPath = "";
-          console.log(res.obj);
           this.$Message.success(res.msg);
         } else {
           this.$Message.error(res.msg);
@@ -179,15 +175,12 @@ export default {
         logoPath: this.form.logoPath,
         llevel: 2,
         rtype: this.powerParams.rtype,
-        objectid: this.powerParams.objectid,
-        regionid: this.powerParams.objectid
+        objectid: this.powerParams.objectid
       };
-      console.log(form);
       this.showLoading = true;
       logo_edit(form).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
-          console.log(res.obj);
           this.$Message.success(res.msg);
         } else {
           this.$Message.error(res.msg);

src/views/regionSection/setting/powerUp.vue

@@ -41,10 +41,7 @@
 </template>
 
 <script>
-import {
-  autoapp_detail,
-  autoapp_edit
-} from "@/api/setting";
+import { autoapp_detail, autoapp_edit } from "@/api/setting";
 
 export default {
   data() {
@@ -72,9 +69,11 @@ export default {
   },
   methods: {
     init() {
-      autoapp_detail({  rtype: this.powerParams.rtype,
+      autoapp_detail({
+        rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
-        regionid: this.powerParams.objectid }).then((res) => {
+        regionid: this.powerParams.objectid
+      }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
           if (res.obj) {

src/views/regionSection/setting/wallpaper.vue

@@ -9,7 +9,7 @@
         style="width: 150px"
       />
       <Button
-        v-if="searchForm.list.length === 0"
+        v-if="add_has === 1"
         type="primary"
         class="primary_btn"
         @click="toAdd()"
@@ -161,10 +161,13 @@ import axios from "axios";
 import CheckboxDevice from "@/components/Checkbox/CheckboxDevice";
 import {
   wallpaper_add,
+  wallpaper_add_has,
   wallpaper_delete,
   wallpaper_detail,
   wallpaper_edit,
-  wallpaper_list
+  wallpaper_list,
+  wallpaper_list_device,
+  wallpaper_list_devicewp
 } from "@/api/setting";
 import { device_list } from "@/api/appgroup";
 export default {
@@ -217,6 +220,7 @@ export default {
       userInfo: {},
       device_list: [],
       deviceids: {}, //设备类型
+      add_has: 0,
       columns: [
         {
           title: "序号",
@@ -277,17 +281,19 @@ export default {
     CheckboxDevice(dgroupid, val) {
       this.deviceids[dgroupid] = val;
     },
-    init() {
-      //获取分组下设备
+    async init() {
+      //是否显示添加按钮
       this.showLoading = true;
-      device_list({}).then((res) => {
-        this.showLoading = false;
-        if (res.code === 0) {
-          this.device_list = res.obj;
-        } else {
-          this.$Message.error(res.msg);
-        }
+      let res = await wallpaper_add_has({
+        wlevel: 2,
+        objectid: this.powerParams.objectid
       });
+      this.showLoading = false;
+      if (res.code === 0) {
+        this.add_has = res.obj;
+      } else {
+        this.$Message.error(res.msg);
+      }
     },
     upLoad(file) {
       let str = file.name.split(".");
@@ -345,8 +351,7 @@ export default {
         size: this.searchForm.size,
         name: this.searchForm.name,
         rtype: this.powerParams.rtype,
-        objectid: this.powerParams.objectid,
-        regionid: this.powerParams.objectid
+        objectid: this.powerParams.objectid
       }).then((data) => {
         this.showLoading = false;
         if (data.code === 0) {
@@ -359,15 +364,27 @@ export default {
     },
     // 新建
     toAdd() {
-      this.wallpaperInfo = {
-        show: true,
-        id: null,
-        wname: "",
-        hpath: "",
-        wlevel: "",
-        objectid: "",
-        deviceids: []
-      };
+      this.showLoading = true;
+      wallpaper_list_device({
+        wlevel: 2,
+        objectid: this.powerParams.objectid
+      }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          this.device_list = res.obj;
+          this.wallpaperInfo = {
+            show: true,
+            id: null,
+            wname: "",
+            hpath: "",
+            wlevel: "",
+            objectid: "",
+            deviceids: []
+          };
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
     },
     // 保存新建
     saveAddInfo() {
@@ -397,7 +414,6 @@ export default {
             wlevel: 2,
             rtype: this.powerParams.rtype,
             objectid: this.powerParams.objectid,
-            regionid: this.powerParams.objectid,
             deviceids
           };
           if (this.wallpaperInfo.wallpaperid) {
@@ -441,52 +457,56 @@ export default {
       });
     },
     // 编辑
-    toEdit(row) {
+    async toEdit(row) {
       this.showLoading = true;
-      wallpaper_detail({
+      //获取选择设备包含自己
+      let res1 = await wallpaper_list_devicewp({
+        wlevel: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        wallpaperid: row.wallpaperid
+      });
+      if (res1.code === 0) {
+        this.device_list = res1.obj;
+      } else {
+        this.$Message.error(res1.msg);
+      }
+      //获取详情
+      let res = await wallpaper_detail({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         wallpaperid: row.wallpaperid
-      }).then((data) => {
-        this.showLoading = false;
-        if (data.code === 0) {
-          this.wallpaperInfo = {
-            show: true,
-            wallpaperid: data.obj.wallpaperid,
-            wname: data.obj.wname,
-            hpath: data.obj.hpath,
-            wlevel: data.obj.wlevel,
-            objectid: data.obj.objectid,
-            deviceids: data.obj.devices,
-            rversion: data.obj.rversion
-          };
-          this.$nextTick(() => {
-            //回显设备
-            let checkedArr = this.$refs.checkbevice;
-            if (checkedArr) {
-              for (let m = 0; m < checkedArr.length; m++) {
-                let dgroupid = checkedArr[m].module.dgroupid;
-                let marr = data.obj.devices;
-                for (let h = 0; h < marr.length; h++) {
-                  let arr = marr[h].devices;
-                  if (dgroupid == marr[h].dgroupid) {
-                    checkedArr[m].getCheckedDevices(arr);
-                  }
+      });
+      this.showLoading = false;
+      if (res.code === 0) {
+        this.wallpaperInfo = {
+          show: true,
+          wallpaperid: res.obj.wallpaperid,
+          wname: res.obj.wname,
+          hpath: res.obj.hpath,
+          wlevel: res.obj.wlevel,
+          objectid: res.obj.objectid,
+          deviceids: res.obj.devices,
+          rversion: res.obj.rversion
+        };
+        this.$nextTick(() => {
+          //回显设备
+          let checkedArr = this.$refs.checkbevice;
+          if (checkedArr) {
+            for (let m = 0; m < checkedArr.length; m++) {
+              let dgroupid = checkedArr[m].module.dgroupid;
+              let marr = res.obj.devices;
+              for (let h = 0; h < marr.length; h++) {
+                let arr = marr[h].devices;
+                if (dgroupid == marr[h].dgroupid) {
+                  checkedArr[m].getCheckedDevices(arr);
                 }
               }
             }
-          });
-        } else {
-          this.$Message.error(data.msg);
-        }
-      });
-      this.wallpaperInfo = {
-        show: true,
-        // 验证码计时
-        timer: null,
-        name: "",
-        img: ""
-      };
+          }
+        });
+      } else {
+        this.$Message.error(res.msg);
+      }
     },
     // 删除
     toDel(row) {