设备导出

src/views/regionSection/applicationManage/applicationGroup.vue

@@ -307,6 +307,7 @@ export default {
     },
     // 获取列表
     getList() {
+      this.showLoading = true;
       appgroup_list({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
@@ -314,6 +315,7 @@ export default {
         size: this.searchForm.size,
         appgroupName: this.searchForm.appgroupName
       }).then((res) => {
+        this.showLoading = false;
         if (res.code === 0) {
           this.searchForm.list = res.obj.data;
           this.searchForm.total = res.obj.total;
@@ -359,7 +361,9 @@ export default {
             form.appgroupid = this.wallpaperInfo.appgroupid;
             form.rversion = this.wallpaperInfo.rversion;
           }
+          this.showLoading = true;
           api(form).then((res) => {
+            this.showLoading = false;
             if (res.code === 0) {
               this.$Message.success(res.msg);
               this.searchList();

src/views/regionSection/applicationManage/applicationManage.vue

@@ -1124,8 +1124,7 @@ export default {
         //获取历史版本
         this.showLoading = true;
         let res = await app_detail_history({ appid: row.appid });
-        if (res.code === 0) {
-        } else {
+        if (res.code != 0) {
           this.$Message.error(res.msg);
         }
         //安装统计

src/views/regionSection/networkManage/whitelist.vue

@@ -189,6 +189,10 @@
         <Button @click="viewInfo.show = false">关闭</Button>
       </div>
     </Modal>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
@@ -204,6 +208,7 @@ import { region_list_rs } from "@/api/region";
 export default {
   data() {
     return {
+      showLoading: false,
       searchForm: {
         whiteName: "",
         regionid: "",

src/views/regionSection/regionManage/adminManage.vue

@@ -231,12 +231,15 @@
         <Button @click="viewInfo.show = false">关闭</Button>
       </div>
     </Modal>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
 <script>
 import {
-  admin_list_pt,
   admin_add,
   admin_edit,
   admin_delete,
@@ -245,7 +248,7 @@ import {
   admin_list_qy,
   admin_detail
 } from "@/api/admin";
-import { region_list_sel_pt, region_list_sel_qy } from "@/api/region";
+import { region_list_sel_qy } from "@/api/region";
 import { login_msg_code } from "@/api/login";
 import { generateRandomString } from "@/utils";
 export default {
@@ -424,6 +427,7 @@ export default {
           align: "center"
         }
       ],
+      showLoading: false,
       userInfo: {}
     };
   },
@@ -442,11 +446,13 @@ export default {
   methods: {
     // 获取搜索区域列表
     getSearchRegionList() {
+      this.showLoading = true;
       region_list_sel_qy({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: this.powerParams.objectid
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           this.searchForm.dropList = data.obj;
         } else {
@@ -472,6 +478,7 @@ export default {
     },
     // 获取列表
     getList() {
+      this.showLoading = true;
       admin_list_qy({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
@@ -481,10 +488,10 @@ export default {
         aname: this.searchForm.aname,
         regionid: this.searchForm.regionid
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
           this.searchForm.total = data.obj.total;
-          console.log(this.searchForm.list);
         } else {
           this.$Message.error(data.msg);
         }
@@ -523,9 +530,11 @@ export default {
         return;
       }
       this.setRegionSecond();
+      this.showLoading = true;
       login_msg_code({
         phone: this.adminInfo.phone
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           this.$Message.success(data.msg);
         } else {
@@ -593,7 +602,9 @@ export default {
             form.adminid = this.adminInfo.adminid;
             form.rversion = this.adminInfo.rversion;
           }
+          this.showLoading = true;
           api(form).then((data) => {
+            this.showLoading = false;
             if (data.code === 0) {
               this.searchList();
               this.$Message.success(data.msg);
@@ -617,11 +628,13 @@ export default {
     },
     // 编辑
     toEdit(row) {
+      this.showLoading = true;
       admin_detail({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         adminid: row.adminid
       }).then((res) => {
+        this.showLoading = false;
         if (res.code === 0) {
           this.adminInfo = {
             show: true,
@@ -638,7 +651,6 @@ export default {
             regionid: res.obj.regionid,
             rversion: row.rversion
           };
-          console.log(this.adminInfo);
         } else {
           this.$Message.error(res.msg);
         }

src/views/regionSection/regionManage/regionManage.vue

@@ -693,7 +693,6 @@ export default {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
           this.searchForm.total = data.obj.total;
-          console.log(this.searchForm.list);
         } else {
           this.$Message.error(data.msg);
         }
@@ -740,7 +739,6 @@ export default {
             form.authKey = this.authInfo.authKey;
             form.authType = this.authInfo.authType;
           }
-          console.log(form);
           this.showLoading = true;
           region_set(form).then((data) => {
             this.showLoading = false;

src/views/regionSection/regionManage/schoolManage.vue

@@ -311,6 +311,10 @@
         <Button @click="viewInfo.show = false">关闭</Button>
       </div>
     </Modal>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
@@ -498,6 +502,7 @@ export default {
       areaList: [],
       marketList: [],
       regionList: [],
+      showLoading: false,
       userInfo: {}
     };
   },
@@ -560,7 +565,9 @@ export default {
       this.searchList();
     },
     getAreaList() {
+      this.showLoading = true;
       area_list_sel({}).then((res) => {
+        this.showLoading = false;
         if (res.code === 0) {
           this.areaList = res.obj;
         } else {
@@ -570,11 +577,13 @@ export default {
     },
     // 获取搜索区域列表
     getSearchRegionList() {
+      this.showLoading = true;
       region_list_sel_qy({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: this.powerParams.objectid
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           this.searchForm.dropList = data.obj;
         } else {
@@ -600,6 +609,7 @@ export default {
     },
     // 获取列表
     getList() {
+      this.showLoading = true;
       school_list({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
@@ -609,6 +619,7 @@ export default {
         areaCode: this.searchForm.areaCodes,
         schoolName: this.searchForm.schoolName
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
           this.searchForm.total = data.obj.total;
@@ -741,7 +752,9 @@ export default {
               msgcode: this.adminInfo.admin.msgcode
             };
           }
+          this.showLoading = true;
           api(form).then((data) => {
+            this.showLoading = false;
             if (data.code === 0) {
               this.searchList();
               this.$Message.success(data.msg);
@@ -767,11 +780,13 @@ export default {
     toEdit(row) {
       this.marketList = [];
       this.regionList = [];
+      this.showLoading = true;
       school_detail({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         schoolid: row.schoolid
       }).then((res) => {
+        this.showLoading = false;
         if (res.code === 0) {
           let str = res.obj.areaCode;
           let obj1 = { areaCode: "" },

src/views/regionSection/setting/device.vue

@@ -99,12 +99,10 @@ export default {
         trend: this.adminInfo.trend,
         password: this.adminInfo.password || null
       };
-      console.log(form);
       this.showLoading = true;
       password_edit(form).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
-          console.log(res.obj);
           this.$Message.success(res.msg);
         } else {
           this.$Message.error(res.msg);

src/views/regionSection/setting/powerUp.vue

@@ -78,7 +78,6 @@ export default {
         this.showLoading = false;
         if (res.code === 0) {
           if (res.obj) {
-            console.log(res.obj);
             this.adminInfo = {
               appPackage: res.obj.appPackage,
               authUrl: res.obj.authUrl,
@@ -103,12 +102,10 @@ export default {
         authUrl: this.adminInfo.authUrl,
         singleType: this.adminInfo.singleType
       };
-      console.log(form);
       this.showLoading = true;
       autoapp_edit(form).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
-          console.log(res.obj);
           this.$Message.success(res.msg);
         } else {
           this.$Message.error(res.msg);

src/views/schoolSection/applicationManage/applicationList.vue

@@ -966,11 +966,13 @@ export default {
     },
     // 查看
     toView(row) {
+      this.showLoading = true;
       app_detail({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         appid: row.appid
       }).then((res) => {
+        this.showLoading = true;
         if (res.code === 0) {
           this.viewInfo = {
             show: true,
@@ -999,7 +1001,6 @@ export default {
             devices: res.obj.devices,
             schools: res.obj.schools
           };
-          console.log(this.viewInfo);
         } else {
           this.$Message.error(res.msg);
         }
@@ -1018,7 +1019,6 @@ export default {
             appName: res.obj.appName,
             devices: res.obj.devices
           };
-          console.log(this.deviceInfo);
         } else {
           this.$Message.error(res.msg);
         }
@@ -1026,12 +1026,14 @@ export default {
     },
     enabledChange(row) {
       let api = row.enabled === 1 ? app_edit_enable : app_edit_unenable;
+      this.showLoading = true;
       api({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         appid: row.appid,
         rversion: row.rversion
       }).then((data) => {
+        this.showLoading = true;
         this.searchList();
         if (data.code === 0) {
           this.$Message.success(data.msg);
@@ -1061,7 +1063,6 @@ export default {
       });
     },
     async countSlot(row, type) {
-      console.log(row);
       if (type === 1) {
         //下载
         this.downloadInfo = {
@@ -1185,7 +1186,6 @@ export default {
     },
     onFileProgress(rootFile, file) {
       file.progress();
-      this.showLiading = true;
     },
     onFileSuccess(rootFile, file, response) {
       let that = this;
@@ -1198,6 +1198,7 @@ export default {
         formData.append("identifier", file.uniqueIdentifier);
         formData.append("filename", `${file.resourcename}.${file.suffix}`);
         formData.append("savefolder", "app");
+        that.showLoading = true;
         // 进行post 请求
         axios({
           method: "post",
@@ -1209,6 +1210,7 @@ export default {
           }
         })
           .then((response) => {
+            that.showLoading = false;
             let res = response.data;
             if (res.code === 0) {
               that.wallpaperInfo.apkPath = res.obj.apkPath;
@@ -1239,7 +1241,6 @@ export default {
     },
     CheckboxDevice(dgroupid, val) {
       this.deviceids[dgroupid] = val;
-      console.log(this.deviceids);
     },
     init() {
       //获取分组列表
@@ -1346,7 +1347,6 @@ export default {
           if (document.querySelector(".section_main")) {
             document.querySelector(".section_main").scrollTop = 0;
           }
-          console.log(this.searchForm.list);
         } else {
           this.$Message.error(res.msg);
         }
@@ -1446,12 +1446,12 @@ export default {
             form.appid = this.wallpaperInfo.appid;
             form.rversion = this.wallpaperInfo.rversion;
           }
-          console.log(form);
+          this.showLoading = true;
           let api = this.wallpaperInfo.appid ? app_edit : app_add;
           api(form).then((res) => {
+            this.showLoading = false;
             if (res.code === 0) {
               this.wallpaperInfo.show = false;
-              console.log(res.obj);
               this.$Message.success(res.msg);
               this.searchList();
             } else {
@@ -1463,11 +1463,13 @@ export default {
     },
     // 编辑
     toEdit(row) {
+      this.showLoading = true;
       app_detail({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         appid: row.appid
       }).then((res) => {
+        this.showLoading = false;
         if (res.code === 0) {
           this.school_list = JSON.parse(JSON.stringify(this.curRegion));
           this.wallpaperInfo = {
@@ -1523,9 +1525,6 @@ export default {
               }
             }
           });
-
-          console.log(res.obj);
-          console.log(this.wallpaperInfo);
         } else {
           this.$Message.error(res.msg);
         }
@@ -1537,12 +1536,14 @@ export default {
         title: "提示",
         content: "您确定删除选中数据吗？",
         onOk: () => {
+          this.showLoading = true;
           app_delete({
             rtype: this.powerParams.rtype,
             objectid: this.powerParams.objectid,
             appid: row.appid,
             rversion: row.rversion
           }).then((res) => {
+            this.showLoading = false;
             if (res.code === 0) {
               this.$Message.success(res.msg);
               this.searchList();

src/views/schoolSection/applicationManage/greenBrowser.vue

@@ -78,6 +78,10 @@
         <Button @click="saveAddInfo()" type="primary">保存</Button>
       </div>
     </Modal>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
@@ -91,6 +95,7 @@ import {
 export default {
   data() {
     return {
+      showLoading: false,
       searchForm: {
         visitName: "",
         page: 1,
@@ -193,6 +198,7 @@ export default {
     },
     // 获取列表
     getList() {
+      this.showLoading = true;
       browser_list({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
@@ -201,6 +207,7 @@ export default {
         size: this.searchForm.size,
         visitName: this.searchForm.visitName
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
           this.searchForm.total = data.obj.total;
@@ -235,7 +242,9 @@ export default {
             form.browserid = this.browserInfo.browserid;
             form.rversion = this.browserInfo.rversion;
           }
+          this.showLoading = true;
           api(form).then((data) => {
+            this.showLoading = false;
             if (data.code === 0) {
               this.searchList();
               this.$Message.success(data.msg);

src/views/schoolSection/log/deviceExport.vue

@@ -1,15 +1,14 @@
 <template>
   <div class="main_root">
     <div class="search_header">
-      <div class="search_left">
-      </div>
+      <div class="search_left"></div>
       <Button type="primary" class="primary_btn" @click="toExport()"
         >导出</Button
       >
     </div>
     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
-        <template slot-scope="{ row }" slot="violatedSlot">
+        <template slot-scope="{ row }" slot="violated">
           <div class="action_list">
             <!-- 0不违规1违规 -->
             <div v-if="row.violated === 1" class="action_success">是</div>

src/views/schoolSection/userManage/userManage.vue

@@ -560,7 +560,7 @@ export default {
         this.$Message.error("请选择上传文件");
         return;
       }
-      this.wait_flag = true;
+      this.wait_flag = true; //showLoading
       let that = this;
       user_import(this.form_data)
         .then((res) => {
@@ -617,11 +617,13 @@ export default {
     },
     //导出
     userExport() {
+      this.showLoading = true;
       user_export({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         schoolid: this.powerParams.objectid
       }).then((res) => {
+        this.showLoading = false;
         if (res.code === 0) {
           exportToExcel(
             [
@@ -694,7 +696,9 @@ export default {
             cardid: this.addInfo.cardid
           };
           let api = this.addInfo.userid ? user_edit : user_add;
+          this.showLoading = true;
           api(form).then((res) => {
+            this.showLoading = false;
             if (res.code === 0) {
               this.addInfo.show = false;
               this.$Message.success(res.msg);
@@ -723,18 +727,25 @@ export default {
       });
     },
     toDel(row) {
-      user_delete({
-        rtype: this.powerParams.rtype,
-        objectid: this.powerParams.objectid,
-        userid: row.userid,
-        rversion: row.rversion
-      }).then((res) => {
-        if (res.code === 0) {
-          this.searchList();
-          this.$Message.success(res.msg);
-        } else {
-          this.$Message.error(res.msg);
-        }
+      this.$Modal.confirm({
+        title: "提示",
+        content: "您确定删除【" + row.username + "】吗？",
+        onOk: () => {
+          user_delete({
+            rtype: this.powerParams.rtype,
+            objectid: this.powerParams.objectid,
+            userid: row.userid,
+            rversion: row.rversion
+          }).then((res) => {
+            if (res.code === 0) {
+              this.searchList();
+              this.$Message.success(res.msg);
+            } else {
+              this.$Message.error(res.msg);
+            }
+          });
+        },
+        onCancel: () => {}
       });
     },
     enabledChange(row) {
@@ -790,7 +801,6 @@ export default {
     // 获取列表
     getList() {
       this.showLoading = true;
-      console.log(this.powerParams);
       user_list({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
@@ -880,7 +890,7 @@ export default {
     display: flex;
     margin: 16px 0;
     .app_logo {
-      flex-wrap: none;
+      flex: none;
       width: 56px;
       height: 56px;
       border-radius: 20px;