应用分组

src/api/appgroup.js

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

src/views/regionSection/applicationManage/applicationGroup.vue

@@ -3,7 +3,7 @@
     <div class="search_header">
       <div class="search_left">
         <Input
-          v-model="searchForm.name"
+          v-model="searchForm.appgroupName"
           placeholder="请输入名称"
           search
           @on-search="searchList()"
@@ -14,18 +14,16 @@
     </div>
     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
-        <template slot-scope="{ row }" slot="createtimeSlot">
-          <div>{{ date_format(row.createtime) }}</div>
-        </template>
-        <template slot-scope="{ row }" slot="updatetimeSlot">
-          <div>{{ date_format(row.updatetime) }}</div>
+        <template slot-scope="{ row }" slot="iconPath">
+          <div class="iconPath" v-if="row.iconPath">
+            <img :src="$api.showImageUrl + row.iconPath" />
+          </div>
         </template>
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
             <div @click="toView(row)">查看</div>
             <div @click="toEdit(row)">编辑</div>
             <div class="action_del" @click="toDel(row)">删除</div>
-
           </div>
         </template>
       </Table>
@@ -48,7 +46,7 @@
       class="modal1 application"
       :mask-closable="false"
       v-model="wallpaperInfo.show"
-      :title="wallpaperInfo.id ? '编辑' : '新建'"
+      :title="wallpaperInfo.appgroupid ? '编辑' : '新建'"
     >
       <Form
         ref="addForm"
@@ -87,6 +85,13 @@
             />
           </div>
         </FormItem>
+        <FormItem label="排序" prop="appgroupOrder">
+          <InputNumber
+            placeholder="请输入排序"
+            v-model="wallpaperInfo.appgroupOrder"
+            :min="1"
+          />
+        </FormItem>
         <FormItem label="描述信息" style="width: 100%">
           <Input
             v-model="wallpaperInfo.comm"
@@ -115,7 +120,8 @@
         style="border: 1px solid #e8eaec; border-bottom: none"
         :columns="viewInfo.columns"
         :data="viewInfo.list"
-      ></Table>
+      >
+      </Table>
       <div slot="footer" style="text-align: center">
         <Button @click="viewInfo.show = false">关闭</Button>
       </div>
@@ -130,18 +136,19 @@
 <script>
 import { date_format } from "@/utils";
 import axios from "axios";
-import {appgroup_add} from "@/api/appgroup";
+import {
+  appgroup_add,
+  appgroup_delete,
+  appgroup_edit,
+  appgroup_list
+} from "@/api/appgroup";
 export default {
   data() {
     return {
       date_format,
       showLoading: false,
       searchForm: {
-        showDrop: false,
-        dropList: [],
-        areaname: "",
-        areaid: null,
-        state: 0,
+        appgroupName: "",
         page: 1,
         size: 10,
         list: [],
@@ -150,8 +157,9 @@ export default {
       // 新建/编辑
       wallpaperInfo: {
         show: false,
-        id: null,
+        appgroupid: null,
         appgroupName: "",
+        appgroupOrder: 1,
         iconPath: "",
         comm: ""
       },
@@ -185,7 +193,7 @@ export default {
         ]
       },
       rules: {
-        areaname: [
+        appgroupName: [
           {
             required: true,
             message: "请输入名称",
@@ -200,8 +208,8 @@ export default {
           width: 70,
           render: (h, params) => {
             return h(
-                "span",
-                params.index +
+              "span",
+              params.index +
                 (this.searchForm.page - 1) * this.searchForm.size +
                 1
             );
@@ -209,24 +217,24 @@ export default {
         },
         {
           title: "名称",
-          key: "createname",
+          key: "appgroupName",
           align: "center"
         },
         {
           title: "图标",
-          slot: "createtimeSlot",
+          slot: "iconPath",
           width: 190,
           align: "center"
         },
         {
           title: "创建人",
-          key: "updatename",
+          key: "createname",
           width: 140,
           align: "center"
         },
         {
           title: "创建时间",
-          slot: "updatetimeSlot",
+          key: "createtime",
           width: 190,
           align: "center"
         },
@@ -238,7 +246,7 @@ export default {
         },
         {
           title: "操作时间",
-          slot: "updatetimeSlot",
+          key: "updatetime",
           width: 190,
           align: "center"
         },
@@ -251,12 +259,11 @@ export default {
       ]
     };
   },
-  created() {
+  mounted() {
     this.searchList();
   },
   methods: {
     upLoadUserpic(file) {
-      let size = file.size / 1024 / 1024;
       let str = file.name.split(".");
       let suffix = str[str.length - 1];
       suffix = suffix.toLowerCase();
@@ -283,7 +290,7 @@ export default {
             this.$Message.error(res.data.msg);
           }
         })
-        .catch((err) => {
+        .catch(() => {
           this.showLoading = false;
           this.$Message.error("图片上传失败");
         });
@@ -308,41 +315,27 @@ export default {
     },
     // 获取列表
     getList() {
-      this.searchForm.list = [
-        {
-          id: 1,
-          areaname: "区域一",
-          createname: "区域一",
-          createtime: 1710838418,
-          updatename: "区域一",
-          updatetime: 1710838430
-        },
-        {
-          id: 2,
-          areaname: "区域二",
-          createname: "区域一",
-          createtime: 1710838418,
-          updatename: "区域一",
-          updatetime: 1710838430
-        },
-        {
-          id: 3,
-          areaname: "区域三",
-          createname: "区域一",
-          createtime: 1710838418,
-          updatename: "区域一",
-          updatetime: 1710838430
+      appgroup_list({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        appgroupName: this.searchForm.appgroupName
+      }).then((res) => {
+        if (res.code === 0) {
+          this.searchForm.list = res.obj.data;
+          this.searchForm.total = res.obj.total;
+        } else {
+          this.$Message.error(res.msg);
         }
-      ];
-      this.searchForm.total = 3;
+      });
     },
     // 新建
     toAdd() {
       this.wallpaperInfo = {
         show: true,
-        id: null,
+        appgroupid: null,
         appgroupName: "",
         iconPath: "",
+        appgroupOrder: Number(this.searchForm.total) + 1,
         comm: ""
       };
       this.$refs.addForm.resetFields();
@@ -356,21 +349,31 @@ export default {
             return;
           }
           this.wallpaperInfo.show = false;
-          console.log(this.wallpaperInfo)
-          appgroup_add({appgroupName:this.wallpaperInfo.appgroupName,
-            iconPath:this.wallpaperInfo.iconPath,
-            comm:this.wallpaperInfo.comm,}).then(res=>{
-              if(res.code === 0){
-                  console.log(res.obj)
-              }else {
-                this.$Message.error(res.msg)
-              }
-          })
+          let api = this.wallpaperInfo.appgroupid
+            ? appgroup_edit
+            : appgroup_add;
+          let form = {
+            appgroupName: this.wallpaperInfo.appgroupName,
+            iconPath: this.wallpaperInfo.iconPath,
+            comm: this.wallpaperInfo.comm,
+            appgroupOrder: this.wallpaperInfo.appgroupOrder
+          };
+          //编辑
+          if (this.wallpaperInfo.appgroupid) {
+            form.appgroupid = this.wallpaperInfo.appgroupid;
+            form.rversion = this.wallpaperInfo.rversion;
+          }
+          api(form).then((res) => {
+            if (res.code === 0) {
+              this.$Message.success(res.msg);
+              this.searchList();
+            } else {
+              this.$Message.error(res.msg);
+            }
+          });
         }
       });
     },
-    //进入
-    toGo(row) {},
     // 查看
     toView() {
       this.viewInfo.show = true;
@@ -393,22 +396,35 @@ export default {
       this.$refs.addForm.resetFields();
       this.wallpaperInfo = {
         show: true,
-        id: row.id,
         appgroupName: row.appgroupName,
         iconPath: row.iconPath,
-        comm: row.comm
+        comm: row.comm,
+        appgroupid: row.appgroupid,
+        rversion: row.rversion,
+        appgroupOrder: row.appgroupOrder
       };
     },
     // 删除
-    toDel() {
+    toDel(row) {
       this.$Modal.confirm({
         title: "提示",
         content: "您确定删除选中数据吗？",
-        onOk: () => {},
+        onOk: () => {
+          appgroup_delete({
+            appgroupid: row.appgroupid,
+            rversion: row.rversion
+          }).then((res) => {
+            if (res.code === 0) {
+              this.$Message.success(res.msg);
+              this.searchList();
+            } else {
+              this.$Message.error(res.msg);
+            }
+          });
+        },
         onCancel: () => {}
       });
-    },
-
+    }
   }
 };
 </script>
@@ -479,4 +495,20 @@ export default {
     }
   }
 }
+.table_wrap {
+  .iconPath {
+    width: 60px;
+    height: 60px;
+    border-radius: 20px;
+    border: 1px solid #e5e5e5;
+    margin: 10px auto;
+    text-align: center;
+    padding: 10px;
+    img {
+      width: 40px;
+      height: 40px;
+      object-fit: cover;
+    }
+  }
+}
 </style>

src/views/regionSection/applicationManage/applicationManage.vue

@@ -48,13 +48,13 @@
       class="modal1 application"
       :mask-closable="false"
       v-model="wallpaperInfo.show"
-      :title="wallpaperInfo.id ? '编辑' : '新建'"
+      :title="wallpaperInfo.appid ? '编辑' : '新建'"
     >
       <Form
         ref="addForm"
         :model="wallpaperInfo"
         :rules="rules"
-        :label-width="120"
+        :label-width="130"
         inline
       >
         <FormItem label="名称" prop="areaname" style="width: 100%">
@@ -333,6 +333,7 @@
 <script>
 import { date_format } from "@/utils";
 import axios from "axios";
+import {appgroup_list} from "@/api/appgroup";
 export default {
   data() {
     return {
@@ -352,7 +353,7 @@ export default {
       // 新建/编辑
       wallpaperInfo: {
         show: true,
-        id: null,
+        appid: null,
         appName: "",
         appgroupid: "",
         appState: 1,
@@ -486,9 +487,24 @@ export default {
     };
   },
   created() {
+    this.init();
     this.searchList();
   },
   methods: {
+    init(){
+      //获取分组列表
+      appgroup_list({
+        page: 1,
+        size: 100,
+        appgroupName: ""
+      }).then((res) => {
+        if (res.code === 0) {
+          this.group_list = res.obj;
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
     getSchool() {},
     //gengx
     toRenew(row) {
@@ -585,10 +601,30 @@ export default {
     toAdd() {
       this.wallpaperInfo = {
         show: true,
-        id: null,
-        appgroupName: "",
-        iconPath: "",
-        comm: ""
+        appid: null,
+        appName: "",
+        appgroupid: "",
+        appState: 1,
+        appType: 1,
+        forced: 1,
+        whited: 1,
+        trusted: 1,
+        showico: 1,
+        cached: 1,
+        strategy: 1,
+        apkPath: "",
+        appIcon: "",
+        appImg: "",
+        versionName: "",
+        versionNum: "",
+        appSize: "",
+        appDeveloper: "",
+        uniqueCode: "",
+        appAbbr: "",
+        appRenew: "",
+        targetSchool: 1,
+        deviceids: [],
+        schoolids: []
       };
       this.$refs.addForm.resetFields();
     },

src/views/regionSection/regionManage/adminManage.vue

@@ -193,7 +193,7 @@
     </Modal>
     <!-- 查看 -->
     <Modal
-      class="modal1"
+      class="modal1 see"
       :mask-closable="false"
       v-model="viewInfo.show"
       title="查看"
@@ -232,7 +232,9 @@ import {
   admin_edit,
   admin_delete,
   admin_enable,
-  admin_disabled, admin_list_qy, admin_detail
+  admin_disabled,
+  admin_list_qy,
+  admin_detail
 } from "@/api/admin";
 import { region_list_sel_pt } from "@/api/region";
 import { login_msg_code } from "@/api/login";
@@ -243,9 +245,7 @@ export default {
     // 密码验证
     const pwdCheck = (rule, value, callback) => {
       if (!reg.test(this.adminInfo.loginpwd)) {
-        return callback(
-            new Error("密码格式不正确!")
-        );
+        return callback(new Error("密码格式不正确!"));
       } else {
         callback();
       }
@@ -253,9 +253,7 @@ export default {
     // 重复密码验证
     const pwdAgainCheck = async (rule, value, callback) => {
       if (!reg.test(this.adminInfo.loginpwd1)) {
-        return callback(
-            new Error("密码格式不正确!")
-        );
+        return callback(new Error("密码格式不正确!"));
       } else if (this.adminInfo.loginpwd != this.adminInfo.loginpwd1) {
         return callback(new Error("两次输入密码不一致！"));
       } else {
@@ -417,7 +415,7 @@ export default {
   },
   created() {
     this.userInfo = JSON.parse(
-        localStorage.getItem("xh_control_userInfo")
+      localStorage.getItem("xh_control_userInfo")
     ).content;
     this.getSearchRegionList();
     this.searchList();
@@ -461,7 +459,7 @@ export default {
         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);
         }
@@ -531,9 +529,7 @@ export default {
           ) {
             const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,32}$/;
             if (!reg.test(this.adminInfo.loginpwd)) {
-              this.$Message.error(
-                "密码格式不正确!"
-              );
+              this.$Message.error("密码格式不正确!");
               return;
             }
             if (this.adminInfo.loginpwd != this.adminInfo.loginpwd1) {
@@ -594,8 +590,8 @@ export default {
     },
     // 编辑
     toEdit(row) {
-      admin_detail({adminid:row.adminid}).then(res=>{
-        if(res.code === 0){
+      admin_detail({ adminid: row.adminid }).then((res) => {
+        if (res.code === 0) {
           this.adminInfo = {
             show: true,
             timer: null,
@@ -611,12 +607,11 @@ export default {
             regionid: res.obj.regionid,
             rversion: row.rversion
           };
-          console.log( this.adminInfo)
-        }else {
-          this.$Message.error(res.msg)
+          console.log(this.adminInfo);
+        } else {
+          this.$Message.error(res.msg);
         }
-      })
-
+      });
     },
     // 删除
     toDel(row) {
@@ -717,4 +712,9 @@ export default {
     background-color: #fee8ec;
   }
 }
+.see {
+  /deep/ .ivu-form-item-content {
+    line-height: 36px;
+  }
+}
 </style>

src/views/regionSection/regionManage/schoolManage.vue

@@ -517,6 +517,7 @@ export default {
         this.searchForm.marketid = "";
         this.searchForm.regionList = [];
         this.searchForm.areaCode = "";
+        this.searchList(arr[0]);
       } else {
         this.marketList = arr[0].childList;
         this.adminInfo.marketid = "";
@@ -533,6 +534,7 @@ export default {
         let arr = this.searchForm.marketList.filter((v) => v.areaCode === id);
         this.searchForm.regionList = arr[0].childList;
         this.searchForm.areaCode = "";
+        this.searchList(arr[0]);
       } else {
         let arr = this.marketList.filter((v) => v.areaCode === id);
         this.regionList = arr[0].childList;
@@ -544,17 +546,11 @@ export default {
       if (!this.searchForm.areaCode) {
         return;
       }
-      let obj = this.searchForm.regionList.filter(
-        (v) => v.areaCode === this.searchForm.areaCode
-      )[0];
-      console.log(obj);
-      this.searchForm.areaName = obj.areaAll;
       this.searchList();
     },
     getAreaList() {
       area_list_sel({}).then((res) => {
         if (res.code === 0) {
-          console.log(res.obj);
           this.areaList = res.obj;
         } else {
           this.$Message.error(res.msg);
@@ -572,9 +568,9 @@ export default {
       });
     },
     // 搜索
-    searchList() {
+    searchList(obj) {
       this.searchForm.page = 1;
-      this.getList();
+      this.getList(obj);
     },
     // 页码改变
     pageChange(page) {
@@ -588,11 +584,11 @@ export default {
       this.getList();
     },
     // 获取列表
-    getList() {
+    getList(obj) {
       school_list({
         page: this.searchForm.page,
         size: this.searchForm.size,
-        areaCode: this.searchForm.areaCode,
+        areaCode: obj && obj.areaCode?obj.areaCode:this.searchForm.areaCode,
         schoolName: this.searchForm.schoolName,
         regionid: this.searchForm.regionid
       }).then((data) => {
@@ -726,7 +722,6 @@ export default {
               msgcode: this.adminInfo.admin.msgcode
             };
           }
-          console.log(form);
           api(form).then((data) => {
             if (data.code === 0) {
               this.searchList();
@@ -771,7 +766,6 @@ export default {
             createAdmin: false,
             admin: {}
           };
-          console.log(this.adminInfo);
         } else {
           this.$Message.error(res.msg);
         }