Browse Source

区域接口增加统一参数

gzb
guozhongbo 9 months ago
parent
commit
f4b6d27fe0
31 changed files with 532 additions and 173 deletions
  1. 1
    1
      src/views/layout.vue
  2. 11
    0
      src/views/regionSection/applicationManage/applicationGroup.vue
  3. 53
    15
      src/views/regionSection/applicationManage/applicationManage.vue
  4. 9
    2
      src/views/regionSection/log/admin.vue
  5. 9
    2
      src/views/regionSection/log/appLaunch.vue
  6. 9
    2
      src/views/regionSection/log/applicationDownload.vue
  7. 9
    2
      src/views/regionSection/log/deviceEvents.vue
  8. 9
    2
      src/views/regionSection/log/deviceExport.vue
  9. 9
    2
      src/views/regionSection/log/deviceInstallation.vue
  10. 36
    29
      src/views/regionSection/log/deviceLocation.vue
  11. 9
    2
      src/views/regionSection/log/devicePush.vue
  12. 9
    2
      src/views/regionSection/log/violatingDevice.vue
  13. 31
    6
      src/views/regionSection/networkManage/whitelist.vue
  14. 11
    2
      src/views/regionSection/networkManage/whitelistLibrary.vue
  15. 41
    32
      src/views/regionSection/notice/index.vue
  16. 21
    2
      src/views/regionSection/regionManage/adminManage.vue
  17. 20
    6
      src/views/regionSection/regionManage/regionManage.vue
  18. 14
    3
      src/views/regionSection/regionManage/schoolManage.vue
  19. 20
    11
      src/views/regionSection/search/allApps.vue
  20. 7
    0
      src/views/regionSection/search/allUsers.vue
  21. 12
    1
      src/views/regionSection/search/allWhitelists.vue
  22. 7
    0
      src/views/regionSection/search/clientVersion.vue
  23. 7
    0
      src/views/regionSection/search/device.vue
  24. 7
    0
      src/views/regionSection/search/deviceModel.vue
  25. 7
    0
      src/views/regionSection/search/deviceUsers.vue
  26. 11
    1
      src/views/regionSection/setting/device.vue
  27. 28
    16
      src/views/regionSection/setting/logo.vue
  28. 11
    2
      src/views/regionSection/setting/powerUp.vue
  29. 17
    2
      src/views/regionSection/setting/wallpaper.vue
  30. 46
    14
      src/views/schoolSection/applicationManage/applicationList.vue
  31. 41
    14
      src/views/schoolSection/userManage/userManage.vue

+ 1
- 1
src/views/layout.vue View File

82
           regionid: this.powerParams.objectid
82
           regionid: this.powerParams.objectid
83
         }).then((data) => {
83
         }).then((data) => {
84
           if (data.code === 0) {
84
           if (data.code === 0) {
85
-            this.belongName = data.obj.regionName;
85
+            this.belongName = data.obj.regionName || "--";
86
           } else {
86
           } else {
87
             this.belongName = "";
87
             this.belongName = "";
88
             this.$Message.error(data.msg);
88
             this.$Message.error(data.msg);

+ 11
- 0
src/views/regionSection/applicationManage/applicationGroup.vue View File

259
       ]
259
       ]
260
     };
260
     };
261
   },
261
   },
262
+  computed: {
263
+    powerParams() {
264
+      return this.$store.getters.powerParams;
265
+    }
266
+  },
262
   mounted() {
267
   mounted() {
263
     this.searchList();
268
     this.searchList();
264
   },
269
   },
316
     // 获取列表
321
     // 获取列表
317
     getList() {
322
     getList() {
318
       appgroup_list({
323
       appgroup_list({
324
+        rtype: this.powerParams.rtype,
325
+        objectid: this.powerParams.objectid,
319
         page: this.searchForm.page,
326
         page: this.searchForm.page,
320
         size: this.searchForm.size,
327
         size: this.searchForm.size,
321
         appgroupName: this.searchForm.appgroupName
328
         appgroupName: this.searchForm.appgroupName
353
             ? appgroup_edit
360
             ? appgroup_edit
354
             : appgroup_add;
361
             : appgroup_add;
355
           let form = {
362
           let form = {
363
+            rtype: this.powerParams.rtype,
364
+            objectid: this.powerParams.objectid,
356
             appgroupName: this.wallpaperInfo.appgroupName,
365
             appgroupName: this.wallpaperInfo.appgroupName,
357
             iconPath: this.wallpaperInfo.iconPath,
366
             iconPath: this.wallpaperInfo.iconPath,
358
             comm: this.wallpaperInfo.comm,
367
             comm: this.wallpaperInfo.comm,
411
         content: "您确定删除选中数据吗?",
420
         content: "您确定删除选中数据吗?",
412
         onOk: () => {
421
         onOk: () => {
413
           appgroup_delete({
422
           appgroup_delete({
423
+            rtype: this.powerParams.rtype,
424
+            objectid: this.powerParams.objectid,
414
             appgroupid: row.appgroupid,
425
             appgroupid: row.appgroupid,
415
             rversion: row.rversion
426
             rversion: row.rversion
416
           }).then((res) => {
427
           }).then((res) => {

+ 53
- 15
src/views/regionSection/applicationManage/applicationManage.vue View File

877
       ]
877
       ]
878
     };
878
     };
879
   },
879
   },
880
+  computed: {
881
+    powerParams() {
882
+      return this.$store.getters.powerParams;
883
+    }
884
+  },
880
   created() {
885
   created() {
881
     this.userInfo = JSON.parse(
886
     this.userInfo = JSON.parse(
882
       localStorage.getItem("xh_control_userInfo")
887
       localStorage.getItem("xh_control_userInfo")
891
     },
896
     },
892
     // 查看
897
     // 查看
893
     toView(row) {
898
     toView(row) {
894
-      app_detail({ appid: row.appid }).then((res) => {
899
+      app_detail({
900
+        rtype: this.powerParams.rtype,
901
+        objectid: this.powerParams.objectid,
902
+        appid: row.appid
903
+      }).then((res) => {
895
         if (res.code === 0) {
904
         if (res.code === 0) {
896
           this.viewInfo = {
905
           this.viewInfo = {
897
             show: true,
906
             show: true,
927
     },
936
     },
928
     //查看型号
937
     //查看型号
929
     see_device(row) {
938
     see_device(row) {
930
-      app_detail({ appid: row.appid }).then((res) => {
939
+      app_detail({
940
+        rtype: this.powerParams.rtype,
941
+        objectid: this.powerParams.objectid,
942
+        appid: row.appid
943
+      }).then((res) => {
931
         if (res.code === 0) {
944
         if (res.code === 0) {
932
           this.deviceInfo = {
945
           this.deviceInfo = {
933
             show: true,
946
             show: true,
943
     enabledChange(row) {
956
     enabledChange(row) {
944
       let api = row.enable === 1 ? app_edit_enable : app_edit_unenable;
957
       let api = row.enable === 1 ? app_edit_enable : app_edit_unenable;
945
       api({
958
       api({
959
+        rtype: this.powerParams.rtype,
960
+        objectid: this.powerParams.objectid,
946
         appid: row.appid,
961
         appid: row.appid,
947
         rversion: row.rversion
962
         rversion: row.rversion
948
       }).then((data) => {
963
       }).then((data) => {
958
       console.log(row);
973
       console.log(row);
959
       if (type === 1) {
974
       if (type === 1) {
960
         //下载
975
         //下载
961
-        app_detail({ appid: row.appid }).then((res) => {
976
+        app_detail({
977
+          rtype: this.powerParams.rtype,
978
+          objectid: this.powerParams.objectid,
979
+          appid: row.appid
980
+        }).then((res) => {
962
           if (res.code === 0) {
981
           if (res.code === 0) {
963
             this.downloadInfo = {
982
             this.downloadInfo = {
964
               show: true,
983
               show: true,
1100
     init() {
1119
     init() {
1101
       //获取分组列表
1120
       //获取分组列表
1102
       appgroup_list({
1121
       appgroup_list({
1122
+        rtype: this.powerParams.rtype,
1123
+        objectid: this.powerParams.objectid,
1103
         page: 1,
1124
         page: 1,
1104
         size: 100,
1125
         size: 100,
1105
         appgroupName: ""
1126
         appgroupName: ""
1120
       });
1141
       });
1121
 
1142
 
1122
       //获取区域学校
1143
       //获取区域学校
1123
-      region_list_rs({ regionid: this.userInfo.regionid }).then((res) => {
1144
+      region_list_rs({
1145
+        rtype: this.powerParams.rtype,
1146
+        objectid: this.powerParams.objectid,
1147
+        regionid: this.powerParams.objectid
1148
+      }).then((res) => {
1124
         if (res.code === 0) {
1149
         if (res.code === 0) {
1125
           this.getHandleData(res.obj[0]);
1150
           this.getHandleData(res.obj[0]);
1126
           this.curRegion = res.obj;
1151
           this.curRegion = res.obj;
1143
       //获取区域学校
1168
       //获取区域学校
1144
       this.showLoading = true;
1169
       this.showLoading = true;
1145
       region_list_rs({
1170
       region_list_rs({
1146
-        regionid: this.userInfo.regionid,
1171
+        rtype: this.powerParams.rtype,
1172
+        objectid: this.powerParams.objectid,
1173
+        regionid: this.powerParams.objectid,
1147
         regionName: this.wallpaperInfo.schoolname
1174
         regionName: this.wallpaperInfo.schoolname
1148
       }).then((res) => {
1175
       }).then((res) => {
1149
         this.showLoading = false;
1176
         this.showLoading = false;
1224
     getList() {
1251
     getList() {
1225
       this.showLoading = true;
1252
       this.showLoading = true;
1226
       app_list({
1253
       app_list({
1254
+        rtype: this.powerParams.rtype,
1255
+        objectid: this.powerParams.objectid,
1227
         page: this.searchForm.page,
1256
         page: this.searchForm.page,
1228
         size: this.searchForm.size,
1257
         size: this.searchForm.size,
1229
         appName: this.searchForm.appName
1258
         appName: this.searchForm.appName
1320
           }
1349
           }
1321
           let appImg = this.wallpaperInfo.appImg.join(";");
1350
           let appImg = this.wallpaperInfo.appImg.join(";");
1322
           let form = {
1351
           let form = {
1352
+            rtype: this.powerParams.rtype,
1353
+            objectid: this.powerParams.objectid,
1323
             appName: this.wallpaperInfo.appName,
1354
             appName: this.wallpaperInfo.appName,
1324
             enable: this.wallpaperInfo.enable,
1355
             enable: this.wallpaperInfo.enable,
1325
             appType: this.wallpaperInfo.appType,
1356
             appType: this.wallpaperInfo.appType,
1386
 
1417
 
1387
     // 编辑
1418
     // 编辑
1388
     toEdit(row) {
1419
     toEdit(row) {
1389
-      app_detail({ appid: row.appid }).then((res) => {
1420
+      app_detail({
1421
+        rtype: this.powerParams.rtype,
1422
+        objectid: this.powerParams.objectid,
1423
+        appid: row.appid
1424
+      }).then((res) => {
1390
         if (res.code === 0) {
1425
         if (res.code === 0) {
1391
           this.school_list = JSON.parse(JSON.stringify(this.curRegion));
1426
           this.school_list = JSON.parse(JSON.stringify(this.curRegion));
1392
           this.wallpaperInfo = {
1427
           this.wallpaperInfo = {
1468
         title: "提示",
1503
         title: "提示",
1469
         content: "您确定删除选中数据吗?",
1504
         content: "您确定删除选中数据吗?",
1470
         onOk: () => {
1505
         onOk: () => {
1471
-          app_delete({ appid: row.appid, rversion: row.rversion }).then(
1472
-            (res) => {
1473
-              if (res.code === 0) {
1474
-                this.$Message.success(res.msg);
1475
-                this.searchList();
1476
-              } else {
1477
-                this.$Message.error(res.msg);
1478
-              }
1506
+          app_delete({
1507
+            rtype: this.powerParams.rtype,
1508
+            objectid: this.powerParams.objectid,
1509
+            appid: row.appid,
1510
+            rversion: row.rversion
1511
+          }).then((res) => {
1512
+            if (res.code === 0) {
1513
+              this.$Message.success(res.msg);
1514
+              this.searchList();
1515
+            } else {
1516
+              this.$Message.error(res.msg);
1479
             }
1517
             }
1480
-          );
1518
+          });
1481
         },
1519
         },
1482
         onCancel: () => {}
1520
         onCancel: () => {}
1483
       });
1521
       });

+ 9
- 2
src/views/regionSection/log/admin.vue View File

94
       ]
94
       ]
95
     };
95
     };
96
   },
96
   },
97
+  computed: {
98
+    powerParams() {
99
+      return this.$store.getters.powerParams;
100
+    }
101
+  },
97
   created() {
102
   created() {
98
     this.userInfo = JSON.parse(
103
     this.userInfo = JSON.parse(
99
         localStorage.getItem("xh_control_userInfo")
104
         localStorage.getItem("xh_control_userInfo")
124
       let _enddate = this.searchForm.dataRange[1];
129
       let _enddate = this.searchForm.dataRange[1];
125
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
130
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
126
       logOperate_list({
131
       logOperate_list({
132
+        rtype: this.powerParams.rtype,
133
+        objectid: this.powerParams.objectid,
134
+        regionid: this.powerParams.objectid,
127
         page: this.searchForm.page,
135
         page: this.searchForm.page,
128
         size: this.searchForm.size,
136
         size: this.searchForm.size,
129
         begindate: _begindate,
137
         begindate: _begindate,
130
         enddate: _enddate,
138
         enddate: _enddate,
131
-        name: this.searchForm.name,
132
-        regionid: this.userInfo.regionid
139
+        name: this.searchForm.name
133
       }).then((data) => {
140
       }).then((data) => {
134
         if (data.code === 0) {
141
         if (data.code === 0) {
135
           this.searchForm.list = data.obj.data;
142
           this.searchForm.list = data.obj.data;

+ 9
- 2
src/views/regionSection/log/appLaunch.vue View File

122
       ]
122
       ]
123
     };
123
     };
124
   },
124
   },
125
+  computed: {
126
+    powerParams() {
127
+      return this.$store.getters.powerParams;
128
+    }
129
+  },
125
   created() {
130
   created() {
126
     this.userInfo = JSON.parse(
131
     this.userInfo = JSON.parse(
127
       localStorage.getItem("xh_control_userInfo")
132
       localStorage.getItem("xh_control_userInfo")
152
       let _enddate = this.searchForm.dataRange[1];
157
       let _enddate = this.searchForm.dataRange[1];
153
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
158
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
154
       logAppStart_list_start({
159
       logAppStart_list_start({
160
+        rtype: this.powerParams.rtype,
161
+        objectid: this.powerParams.objectid,
162
+        regionid: this.powerParams.objectid,
155
         page: this.searchForm.page,
163
         page: this.searchForm.page,
156
         size: this.searchForm.size,
164
         size: this.searchForm.size,
157
         begindate: _begindate,
165
         begindate: _begindate,
158
         enddate: _enddate,
166
         enddate: _enddate,
159
-        name: this.searchForm.name,
160
-        regionid: this.userInfo.regionid
167
+        name: this.searchForm.name
161
       }).then((data) => {
168
       }).then((data) => {
162
         if (data.code === 0) {
169
         if (data.code === 0) {
163
           this.searchForm.list = data.obj.data;
170
           this.searchForm.list = data.obj.data;

+ 9
- 2
src/views/regionSection/log/applicationDownload.vue View File

114
       ]
114
       ]
115
     };
115
     };
116
   },
116
   },
117
+  computed: {
118
+    powerParams() {
119
+      return this.$store.getters.powerParams;
120
+    }
121
+  },
117
   created() {
122
   created() {
118
     this.userInfo = JSON.parse(
123
     this.userInfo = JSON.parse(
119
       localStorage.getItem("xh_control_userInfo")
124
       localStorage.getItem("xh_control_userInfo")
144
       let _enddate = this.searchForm.dataRange[1];
149
       let _enddate = this.searchForm.dataRange[1];
145
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
150
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
146
       logAppDown_list({
151
       logAppDown_list({
152
+        rtype: this.powerParams.rtype,
153
+        objectid: this.powerParams.objectid,
154
+        regionid: this.powerParams.objectid,
147
         page: this.searchForm.page,
155
         page: this.searchForm.page,
148
         size: this.searchForm.size,
156
         size: this.searchForm.size,
149
         begindate: _begindate,
157
         begindate: _begindate,
150
         enddate: _enddate,
158
         enddate: _enddate,
151
-        name: this.searchForm.name,
152
-        regionid: this.userInfo.regionid
159
+        name: this.searchForm.name
153
       }).then((data) => {
160
       }).then((data) => {
154
         if (data.code === 0) {
161
         if (data.code === 0) {
155
           this.searchForm.list = data.obj.data;
162
           this.searchForm.list = data.obj.data;

+ 9
- 2
src/views/regionSection/log/deviceEvents.vue View File

150
       ]
150
       ]
151
     };
151
     };
152
   },
152
   },
153
+  computed: {
154
+    powerParams() {
155
+      return this.$store.getters.powerParams;
156
+    }
157
+  },
153
   created() {
158
   created() {
154
     this.userInfo = JSON.parse(
159
     this.userInfo = JSON.parse(
155
       localStorage.getItem("xh_control_userInfo")
160
       localStorage.getItem("xh_control_userInfo")
180
       let _enddate = this.searchForm.dataRange[1];
185
       let _enddate = this.searchForm.dataRange[1];
181
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
186
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
182
       logdoperate_list_event({
187
       logdoperate_list_event({
188
+        rtype: this.powerParams.rtype,
189
+        objectid: this.powerParams.objectid,
190
+        regionid: this.powerParams.objectid,
183
         page: this.searchForm.page,
191
         page: this.searchForm.page,
184
         size: this.searchForm.size,
192
         size: this.searchForm.size,
185
         doEvent: this.searchForm.doEvent,
193
         doEvent: this.searchForm.doEvent,
186
         begindate: _begindate,
194
         begindate: _begindate,
187
         enddate: _enddate,
195
         enddate: _enddate,
188
-        name: this.searchForm.name,
189
-        regionid: this.userInfo.regionid
196
+        name: this.searchForm.name
190
       }).then((data) => {
197
       }).then((data) => {
191
         if (data.code === 0) {
198
         if (data.code === 0) {
192
           this.searchForm.list = data.obj.data;
199
           this.searchForm.list = data.obj.data;

+ 9
- 2
src/views/regionSection/log/deviceExport.vue View File

95
       ]
95
       ]
96
     };
96
     };
97
   },
97
   },
98
+  computed: {
99
+    powerParams() {
100
+      return this.$store.getters.powerParams;
101
+    }
102
+  },
98
   created() {
103
   created() {
99
     this.userInfo = JSON.parse(
104
     this.userInfo = JSON.parse(
100
       localStorage.getItem("xh_control_userInfo")
105
       localStorage.getItem("xh_control_userInfo")
121
     // 获取列表
126
     // 获取列表
122
     getList() {
127
     getList() {
123
       logDeviceBind_list({
128
       logDeviceBind_list({
129
+        rtype: this.powerParams.rtype,
130
+        objectid: this.powerParams.objectid,
131
+        regionid: this.powerParams.objectid,
124
         page: this.searchForm.page,
132
         page: this.searchForm.page,
125
         size: this.searchForm.size,
133
         size: this.searchForm.size,
126
-        name: this.searchForm.name,
127
-        regionid: this.userInfo.regionid
134
+        name: this.searchForm.name
128
       }).then((data) => {
135
       }).then((data) => {
129
         if (data.code === 0) {
136
         if (data.code === 0) {
130
           this.searchForm.list = data.obj.data;
137
           this.searchForm.list = data.obj.data;

+ 9
- 2
src/views/regionSection/log/deviceInstallation.vue View File

127
       ]
127
       ]
128
     };
128
     };
129
   },
129
   },
130
+  computed: {
131
+    powerParams() {
132
+      return this.$store.getters.powerParams;
133
+    }
134
+  },
130
   created() {
135
   created() {
131
     this.userInfo = JSON.parse(
136
     this.userInfo = JSON.parse(
132
       localStorage.getItem("xh_control_userInfo")
137
       localStorage.getItem("xh_control_userInfo")
157
       let _enddate = this.searchForm.dataRange[1];
162
       let _enddate = this.searchForm.dataRange[1];
158
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
163
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
159
       logAppStart_list_install({
164
       logAppStart_list_install({
165
+        rtype: this.powerParams.rtype,
166
+        objectid: this.powerParams.objectid,
167
+        regionid: this.powerParams.objectid,
160
         page: this.searchForm.page,
168
         page: this.searchForm.page,
161
         size: this.searchForm.size,
169
         size: this.searchForm.size,
162
         begindate: _begindate,
170
         begindate: _begindate,
163
         enddate: _enddate,
171
         enddate: _enddate,
164
-        name: this.searchForm.name,
165
-        regionid: this.userInfo.regionid
172
+        name: this.searchForm.name
166
       }).then((data) => {
173
       }).then((data) => {
167
         if (data.code === 0) {
174
         if (data.code === 0) {
168
           this.searchForm.list = data.obj.data;
175
           this.searchForm.list = data.obj.data;

+ 36
- 29
src/views/regionSection/log/deviceLocation.vue View File

3
     <div class="search_header">
3
     <div class="search_header">
4
       <div class="search_left">
4
       <div class="search_left">
5
         <DatePicker
5
         <DatePicker
6
-            v-model="searchForm.dataRange"
7
-            @on-change="searchList()"
8
-            :editable="false"
9
-            :transfer="true"
10
-            format="yyyy-MM-dd"
11
-            type="daterange"
12
-            placement="bottom-start"
13
-            placeholder="请选择日期范围"
14
-            style="margin-right: 10px; width: 220px"
6
+          v-model="searchForm.dataRange"
7
+          @on-change="searchList()"
8
+          :editable="false"
9
+          :transfer="true"
10
+          format="yyyy-MM-dd"
11
+          type="daterange"
12
+          placement="bottom-start"
13
+          placeholder="请选择日期范围"
14
+          style="margin-right: 10px; width: 220px"
15
         ></DatePicker>
15
         ></DatePicker>
16
         <Input
16
         <Input
17
-            v-model="searchForm.name"
18
-            placeholder="请输入登录名、事件"
19
-            search
20
-            @on-search="searchList()"
21
-            style="width: 180px"
17
+          v-model="searchForm.name"
18
+          placeholder="请输入登录名、事件"
19
+          search
20
+          @on-search="searchList()"
21
+          style="width: 180px"
22
         />
22
         />
23
       </div>
23
       </div>
24
       <Button type="primary" class="primary_btn" @click="toExport()"
24
       <Button type="primary" class="primary_btn" @click="toExport()"
25
-      >导出</Button
25
+        >导出</Button
26
       >
26
       >
27
     </div>
27
     </div>
28
     <div class="table_wrap">
28
     <div class="table_wrap">
30
     </div>
30
     </div>
31
     <div class="page_wrap">
31
     <div class="page_wrap">
32
       <Page
32
       <Page
33
-          :transfer="true"
34
-          :total="searchForm.total"
35
-          :current="searchForm.page"
36
-          :page-size="searchForm.size"
37
-          :page-size-opts="[10, 20, 40, 60]"
38
-          @on-change="pageChange"
39
-          @on-page-size-change="pageSizeChange"
40
-          show-total
41
-          show-sizer
33
+        :transfer="true"
34
+        :total="searchForm.total"
35
+        :current="searchForm.page"
36
+        :page-size="searchForm.size"
37
+        :page-size-opts="[10, 20, 40, 60]"
38
+        @on-change="pageChange"
39
+        @on-page-size-change="pageSizeChange"
40
+        show-total
41
+        show-sizer
42
       ></Page>
42
       ></Page>
43
     </div>
43
     </div>
44
   </div>
44
   </div>
66
           width: 70,
66
           width: 70,
67
           render: (h, params) => {
67
           render: (h, params) => {
68
             return h(
68
             return h(
69
-                "span",
70
-                params.index +
69
+              "span",
70
+              params.index +
71
                 (this.searchForm.page - 1) * this.searchForm.size +
71
                 (this.searchForm.page - 1) * this.searchForm.size +
72
                 1
72
                 1
73
             );
73
             );
112
       ]
112
       ]
113
     };
113
     };
114
   },
114
   },
115
+  computed: {
116
+    powerParams() {
117
+      return this.$store.getters.powerParams;
118
+    }
119
+  },
115
   created() {
120
   created() {
116
     this.userInfo = JSON.parse(
121
     this.userInfo = JSON.parse(
117
-        localStorage.getItem("xh_control_userInfo")
122
+      localStorage.getItem("xh_control_userInfo")
118
     ).content;
123
     ).content;
119
     this.searchList();
124
     this.searchList();
120
   },
125
   },
142
       let _enddate = this.searchForm.dataRange[1];
147
       let _enddate = this.searchForm.dataRange[1];
143
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
148
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
144
       logDeviceLogin_list({
149
       logDeviceLogin_list({
150
+        rtype: this.powerParams.rtype,
151
+        objectid: this.powerParams.objectid,
152
+        regionid: this.powerParams.objectid,
145
         page: this.searchForm.page,
153
         page: this.searchForm.page,
146
         size: this.searchForm.size,
154
         size: this.searchForm.size,
147
         begindate: _begindate,
155
         begindate: _begindate,
148
         enddate: _enddate,
156
         enddate: _enddate,
149
-        name: this.searchForm.name,
150
-        regionid: this.userInfo.regionid
157
+        name: this.searchForm.name
151
       }).then((data) => {
158
       }).then((data) => {
152
         if (data.code === 0) {
159
         if (data.code === 0) {
153
           this.searchForm.list = data.obj.data;
160
           this.searchForm.list = data.obj.data;

+ 9
- 2
src/views/regionSection/log/devicePush.vue View File

105
       ]
105
       ]
106
     };
106
     };
107
   },
107
   },
108
+  computed: {
109
+    powerParams() {
110
+      return this.$store.getters.powerParams;
111
+    }
112
+  },
108
   created() {
113
   created() {
109
     this.userInfo = JSON.parse(
114
     this.userInfo = JSON.parse(
110
       localStorage.getItem("xh_control_userInfo")
115
       localStorage.getItem("xh_control_userInfo")
135
       let _enddate = this.searchForm.dataRange[1];
140
       let _enddate = this.searchForm.dataRange[1];
136
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
141
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
137
       logPush_list({
142
       logPush_list({
143
+        rtype: this.powerParams.rtype,
144
+        objectid: this.powerParams.objectid,
145
+        regionid: this.powerParams.objectid,
138
         page: this.searchForm.page,
146
         page: this.searchForm.page,
139
         size: this.searchForm.size,
147
         size: this.searchForm.size,
140
         begindate: _begindate,
148
         begindate: _begindate,
141
         enddate: _enddate,
149
         enddate: _enddate,
142
-        name: this.searchForm.name,
143
-        regionid: this.userInfo.regionid
150
+        name: this.searchForm.name
144
       }).then((data) => {
151
       }).then((data) => {
145
         if (data.code === 0) {
152
         if (data.code === 0) {
146
           this.searchForm.list = data.obj.data;
153
           this.searchForm.list = data.obj.data;

+ 9
- 2
src/views/regionSection/log/violatingDevice.vue View File

193
       ]
193
       ]
194
     };
194
     };
195
   },
195
   },
196
+  computed: {
197
+    powerParams() {
198
+      return this.$store.getters.powerParams;
199
+    }
200
+  },
196
   created() {
201
   created() {
197
     this.userInfo = JSON.parse(
202
     this.userInfo = JSON.parse(
198
       localStorage.getItem("xh_control_userInfo")
203
       localStorage.getItem("xh_control_userInfo")
223
       let _enddate = this.searchForm.dataRange[1];
228
       let _enddate = this.searchForm.dataRange[1];
224
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
229
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
225
       logdoperate_list_violate({
230
       logdoperate_list_violate({
231
+        rtype: this.powerParams.rtype,
232
+        objectid: this.powerParams.objectid,
233
+        regionid: this.powerParams.objectid,
226
         page: this.searchForm.page,
234
         page: this.searchForm.page,
227
         size: this.searchForm.size,
235
         size: this.searchForm.size,
228
         doEvent: this.searchForm.doEvent,
236
         doEvent: this.searchForm.doEvent,
229
         begindate: _begindate,
237
         begindate: _begindate,
230
         enddate: _enddate,
238
         enddate: _enddate,
231
-        name: this.searchForm.name,
232
-        regionid: this.userInfo.regionid
239
+        name: this.searchForm.name
233
       }).then((data) => {
240
       }).then((data) => {
234
         if (data.code === 0) {
241
         if (data.code === 0) {
235
           this.searchForm.list = data.obj.data;
242
           this.searchForm.list = data.obj.data;

+ 31
- 6
src/views/regionSection/networkManage/whitelist.vue View File

330
       ]
330
       ]
331
     };
331
     };
332
   },
332
   },
333
+  computed: {
334
+    powerParams() {
335
+      return this.$store.getters.powerParams;
336
+    }
337
+  },
333
   created() {
338
   created() {
334
     this.userInfo = JSON.parse(
339
     this.userInfo = JSON.parse(
335
       localStorage.getItem("xh_control_userInfo")
340
       localStorage.getItem("xh_control_userInfo")
340
   methods: {
345
   methods: {
341
     init() {
346
     init() {
342
       //获取区域学校
347
       //获取区域学校
343
-      region_list_rs({ regionid: this.userInfo.regionid }).then((res) => {
348
+      region_list_rs({
349
+        rtype: this.powerParams.rtype,
350
+        objectid: this.powerParams.objectid,
351
+        regionid: this.powerParams.objectid
352
+      }).then((res) => {
344
         if (res.code === 0) {
353
         if (res.code === 0) {
345
           this.getHandleData(res.obj[0]);
354
           this.getHandleData(res.obj[0]);
346
           this.curRegion = res.obj;
355
           this.curRegion = res.obj;
382
     getSchool() {
391
     getSchool() {
383
       //获取区域学校
392
       //获取区域学校
384
       region_list_rs({
393
       region_list_rs({
385
-        regionid: this.userInfo.regionid,
394
+        rtype: this.powerParams.rtype,
395
+        objectid: this.powerParams.objectid,
396
+        regionid: this.powerParams.objectid,
386
         name: this.whiteLibraryInfo.schoolname
397
         name: this.whiteLibraryInfo.schoolname
387
       }).then((res) => {
398
       }).then((res) => {
388
         if (res.code === 0) {
399
         if (res.code === 0) {
424
         page: this.searchForm.page,
435
         page: this.searchForm.page,
425
         size: this.searchForm.size,
436
         size: this.searchForm.size,
426
         whiteName: this.searchForm.whiteName,
437
         whiteName: this.searchForm.whiteName,
427
-        regionid: this.userInfo.regionid
438
+        rtype: this.powerParams.rtype,
439
+        objectid: this.powerParams.objectid,
440
+        regionid: this.powerParams.objectid
428
       }).then((data) => {
441
       }).then((data) => {
429
         if (data.code === 0) {
442
         if (data.code === 0) {
430
           this.searchForm.list = data.obj.data;
443
           this.searchForm.list = data.obj.data;
468
           }
481
           }
469
           let api = this.whiteLibraryInfo.whiteid ? white_edit : white_add;
482
           let api = this.whiteLibraryInfo.whiteid ? white_edit : white_add;
470
           let form = {
483
           let form = {
484
+            rtype: this.powerParams.rtype,
485
+            objectid: this.powerParams.objectid,
486
+            regionid: this.powerParams.objectid,
471
             whiteName: this.whiteLibraryInfo.whiteName,
487
             whiteName: this.whiteLibraryInfo.whiteName,
472
             targetSchool: this.whiteLibraryInfo.targetSchool,
488
             targetSchool: this.whiteLibraryInfo.targetSchool,
473
-            regionid: this.userInfo.regionid,
474
             website: this.whiteLibraryInfo.website,
489
             website: this.whiteLibraryInfo.website,
475
             comm: this.whiteLibraryInfo.comm,
490
             comm: this.whiteLibraryInfo.comm,
476
             schoolids: this.whiteLibraryInfo.schoolids
491
             schoolids: this.whiteLibraryInfo.schoolids
494
     },
509
     },
495
     // 查看
510
     // 查看
496
     toView(row) {
511
     toView(row) {
497
-      white_detail({ whiteid: row.whiteid }).then((res) => {
512
+      white_detail({
513
+        rtype: this.powerParams.rtype,
514
+        objectid: this.powerParams.objectid,
515
+        whiteid: row.whiteid
516
+      }).then((res) => {
498
         if (res.code === 0) {
517
         if (res.code === 0) {
499
           this.viewInfo = {
518
           this.viewInfo = {
500
             show: true,
519
             show: true,
516
     // 编辑
535
     // 编辑
517
     toEdit(row) {
536
     toEdit(row) {
518
       this.school_list = JSON.parse(JSON.stringify(this.curRegion));
537
       this.school_list = JSON.parse(JSON.stringify(this.curRegion));
519
-      white_detail({ whiteid: row.whiteid }).then((res) => {
538
+      white_detail({
539
+        rtype: this.powerParams.rtype,
540
+        objectid: this.powerParams.objectid,
541
+        whiteid: row.whiteid
542
+      }).then((res) => {
520
         if (res.code === 0) {
543
         if (res.code === 0) {
521
           this.whiteLibraryInfo = {
544
           this.whiteLibraryInfo = {
522
             show: true,
545
             show: true,
550
         content: "您确定删除选中数据吗?",
573
         content: "您确定删除选中数据吗?",
551
         onOk: () => {
574
         onOk: () => {
552
           white_delete({
575
           white_delete({
576
+            rtype: this.powerParams.rtype,
577
+            objectid: this.powerParams.objectid,
553
             whiteid: row.whiteid,
578
             whiteid: row.whiteid,
554
             rversion: row.rversion
579
             rversion: row.rversion
555
           }).then((data) => {
580
           }).then((data) => {

+ 11
- 2
src/views/regionSection/networkManage/whitelistLibrary.vue View File

111
       ]
111
       ]
112
     };
112
     };
113
   },
113
   },
114
+  computed: {
115
+    powerParams() {
116
+      return this.$store.getters.powerParams;
117
+    }
118
+  },
114
   created() {
119
   created() {
115
     this.userInfo = JSON.parse(
120
     this.userInfo = JSON.parse(
116
       localStorage.getItem("xh_control_userInfo")
121
       localStorage.getItem("xh_control_userInfo")
137
     // 获取列表
142
     // 获取列表
138
     getList() {
143
     getList() {
139
       whiteLibrary_list({
144
       whiteLibrary_list({
145
+        rtype: this.powerParams.rtype,
146
+        objectid: this.powerParams.objectid,
140
         page: this.searchForm.page,
147
         page: this.searchForm.page,
141
         size: this.searchForm.size,
148
         size: this.searchForm.size,
142
         name: this.searchForm.name
149
         name: this.searchForm.name
159
           '</span>" 加到白名单?',
166
           '</span>" 加到白名单?',
160
         onOk: () => {
167
         onOk: () => {
161
           whiteLibrary_add_white({
168
           whiteLibrary_add_white({
162
-            wlid: row.wlid,
163
-            regionid: this.userInfo.regionid
169
+            rtype: this.powerParams.rtype,
170
+            objectid: this.powerParams.objectid,
171
+            regionid: this.powerParams.objectid,
172
+            wlid: row.wlid
164
           }).then((data) => {
173
           }).then((data) => {
165
             if (data.code === 0) {
174
             if (data.code === 0) {
166
               this.searchList();
175
               this.searchList();

+ 41
- 32
src/views/regionSection/notice/index.vue View File

3
     <div class="search_header">
3
     <div class="search_header">
4
       <div class="search_left">
4
       <div class="search_left">
5
         <DatePicker
5
         <DatePicker
6
-            v-model="searchForm.dataRange"
7
-            @on-change="searchList()"
8
-            :editable="false"
9
-            :transfer="true"
10
-            format="yyyy-MM-dd"
11
-            type="daterange"
12
-            placement="bottom-start"
13
-            placeholder="请选择日期范围"
14
-            style="margin-right: 10px; width: 220px"
6
+          v-model="searchForm.dataRange"
7
+          @on-change="searchList()"
8
+          :editable="false"
9
+          :transfer="true"
10
+          format="yyyy-MM-dd"
11
+          type="daterange"
12
+          placement="bottom-start"
13
+          placeholder="请选择日期范围"
14
+          style="margin-right: 10px; width: 220px"
15
         ></DatePicker>
15
         ></DatePicker>
16
         <Input
16
         <Input
17
-            v-model="searchForm.title"
18
-            placeholder="请输入标题"
19
-            search
20
-            @on-search="searchList()"
21
-            style="width: 150px"
17
+          v-model="searchForm.title"
18
+          placeholder="请输入标题"
19
+          search
20
+          @on-search="searchList()"
21
+          style="width: 150px"
22
         />
22
         />
23
       </div>
23
       </div>
24
     </div>
24
     </div>
33
     </div>
33
     </div>
34
     <div class="page_wrap">
34
     <div class="page_wrap">
35
       <Page
35
       <Page
36
-          :transfer="true"
37
-          :total="searchForm.total"
38
-          :current="searchForm.page"
39
-          :page-size="searchForm.size"
40
-          :page-size-opts="[10, 20, 40, 60]"
41
-          @on-change="pageChange"
42
-          @on-page-size-change="pageSizeChange"
43
-          show-total
44
-          show-sizer
36
+        :transfer="true"
37
+        :total="searchForm.total"
38
+        :current="searchForm.page"
39
+        :page-size="searchForm.size"
40
+        :page-size-opts="[10, 20, 40, 60]"
41
+        @on-change="pageChange"
42
+        @on-page-size-change="pageSizeChange"
43
+        show-total
44
+        show-sizer
45
       ></Page>
45
       ></Page>
46
     </div>
46
     </div>
47
     <!-- 查看 -->
47
     <!-- 查看 -->
48
     <Modal
48
     <Modal
49
-        class="modal1"
50
-        :mask-closable="false"
51
-        v-model="viewInfo.show"
52
-        title="查看"
49
+      class="modal1"
50
+      :mask-closable="false"
51
+      v-model="viewInfo.show"
52
+      title="查看"
53
     >
53
     >
54
       <div class="notice_title">{{ viewInfo.noticeTitle }}</div>
54
       <div class="notice_title">{{ viewInfo.noticeTitle }}</div>
55
       <div class="notice_create">
55
       <div class="notice_create">
96
           width: 70,
96
           width: 70,
97
           render: (h, params) => {
97
           render: (h, params) => {
98
             return h(
98
             return h(
99
-                "span",
100
-                params.index +
99
+              "span",
100
+              params.index +
101
                 (this.searchForm.page - 1) * this.searchForm.size +
101
                 (this.searchForm.page - 1) * this.searchForm.size +
102
                 1
102
                 1
103
             );
103
             );
129
       ]
129
       ]
130
     };
130
     };
131
   },
131
   },
132
+  computed: {
133
+    powerParams() {
134
+      return this.$store.getters.powerParams;
135
+    }
136
+  },
132
   created() {
137
   created() {
133
     this.userInfo = JSON.parse(
138
     this.userInfo = JSON.parse(
134
-        localStorage.getItem("xh_control_userInfo")
139
+      localStorage.getItem("xh_control_userInfo")
135
     ).content;
140
     ).content;
136
     this.searchList();
141
     this.searchList();
137
   },
142
   },
159
       let _enddate = this.searchForm.dataRange[1];
164
       let _enddate = this.searchForm.dataRange[1];
160
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
165
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
161
       notice_list_region({
166
       notice_list_region({
167
+        rtype: this.powerParams.rtype,
168
+        objectid: this.powerParams.objectid,
162
         page: this.searchForm.page,
169
         page: this.searchForm.page,
163
         size: this.searchForm.size,
170
         size: this.searchForm.size,
164
         title: this.searchForm.title,
171
         title: this.searchForm.title,
176
     // 查看
183
     // 查看
177
     toView(row) {
184
     toView(row) {
178
       notice_detail_region({
185
       notice_detail_region({
186
+        rtype: this.powerParams.rtype,
187
+        objectid: this.powerParams.objectid,
179
         noticeid: row.noticeid
188
         noticeid: row.noticeid
180
       }).then((data) => {
189
       }).then((data) => {
181
         if (data.code === 0) {
190
         if (data.code === 0) {
188
             noticeType: data.obj.noticeType,
197
             noticeType: data.obj.noticeType,
189
             regions: data.obj.noticeType === 1 ? [] : data.obj.regions
198
             regions: data.obj.noticeType === 1 ? [] : data.obj.regions
190
           };
199
           };
191
-          console.log(data.obj.noticeContent)
200
+          console.log(data.obj.noticeContent);
192
         } else {
201
         } else {
193
           this.$Message.error(data.msg);
202
           this.$Message.error(data.msg);
194
         }
203
         }
229
 }
238
 }
230
 .notice_content {
239
 .notice_content {
231
   font-size: 16px;
240
   font-size: 16px;
232
-  /deep/ img{
241
+  /deep/ img {
233
     width: 100%;
242
     width: 100%;
234
   }
243
   }
235
 }
244
 }

+ 21
- 2
src/views/regionSection/regionManage/adminManage.vue View File

413
       userInfo: {}
413
       userInfo: {}
414
     };
414
     };
415
   },
415
   },
416
+  computed: {
417
+    powerParams() {
418
+      return this.$store.getters.powerParams;
419
+    }
420
+  },
416
   created() {
421
   created() {
417
     this.userInfo = JSON.parse(
422
     this.userInfo = JSON.parse(
418
       localStorage.getItem("xh_control_userInfo")
423
       localStorage.getItem("xh_control_userInfo")
423
   methods: {
428
   methods: {
424
     // 获取搜索区域列表
429
     // 获取搜索区域列表
425
     getSearchRegionList() {
430
     getSearchRegionList() {
426
-      region_list_sel_qy({ regionid: this.userInfo.regionid }).then((data) => {
431
+      region_list_sel_qy({
432
+        rtype: this.powerParams.rtype,
433
+        objectid: this.powerParams.objectid,
434
+        regionid: this.powerParams.objectid }).then((data) => {
427
         if (data.code === 0) {
435
         if (data.code === 0) {
428
           this.searchForm.dropList = data.obj;
436
           this.searchForm.dropList = data.obj;
429
         } else {
437
         } else {
450
     // 获取列表
458
     // 获取列表
451
     getList() {
459
     getList() {
452
       admin_list_qy({
460
       admin_list_qy({
461
+        rtype: this.powerParams.rtype,
462
+        objectid: this.powerParams.objectid,
453
         page: this.searchForm.page,
463
         page: this.searchForm.page,
454
         size: this.searchForm.size,
464
         size: this.searchForm.size,
455
         enabled: this.searchForm.enabled,
465
         enabled: this.searchForm.enabled,
553
           this.adminInfo.show = false;
563
           this.adminInfo.show = false;
554
           let api = this.adminInfo.adminid ? admin_edit : admin_add;
564
           let api = this.adminInfo.adminid ? admin_edit : admin_add;
555
           let form = {
565
           let form = {
566
+            rtype: this.powerParams.rtype,
567
+            objectid: this.powerParams.objectid,
556
             aname: this.adminInfo.aname,
568
             aname: this.adminInfo.aname,
557
             loginname: this.adminInfo.loginname,
569
             loginname: this.adminInfo.loginname,
558
             loginpwd: this.adminInfo.loginpwd,
570
             loginpwd: this.adminInfo.loginpwd,
590
     },
602
     },
591
     // 编辑
603
     // 编辑
592
     toEdit(row) {
604
     toEdit(row) {
593
-      admin_detail({ adminid: row.adminid }).then((res) => {
605
+      admin_detail({
606
+        rtype: this.powerParams.rtype,
607
+        objectid: this.powerParams.objectid,
608
+        adminid: row.adminid }).then((res) => {
594
         if (res.code === 0) {
609
         if (res.code === 0) {
595
           this.adminInfo = {
610
           this.adminInfo = {
596
             show: true,
611
             show: true,
620
         content: "您确定删除选中数据吗?",
635
         content: "您确定删除选中数据吗?",
621
         onOk: () => {
636
         onOk: () => {
622
           admin_delete({
637
           admin_delete({
638
+            rtype: this.powerParams.rtype,
639
+            objectid: this.powerParams.objectid,
623
             adminid: row.adminid,
640
             adminid: row.adminid,
624
             rversion: row.rversion
641
             rversion: row.rversion
625
           }).then((data) => {
642
           }).then((data) => {
637
     enabledChange(row) {
654
     enabledChange(row) {
638
       let api = row.enabled === 1 ? admin_enable : admin_disabled;
655
       let api = row.enabled === 1 ? admin_enable : admin_disabled;
639
       api({
656
       api({
657
+        rtype: this.powerParams.rtype,
658
+        objectid: this.powerParams.objectid,
640
         adminid: row.adminid,
659
         adminid: row.adminid,
641
         rversion: row.rversion
660
         rversion: row.rversion
642
       }).then((data) => {
661
       }).then((data) => {

+ 20
- 6
src/views/regionSection/regionManage/regionManage.vue View File

198
     const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,32}$/;
198
     const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,32}$/;
199
     // 密码验证
199
     // 密码验证
200
     const pwdCheck = (rule, value, callback) => {
200
     const pwdCheck = (rule, value, callback) => {
201
-      if (!reg.test(this.regionInfo.admin.loginpwd)) {
201
+      if (!reg.test(value)) {
202
         return callback(new Error("密码格式不正确!"));
202
         return callback(new Error("密码格式不正确!"));
203
       }
203
       }
204
+      callback();
204
     };
205
     };
205
     // 重复密码验证
206
     // 重复密码验证
206
     const pwdAgainCheck = async (rule, value, callback) => {
207
     const pwdAgainCheck = async (rule, value, callback) => {
207
-      if (!reg.test(this.regionInfo.admin.loginpwd1)) {
208
+      if (!reg.test(value)) {
208
         return callback(new Error("密码格式不正确!"));
209
         return callback(new Error("密码格式不正确!"));
209
       }
210
       }
210
-      if (this.regionInfo.admin.loginpwd != this.regionInfo.admin.loginpwd1) {
211
+      if (this.regionInfo.admin.loginpwd != value) {
211
         return callback(new Error("两次输入密码不一致!"));
212
         return callback(new Error("两次输入密码不一致!"));
212
       }
213
       }
214
+      callback();
213
     };
215
     };
214
     return {
216
     return {
215
       searchForm: {
217
       searchForm: {
488
           this.regionInfo.show = false;
490
           this.regionInfo.show = false;
489
           region_add({
491
           region_add({
490
             regionName: this.regionInfo.regionName,
492
             regionName: this.regionInfo.regionName,
491
-            regionPid: this.userInfo.regionid,
493
+            rtype: this.powerParams.rtype,
494
+            objectid: this.powerParams.objectid,
495
+            regionPid: this.powerParams.objectid,
492
             admin: {
496
             admin: {
493
               aname: this.regionInfo.admin.aname,
497
               aname: this.regionInfo.admin.aname,
494
               loginname: this.regionInfo.admin.loginname,
498
               loginname: this.regionInfo.admin.loginname,
512
       this.$refs.modifyForm.validate((valid) => {
516
       this.$refs.modifyForm.validate((valid) => {
513
         if (valid) {
517
         if (valid) {
514
           region_edit({
518
           region_edit({
515
-            regionName: this.modifyRegion.regionName,
519
+            rtype: this.powerParams.rtype,
520
+            objectid: this.powerParams.objectid,
516
             regionid: this.modifyRegion.regionid,
521
             regionid: this.modifyRegion.regionid,
522
+            regionName: this.modifyRegion.regionName,
517
             rversion: this.modifyRegion.rversion
523
             rversion: this.modifyRegion.rversion
518
           }).then((data) => {
524
           }).then((data) => {
519
             this.modifyRegion.show = false;
525
             this.modifyRegion.show = false;
538
     // 查看管理员列表
544
     // 查看管理员列表
539
     toView(row) {
545
     toView(row) {
540
       region_list_admin({
546
       region_list_admin({
547
+        rtype: this.powerParams.rtype,
548
+        objectid: this.powerParams.objectid,
541
         regionid: row.regionid
549
         regionid: row.regionid
542
       }).then((data) => {
550
       }).then((data) => {
543
         if (data.code === 0) {
551
         if (data.code === 0) {
551
     },
559
     },
552
     // 编辑
560
     // 编辑
553
     toEdit(row) {
561
     toEdit(row) {
554
-      region_detail({ regionid: row.regionid }).then((res) => {
562
+      region_detail({
563
+        rtype: this.powerParams.rtype,
564
+        objectid: this.powerParams.objectid,
565
+        regionid: row.regionid
566
+      }).then((res) => {
555
         if (res.code === 0) {
567
         if (res.code === 0) {
556
           this.modifyRegion = {
568
           this.modifyRegion = {
557
             show: true,
569
             show: true,
571
         content: "您确定删除选中数据吗?",
583
         content: "您确定删除选中数据吗?",
572
         onOk: () => {
584
         onOk: () => {
573
           region_delete({
585
           region_delete({
586
+            rtype: this.powerParams.rtype,
587
+            objectid: this.powerParams.objectid,
574
             regionid: row.regionid,
588
             regionid: row.regionid,
575
             rversion: row.rversion
589
             rversion: row.rversion
576
           }).then((data) => {
590
           }).then((data) => {

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

567
     },
567
     },
568
     // 获取搜索区域列表
568
     // 获取搜索区域列表
569
     getSearchRegionList() {
569
     getSearchRegionList() {
570
-      region_list_sel_qy({ regionid: this.userInfo.regionid }).then((data) => {
570
+      region_list_sel_qy({  rtype: this.powerParams.rtype,
571
+        objectid: this.powerParams.objectid,
572
+        regionid: this.powerParams.objectid }).then((data) => {
571
         if (data.code === 0) {
573
         if (data.code === 0) {
572
           this.searchForm.dropList = data.obj;
574
           this.searchForm.dropList = data.obj;
573
         } else {
575
         } else {
624
         areaName: "",
626
         areaName: "",
625
         address: "",
627
         address: "",
626
         schoolAbbr: "",
628
         schoolAbbr: "",
627
-        regionid: this.userInfo.regionid,
629
+        regionid: this.powerParams.objectid,
628
         createAdmin: false,
630
         createAdmin: false,
629
         admin: {
631
         admin: {
630
           aname: "",
632
           aname: "",
709
           this.adminInfo.show = false;
711
           this.adminInfo.show = false;
710
           let api = this.adminInfo.schoolid ? school_edit : school_add;
712
           let api = this.adminInfo.schoolid ? school_edit : school_add;
711
           let form = {
713
           let form = {
714
+            rtype: this.powerParams.rtype,
715
+            objectid: this.powerParams.objectid,
712
             schoolName: this.adminInfo.schoolName,
716
             schoolName: this.adminInfo.schoolName,
713
             regionid: this.adminInfo.regionid,
717
             regionid: this.adminInfo.regionid,
714
             areaCode: this.adminInfo.areaCode,
718
             areaCode: this.adminInfo.areaCode,
755
     toEdit(row) {
759
     toEdit(row) {
756
       this.marketList = [];
760
       this.marketList = [];
757
       this.regionList = [];
761
       this.regionList = [];
758
-      school_detail({ schoolid: row.schoolid }).then((res) => {
762
+      school_detail({
763
+        rtype: this.powerParams.rtype,
764
+        objectid: this.powerParams.objectid,
765
+        schoolid: row.schoolid }).then((res) => {
759
         if (res.code === 0) {
766
         if (res.code === 0) {
760
           let str = res.obj.areaCode;
767
           let str = res.obj.areaCode;
761
           let obj1 = { areaCode: "" },
768
           let obj1 = { areaCode: "" },
800
         content: "您确定删除选中数据吗?",
807
         content: "您确定删除选中数据吗?",
801
         onOk: () => {
808
         onOk: () => {
802
           school_delete({
809
           school_delete({
810
+            rtype: this.powerParams.rtype,
811
+            objectid: this.powerParams.objectid,
803
             schoolid: row.schoolid,
812
             schoolid: row.schoolid,
804
             rversion: row.rversion
813
             rversion: row.rversion
805
           }).then((data) => {
814
           }).then((data) => {
817
     enabledChange(row) {
826
     enabledChange(row) {
818
       let api = row.enabled === 1 ? school_enable : school_disabled;
827
       let api = row.enabled === 1 ? school_enable : school_disabled;
819
       api({
828
       api({
829
+        rtype: this.powerParams.rtype,
830
+        objectid: this.powerParams.objectid,
820
         schoolid: row.schoolid,
831
         schoolid: row.schoolid,
821
         rversion: row.rversion
832
         rversion: row.rversion
822
       }).then((data) => {
833
       }).then((data) => {

+ 20
- 11
src/views/regionSection/search/allApps.vue View File

34
         </template>
34
         </template>
35
         <template slot-scope="{ row }" slot="enable">
35
         <template slot-scope="{ row }" slot="enable">
36
           <i-switch
36
           <i-switch
37
-              size="large"
38
-              v-model="row.enable"
39
-              :true-value="1"
40
-              :false-value="2"
41
-              @on-change="enabledChange(row)"
37
+            size="large"
38
+            v-model="row.enable"
39
+            :true-value="1"
40
+            :false-value="2"
41
+            @on-change="enabledChange(row)"
42
           >
42
           >
43
             <span slot="open">启用</span>
43
             <span slot="open">启用</span>
44
             <span slot="close">禁用</span>
44
             <span slot="close">禁用</span>
101
 </template>
101
 </template>
102
 
102
 
103
 <script>
103
 <script>
104
-import { search_list_app} from "@/api/region";
105
-import {app_edit_enable, app_edit_unenable} from "@/api/appgroup";
104
+import { search_list_app } from "@/api/region";
105
+import { app_edit_enable, app_edit_unenable } from "@/api/appgroup";
106
 export default {
106
 export default {
107
   data() {
107
   data() {
108
     return {
108
     return {
185
       ]
185
       ]
186
     };
186
     };
187
   },
187
   },
188
+  computed: {
189
+    powerParams() {
190
+      return this.$store.getters.powerParams;
191
+    }
192
+  },
188
   created() {
193
   created() {
189
     this.searchList();
194
     this.searchList();
190
   },
195
   },
193
       let api = row.enable === 1 ? app_edit_enable : app_edit_unenable;
198
       let api = row.enable === 1 ? app_edit_enable : app_edit_unenable;
194
       this.showLoading = true;
199
       this.showLoading = true;
195
       api({
200
       api({
201
+        rtype: this.powerParams.rtype,
202
+        objectid: this.powerParams.objectid,
196
         appid: row.appid,
203
         appid: row.appid,
197
         rversion: row.rversion
204
         rversion: row.rversion
198
       }).then((data) => {
205
       }).then((data) => {
205
         }
212
         }
206
       });
213
       });
207
     },
214
     },
208
-    countSlot(){},
209
-    toView(){},
210
-    toDel(){},
215
+    countSlot() {},
216
+    toView() {},
217
+    toDel() {},
211
     // 搜索
218
     // 搜索
212
     searchList() {
219
     searchList() {
213
       this.searchForm.page = 1;
220
       this.searchForm.page = 1;
228
     getList() {
235
     getList() {
229
       this.showLoading = true;
236
       this.showLoading = true;
230
       search_list_app({
237
       search_list_app({
238
+        rtype: this.powerParams.rtype,
239
+        objectid: this.powerParams.objectid,
231
         page: this.searchForm.page,
240
         page: this.searchForm.page,
232
         size: this.searchForm.size,
241
         size: this.searchForm.size,
233
         name: this.searchForm.name,
242
         name: this.searchForm.name,
236
         this.showLoading = false;
245
         this.showLoading = false;
237
         if (data.code === 0) {
246
         if (data.code === 0) {
238
           this.searchForm.list = data.obj.data;
247
           this.searchForm.list = data.obj.data;
239
-          console.log(this.searchForm.list)
248
+          console.log(this.searchForm.list);
240
           this.searchForm.total = data.obj.total;
249
           this.searchForm.total = data.obj.total;
241
         } else {
250
         } else {
242
           this.$Message.error(data.msg);
251
           this.$Message.error(data.msg);

+ 7
- 0
src/views/regionSection/search/allUsers.vue View File

106
       ]
106
       ]
107
     };
107
     };
108
   },
108
   },
109
+  computed: {
110
+    powerParams() {
111
+      return this.$store.getters.powerParams;
112
+    }
113
+  },
109
   created() {
114
   created() {
110
     this.searchList();
115
     this.searchList();
111
   },
116
   },
129
     // 获取列表
134
     // 获取列表
130
     getList() {
135
     getList() {
131
       search_list_user({
136
       search_list_user({
137
+        rtype: this.powerParams.rtype,
138
+        objectid: this.powerParams.objectid,
132
         page: this.searchForm.page,
139
         page: this.searchForm.page,
133
         size: this.searchForm.size,
140
         size: this.searchForm.size,
134
         name: this.searchForm.name,
141
         name: this.searchForm.name,

+ 12
- 1
src/views/regionSection/search/allWhitelists.vue View File

168
       ]
168
       ]
169
     };
169
     };
170
   },
170
   },
171
+  computed: {
172
+    powerParams() {
173
+      return this.$store.getters.powerParams;
174
+    }
175
+  },
171
   created() {
176
   created() {
172
     this.searchList();
177
     this.searchList();
173
   },
178
   },
174
   methods: {
179
   methods: {
175
     toView(row) {
180
     toView(row) {
176
-      white_detail({ whiteid: row.whiteid }).then((res) => {
181
+      white_detail({
182
+        rtype: this.powerParams.rtype,
183
+        objectid: this.powerParams.objectid,
184
+        whiteid: row.whiteid
185
+      }).then((res) => {
177
         if (res.code === 0) {
186
         if (res.code === 0) {
178
           this.viewInfo = {
187
           this.viewInfo = {
179
             show: true,
188
             show: true,
211
     // 获取列表
220
     // 获取列表
212
     getList() {
221
     getList() {
213
       search_list_white({
222
       search_list_white({
223
+        rtype: this.powerParams.rtype,
224
+        objectid: this.powerParams.objectid,
214
         page: this.searchForm.page,
225
         page: this.searchForm.page,
215
         size: this.searchForm.size,
226
         size: this.searchForm.size,
216
         name: this.searchForm.name
227
         name: this.searchForm.name

+ 7
- 0
src/views/regionSection/search/clientVersion.vue View File

102
       ]
102
       ]
103
     };
103
     };
104
   },
104
   },
105
+  computed: {
106
+    powerParams() {
107
+      return this.$store.getters.powerParams;
108
+    }
109
+  },
105
   created() {
110
   created() {
106
     this.searchList();
111
     this.searchList();
107
   },
112
   },
125
     // 获取列表
130
     // 获取列表
126
     getList() {
131
     getList() {
127
       search_list_client({
132
       search_list_client({
133
+        rtype: this.powerParams.rtype,
134
+        objectid: this.powerParams.objectid,
128
         page: this.searchForm.page,
135
         page: this.searchForm.page,
129
         size: this.searchForm.size,
136
         size: this.searchForm.size,
130
         doEvent: this.searchForm.doEvent,
137
         doEvent: this.searchForm.doEvent,

+ 7
- 0
src/views/regionSection/search/device.vue View File

85
       ]
85
       ]
86
     };
86
     };
87
   },
87
   },
88
+  computed: {
89
+    powerParams() {
90
+      return this.$store.getters.powerParams;
91
+    }
92
+  },
88
   created() {
93
   created() {
89
     this.searchList();
94
     this.searchList();
90
   },
95
   },
108
     // 获取列表
113
     // 获取列表
109
     getList() {
114
     getList() {
110
       search_list_device({
115
       search_list_device({
116
+        rtype: this.powerParams.rtype,
117
+        objectid: this.powerParams.objectid,
111
         page: this.searchForm.page,
118
         page: this.searchForm.page,
112
         size: this.searchForm.size,
119
         size: this.searchForm.size,
113
         name: this.searchForm.name
120
         name: this.searchForm.name

+ 7
- 0
src/views/regionSection/search/deviceModel.vue View File

92
       ]
92
       ]
93
     };
93
     };
94
   },
94
   },
95
+  computed: {
96
+    powerParams() {
97
+      return this.$store.getters.powerParams;
98
+    }
99
+  },
95
   created() {
100
   created() {
96
     this.searchList();
101
     this.searchList();
97
   },
102
   },
115
     // 获取列表
120
     // 获取列表
116
     getList() {
121
     getList() {
117
       search_list_dmodel({
122
       search_list_dmodel({
123
+        rtype: this.powerParams.rtype,
124
+        objectid: this.powerParams.objectid,
118
         page: this.searchForm.page,
125
         page: this.searchForm.page,
119
         size: this.searchForm.size,
126
         size: this.searchForm.size,
120
         name: this.searchForm.name,
127
         name: this.searchForm.name,

+ 7
- 0
src/views/regionSection/search/deviceUsers.vue View File

85
       ]
85
       ]
86
     };
86
     };
87
   },
87
   },
88
+  computed: {
89
+    powerParams() {
90
+      return this.$store.getters.powerParams;
91
+    }
92
+  },
88
   created() {
93
   created() {
89
     this.searchList();
94
     this.searchList();
90
   },
95
   },
108
     // 获取列表
113
     // 获取列表
109
     getList() {
114
     getList() {
110
       search_list_duser({
115
       search_list_duser({
116
+        rtype: this.powerParams.rtype,
117
+        objectid: this.powerParams.objectid,
111
         page: this.searchForm.page,
118
         page: this.searchForm.page,
112
         size: this.searchForm.size,
119
         size: this.searchForm.size,
113
         name: this.searchForm.name
120
         name: this.searchForm.name

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

52
       showLoading: false
52
       showLoading: false
53
     };
53
     };
54
   },
54
   },
55
+  computed: {
56
+    powerParams() {
57
+      return this.$store.getters.powerParams;
58
+    }
59
+  },
55
   created() {
60
   created() {
56
     this.userInfo = JSON.parse(
61
     this.userInfo = JSON.parse(
57
       localStorage.getItem("xh_control_userInfo")
62
       localStorage.getItem("xh_control_userInfo")
60
   },
65
   },
61
   methods: {
66
   methods: {
62
     init() {
67
     init() {
63
-      password_detail({}).then((res) => {
68
+      password_detail({
69
+        rtype: this.powerParams.rtype,
70
+        objectid: this.powerParams.objectid
71
+      }).then((res) => {
64
         this.showLoading = false;
72
         this.showLoading = false;
65
         if (res.code === 0) {
73
         if (res.code === 0) {
66
           if (res.obj) {
74
           if (res.obj) {
84
         return;
92
         return;
85
       }
93
       }
86
       let form = {
94
       let form = {
95
+        rtype: this.powerParams.rtype,
96
+        objectid: this.powerParams.objectid,
87
         trend: this.adminInfo.trend,
97
         trend: this.adminInfo.trend,
88
         password: this.adminInfo.password
98
         password: this.adminInfo.password
89
       };
99
       };

+ 28
- 16
src/views/regionSection/setting/logo.vue View File

88
       }
88
       }
89
     };
89
     };
90
   },
90
   },
91
+  computed: {
92
+    powerParams() {
93
+      return this.$store.getters.powerParams;
94
+    }
95
+  },
91
   created() {
96
   created() {
92
     this.userInfo = JSON.parse(
97
     this.userInfo = JSON.parse(
93
       localStorage.getItem("xh_control_userInfo")
98
       localStorage.getItem("xh_control_userInfo")
96
   },
101
   },
97
   methods: {
102
   methods: {
98
     init() {
103
     init() {
99
-      logo_detail({ objectid: this.userInfo.regionid, llevel: 2 }).then(
100
-        (res) => {
101
-          this.showLoading = false;
102
-          if (res.code === 0) {
103
-            if (res.obj) {
104
-              this.form = {
105
-                logoPath: res.obj.logoPath,
106
-                rversion: res.obj.rversion,
107
-                objectid: res.obj.objectid,
108
-                logoid: res.obj.logoid
109
-              };
110
-            }
111
-          } else {
112
-            this.$Message.error(res.msg);
104
+      logo_detail({
105
+        rtype: this.powerParams.rtype,
106
+        objectid: this.powerParams.objectid,
107
+        regionid: this.powerParams.objectid,
108
+        llevel: 2
109
+      }).then((res) => {
110
+        this.showLoading = false;
111
+        if (res.code === 0) {
112
+          if (res.obj) {
113
+            this.form = {
114
+              logoPath: res.obj.logoPath,
115
+              rversion: res.obj.rversion,
116
+              objectid: res.obj.objectid,
117
+              logoid: res.obj.logoid
118
+            };
113
           }
119
           }
120
+        } else {
121
+          this.$Message.error(res.msg);
114
         }
122
         }
115
-      );
123
+      });
116
     },
124
     },
117
     upLoad(file) {
125
     upLoad(file) {
118
       let str = file.name.split(".");
126
       let str = file.name.split(".");
151
     resetting() {
159
     resetting() {
152
       this.showLoading = true;
160
       this.showLoading = true;
153
       logo_delete({
161
       logo_delete({
162
+        rtype: this.powerParams.rtype,
163
+        objectid: this.powerParams.objectid,
154
         rversion: this.form.rversion,
164
         rversion: this.form.rversion,
155
         logoid: this.form.logoid
165
         logoid: this.form.logoid
156
       }).then((res) => {
166
       }).then((res) => {
168
       let form = {
178
       let form = {
169
         logoPath: this.form.logoPath,
179
         logoPath: this.form.logoPath,
170
         llevel: 2,
180
         llevel: 2,
171
-        objectid: this.userInfo.regionid
181
+        rtype: this.powerParams.rtype,
182
+        objectid: this.powerParams.objectid,
183
+        regionid: this.powerParams.objectid
172
       };
184
       };
173
       console.log(form);
185
       console.log(form);
174
       this.showLoading = true;
186
       this.showLoading = true;

+ 11
- 2
src/views/regionSection/setting/powerUp.vue View File

59
       showLoading: false
59
       showLoading: false
60
     };
60
     };
61
   },
61
   },
62
+  computed: {
63
+    powerParams() {
64
+      return this.$store.getters.powerParams;
65
+    }
66
+  },
62
   created() {
67
   created() {
63
     this.userInfo = JSON.parse(
68
     this.userInfo = JSON.parse(
64
       localStorage.getItem("xh_control_userInfo")
69
       localStorage.getItem("xh_control_userInfo")
67
   },
72
   },
68
   methods: {
73
   methods: {
69
     init() {
74
     init() {
70
-      autoapp_detail({ regionid: this.userInfo.regionid }).then((res) => {
75
+      autoapp_detail({  rtype: this.powerParams.rtype,
76
+        objectid: this.powerParams.objectid,
77
+        regionid: this.powerParams.objectid }).then((res) => {
71
         this.showLoading = false;
78
         this.showLoading = false;
72
         if (res.code === 0) {
79
         if (res.code === 0) {
73
           if (res.obj) {
80
           if (res.obj) {
93
         return;
100
         return;
94
       }
101
       }
95
       let form = {
102
       let form = {
96
-        regionid: this.userInfo.regionid,
103
+        rtype: this.powerParams.rtype,
104
+        objectid: this.powerParams.objectid,
105
+        regionid: this.powerParams.objectid,
97
         appPackage: this.adminInfo.appPackage,
106
         appPackage: this.adminInfo.appPackage,
98
         authUrl: this.adminInfo.authUrl,
107
         authUrl: this.adminInfo.authUrl,
99
         singleType: this.adminInfo.singleType
108
         singleType: this.adminInfo.singleType

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

261
       ]
261
       ]
262
     };
262
     };
263
   },
263
   },
264
+  computed: {
265
+    powerParams() {
266
+      return this.$store.getters.powerParams;
267
+    }
268
+  },
264
   created() {
269
   created() {
265
     this.userInfo = JSON.parse(
270
     this.userInfo = JSON.parse(
266
       localStorage.getItem("xh_control_userInfo")
271
       localStorage.getItem("xh_control_userInfo")
339
         page: this.searchForm.page,
344
         page: this.searchForm.page,
340
         size: this.searchForm.size,
345
         size: this.searchForm.size,
341
         name: this.searchForm.name,
346
         name: this.searchForm.name,
342
-        regionid: this.userInfo.regionid
347
+        rtype: this.powerParams.rtype,
348
+        objectid: this.powerParams.objectid,
349
+        regionid: this.powerParams.objectid
343
       }).then((data) => {
350
       }).then((data) => {
344
         this.showLoading = false;
351
         this.showLoading = false;
345
         if (data.code === 0) {
352
         if (data.code === 0) {
388
             wname: this.wallpaperInfo.wname,
395
             wname: this.wallpaperInfo.wname,
389
             hpath: this.wallpaperInfo.hpath,
396
             hpath: this.wallpaperInfo.hpath,
390
             wlevel: 2,
397
             wlevel: 2,
391
-            objectid: this.userInfo.regionid,
398
+            rtype: this.powerParams.rtype,
399
+            objectid: this.powerParams.objectid,
400
+            regionid: this.powerParams.objectid,
392
             deviceids
401
             deviceids
393
           };
402
           };
394
           if (this.wallpaperInfo.wallpaperid) {
403
           if (this.wallpaperInfo.wallpaperid) {
414
     toView(row) {
423
     toView(row) {
415
       this.showLoading = true;
424
       this.showLoading = true;
416
       wallpaper_detail({
425
       wallpaper_detail({
426
+        rtype: this.powerParams.rtype,
427
+        objectid: this.powerParams.objectid,
417
         wallpaperid: row.wallpaperid
428
         wallpaperid: row.wallpaperid
418
       }).then((data) => {
429
       }).then((data) => {
419
         this.showLoading = false;
430
         this.showLoading = false;
433
     toEdit(row) {
444
     toEdit(row) {
434
       this.showLoading = true;
445
       this.showLoading = true;
435
       wallpaper_detail({
446
       wallpaper_detail({
447
+        rtype: this.powerParams.rtype,
448
+        objectid: this.powerParams.objectid,
436
         wallpaperid: row.wallpaperid
449
         wallpaperid: row.wallpaperid
437
       }).then((data) => {
450
       }).then((data) => {
438
         this.showLoading = false;
451
         this.showLoading = false;
482
         content: "您确定删除选中数据吗?",
495
         content: "您确定删除选中数据吗?",
483
         onOk: () => {
496
         onOk: () => {
484
           wallpaper_delete({
497
           wallpaper_delete({
498
+            rtype: this.powerParams.rtype,
499
+            objectid: this.powerParams.objectid,
485
             wallpaperid: row.wallpaperid,
500
             wallpaperid: row.wallpaperid,
486
             rversion: row.rversion
501
             rversion: row.rversion
487
           }).then((data) => {
502
           }).then((data) => {

+ 46
- 14
src/views/schoolSection/applicationManage/applicationList.vue View File

841
       ]
841
       ]
842
     };
842
     };
843
   },
843
   },
844
+  computed: {
845
+    powerParams() {
846
+      return this.$store.getters.powerParams;
847
+    }
848
+  },
844
   created() {
849
   created() {
845
     this.userInfo = JSON.parse(
850
     this.userInfo = JSON.parse(
846
       localStorage.getItem("xh_control_userInfo")
851
       localStorage.getItem("xh_control_userInfo")
855
     },
860
     },
856
     // 查看
861
     // 查看
857
     toView(row) {
862
     toView(row) {
858
-      app_detail({ appid: row.appid }).then((res) => {
863
+      app_detail({
864
+        rtype: this.powerParams.rtype,
865
+        objectid: this.powerParams.objectid,
866
+        appid: row.appid
867
+      }).then((res) => {
859
         if (res.code === 0) {
868
         if (res.code === 0) {
860
           this.viewInfo = {
869
           this.viewInfo = {
861
             show: true,
870
             show: true,
891
     },
900
     },
892
     //查看型号
901
     //查看型号
893
     see_device(row) {
902
     see_device(row) {
894
-      app_detail({ appid: row.appid }).then((res) => {
903
+      app_detail({
904
+        rtype: this.powerParams.rtype,
905
+        objectid: this.powerParams.objectid,
906
+        appid: row.appid
907
+      }).then((res) => {
895
         if (res.code === 0) {
908
         if (res.code === 0) {
896
           this.deviceInfo = {
909
           this.deviceInfo = {
897
             show: true,
910
             show: true,
907
     enabledChange(row) {
920
     enabledChange(row) {
908
       let api = row.enable === 1 ? app_edit_enable : app_edit_unenable;
921
       let api = row.enable === 1 ? app_edit_enable : app_edit_unenable;
909
       api({
922
       api({
923
+        rtype: this.powerParams.rtype,
924
+        objectid: this.powerParams.objectid,
910
         appid: row.appid,
925
         appid: row.appid,
911
         rversion: row.rversion
926
         rversion: row.rversion
912
       }).then((data) => {
927
       }).then((data) => {
922
       console.log(row);
937
       console.log(row);
923
       if (type === 1) {
938
       if (type === 1) {
924
         //下载
939
         //下载
925
-        app_detail({ appid: row.appid }).then((res) => {
940
+        app_detail({
941
+          rtype: this.powerParams.rtype,
942
+          objectid: this.powerParams.objectid,
943
+          appid: row.appid
944
+        }).then((res) => {
926
           if (res.code === 0) {
945
           if (res.code === 0) {
927
             this.downloadInfo = {
946
             this.downloadInfo = {
928
               show: true,
947
               show: true,
929
               appName: res.obj.appName,
948
               appName: res.obj.appName,
930
-              apkPath:this.$api.showImageUrl +  res.obj.apkPath
949
+              apkPath: this.$api.showImageUrl + res.obj.apkPath
931
             };
950
             };
932
             this.$nextTick(() => {
951
             this.$nextTick(() => {
933
               let qrcodeEl = this.$refs.ScanShare;
952
               let qrcodeEl = this.$refs.ScanShare;
1052
     init() {
1071
     init() {
1053
       //获取分组列表
1072
       //获取分组列表
1054
       appgroup_list({
1073
       appgroup_list({
1074
+        rtype: this.powerParams.rtype,
1075
+        objectid: this.powerParams.objectid,
1055
         page: 1,
1076
         page: 1,
1056
         size: 100,
1077
         size: 100,
1057
         appgroupName: ""
1078
         appgroupName: ""
1137
     getList() {
1158
     getList() {
1138
       this.showLoading = true;
1159
       this.showLoading = true;
1139
       app_list({
1160
       app_list({
1161
+        rtype: this.powerParams.rtype,
1162
+        objectid: this.powerParams.objectid,
1140
         page: this.searchForm.page,
1163
         page: this.searchForm.page,
1141
         size: this.searchForm.size,
1164
         size: this.searchForm.size,
1142
         appName: this.searchForm.appName,
1165
         appName: this.searchForm.appName,
1221
           }
1244
           }
1222
           let appImg = this.wallpaperInfo.appImg.join(";");
1245
           let appImg = this.wallpaperInfo.appImg.join(";");
1223
           let form = {
1246
           let form = {
1247
+            rtype: this.powerParams.rtype,
1248
+            objectid: this.powerParams.objectid,
1224
             appName: this.wallpaperInfo.appName,
1249
             appName: this.wallpaperInfo.appName,
1225
             enable: this.wallpaperInfo.enable,
1250
             enable: this.wallpaperInfo.enable,
1226
             appType: this.wallpaperInfo.appType,
1251
             appType: this.wallpaperInfo.appType,
1266
     },
1291
     },
1267
     // 编辑
1292
     // 编辑
1268
     toEdit(row) {
1293
     toEdit(row) {
1269
-      app_detail({ appid: row.appid }).then((res) => {
1294
+      app_detail({
1295
+        rtype: this.powerParams.rtype,
1296
+        objectid: this.powerParams.objectid,
1297
+        appid: row.appid
1298
+      }).then((res) => {
1270
         if (res.code === 0) {
1299
         if (res.code === 0) {
1271
           this.school_list = JSON.parse(JSON.stringify(this.curRegion));
1300
           this.school_list = JSON.parse(JSON.stringify(this.curRegion));
1272
           this.wallpaperInfo = {
1301
           this.wallpaperInfo = {
1336
         title: "提示",
1365
         title: "提示",
1337
         content: "您确定删除选中数据吗?",
1366
         content: "您确定删除选中数据吗?",
1338
         onOk: () => {
1367
         onOk: () => {
1339
-          app_delete({ appid: row.appid, rversion: row.rversion }).then(
1340
-            (res) => {
1341
-              if (res.code === 0) {
1342
-                this.$Message.success(res.msg);
1343
-                this.searchList();
1344
-              } else {
1345
-                this.$Message.error(res.msg);
1346
-              }
1368
+          app_delete({
1369
+            rtype: this.powerParams.rtype,
1370
+            objectid: this.powerParams.objectid,
1371
+            appid: row.appid,
1372
+            rversion: row.rversion
1373
+          }).then((res) => {
1374
+            if (res.code === 0) {
1375
+              this.$Message.success(res.msg);
1376
+              this.searchList();
1377
+            } else {
1378
+              this.$Message.error(res.msg);
1347
             }
1379
             }
1348
-          );
1380
+          });
1349
         },
1381
         },
1350
         onCancel: () => {}
1382
         onCancel: () => {}
1351
       });
1383
       });

+ 41
- 14
src/views/schoolSection/userManage/userManage.vue View File

503
       }
503
       }
504
     };
504
     };
505
   },
505
   },
506
+  computed: {
507
+    powerParams() {
508
+      return this.$store.getters.powerParams;
509
+    }
510
+  },
506
   created() {
511
   created() {
507
     this.userInfo = JSON.parse(
512
     this.userInfo = JSON.parse(
508
       localStorage.getItem("xh_control_userInfo")
513
       localStorage.getItem("xh_control_userInfo")
590
     },
595
     },
591
     //导出
596
     //导出
592
     userExport() {
597
     userExport() {
593
-      user_export({ schoolid: 1 }).then((res) => {
598
+      user_export({
599
+        rtype: this.powerParams.rtype,
600
+        objectid: this.powerParams.objectid,
601
+        schoolid: this.powerParams.objectid
602
+      }).then((res) => {
594
         if (res.code === 0) {
603
         if (res.code === 0) {
595
           exportToExcel(
604
           exportToExcel(
596
             [
605
             [
653
             loginpwd: this.addInfo.loginpwd,
662
             loginpwd: this.addInfo.loginpwd,
654
             classid: this.addInfo.classid,
663
             classid: this.addInfo.classid,
655
             classname: this.addInfo.classname,
664
             classname: this.addInfo.classname,
665
+            rtype: this.powerParams.rtype,
666
+            objectid: this.powerParams.objectid,
667
+            regionid: this.powerParams.objectid,
656
             schoolid: this.addInfo.schoolid || 1,
668
             schoolid: this.addInfo.schoolid || 1,
657
-            regionid: this.userInfo.regionid,
658
             enabled: this.addInfo.enabled,
669
             enabled: this.addInfo.enabled,
659
             studentno: this.addInfo.studentno,
670
             studentno: this.addInfo.studentno,
660
             userphone: this.addInfo.userphone,
671
             userphone: this.addInfo.userphone,
675
     },
686
     },
676
     toCare(row) {
687
     toCare(row) {
677
       let api = row.care === 1 ? user_un_care : user_care;
688
       let api = row.care === 1 ? user_un_care : user_care;
678
-      api({ userid: row.userid, rversion: row.rversion }).then((res) => {
689
+      api({
690
+        rtype: this.powerParams.rtype,
691
+        objectid: this.powerParams.objectid,
692
+        userid: row.userid,
693
+        rversion: row.rversion
694
+      }).then((res) => {
679
         if (res.code === 0) {
695
         if (res.code === 0) {
680
           this.searchList();
696
           this.searchList();
681
           this.$Message.success(res.msg);
697
           this.$Message.success(res.msg);
685
       });
701
       });
686
     },
702
     },
687
     toDel(row) {
703
     toDel(row) {
688
-      user_delete({ userid: row.userid, rversion: row.rversion }).then(
689
-        (res) => {
690
-          if (res.code === 0) {
691
-            this.searchList();
692
-            this.$Message.success(res.msg);
693
-          } else {
694
-            this.$Message.error(res.msg);
695
-          }
704
+      user_delete({
705
+        rtype: this.powerParams.rtype,
706
+        objectid: this.powerParams.objectid,
707
+        userid: row.userid,
708
+        rversion: row.rversion
709
+      }).then((res) => {
710
+        if (res.code === 0) {
711
+          this.searchList();
712
+          this.$Message.success(res.msg);
713
+        } else {
714
+          this.$Message.error(res.msg);
696
         }
715
         }
697
-      );
716
+      });
698
     },
717
     },
699
     enabledChange(row) {
718
     enabledChange(row) {
700
       let api = row.enabled === 1 ? user_enable : user_disabled;
719
       let api = row.enabled === 1 ? user_enable : user_disabled;
701
       api({
720
       api({
721
+        rtype: this.powerParams.rtype,
722
+        objectid: this.powerParams.objectid,
702
         userid: row.userid,
723
         userid: row.userid,
703
         rversion: row.rversion
724
         rversion: row.rversion
704
       }).then((data) => {
725
       }).then((data) => {
716
     },
737
     },
717
     init() {
738
     init() {
718
       this.showLoading = true;
739
       this.showLoading = true;
719
-      class_list({ schoolid: 1 }).then((res) => {
740
+      class_list({
741
+        rtype: this.powerParams.rtype,
742
+        objectid: this.powerParams.objectid,
743
+        schoolid: this.powerParams.objectid
744
+      }).then((res) => {
720
         this.showLoading = false;
745
         this.showLoading = false;
721
         if (res.code === 0) {
746
         if (res.code === 0) {
722
           this.schoolInfo = res.obj;
747
           this.schoolInfo = res.obj;
748
     getList() {
773
     getList() {
749
       this.showLoading = true;
774
       this.showLoading = true;
750
       user_list({
775
       user_list({
776
+        rtype: this.powerParams.rtype,
777
+        objectid: this.powerParams.objectid,
778
+        schoolid: this.powerParams.objectid,
751
         page: this.searchForm.page,
779
         page: this.searchForm.page,
752
         size: this.searchForm.size,
780
         size: this.searchForm.size,
753
-        schoolid: this.searchForm.schoolid,
754
         classid: this.curClass.id,
781
         classid: this.curClass.id,
755
         care: this.searchForm.care,
782
         care: this.searchForm.care,
756
         enabled: this.searchForm.enabled,
783
         enabled: this.searchForm.enabled,

Loading…
Cancel
Save