Browse Source

应用管理添加更换字段

gzb
guozhongbo 9 months ago
parent
commit
4f5522b3df

+ 39
- 0
src/api/region.js View File

13
  */
13
  */
14
 export const region_list_sel_pt = (data) =>
14
 export const region_list_sel_pt = (data) =>
15
   setRequest("region/list_sel_pt", data);
15
   setRequest("region/list_sel_pt", data);
16
+/**
17
+ * 2.1.1.2区域--区域选择列表
18
+ */
19
+export const region_list_sel_qy = (data) =>
20
+    setRequest("region/list_sel_qy", data);
16
 /**
21
 /**
17
  * 2.1.1.2区域--区域学校选择列表
22
  * 2.1.1.2区域--区域学校选择列表
18
  */
23
  */
38
  */
43
  */
39
 export const region_list_admin = (data) =>
44
 export const region_list_admin = (data) =>
40
   setRequest("region/list_admin", data);
45
   setRequest("region/list_admin", data);
46
+
47
+/**
48
+ * 2.2.1搜索--搜索所有用户
49
+ */
50
+export const search_list_user = (data) => setRequest("search/list_user", data);
51
+/**
52
+ * 2.2.2搜索--搜索设备用户
53
+ */
54
+export const search_list_duser = (data) =>
55
+  setRequest("search/list_duser", data);
56
+/**
57
+ * 2.2.3搜索--搜索设备
58
+ */
59
+export const search_list_device = (data) =>
60
+  setRequest("search/list_device", data);
61
+/**
62
+ * 2.2.4搜索--搜索所有应用
63
+ */
64
+export const search_list_app = (data) => setRequest("search/list_app", data);
65
+/**
66
+ * 2.2.5搜索--搜索所有白名单
67
+ */
68
+export const search_list_white = (data) =>
69
+  setRequest("search/list_white", data);
70
+/**
71
+ * 2.2.6搜索--搜索设备型号
72
+ */
73
+export const search_list_dmodel = (data) =>
74
+  setRequest("search/list_dmodel", data);
75
+/**
76
+ * 2.2.7搜索--搜索客户端版本
77
+ */
78
+export const search_list_client = (data) =>
79
+  setRequest("search/list_client", data);

+ 5
- 5
src/views/regionSection/applicationManage/applicationManage.vue View File

144
           </Select>
144
           </Select>
145
         </FormItem>
145
         </FormItem>
146
         <FormItem label="状态" style="width: 300px">
146
         <FormItem label="状态" style="width: 300px">
147
-          <RadioGroup v-model="wallpaperInfo.appState">
147
+          <RadioGroup v-model="wallpaperInfo.enable">
148
             <Radio :label="1">启用</Radio>
148
             <Radio :label="1">启用</Radio>
149
             <Radio :label="2">禁用</Radio>
149
             <Radio :label="2">禁用</Radio>
150
           </RadioGroup>
150
           </RadioGroup>
525
         appid: null,
525
         appid: null,
526
         appName: "",
526
         appName: "",
527
         appgroupid: "",
527
         appgroupid: "",
528
-        appState: 1,
528
+        enable: 1,
529
         appType: 1,
529
         appType: 1,
530
         forced: 1,
530
         forced: 1,
531
         whited: 1,
531
         whited: 1,
980
         appid: null,
980
         appid: null,
981
         appName: "",
981
         appName: "",
982
         appgroupid: "",
982
         appgroupid: "",
983
-        appState: 1,
983
+        enable: 1,
984
         appType: 1,
984
         appType: 1,
985
         forced: 1,
985
         forced: 1,
986
         whited: 1,
986
         whited: 1,
1052
           let appImg = this.wallpaperInfo.appImg.join(";");
1052
           let appImg = this.wallpaperInfo.appImg.join(";");
1053
           let form = {
1053
           let form = {
1054
             appName: this.wallpaperInfo.appName,
1054
             appName: this.wallpaperInfo.appName,
1055
-            appState: this.wallpaperInfo.appState,
1055
+            enable: this.wallpaperInfo.enable,
1056
             appType: this.wallpaperInfo.appType,
1056
             appType: this.wallpaperInfo.appType,
1057
             forced: this.wallpaperInfo.forced,
1057
             forced: this.wallpaperInfo.forced,
1058
             whited: this.wallpaperInfo.whited,
1058
             whited: this.wallpaperInfo.whited,
1138
             appid: res.obj.appid,
1138
             appid: res.obj.appid,
1139
             appName: res.obj.appName,
1139
             appName: res.obj.appName,
1140
             appgroupid: res.obj.appgroupid,
1140
             appgroupid: res.obj.appgroupid,
1141
-            appState: res.obj.enable,
1141
+            enable: res.obj.enable,
1142
             appType: res.obj.appType,
1142
             appType: res.obj.appType,
1143
             forced: res.obj.forced,
1143
             forced: res.obj.forced,
1144
             whited: res.obj.whited,
1144
             whited: res.obj.whited,

+ 3
- 3
src/views/regionSection/regionManage/schoolManage.vue View File

314
 </template>
314
 </template>
315
 
315
 
316
 <script>
316
 <script>
317
-import { region_list_sel_pt } from "@/api/region";
317
+import { region_list_sel_pt, region_list_sel_qy } from "@/api/region";
318
 import { login_msg_code } from "@/api/login";
318
 import { login_msg_code } from "@/api/login";
319
 import { generateRandomString } from "@/utils";
319
 import { generateRandomString } from "@/utils";
320
 import {
320
 import {
559
     },
559
     },
560
     // 获取搜索区域列表
560
     // 获取搜索区域列表
561
     getSearchRegionList() {
561
     getSearchRegionList() {
562
-      region_list_sel_pt({}).then((data) => {
562
+      region_list_sel_qy({ regionid: this.userInfo.regionid }).then((data) => {
563
         if (data.code === 0) {
563
         if (data.code === 0) {
564
           this.searchForm.dropList = data.obj;
564
           this.searchForm.dropList = data.obj;
565
         } else {
565
         } else {
588
       school_list({
588
       school_list({
589
         page: this.searchForm.page,
589
         page: this.searchForm.page,
590
         size: this.searchForm.size,
590
         size: this.searchForm.size,
591
-        areaCode: obj && obj.areaCode?obj.areaCode:this.searchForm.areaCode,
591
+        areaCode: obj && obj.areaCode ? obj.areaCode : this.searchForm.areaCode,
592
         schoolName: this.searchForm.schoolName,
592
         schoolName: this.searchForm.schoolName,
593
         regionid: this.searchForm.regionid
593
         regionid: this.searchForm.regionid
594
       }).then((data) => {
594
       }).then((data) => {

+ 18
- 14
src/views/regionSection/search/allUsers.vue View File

2
   <div class="main_root">
2
   <div class="main_root">
3
     <div class="search_header">
3
     <div class="search_header">
4
       <Input
4
       <Input
5
-        v-model="searchForm.regionName"
5
+        v-model="searchForm.name"
6
         placeholder="请输入学生姓名、账号"
6
         placeholder="请输入学生姓名、账号"
7
         style="width: 200px"
7
         style="width: 200px"
8
       />
8
       />
9
       <Input
9
       <Input
10
-        v-model="searchForm.regionName"
10
+        v-model="searchForm.title"
11
         placeholder="请输入学校名称"
11
         placeholder="请输入学校名称"
12
         style="width: 150px; margin: 0 10px"
12
         style="width: 150px; margin: 0 10px"
13
       />
13
       />
16
       </Button>
16
       </Button>
17
     </div>
17
     </div>
18
     <div class="table_wrap">
18
     <div class="table_wrap">
19
-      <Table :columns="columns" :data="searchForm.list"> </Table>
19
+      <Table :columns="columns" :data="searchForm.list">
20
+
21
+      </Table>
20
     </div>
22
     </div>
21
     <div class="page_wrap">
23
     <div class="page_wrap">
22
       <Page
24
       <Page
35
 </template>
37
 </template>
36
 
38
 
37
 <script>
39
 <script>
38
-import { region_list_qy } from "@/api/region";
40
+import {region_list_qy, search_list_user} from "@/api/region";
39
 export default {
41
 export default {
40
   data() {
42
   data() {
41
     return {
43
     return {
42
       searchForm: {
44
       searchForm: {
43
-        regionName: "",
45
+        title: "",
46
+        name: "",
44
         page: 1,
47
         page: 1,
45
         size: 10,
48
         size: 10,
46
         list: [],
49
         list: [],
62
         },
65
         },
63
         {
66
         {
64
           title: "登录名",
67
           title: "登录名",
65
-          key: "regionName",
68
+          key: "loginname",
66
           align: "center"
69
           align: "center"
67
         },
70
         },
68
         {
71
         {
69
           title: "学生姓名",
72
           title: "学生姓名",
70
-          key: "createname",
73
+          key: "username",
71
           width: 140,
74
           width: 140,
72
           align: "center"
75
           align: "center"
73
         },
76
         },
74
         {
77
         {
75
           title: "状态",
78
           title: "状态",
76
-          key: "createtime",
79
+          slot: "enabled",
77
           width: 190,
80
           width: 190,
78
           align: "center"
81
           align: "center"
79
         },
82
         },
80
         {
83
         {
81
           title: "学校名称",
84
           title: "学校名称",
82
-          key: "updatename",
85
+          key: "schoolName",
83
           width: 140,
86
           width: 140,
84
           align: "center"
87
           align: "center"
85
         },
88
         },
86
         {
89
         {
87
           title: "创建时间",
90
           title: "创建时间",
88
-          key: "updatetime",
91
+          key: "createtime",
89
           width: 190,
92
           width: 190,
90
           align: "center"
93
           align: "center"
91
         },
94
         },
92
         {
95
         {
93
           title: "最后登录时间",
96
           title: "最后登录时间",
94
-          slot: "actionSlot",
97
+          key: "createtime",
95
           width: 220,
98
           width: 220,
96
           align: "center"
99
           align: "center"
97
         }
100
         }
120
     },
123
     },
121
     // 获取列表
124
     // 获取列表
122
     getList() {
125
     getList() {
123
-      return;
124
-      region_list_qy({
126
+      search_list_user({
125
         page: this.searchForm.page,
127
         page: this.searchForm.page,
126
         size: this.searchForm.size,
128
         size: this.searchForm.size,
127
-        regionName: this.searchForm.regionName
129
+        name: this.searchForm.name,
130
+        title: this.searchForm.title,
128
       }).then((data) => {
131
       }).then((data) => {
129
         if (data.code === 0) {
132
         if (data.code === 0) {
130
           this.searchForm.list = data.obj.data;
133
           this.searchForm.list = data.obj.data;
134
+          console.log(this.searchForm.list)
131
           this.searchForm.total = data.obj.total;
135
           this.searchForm.total = data.obj.total;
132
         } else {
136
         } else {
133
           this.$Message.error(data.msg);
137
           this.$Message.error(data.msg);

+ 1
- 1
src/views/regionSection/setting/wallpaper.vue View File

119
       <div class="view_content">
119
       <div class="view_content">
120
         <div class="view_title">壁纸效果</div>
120
         <div class="view_title">壁纸效果</div>
121
         <div class="hpath">
121
         <div class="hpath">
122
-          <img :src="$api.showImageUrl + viewInfo.hpath" />
122
+          <img v-if="viewInfo.hpat" :src="$api.showImageUrl + viewInfo.hpath" />
123
         </div>
123
         </div>
124
       </div>
124
       </div>
125
       <div class="view_content" style="margin-top: 20px">
125
       <div class="view_content" style="margin-top: 20px">

Loading…
Cancel
Save