添加应用

public/config.js

@@ -3,7 +3,7 @@ window._config = window.isTest
   ? {
       // 测试环境
       baseUrl: "http://mcapitest.xhkjedu.com/",
-      baseImageUrl: "http://49.4.26.249:8331/",
+      baseImageUrl: "http://mcapitest.xhkjedu.com/",
       showImageUrl: "https://mcapitest.xhkjedu.com/",
       axiosApiTimeout: 60, // 接口超时时间 单位秒
       axiosFileTimeout: 120, // 上传文件超时时间 单位秒

src/api/region.js

@@ -13,6 +13,10 @@ export const region_list_qy = (data) => setRequest("region/list_qy", data);
  */
 export const region_list_sel_pt = (data) =>
   setRequest("region/list_sel_pt", data);
+/**
+ * 2.1.1.2区域--区域学校选择列表
+ */
+export const region_list_rs = (data) => setRequest("region/list_rs", data);
 /**
  * 2.2区域--添加
  */

src/components/Checkbox/CheckboxDevice.vue

@@ -0,0 +1,113 @@
+<template>
+  <div class="index">
+    <CheckboxGroup style="flex-shrink: 0">
+      <Checkbox
+        class="checkbox_style"
+        :indeterminate="indeterminate"
+        :value="checkAll"
+        :label="module.dgroupid"
+        @click.prevent.native="handleCheckAll(module.devices)"
+        ><span style="font-size: 14px; color: #333; font-weight: 700">{{
+          module.dgname
+        }}</span>
+      </Checkbox>
+    </CheckboxGroup>
+    <CheckboxGroup
+      v-model="checkAllSingleGroup"
+      @on-change="checkAllSingleGroupChange"
+    >
+      <Checkbox
+        v-for="mc in module.devices"
+        :key="mc.deviceid"
+        :label="mc.deviceid"
+      >
+        <span>{{ mc.deviceModel }}</span>
+      </Checkbox>
+    </CheckboxGroup>
+  </div>
+</template>
+<script>
+export default {
+  name: "CheckboxDevice",
+  props: ["module", "lsbid", "initdata"],
+  data() {
+    return {
+      checkAll: false,
+      indeterminate: false, //全选
+      checkAllSingleGroup: [] //当前选中
+    };
+  },
+  watch: {
+    checkAllSingleGroup: function (val) {
+      this.$emit("CheckboxDevice", this.module.dgroupid, val);
+    },
+    //清空回显
+    initdata: function () {
+      if (this.initdata) {
+        this.checkAllSingleGroup = [];
+        this.checkAll = false;
+        this.indeterminate = false;
+      }
+    }
+  },
+  methods: {
+    //全选或者全不选
+    handleCheckAll(arr) {
+      if (this.indeterminate) {
+        this.checkAll = false;
+      } else {
+        this.checkAll = !this.checkAll;
+      }
+      this.indeterminate = false;
+      let singleCheckedGroup = [];
+      let singleObj = {};
+      if (!Array.isArray(arr)) {
+        return;
+      }
+
+      for (let i = 0; i < arr.length; i++) {
+        singleObj = arr[i];
+        singleCheckedGroup.push(singleObj.deviceid);
+      }
+
+      if (this.checkAll) {
+        this.checkAllSingleGroup = singleCheckedGroup;
+      } else {
+        this.checkAllSingleGroup = [];
+      }
+    },
+    //老师单独选择
+    checkAllSingleGroupChange(data) {
+      if (data.length === this.module.devices.length && data.length != 0) {
+        this.indeterminate = false;
+        this.checkAll = true;
+      } else if (data.length > 0) {
+        this.indeterminate = true;
+        this.checkAll = false;
+      } else {
+        this.indeterminate = false;
+        this.checkAll = false;
+      }
+    },
+    //设置默认选中
+    getCheckedRole(val) {
+      this.checkAllSingleGroup = [];
+      this.module.devices.forEach((item) => {
+        val.map((value) => {
+          if (value.deviceid === item.deviceid) {
+            this.checkAllSingleGroup.push(value.deviceid);
+          }
+        });
+      });
+      this.checkAllSingleGroupChange(this.checkAllSingleGroup);
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.index {
+  .checkbox_style {
+    line-height: 36px;
+  }
+}
+</style>

src/utils/fileConfig.js

@@ -0,0 +1,93 @@
+//文件上传格式
+export const ACCEPT_CONFIG = {
+  image: [".png", ".jpg", ".jpeg"], // ".gif", ".bmp"
+  client: [".exe"],
+  app: [".apk"],
+  audio: [".mp3", ".wav"],
+  video: [".mp4", ".flv"],
+  document: [".doc", ".docx", ".ppt", ".pptx", ".pdf"],
+  // ".class", ".dsc",
+  documentClass: [".doc", ".docx", ".ppt", ".pptx", ".pdf"],
+  zipFile: [".zip", ".rar"],
+  getPreview() {
+    return [...this.document, ...this.image, ...this.audio, ...this.video];
+  },
+  getAll() {
+    return [
+      ...this.image,
+      ...this.video,
+      ...this.document,
+      ...this.audio,
+      ...this.documentClass,
+      ...this.zipFile
+    ];
+  },
+  getClient() {
+    return [...this.client];
+  },
+  getApp() {
+    return [...this.app];
+  },
+  getImg() {
+    return [...this.image];
+  },
+  getAudio() {
+    return [...this.audio];
+  },
+  getVideo() {
+    return [...this.video];
+  },
+  getDocument() {
+    return [...this.document];
+  },
+  getDocumentClass() {
+    return [...this.documentClass];
+  },
+  getZipFile() {
+    return [...this.zipFile];
+  }
+};
+//定义分片大小
+export const CHUNK_SIZE = {
+  chunkSize: 5 * 1024 * 1024,
+  getSize() {
+    return this.chunkSize;
+  }
+};
+export const CONFIG_SUFFIX = {
+  image: ["png", "jpg", "jpeg"], // "gif", "bmp"
+  audio: ["mp3", "wav"],
+  app: ["apk"],
+  video: ["mp4", "flv"],
+  document: ["doc", "docx", "ppt", "pptx", "pdf"],
+  documentClass: ["class", "dsc", "doc", "docx", "ppt", "pptx", "pdf"],
+  zipFile: ["zip", "rar"],
+  getApp() {
+    return [...this.app];
+  },
+  getImg() {
+    return [...this.image];
+  },
+  getAudio() {
+    return [...this.audio];
+  },
+  getVideo() {
+    return [...this.video];
+  },
+  getDocument() {
+    return [...this.document];
+  },
+  getDocumentClass() {
+    return [...this.documentClass];
+  },
+  getZipFile() {
+    return [...this.zipFile];
+  }
+};
+//教材上传封面格式
+export const MATERIAL_IMG_SUFFIX = {
+  image: ["png", "jpg", "jpeg"],
+  getImg() {
+    return [...this.image];
+  }
+};

src/views/regionSection/applicationManage/applicationGroup.vue

@@ -273,7 +273,7 @@ export default {
       }
       let formData = new FormData();
       formData.append("file", file);
-      formData.append("savefolder", "headpic");
+      formData.append("savefolder", "app");
       formData.append("isrename", "1");
       let Url = this.$api.baseImageUrl + "up/upfile";
       this.showLoading = true;

src/views/regionSection/applicationManage/applicationManage.vue

@@ -2,6 +2,21 @@
   <div class="main_root">
     <div class="search_header">
       <div class="search_left">
+        <Select
+          :transfer="true"
+          v-model="searchForm.appgroupid"
+          style="width: 120px; margin: 0 10px"
+          placeholder="请选择分组"
+        >
+          <template v-if="group_list.length > 0">
+            <Option
+              v-for="item in group_list"
+              :value="item.appgroupid"
+              :key="item.appgroupid"
+              >{{ item.appgroupName }}</Option
+            >
+          </template>
+        </Select>
         <Input
           v-model="searchForm.name"
           placeholder="请输入名称"
@@ -57,13 +72,13 @@
         :label-width="130"
         inline
       >
-        <FormItem label="名称" prop="areaname" style="width: 100%">
+        <FormItem label="名称" prop="appName" style="width: 100%">
           <Input
-            v-model="wallpaperInfo.appgroupName"
+            v-model="wallpaperInfo.appName"
             placeholder="请输入名称"
           ></Input>
         </FormItem>
-        <FormItem label="分组" prop="areaname" style="width: 100%">
+        <FormItem label="分组" prop="appgroupid" style="width: 100%">
           <Select
             v-model="wallpaperInfo.appgroupid"
             placeholder="请选择分组"
@@ -71,9 +86,12 @@
             @on-change="groupChange()"
           >
             <template v-if="group_list.length > 0">
-              <Option v-for="item in group_list" :value="item.id" :key="item.id"
-                >{{ item.id }}
-              </Option>
+              <Option
+                v-for="item in group_list"
+                :value="item.appgroupid"
+                :key="item.appgroupid"
+                >{{ item.appgroupName }}</Option
+              >
             </template>
           </Select>
         </FormItem>
@@ -109,7 +127,7 @@
         </FormItem>
         <FormItem label="可信任" style="width: 100%">
           <div class="comm">
-            <RadioGroup v-model="wallpaperInfo.whited">
+            <RadioGroup v-model="wallpaperInfo.trusted">
               <Radio :label="1">是</Radio>
               <Radio :label="0">否</Radio>
             </RadioGroup>
@@ -120,7 +138,7 @@
         </FormItem>
         <FormItem label="隐藏图标" style="width: 100%">
           <div class="comm">
-            <RadioGroup v-model="wallpaperInfo.whited">
+            <RadioGroup v-model="wallpaperInfo.showico">
               <Radio :label="1">是</Radio>
               <Radio :label="0">否</Radio>
             </RadioGroup>
@@ -129,7 +147,7 @@
         </FormItem>
         <FormItem label="允许清空缓存" style="width: 100%">
           <div class="comm">
-            <RadioGroup v-model="wallpaperInfo.whited">
+            <RadioGroup v-model="wallpaperInfo.cached">
               <Radio :label="1">是</Radio>
               <Radio :label="0">否</Radio>
             </RadioGroup>
@@ -138,7 +156,7 @@
         </FormItem>
         <FormItem label="添加到已有策略" style="width: 100%">
           <div class="comm">
-            <RadioGroup v-model="wallpaperInfo.whited">
+            <RadioGroup v-model="wallpaperInfo.strategy">
               <Radio :label="1">是</Radio>
               <Radio :label="0">否</Radio>
             </RadioGroup>
@@ -148,39 +166,59 @@
           </div>
         </FormItem>
         <FormItem label="适配设备" style="width: 100%" class="require">
+          <div v-for="item in device_list" :key="item.dgroupid">
+            <CheckboxDevice
+              @CheckboxDevice="CheckboxDevice"
+              :module="item"
+            ></CheckboxDevice>
+          </div>
         </FormItem>
-        <FormItem label="应用上传" style="width: 320px">
-          <div class="logo">
-            <Upload
-              action
-              :show-upload-list="false"
-              :before-upload="
-                (file) => {
-                  upLoadUserpic(file);
-                  return false;
-                }
-              "
-              accept=".png,.jpeg,.jpg"
+        <FormItem label="应用上传" class="require" style="width: 400px">
+          <div class="upload_box">
+            <uploader
+              ref="uploader"
+              :options="options"
+              :autoStart="true"
+              :file-status-text="statusText"
+              @file-added="onFileAdded"
+              @file-progress="onFileProgress"
+              @file-success="onFileSuccess"
+              @file-error="onFileError"
             >
-              <Button type="primary" class="primary_btn">上传应用</Button>
-            </Upload>
-            <span>支持apk文件</span>
+              <uploader-unsupport></uploader-unsupport>
+              <uploader-btn
+                id="global_uploader_btn"
+                :attrs="attrs"
+                ref="uploadBtn"
+              >
+                <div class="primary_btn">上传应用</div>
+              </uploader-btn>
+            </uploader>
           </div>
-          <div class="app_img">
-            <img
-              v-if="wallpaperInfo.iconPath"
-              :src="$api.showImageUrl + wallpaperInfo.iconPath"
-            />
+          <div class="upProgress" v-if="file_list.length > 0">
+            <div v-for="file in file_list" key="file1">
+              <div class="file_name" :title="wallpaperInfo.appPackage">
+                <div class="show_name">
+                  {{ wallpaperInfo.appPackage }}
+                </div>
+              </div>
+              <Progress
+                hide-info
+                :stroke-width="8"
+                :percent="getUploadProgress(file)"
+                status="active"
+              />
+            </div>
           </div>
         </FormItem>
-        <FormItem label="应用图标">
+        <FormItem label="应用图标" class="require">
           <div class="logo">
             <Upload
               action
               :show-upload-list="false"
               :before-upload="
                 (file) => {
-                  upLoadUserpic(file);
+                  upLoadUserpic(file,1);
                   return false;
                 }
               "
@@ -190,10 +228,10 @@
             </Upload>
             <span>支持图片格式：jpg、jgeg、png</span>
           </div>
-          <div class="app_img">
+          <div class="app_img" style="border-radius: 20px">
             <img
-              v-if="wallpaperInfo.iconPath"
-              :src="$api.showImageUrl + wallpaperInfo.iconPath"
+              v-if="wallpaperInfo.appIcon"
+              :src="$api.showImageUrl + wallpaperInfo.appIcon"
             />
           </div>
         </FormItem>
@@ -204,22 +242,27 @@
               :show-upload-list="false"
               :before-upload="
                 (file) => {
-                  upLoadUserpic(file);
+                  upLoadUserpic(file,2);
                   return false;
                 }
               "
               accept=".png,.jpeg,.jpg"
             >
-              <Button type="primary" class="primary_btn">上传图标</Button>
+              <Button type="primary" class="primary_btn">上传截图</Button>
             </Upload>
             <span>支持图片格式：jpg、jgeg、png</span>
           </div>
-          <div class="app_img">
-            <img
-              v-if="wallpaperInfo.iconPath"
-              :src="$api.showImageUrl + wallpaperInfo.iconPath"
-            />
+          <div class="img_list">
+            <div class="app_img"
+                 v-for="(img,idx) in wallpaperInfo.appImg"
+                 :key="idx">
+              <img
+                  :src="$api.showImageUrl + img"
+              />
+              <img class="del" src="../../../assets/img/guanbi_red.png" />
+            </div>
           </div>
+
         </FormItem>
         <FormItem
           label="版本名称"
@@ -227,13 +270,13 @@
           style="width: calc(50% - 10px)"
         >
           <Input
-            v-model="wallpaperInfo.appgroupName"
+            v-model="wallpaperInfo.versionName"
             placeholder="请输入版本名称"
           ></Input>
         </FormItem>
         <FormItem label="版本号码" style="width: calc(50% - 10px)">
           <Input
-            v-model="wallpaperInfo.appgroupName"
+            v-model="wallpaperInfo.versionNum"
             placeholder="请输入版本号码"
           ></Input>
         </FormItem>
@@ -243,25 +286,25 @@
           style="width: calc(50% - 10px)"
         >
           <Input
-            v-model="wallpaperInfo.appgroupName"
+            v-model="wallpaperInfo.appSize"
             placeholder="请输入应用大小"
           ></Input>
         </FormItem>
         <FormItem label="开发者" style="width: calc(50% - 10px)">
           <Input
-            v-model="wallpaperInfo.appgroupName"
+            v-model="wallpaperInfo.appDeveloper"
             placeholder="请输入开发者"
           ></Input>
         </FormItem>
-        <FormItem label="唯一码" style="width: 100%">
+        <FormItem label="应用包名" style="width: 100%">
           <Input
-            v-model="wallpaperInfo.appgroupName"
-            placeholder="请输入唯一码"
+            v-model="wallpaperInfo.appPackage"
+            placeholder="请输入应用包名"
           ></Input>
         </FormItem>
         <FormItem label="描述信息" style="width: 100%">
           <Input
-            v-model="wallpaperInfo.comm"
+            v-model="wallpaperInfo.appAbbr"
             type="textarea"
             :maxlength="255"
             :rows="4"
@@ -270,27 +313,29 @@
         </FormItem>
         <FormItem label="更新" style="width: 100%">
           <Input
-            v-model="wallpaperInfo.comm"
+            v-model="wallpaperInfo.appRenew"
             type="textarea"
             :rows="4"
             :maxlength="1000"
-            placeholder="请输入更新"
+            placeholder="请输入更新内容"
           ></Input>
         </FormItem>
-        <FormItem label="选择学校" style="width: 100%">
+        <FormItem label="选择学校" style="width: 100%" class="require">
           <RadioGroup v-model="wallpaperInfo.targetSchool">
             <Radio :label="1">所有学校</Radio>
             <Radio :label="2">自定义学校</Radio>
           </RadioGroup>
-          <div class="targetSchool" v-if="wallpaperInfo.targetSchool === 1">
+          <div class="targetSchool" v-if="wallpaperInfo.targetSchool === 2">
             <div class="allSchool">
               <Input
-                v-model="wallpaperInfo.appgroupName"
+                v-model="wallpaperInfo.schoolname"
                 placeholder="请输入关键字"
                 search
                 @on-search="getSchool"
               ></Input>
-              <div class="school_list"></div>
+              <div class="school_list">
+                <Tree @on-check-change="getSelectedNodes" :data="school_list" show-checkbox></Tree>
+              </div>
             </div>
             <div class="selectSchool">
               <div class="school_num">已选<span class="num">1</span>所学校</div>
@@ -331,20 +376,47 @@
 </template>
 
 <script>
-import { date_format } from "@/utils";
+import { date_format, uuid } from "@/utils";
 import axios from "axios";
-import {appgroup_list} from "@/api/appgroup";
+import { appgroup_list, device_list } from "@/api/appgroup";
+import CheckboxDevice from "@/components/Checkbox/CheckboxDevice";
+import { ACCEPT_CONFIG, CHUNK_SIZE, CONFIG_SUFFIX } from "@/utils/fileConfig";
+import { compressImg } from "@/utils";
+import {region_list_rs} from "@/api/region";
 export default {
+  components: {
+    CheckboxDevice
+  },
   data() {
     return {
       date_format,
+      fileDetail: {
+        show: false,
+        file: {}
+      },
+      file_list: [],
+      upTimer: null,
+      options: {
+        singleFile: false, //批量上传
+        target: this.$api.baseImageUrl + "chunk/up", //地址
+        chunkSize: CHUNK_SIZE.getSize(), //分块大小
+        fileParameterName: "file", //上传文件名，
+        maxChunkRetries: 3, //最大自动失败重试上传次数
+        testChunks: false //是否开启服务器分片校验
+      },
+      attrs: {
+        accept: ACCEPT_CONFIG.getApp()
+      },
+      statusText: {
+        success: "上传成功",
+        error: "上传失败",
+        uploading: "上传中",
+        paused: "等待中", //暂停中
+        waiting: "等待中"
+      },
       showLoading: false,
       searchForm: {
-        showDrop: false,
-        dropList: [],
-        areaname: "",
-        areaid: null,
-        state: 0,
+        appgroupid: 0,
         page: 1,
         size: 10,
         list: [],
@@ -366,15 +438,15 @@ export default {
         strategy: 1,
         apkPath: "",
         appIcon: "",
-        appImg: "",
+        appImg: [],
         versionName: "",
         versionNum: "",
         appSize: "",
         appDeveloper: "",
-        uniqueCode: "",
+        appPackage: "",
         appAbbr: "",
         appRenew: "",
-        targetSchool: 1,
+        targetSchool: 2,
         deviceids: [],
         schoolids: []
       },
@@ -417,6 +489,10 @@ export default {
         ]
       },
       group_list: [],
+      device_list: [],
+      curRegion: [],
+      school_list: [],
+      userInfo: {},
       columns: [
         {
           title: "序号",
@@ -487,11 +563,113 @@ export default {
     };
   },
   created() {
+    this.userInfo = JSON.parse(
+        localStorage.getItem("xh_control_userInfo")
+    ).content;
     this.init();
     this.searchList();
   },
   methods: {
-    init(){
+    getSelectedNodes(data){
+      console.log(data)
+
+    },
+    getUploadProgress(file) {
+      let progress = file.progress();
+      if (!progress) {
+        progress = 0;
+      }
+      return progress * 100;
+    },
+    async onFileAdded(file) {
+      let that = this;
+      let { name } = file.file;
+      file.uniqueIdentifier = uuid();
+      file.suffix = that.getFileSuffix(name);
+      let deviceIndex = that.getArrIndex(file.suffix, CONFIG_SUFFIX.getApp());
+      if (deviceIndex == -1) {
+        this.$Message.error("文件格式不正确");
+        return false;
+      }
+      let fname = file.name;
+      let resourcename = fname.substring(0, fname.lastIndexOf("."));
+      file.resourcename = resourcename;
+      this.file_list = [file];
+      console.log(file);
+    },
+    //查找下标
+    getArrIndex(obj, arr) {
+      for (let h = 0; h < arr.length; h++) {
+        if (obj == arr[h]) {
+          return h;
+        }
+      }
+      return -1;
+    },
+    getFileSuffix(fileName) {
+      let dotIndex = fileName.lastIndexOf(".");
+      let fileType = fileName.slice(dotIndex + 1);
+      return fileType.toLowerCase();
+    },
+    onFileProgress(rootFile, file) {
+      file.progress();
+      this.showLiading = true;
+    },
+    onFileSuccess(rootFile, file, response) {
+      let res = JSON.parse(response);
+      // 服务器自定义的错误（即虽返回200，但是是错误的情况），这种错误是Uploader无法拦截的
+      if (res.code === 0) {
+        //合并
+        let url = this.$api.baseImageUrl + "chunk/merge_app";
+        let formData = new FormData();
+        formData.append("identifier", file.uniqueIdentifier);
+        formData.append("filename", `${file.resourcename}.${file.suffix}`);
+        formData.append("savefolder", "app");
+        // 进行post 请求
+        axios({
+          method: "post",
+          timeout: 1000 * window._config.axiosFileTimeout,
+          url,
+          data: formData,
+          headers: {
+            "Content-Type": "application/x-www-form-urlencoded"
+          }
+        })
+          .then((response) => {
+            let res = response.data;
+            if (res.code === 0) {
+              console.log(res.obj);
+              this.wallpaperInfo.apkPath = res.obj.apkPath;
+              this.wallpaperInfo.appIcon = res.obj.appIcon;
+              this.wallpaperInfo.appPackage = res.obj.appPackage;
+              this.wallpaperInfo.apkPath = res.obj.apkPath;
+              this.wallpaperInfo.appSize = res.obj.appSize;
+              this.wallpaperInfo.versionName = res.obj.versionName;
+              this.wallpaperInfo.versionNum = res.obj.versionNum;
+              this.showLiading = false;
+            } else {
+              this.$Message.error(`${file.name} ${res.msg}`);
+              this.showLiading = false;
+            }
+          })
+          .catch(() => {
+            this.$Message.error("上传失败");
+            this.showLiading = false;
+          });
+      } else {
+        this.$Message.error(`${file.name} ${res.msg}`);
+        this.showLiading = false;
+      }
+    },
+    onFileError(rootFile, file, response) {
+      let res = JSON.parse(response);
+      this.$Message.error(`${file.name} ${res.msg}`);
+      this.showLiading = false;
+    },
+    CheckboxDevice(dgroupid, val) {
+      console.log(dgroupid, val);
+    },
+    init() {
       //获取分组列表
       appgroup_list({
         page: 1,
@@ -499,21 +677,73 @@ export default {
         appgroupName: ""
       }).then((res) => {
         if (res.code === 0) {
-          this.group_list = res.obj;
+          this.group_list = res.obj.data;
+          console.log(this.group_list);
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+      //获取分组下设备
+      device_list({}).then((res) => {
+        if (res.code === 0) {
+          this.device_list = res.obj;
+          console.log(res.obj);
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+
+      //获取区域学校
+      region_list_rs({regionid:this.userInfo.regionid}).then((res) => {
+        if (res.code === 0) {
+          this.getHandleData(res.obj[0])
+          this.curRegion = res.obj;
+          this.school_list = res.obj;
+          console.log( this.school_list);
+
+
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
+    getHandleData(node){
+      node.title = node.regionName;
+      node.expand = true;
+      node.selected = false;
+      if(node.children && node.children.length>0){
+        for(let child of node.children){
+          this.getHandleData(child)
+        }
+      }
+    },
+    getSchool() {
+      //wallpaperInfo.schoolname
+      //获取区域学校
+      region_list_rs({regionid:this.userInfo.regionid,
+        regionName:wallpaperInfo.schoolname}).then((res) => {
+        if (res.code === 0) {
+          this.getHandleData(res.obj[0])
+          this.curRegion = res.obj;
+          this.school_list = res.obj;
+          console.log( this.school_list);
+
+
         } else {
           this.$Message.error(res.msg);
         }
       });
     },
-    getSchool() {},
     //gengx
     toRenew(row) {
       console.log(row);
     },
-    groupChange() {},
-    upLoadUserpic(file) {
+    groupChange() {
+
+    },
+    upLoadUserpic(file,type) {
+      //type 1图标/2截图
       console.log(file);
-      let size = file.size / 1024 / 1024;
       let str = file.name.split(".");
       let suffix = str[str.length - 1];
       suffix = suffix.toLowerCase();
@@ -521,13 +751,17 @@ export default {
         this.$Message.warning("请上传png、jpeg、jpg类型的文件");
         return false;
       }
-      if (size > 10) {
-        this.$Message.error("图片太大，不能超过5M！");
-        return false;
+      if(type === 2){
+        console.log(this.wallpaperInfo.appImg)
+        if(this.wallpaperInfo.appImg.length>5 ){
+          this.$Message.warning("最多上传五张截图！");
+          return false;
+        }
+
       }
       let formData = new FormData();
       formData.append("file", file);
-      formData.append("savefolder", "headpic");
+      formData.append("savefolder", "app");
       formData.append("isrename", "1");
       let Url = this.$api.baseImageUrl + "up/upfile";
       this.showLoading = true;
@@ -537,9 +771,18 @@ export default {
         })
         .then((res) => {
           this.showLoading = false;
+          console.log(res)
           if (res.data.code === 0) {
-            console.log(res.obj);
-            this.wallpaperInfo.iconPath = res.obj;
+            if(type === 1){
+              //图标
+              this.wallpaperInfo.appIcon = res.data.obj;
+            }else {
+              //截图
+              this.wallpaperInfo.appImg.push(res.data.obj)
+              console.log(this.wallpaperInfo.appImg)
+            }
+
+            this.$Message.success(res.data.msg);
           } else {
             this.$Message.error(res.data.msg);
           }
@@ -614,15 +857,15 @@ export default {
         strategy: 1,
         apkPath: "",
         appIcon: "",
-        appImg: "",
+        appImg: [],
         versionName: "",
         versionNum: "",
         appSize: "",
         appDeveloper: "",
-        uniqueCode: "",
+        appPackage: "",
         appAbbr: "",
         appRenew: "",
-        targetSchool: 1,
+        targetSchool: 2,
         deviceids: [],
         schoolids: []
       };
@@ -742,20 +985,34 @@ export default {
       color: #7c8db5;
     }
   }
+  .img_list{
+    height: 90px;
+    display: flex;
+  }
   .app_img {
     margin-top: 10px;
     width: 90px;
     height: 90px;
-    border-radius: 20px;
+    margin-right: 20px;
     opacity: 1;
     border: 1px solid #e5e5e5;
     background: #ffffff;
     overflow: hidden;
+    position: relative;
     img {
       width: 100%;
       height: 100%;
       object-fit: cover;
     }
+    .del{
+      width: 20px;
+      height: 20px;
+      object-fit: cover;
+      position: absolute;
+      right: 6px;
+      top: 6px;
+      cursor: pointer;
+    }
   }
   .targetSchool {
     width: 100%;
@@ -769,7 +1026,8 @@ export default {
       width: 50%;
       padding: 10px;
       .school_list {
-        height: calc(100% - 52px);
+        margin-top: 10px;
+        height: calc(100% - 42px);
         overflow-y: auto;
       }
     }
@@ -787,10 +1045,55 @@ export default {
         }
       }
       .school_list {
-        height: calc(100% - 52px);
+        margin-top: 10px;
+        height: calc(100% - 42px);
         overflow-y: auto;
       }
     }
   }
+  .upload_box {
+    /deep/ .uploader-btn {
+      border: navajowhite;
+      &:hover {
+        background-color: transparent;
+      }
+    }
+  }
+  .upProgress {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    text-align: center;
+    > div {
+      margin: 0 10px;
+      width: 100%;
+    }
+  }
+  .file_name {
+    height: 32px;
+    margin-top: 10px;
+    .show_name {
+      font-size: 14px;
+      color: #333;
+      text-align: left;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      line-height: 32px;
+      cursor: pointer;
+    }
+  }
+}
+
+.primary_btn {
+  border-radius: 8px;
+  color: white;
+  line-height: 35px;
+  padding: 0 15px;
+  height: 35px;
+  font-size: 14px;
+  background: linear-gradient(180deg, #30e5fc 0%, #34a4ff 100%);
+  box-shadow: inset 0 1px 2px 0 #ffffffb3, inset 0 -2px 3px 0 #ffffff4d,
+    0 3px 5px 0 #339dff80, inset 0 -2px 0 0 #2b89e0;
 }
 </style>