ソースを参照

调整前端loading没有关闭的地方

xusl 2 年 前
コミット
47cc93e03e

+ 1 - 2
ui/src/views/auditManager/logininfo/index.vue

@@ -227,6 +227,7 @@ export default {
         }
         this.loading = false
       }).catch((error) => {
+        this.loading = false;
         // this.$message.error(error)
       })
     },1000),
@@ -283,7 +284,6 @@ export default {
           type: 'error',
           message: '删除失败!'
         });
-        console.log(error)
         this.loading = false
       })
     },1000),
@@ -327,7 +327,6 @@ export default {
           type: 'error',
           message: '清空失败!'
         });
-        console.log(error)
         this.loading = false
       })
     },1000)

+ 1 - 0
ui/src/views/auditManager/logininforTotal/index.vue

@@ -109,6 +109,7 @@ export default {
         }
         this.loading = false
       }).catch((error) => {
+        this.loading = false;
         // this.$message.error(error)
       })
     },1000),

+ 2 - 4
ui/src/views/auditManager/operlog/index.vue

@@ -211,7 +211,6 @@
 </template>
 
 <script>
-// import { list, delOperlog, cleanOperlog } from "@/api/monitor/operlog";
 
 import {debounce} from "lodash";
 
@@ -321,7 +320,7 @@ export default {
       }
       return belongTo
     },
-// 列表状态格式化
+    // 列表状态格式化
     auditTypeFormat({cellValue}) {
       let belongTo = '未知的类型'
       for (let i = 0; i < this.auditTypeOptions.length; i++) {
@@ -368,6 +367,7 @@ export default {
         }
         this.loading = false
       }).catch((error) => {
+        this.loading = false;
         // this.$message.error(error)
       })
     }, 1000),
@@ -445,7 +445,6 @@ export default {
           type: 'error',
           message: '删除失败!'
         });
-        console.log(error)
         this.loading = false
       })
     }, 1000),
@@ -489,7 +488,6 @@ export default {
           type: 'error',
           message: '清空失败!'
         });
-        console.log(error)
         this.loading = false
       })
     }, 1000)

+ 1 - 0
ui/src/views/auditManager/operlogTotal/index.vue

@@ -110,6 +110,7 @@ export default {
         }
         this.loading = false
       }).catch((error) => {
+        this.loading = false;
         // this.$message.error(error)
       })
     },1000),

+ 1 - 45
ui/src/views/dashboard/index.vue

@@ -4,63 +4,19 @@
 
 <script>
 
-
-import {mapGetters} from "vuex";
-import {doEncrypt, doDecryptStr,doSign,doVerifySignature,userinfoEncrypt,userinfoDecrypt} from '@/utils/smutil'
-
 export default {
-  // computed: {
-  //   ...mapGetters([
-  //     'userinfo'
-  //   ])
-  // },
+
   name: "User",
   data() {
     return{
     }
   },
   created() {
-    // this.getCurrentUser()
   },
   methods: {
-    /** 获取当前用户的最后修改密码时间 */
-    // getCurrentUser() {
-      // this.$axios.get('/sysUserController/getCurrentUser').then((res) => {
-      //   // 用户信息+菜单权限加密存储
-      //   let encryptUserInfo = userinfoEncrypt(JSON.stringify(res.data))
-      //   // this.$store.dispatch('user/changeSetting',encryptUserInfo)
-      //   sessionStorage.setItem('active',encryptUserInfo)
-      //   var user = res.data.sysUser
-      //   if (user.lastUpdatePwdTime==null){
-      //       this.$message({
-      //         type: 'warning',
-      //         message: '需要修改初始密码!'
-      //       });
-      //     this.$router.push("/user/profile")
-      //   }
-      //   else{
-      //     var dateBegin = new Date(user.lastUpdatePwdTime);
-      //     var dateEnd = new Date();
-      //     var dateDiff = dateEnd.getTime() - dateBegin.getTime(); //时间差的毫秒数
-      //     var dayDiff = Math.floor(dateDiff / (24 * 3600 * 1000)); //计算出相差天数
-      //     if (dayDiff>=30){
-      //       this.$message({
-      //         type: 'warning',
-      //         message: '密码超过30天需要修改!'
-      //       })
-      //       this.$router.push("/user/profile")
-      //     }
-      //   }
-      // }).catch((error) => {
-      //   this.$message.error('获取数据出错' + error)
-      // })
-    // }
   }
 }
 </script>
 
 <style scoped>
-#tunnelinfo {
-  padding-left: 20px;
-}
 </style>

+ 1 - 0
ui/src/views/examineManager/sysApprove/index.vue

@@ -213,6 +213,7 @@ export default {
         }
         this.loading = false
       }).catch((error) => {
+        this.loading = false;
         // this.$message.error(error)
       })
     },

+ 4 - 3
ui/src/views/sysManager/roleManager/index.vue

@@ -229,8 +229,7 @@
 </template>
 
 <script>
-// import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
-// import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+
 import {debounce} from "lodash";
 
 export default {
@@ -366,6 +365,7 @@ export default {
         }
         this.loading = false
       }).catch((error) => {
+        this.loading = false
         // this.$message.error('获取数据出错' + error)
       })
     },
@@ -391,6 +391,7 @@ export default {
       this.$axios.get('/sysMenuController/treeselect').then((res) => {
         this.menuOptions = res.data
       }).catch((error) => {
+        this.loading = false
         // this.$message.error('获取数据出错' + error)
       })
     },
@@ -414,6 +415,7 @@ export default {
         this.menuOptions = res.data.menus;
         return res.data
       }).catch((error) => {
+        this.loading = false
         // this.$message.error('获取数据出错' + error)
       })
     },
@@ -695,7 +697,6 @@ export default {
           type: 'error',
           message: '删除失败!'
         });
-        console.log(error)
         this.loading = false
       })
     },1000)

+ 3 - 3
ui/src/views/sysManager/sysMenu/index.vue

@@ -271,7 +271,7 @@
 </template>
 
 <script>
-// import { listMenu, getMenu, delMenu, addMenu, updateMenu } from "@/api/system/menu";
+
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import IconSelect from "@/components/IconSelect";
@@ -352,10 +352,11 @@ export default {
       this.loading = true;
       this.$axios.get('/sysMenuController/list',{params: this.queryParams}).then((res) => {
         this.menuList = this.handleTree(res.data, "menuId")
+        this.loading = false;
       }).catch((error) => {
+        this.loading = false;
         console.log(error)
       })
-      this.loading = false;
     },
     /** 转换菜单数据结构 */
     normalizer(node) {
@@ -518,7 +519,6 @@ export default {
           type: 'error',
           message: '删除失败!'
         });
-        console.log(error)
         this.loading = false
       })
     },1000)

+ 1 - 0
ui/src/views/sysManager/sysParameter/index.vue

@@ -182,6 +182,7 @@ export default {
         }
         this.loading = false
       }).catch((error) => {
+        this.loading = false;
         // this.$message.error('获取数据出错' + error)
       })
     },

+ 0 - 5
ui/src/views/sysManager/userManager/profile/resetPwd.vue

@@ -21,11 +21,6 @@ import { mapGetters } from 'vuex'
 import {doEncrypt, doDecryptStr,doSign,doVerifySignature,userinfoEncrypt,userinfoDecrypt} from '@/utils/smutil'
 import { debounce } from 'lodash'
 export default {
-  // computed: {
-  //   ...mapGetters([
-  //     'userinfo'
-  //   ])
-  // },
   data() {
     const equalToPassword = (rule, value, callback) => {
       if (this.pwd.newPassword !== value) {