应用管理添加更换字段

src/api/region.js

@@ -13,6 +13,11 @@ 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_sel_qy = (data) =>
+    setRequest("region/list_sel_qy", data);
 /**
  * 2.1.1.2区域--区域学校选择列表
  */
@@ -38,3 +43,37 @@ export const region_detail = (data) => setRequest("region/detail", data);
  */
 export const region_list_admin = (data) =>
   setRequest("region/list_admin", data);
+
+/**
+ * 2.2.1搜索--搜索所有用户
+ */
+export const search_list_user = (data) => setRequest("search/list_user", data);
+/**
+ * 2.2.2搜索--搜索设备用户
+ */
+export const search_list_duser = (data) =>
+  setRequest("search/list_duser", data);
+/**
+ * 2.2.3搜索--搜索设备
+ */
+export const search_list_device = (data) =>
+  setRequest("search/list_device", data);
+/**
+ * 2.2.4搜索--搜索所有应用
+ */
+export const search_list_app = (data) => setRequest("search/list_app", data);
+/**
+ * 2.2.5搜索--搜索所有白名单
+ */
+export const search_list_white = (data) =>
+  setRequest("search/list_white", data);
+/**
+ * 2.2.6搜索--搜索设备型号
+ */
+export const search_list_dmodel = (data) =>
+  setRequest("search/list_dmodel", data);
+/**
+ * 2.2.7搜索--搜索客户端版本
+ */
+export const search_list_client = (data) =>
+  setRequest("search/list_client", data);

src/views/regionSection/applicationManage/applicationManage.vue

@@ -144,7 +144,7 @@
           </Select>
         </FormItem>
         <FormItem label="状态" style="width: 300px">
-          <RadioGroup v-model="wallpaperInfo.appState">
+          <RadioGroup v-model="wallpaperInfo.enable">
             <Radio :label="1">启用</Radio>
             <Radio :label="2">禁用</Radio>
           </RadioGroup>
@@ -525,7 +525,7 @@ export default {
         appid: null,
         appName: "",
         appgroupid: "",
-        appState: 1,
+        enable: 1,
         appType: 1,
         forced: 1,
         whited: 1,
@@ -980,7 +980,7 @@ export default {
         appid: null,
         appName: "",
         appgroupid: "",
-        appState: 1,
+        enable: 1,
         appType: 1,
         forced: 1,
         whited: 1,
@@ -1052,7 +1052,7 @@ export default {
           let appImg = this.wallpaperInfo.appImg.join(";");
           let form = {
             appName: this.wallpaperInfo.appName,
-            appState: this.wallpaperInfo.appState,
+            enable: this.wallpaperInfo.enable,
             appType: this.wallpaperInfo.appType,
             forced: this.wallpaperInfo.forced,
             whited: this.wallpaperInfo.whited,
@@ -1138,7 +1138,7 @@ export default {
             appid: res.obj.appid,
             appName: res.obj.appName,
             appgroupid: res.obj.appgroupid,
-            appState: res.obj.enable,
+            enable: res.obj.enable,
             appType: res.obj.appType,
             forced: res.obj.forced,
             whited: res.obj.whited,

src/views/regionSection/regionManage/schoolManage.vue

@@ -314,7 +314,7 @@
 </template>
 
 <script>
-import { region_list_sel_pt } from "@/api/region";
+import { region_list_sel_pt, region_list_sel_qy } from "@/api/region";
 import { login_msg_code } from "@/api/login";
 import { generateRandomString } from "@/utils";
 import {
@@ -559,7 +559,7 @@ export default {
     },
     // 获取搜索区域列表
     getSearchRegionList() {
-      region_list_sel_pt({}).then((data) => {
+      region_list_sel_qy({ regionid: this.userInfo.regionid }).then((data) => {
         if (data.code === 0) {
           this.searchForm.dropList = data.obj;
         } else {
@@ -588,7 +588,7 @@ export default {
       school_list({
         page: this.searchForm.page,
         size: this.searchForm.size,
-        areaCode: obj && obj.areaCode?obj.areaCode:this.searchForm.areaCode,
+        areaCode: obj && obj.areaCode ? obj.areaCode : this.searchForm.areaCode,
         schoolName: this.searchForm.schoolName,
         regionid: this.searchForm.regionid
       }).then((data) => {

src/views/regionSection/search/allUsers.vue

@@ -2,12 +2,12 @@
   <div class="main_root">
     <div class="search_header">
       <Input
-        v-model="searchForm.regionName"
+        v-model="searchForm.name"
         placeholder="请输入学生姓名、账号"
         style="width: 200px"
       />
       <Input
-        v-model="searchForm.regionName"
+        v-model="searchForm.title"
         placeholder="请输入学校名称"
         style="width: 150px; margin: 0 10px"
       />
@@ -16,7 +16,9 @@
       </Button>
     </div>
     <div class="table_wrap">
-      <Table :columns="columns" :data="searchForm.list"> </Table>
+      <Table :columns="columns" :data="searchForm.list">
+
+      </Table>
     </div>
     <div class="page_wrap">
       <Page
@@ -35,12 +37,13 @@
 </template>
 
 <script>
-import { region_list_qy } from "@/api/region";
+import {region_list_qy, search_list_user} from "@/api/region";
 export default {
   data() {
     return {
       searchForm: {
-        regionName: "",
+        title: "",
+        name: "",
         page: 1,
         size: 10,
         list: [],
@@ -62,36 +65,36 @@ export default {
         },
         {
           title: "登录名",
-          key: "regionName",
+          key: "loginname",
           align: "center"
         },
         {
           title: "学生姓名",
-          key: "createname",
+          key: "username",
           width: 140,
           align: "center"
         },
         {
           title: "状态",
-          key: "createtime",
+          slot: "enabled",
           width: 190,
           align: "center"
         },
         {
           title: "学校名称",
-          key: "updatename",
+          key: "schoolName",
           width: 140,
           align: "center"
         },
         {
           title: "创建时间",
-          key: "updatetime",
+          key: "createtime",
           width: 190,
           align: "center"
         },
         {
           title: "最后登录时间",
-          slot: "actionSlot",
+          key: "createtime",
           width: 220,
           align: "center"
         }
@@ -120,14 +123,15 @@ export default {
     },
     // 获取列表
     getList() {
-      return;
-      region_list_qy({
+      search_list_user({
         page: this.searchForm.page,
         size: this.searchForm.size,
-        regionName: this.searchForm.regionName
+        name: this.searchForm.name,
+        title: this.searchForm.title,
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
+          console.log(this.searchForm.list)
           this.searchForm.total = data.obj.total;
         } else {
           this.$Message.error(data.msg);

src/views/regionSection/setting/wallpaper.vue

@@ -119,7 +119,7 @@
       <div class="view_content">
         <div class="view_title">壁纸效果</div>
         <div class="hpath">
-          <img :src="$api.showImageUrl + viewInfo.hpath" />
+          <img v-if="viewInfo.hpat" :src="$api.showImageUrl + viewInfo.hpath" />
         </div>
       </div>
       <div class="view_content" style="margin-top: 20px">