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

public/config.js

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

src/api/appgroup.js

@@ -1,6 +1,76 @@
 import { appgroup_url } from "@/utils/httpRequest";
 
 /**
- * 1.0.1管理员--账号登录
+ * 5.1.1 应用分组-列表
  */
-export const admin_login = (data) => appgroup_url("admin/login", data);
+export const appgroup_list = (data) => appgroup_url("appgroup/list", data);
+
+/**
+ * 5.1.2 应用分组-添加
+ */
+export const appgroup_add = (data) => appgroup_url("appgroup/add", data);
+
+/**
+ * 5.1.3 应用分组-更新
+ */
+export const appgroup_edit = (data) => appgroup_url("appgroup/edit", data);
+
+/**
+ * 5.1.4 应用分组-删除
+ */
+export const appgroup_delete = (data) => appgroup_url("appgroup/delete", data);
+
+/**
+ * 5.1.5 应用分组-列表-应用商店
+ */
+export const appgroup_list_app = (data) => appgroup_url("appgroup/list_app", data);
+
+/**
+ * 5.2.1 应用-列表
+ */
+export const app_list = (data) => appgroup_url("app/list", data);
+
+/**
+ * 5.2.2 应用-添加
+ */
+export const app_add = (data) => appgroup_url("app/add", data);
+
+/**
+ * 5.2.3 应用-更新
+ */
+export const app_edit = (data) => appgroup_url("app/edit", data);
+
+/**
+ * 5.2.4 应用-删除
+ */
+export const app_delete = (data) => appgroup_url("app/delete", data);
+
+/**
+ * 5.2.5 应用-详情
+ */
+export const app_detail = (data) => appgroup_url("app/detail", data);
+
+/**
+ * 5.2.6 应用-获取应用授权设备型号
+ */
+export const app_detail_device = (data) => appgroup_url("app/detail_device", data);
+
+/**
+ * 5.2.7 应用-更新应用授权设备型号
+ */
+export const app_edit_device = (data) => appgroup_url("app/edit_device", data);
+
+/**
+ * 5.2.8 应用-列表-应用商店
+ */
+export const app_list_app = (data) => appgroup_url("app/list_app", data);
+
+/**
+ * 5.2.9 应用-详情-应用商店
+ */
+export const app_detail_app = (data) => appgroup_url("app/detail_app", data);
+
+/**
+ * 5.3 设备-列表(分组下设备)
+ */
+export const device_list = (data) => appgroup_url("device/list", data);

src/api/school.js

@@ -1,5 +1,12 @@
 import { setRequest } from "@/utils/httpRequest";
-
+/**
+ * 省市区--选择列表
+ */
+export const area_list = (data) => setRequest("area/list", data);
+/**
+ * 省市区--选择列表
+ */
+export const area_list_sel = (data) => setRequest("area/list_sel", data);
 /**
  * 3.1.1学校--列表
  */

src/api/up.js

@@ -0,0 +1,30 @@
+import { setRequest } from "@/utils/httpRequest";
+/**
+ * 10.1 单文件上传
+ */
+export const up_upfile = (data) => setRequest("up/upfile", data);
+
+/**
+ * 10.2 多文件上传
+ */
+export const up_upmore = (data) => setRequest("up/upmore", data);
+
+/**
+ * 10.3.1 分片上传-上传分片
+ */
+export const chunk_up = (data) => setRequest("chunk/up", data);
+
+/**
+ * 10.3.2 分片上传-合并
+ */
+export const chunk_merge = (data) => setRequest("chunk/merge", data);
+
+/**
+ * 10.3.3 分片上传-合并app
+ */
+export const chunk_merge_app = (data) => setRequest("chunk/merge_app", data);
+
+/**
+ * 10.4 文件下载
+ */
+export const dn_down_webfile = (data) => setRequest("dn/down_webfile", data);

src/views/regionSection/applicationManage/applicationGroup.vue

@@ -255,7 +255,6 @@ export default {
   },
   methods: {
     upLoadUserpic(file) {
-      console.log(file);
       let size = file.size / 1024 / 1024;
       let str = file.name.split(".");
       let suffix = str[str.length - 1];
@@ -264,10 +263,6 @@ export default {
         this.$Message.warning("请上传png、jpeg、jpg类型的文件");
         return false;
       }
-      if (size > 10) {
-        this.$Message.error("图片太大，不能超过5M！");
-        return false;
-      }
       let formData = new FormData();
       formData.append("file", file);
       formData.append("savefolder", "headpic");
@@ -281,8 +276,8 @@ export default {
         .then((res) => {
           this.showLoading = false;
           if (res.data.code === 0) {
-            console.log(res.obj);
-            this.wallpaperInfo.iconPath = res.obj;
+            console.log(res.data.obj);
+            this.wallpaperInfo.iconPath = res.data.obj;
           } else {
             this.$Message.error(res.data.msg);
           }
@@ -359,8 +354,8 @@ export default {
             this.$Message.error("请上传图标!");
             return;
           }
-
           this.wallpaperInfo.show = false;
+
         }
       });
     },

src/views/regionSection/regionManage/schoolManage.vue

@@ -99,7 +99,50 @@
             placeholder="请输入学校简称"
           ></Input>
         </FormItem>
-        <FormItem label="省市区" style="width: 100%"> </FormItem>
+        <FormItem label="省市区" class="require" style="width: 100%">
+          <Select
+              :transfer="true"
+              v-model="adminInfo.provinceid"
+              style="width: 120px"
+              placeholder="请选择省份"
+              @on-change="provinceChange"
+          >
+            <Option
+                v-for="item in areaList"
+                :value="item.areaCode"
+                :key="item.areaCode"
+            >{{ item.areaName }}</Option
+            >
+          </Select>
+          <Select
+              :transfer="true"
+              v-model="adminInfo.marketid"
+              @on-change="marketChange"
+              style="width: 120px;margin: 0 10px"
+              placeholder="请选择市"
+          >
+            <Option
+                v-for="item in marketList"
+                :value="item.areaCode"
+                :key="item.areaCode"
+            >{{ item.areaName }}</Option
+            >
+          </Select>
+          <Select
+              :transfer="true"
+              v-model="adminInfo.areaCode"
+              @on-change="regionChange"
+              style="width: 120px"
+              placeholder="请选择区"
+          >
+            <Option
+                v-for="item in regionList"
+                :value="item.areaCode"
+                :key="item.areaCode"
+            >{{ item.areaName }}</Option
+            >
+          </Select>
+        </FormItem>
         <FormItem label="地址" style="width: 100%">
           <Input v-model="adminInfo.address" placeholder="请输入地址"></Input>
         </FormItem>
@@ -240,19 +283,11 @@
 </template>
 
 <script>
-import {
-  admin_list_pt,
-  admin_add,
-  admin_edit,
-  admin_delete,
-  admin_enable,
-  admin_disabled,
-  admin_list_qy
-} from "@/api/admin";
 import { region_list_sel_pt } from "@/api/region";
 import { login_msg_code } from "@/api/login";
 import { generateRandomString } from "@/utils";
 import {
+  area_list_sel,
   school_add,
   school_delete,
   school_detail,
@@ -425,6 +460,9 @@ export default {
           align: "center"
         }
       ],
+      areaList: [],
+      marketList: [],
+      regionList: [],
       userInfo: {}
     };
   },
@@ -433,10 +471,41 @@ export default {
       localStorage.getItem("xh_control_userInfo")
     ).content;
     this.getSearchRegionList();
+    this.getAreaList()
     this.searchList();
   },
   mounted() {},
   methods: {
+    //选择省份
+    provinceChange(){
+      let arr = this.areaList.filter(v=>v.areaCode === this.adminInfo.provinceid);
+      this.marketList = arr[0].childList;
+      this.adminInfo.marketid = "";
+      this.regionList = [];
+      this.adminInfo.areaCode = "";
+    },
+    //选择市
+    marketChange(){
+      let arr = this.marketList.filter(v=>v.areaCode === this.adminInfo.marketid);
+      this.regionList = arr[0].childList;
+      this.adminInfo.areaCode = "";
+    },
+    //选中区
+    regionChange(){
+      let arr = this.regionList.filter(v=>v.areaCode === this.adminInfo.areaCode)[0];
+      console.log(arr)
+      this.adminInfo.areaName = arr.areaName;
+    },
+    getAreaList(){
+      area_list_sel({}).then(res=>{
+        if(res.code === 0){
+          console.log(res.obj)
+          this.areaList = res.obj;
+        }else {
+          this.$Message.error(res.msg)
+        }
+      })
+    },
     // 获取搜索区域列表
     getSearchRegionList() {
       region_list_sel_pt({}).then((data) => {
@@ -488,6 +557,8 @@ export default {
         second: 60,
         schoolid: null,
         schoolName: "",
+        provinceid: "",
+        marketid: "",
         areaCode: "",
         areaName: "",
         address: "",
@@ -586,7 +657,6 @@ export default {
             form.schoolid = this.adminInfo.schoolid;
             form.rversion = this.adminInfo.rversion;
           }
-          console.log(this.adminInfo);
           //添加管理员
           if (this.adminInfo.createAdmin) {
             form.admin = {
@@ -597,6 +667,7 @@ export default {
               msgcode: this.adminInfo.admin.msgcode
             };
           }
+          console.log(form);
           api(form).then((data) => {
             if (data.code === 0) {
               this.searchList();
@@ -620,6 +691,8 @@ export default {
             second: 0,
             schoolid: res.obj.schoolid,
             schoolName: res.obj.schoolName,
+            provinceid: "",
+            marketid: "",
             areaCode: res.obj.areaCode,
             areaName: res.obj.areaName,
             address: res.obj.address,