zhuxinbo 4 سال پیش
والد
کامیت
5e664b76f1

+ 6 - 6
src/components/layouts/TabLayout.vue

@@ -205,13 +205,13 @@
 
       // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题
       changeTitle(title) {
-        let projectTitle = "Jeecg-Boot 企业级快速开发平台"
+        // let projectTitle = "Jeecg-Boot 企业级快速开发平台"
         // 首页特殊处理
-        if (this.$route.path === indexKey) {
-          document.title = projectTitle
-        } else {
-          document.title = title + ' · ' + projectTitle
-        }
+        // if (this.$route.path === indexKey) {
+        //   document.title = projectTitle
+        // } else {
+        //   document.title = title + ' · ' + projectTitle
+        // }
       },
       // update-end-author:sunjianlei date:20200120 for: 动态更改页面标题
 

+ 235 - 96
src/store/modules/user.js

@@ -1,9 +1,204 @@
+// import Vue from 'vue'
+// import { login, logout, phoneLogin, thirdLogin } from "@/api/login"
+// import { ACCESS_TOKEN, USER_NAME,USER_INFO,USER_AUTH,SYS_BUTTON_AUTH,UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
+// import { welcome } from "@/utils/util"
+// import { queryPermissionsByUser } from '@/api/api'
+// import { getAction } from '@/api/manage'
+
+// const user = {
+//   state: {
+//     token: '',
+//     username: '',
+//     realname: '',
+//     welcome: '',
+//     avatar: '',
+//     permissionList: [],
+//     info: {}
+//   },
+
+//   mutations: {
+//     SET_TOKEN: (state, token) => {
+//       state.token = token
+//     },
+//     SET_NAME: (state, { username, realname, welcome }) => {
+//       state.username = username
+//       state.realname = realname
+//       state.welcome = welcome
+//     },
+//     SET_AVATAR: (state, avatar) => {
+//       state.avatar = avatar
+//     },
+//     SET_PERMISSIONLIST: (state, permissionList) => {
+//       state.permissionList = permissionList
+//     },
+//     SET_INFO: (state, info) => {
+//       state.info = info
+//     },
+//   },
+
+//   actions: {
+//     // CAS验证登录
+//     ValidateLogin({ commit }, userInfo) {
+//       return new Promise((resolve, reject) => {
+//         getAction("/cas/client/validateLogin",userInfo).then(response => {
+//           console.log("----cas 登录--------",response);
+//           if(response.success){
+//             const result = response.result
+//             const userInfo = result.userInfo
+//             Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
+//             Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
+//             Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
+//             commit('SET_TOKEN', result.token)
+//             commit('SET_INFO', userInfo)
+//             commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() })
+//             commit('SET_AVATAR', userInfo.avatar)
+//             resolve(response)
+//           }else{
+//             resolve(response)
+//           }
+//         }).catch(error => {
+//           reject(error)
+//         })
+//       })
+//     },
+//     // 登录
+//     Login({ commit }, userInfo) {
+//       return new Promise((resolve, reject) => {
+//         login(userInfo).then(response => {
+//           if(response.code =='200'){
+//             const result = response.result
+//             const userInfo = result.userInfo
+//             Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
+//             Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
+//             Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
+//             Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000)
+//             commit('SET_TOKEN', result.token)
+//             commit('SET_INFO', userInfo)
+//             commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() })
+//             commit('SET_AVATAR', userInfo.avatar)
+//             resolve(response)
+//           }else{
+//             reject(response)
+//           }
+//         }).catch(error => {
+//           reject(error)
+//         })
+//       })
+//     },
+//     //手机号登录
+//     PhoneLogin({ commit }, userInfo) {
+//       return new Promise((resolve, reject) => {
+//           phoneLogin(userInfo).then(response => {
+//           if(response.code =='200'){
+//         const result = response.result
+//         const userInfo = result.userInfo
+//         Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
+//         Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
+//         Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
+//         Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000)
+//         commit('SET_TOKEN', result.token)
+//         commit('SET_INFO', userInfo)
+//         commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() })
+//         commit('SET_AVATAR', userInfo.avatar)
+//         resolve(response)
+//       }else{
+//         reject(response)
+//       }
+//     }).catch(error => {
+//         reject(error)
+//       })
+//     })
+//     },
+//     // 获取用户信息
+//     GetPermissionList({ commit }) {
+//       return new Promise((resolve, reject) => {
+//         let v_token = Vue.ls.get(ACCESS_TOKEN);
+//         let params = {token:v_token};
+//         queryPermissionsByUser(params).then(response => {
+//           const menuData = response.result.menu;
+//           const authData = response.result.auth;
+//           const allAuthData = response.result.allAuth;
+//           //Vue.ls.set(USER_AUTH,authData);
+//           sessionStorage.setItem(USER_AUTH,JSON.stringify(authData));
+//           sessionStorage.setItem(SYS_BUTTON_AUTH,JSON.stringify(allAuthData));
+//           if (menuData && menuData.length > 0) {
+//             //update--begin--autor:qinfeng-----date:20200109------for:JEECG-63 一级菜单的子菜单全部是隐藏路由,则一级菜单不显示------
+//             menuData.forEach((item, index) => {
+//               if (item["children"]) {
+//                 let hasChildrenMenu = item["children"].filter((i) => {
+//                   return !i.hidden || i.hidden == false
+//                 })
+//                 if (hasChildrenMenu == null || hasChildrenMenu.length == 0) {
+//                   item["hidden"] = true
+//                 }
+//               }
+//             })
+//             console.log(" menu show json ", menuData)
+//             //update--end--autor:qinfeng-----date:20200109------for:JEECG-63 一级菜单的子菜单全部是隐藏路由,则一级菜单不显示------
+//             commit('SET_PERMISSIONLIST', menuData)
+//           } else {
+//             reject('getPermissionList: permissions must be a non-null array !')
+//           }
+//           resolve(response)
+//         }).catch(error => {
+//           reject(error)
+//         })
+//       })
+//     },
+
+//     // 登出
+//     Logout({ commit, state }) {
+//       return new Promise((resolve) => {
+//         let logoutToken = state.token;
+//         commit('SET_TOKEN', '')
+//         commit('SET_PERMISSIONLIST', [])
+//         Vue.ls.remove(ACCESS_TOKEN)
+//         Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
+//         //console.log('logoutToken: '+ logoutToken)
+//         logout(logoutToken).then(() => {
+//           //let sevice = "http://"+window.location.host+"/";
+//           //let serviceUrl = encodeURIComponent(sevice);
+//           //window.location.href = window._CONFIG['casPrefixUrl']+"/logout?service="+serviceUrl;
+//           resolve()
+//         }).catch(() => {
+//           resolve()
+//         })
+//       })
+//     },
+//     // 第三方登录
+//     ThirdLogin({ commit }, token) {
+//       return new Promise((resolve, reject) => {
+//         thirdLogin(token).then(response => {
+//           if(response.code =='200'){
+//             const result = response.result
+//             const userInfo = result.userInfo
+//             Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
+//             Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
+//             Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
+//             commit('SET_TOKEN', result.token)
+//             commit('SET_INFO', userInfo)
+//             commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() })
+//             commit('SET_AVATAR', userInfo.avatar)
+//             resolve(response)
+//           }else{
+//             reject(response)
+//           }
+//         }).catch(error => {
+//           reject(error)
+//         })
+//       })
+//     },
+
+//   }
+// }
+
+// export default user
+
 import Vue from 'vue'
-import { login, logout, phoneLogin, thirdLogin } from "@/api/login"
-import { ACCESS_TOKEN, USER_NAME,USER_INFO,USER_AUTH,SYS_BUTTON_AUTH,UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
-import { welcome } from "@/utils/util"
-import { queryPermissionsByUser } from '@/api/api'
-import { getAction } from '@/api/manage'
+import {login, logout, phoneLogin} from "@/api/login"
+import {ACCESS_TOKEN, USER_NAME, USER_INFO, USER_AUTH, SYS_BUTTON_AUTH} from "@/store/mutation-types"
+import {welcome} from "@/utils/util"
+import {queryPermissionsByUser} from '@/api/api'
 
 const user = {
   state: {
@@ -12,6 +207,7 @@ const user = {
     realname: '',
     welcome: '',
     avatar: '',
+    orgcode : '',
     permissionList: [],
     info: {}
   },
@@ -20,7 +216,7 @@ const user = {
     SET_TOKEN: (state, token) => {
       state.token = token
     },
-    SET_NAME: (state, { username, realname, welcome }) => {
+    SET_NAME: (state, {username, realname, welcome}) => {
       state.username = username
       state.realname = realname
       state.welcome = welcome
@@ -37,12 +233,11 @@ const user = {
   },
 
   actions: {
-    // CAS验证登录
-    ValidateLogin({ commit }, userInfo) {
+    // 登录
+    Login({commit}, userInfo) {
       return new Promise((resolve, reject) => {
-        getAction("/cas/client/validateLogin",userInfo).then(response => {
-          console.log("----cas 登录--------",response);
-          if(response.success){
+        login(userInfo).then(response => {
+          if (response.code == '200') {
             const result = response.result
             const userInfo = result.userInfo
             Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
@@ -50,91 +245,61 @@ const user = {
             Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
             commit('SET_TOKEN', result.token)
             commit('SET_INFO', userInfo)
-            commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() })
-            commit('SET_AVATAR', userInfo.avatar)
-            resolve(response)
-          }else{
+            commit('SET_NAME', {username: userInfo.username, realname: userInfo.realname, welcome: welcome()})
+            commit('SET_AVATAR', userInfo.avatar)           
             resolve(response)
+          } else {
+            reject(response)
           }
-        }).catch(error => {
-          reject(error)
         })
       })
     },
-    // 登录
-    Login({ commit }, userInfo) {
+    //企业微信登录
+    wxLogin({commit}, userInfos) {
+        const result = userInfos.result
+        const userInfo = result.userInfo
+        Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
+        Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
+        Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
+        commit('SET_TOKEN', result.token)
+        commit('SET_INFO', userInfo)
+        commit('SET_NAME', {username: userInfo.username, realname: userInfo.realname, welcome: welcome()})
+        commit('SET_AVATAR', userInfo.avatar)
+      },
+    //手机号登录
+    PhoneLogin({commit}, userInfo) {
       return new Promise((resolve, reject) => {
-        login(userInfo).then(response => {
-          if(response.code =='200'){
+        phoneLogin(userInfo).then(response => {
+          if (response.code == '200') {
             const result = response.result
             const userInfo = result.userInfo
             Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
             Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
             Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
-            Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000)
             commit('SET_TOKEN', result.token)
             commit('SET_INFO', userInfo)
-            commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() })
+            commit('SET_NAME', {username: userInfo.username, realname: userInfo.realname, welcome: welcome()})
             commit('SET_AVATAR', userInfo.avatar)
             resolve(response)
-          }else{
+          } else {
             reject(response)
           }
-        }).catch(error => {
-          reject(error)
         })
       })
     },
-    //手机号登录
-    PhoneLogin({ commit }, userInfo) {
-      return new Promise((resolve, reject) => {
-          phoneLogin(userInfo).then(response => {
-          if(response.code =='200'){
-        const result = response.result
-        const userInfo = result.userInfo
-        Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
-        Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
-        Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
-        Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000)
-        commit('SET_TOKEN', result.token)
-        commit('SET_INFO', userInfo)
-        commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() })
-        commit('SET_AVATAR', userInfo.avatar)
-        resolve(response)
-      }else{
-        reject(response)
-      }
-    }).catch(error => {
-        reject(error)
-      })
-    })
-    },
     // 获取用户信息
-    GetPermissionList({ commit }) {
+    GetPermissionList({commit}) {
       return new Promise((resolve, reject) => {
         let v_token = Vue.ls.get(ACCESS_TOKEN);
-        let params = {token:v_token};
+        let params = {token: v_token};
         queryPermissionsByUser(params).then(response => {
           const menuData = response.result.menu;
           const authData = response.result.auth;
           const allAuthData = response.result.allAuth;
           //Vue.ls.set(USER_AUTH,authData);
-          sessionStorage.setItem(USER_AUTH,JSON.stringify(authData));
-          sessionStorage.setItem(SYS_BUTTON_AUTH,JSON.stringify(allAuthData));
+          sessionStorage.setItem(USER_AUTH, JSON.stringify(authData));
+          sessionStorage.setItem(SYS_BUTTON_AUTH, JSON.stringify(allAuthData));
           if (menuData && menuData.length > 0) {
-            //update--begin--autor:qinfeng-----date:20200109------for:JEECG-63 一级菜单的子菜单全部是隐藏路由,则一级菜单不显示------
-            menuData.forEach((item, index) => {
-              if (item["children"]) {
-                let hasChildrenMenu = item["children"].filter((i) => {
-                  return !i.hidden || i.hidden == false
-                })
-                if (hasChildrenMenu == null || hasChildrenMenu.length == 0) {
-                  item["hidden"] = true
-                }
-              }
-            })
-            console.log(" menu show json ", menuData)
-            //update--end--autor:qinfeng-----date:20200109------for:JEECG-63 一级菜单的子菜单全部是隐藏路由,则一级菜单不显示------
             commit('SET_PERMISSIONLIST', menuData)
           } else {
             reject('getPermissionList: permissions must be a non-null array !')
@@ -147,49 +312,23 @@ const user = {
     },
 
     // 登出
-    Logout({ commit, state }) {
+    Logout({commit, state}) {
       return new Promise((resolve) => {
         let logoutToken = state.token;
         commit('SET_TOKEN', '')
         commit('SET_PERMISSIONLIST', [])
         Vue.ls.remove(ACCESS_TOKEN)
-        Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
+        localStorage.removeItem("roleCode")
         //console.log('logoutToken: '+ logoutToken)
         logout(logoutToken).then(() => {
-          //let sevice = "http://"+window.location.host+"/";
-          //let serviceUrl = encodeURIComponent(sevice);
-          //window.location.href = window._CONFIG['casPrefixUrl']+"/logout?service="+serviceUrl;
           resolve()
         }).catch(() => {
           resolve()
         })
       })
     },
-    // 第三方登录
-    ThirdLogin({ commit }, token) {
-      return new Promise((resolve, reject) => {
-        thirdLogin(token).then(response => {
-          if(response.code =='200'){
-            const result = response.result
-            const userInfo = result.userInfo
-            Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
-            Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
-            Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
-            commit('SET_TOKEN', result.token)
-            commit('SET_INFO', userInfo)
-            commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() })
-            commit('SET_AVATAR', userInfo.avatar)
-            resolve(response)
-          }else{
-            reject(response)
-          }
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
 
   }
 }
 
-export default user
+export default user

+ 0 - 1
src/views/modules/Statistics/components/selecTable.vue

@@ -217,7 +217,6 @@ export default {
 .group-creat table td {
   height: 20px;
   max-width: 5px;
-  border: 1px solid #dfe6ec;
   font-size: 12px;
   text-align: center;
   vertical-align: middle;

+ 1 - 0
src/views/modules/Statistics/refuseDataCreat.vue

@@ -415,6 +415,7 @@
           if (res.success) {
             this.loadingSyncCreative = false
             this.$message.success("同步成功")
+            this.reset()
           } else {
             this.loadingSyncCreative = false
             this.$message.error(res.message)

+ 0 - 1
src/views/modules/kuaishouapp/account/editAllGroup.vue

@@ -668,7 +668,6 @@
   .group-creat table td {
     height: 20px;
     max-width: 5px;
-    border: 1px solid #dfe6ec;
     font-size: 12px;
     text-align: center;
     vertical-align: middle;

+ 0 - 1
src/views/modules/kuaishouapp/account/stepForm/Step2.vue

@@ -1040,7 +1040,6 @@
   .group-creat table td {
     height: 20px;
     max-width: 5px;
-    border: 1px solid #dfe6ec;
     font-size: 12px;
     text-align: center;
     vertical-align: middle;

+ 0 - 1
src/views/modules/kuaishouapp/account/stepForm/stepModule/newModulePop.vue

@@ -1212,7 +1212,6 @@ export default {
 .group-creat table td {
   height: 20px;
   max-width: 5px;
-  border: 1px solid #dfe6ec;
   font-size: 12px;
   text-align: center;
   vertical-align: middle;

+ 0 - 1
src/views/modules/kuaishouapp/account/stepForm/stepModule/targetedPopulation.vue

@@ -1241,7 +1241,6 @@ export default {
 .group-creat table td {
   height: 20px;
   max-width: 5px;
-  border: 1px solid #dfe6ec;
   font-size: 12px;
   text-align: center;
   vertical-align: middle;

+ 0 - 1
src/views/modules/kuaishouapp/groupCreate.vue

@@ -1306,7 +1306,6 @@
   .group-creat table td {
     height: 20px;
     max-width: 5px;
-    border: 1px solid #dfe6ec;
     font-size: 12px;
     text-align: center;
     vertical-align: middle;

+ 1 - 1
src/views/user/transferLocal.vue

@@ -158,4 +158,4 @@ export default {
 }
 </script>
 
-<style scoped></style>
+<style scoped></style>