+
-
- 或然数据网
+或然数据平台
-
+
-
-
- ![]()
登录
登录
- -
+
- {{item.label}} +
+ {{phoneBtnText}}
+
+ 
diff --git a/src/pages/setting/person/download.vue b/src/pages/setting/person/download.vue
index 788c582..27538a5 100644
--- a/src/pages/setting/person/download.vue
+++ b/src/pages/setting/person/download.vue
@@ -93,20 +93,8 @@ export default {
}).then(res => {
msgObj.close()
if(res.data.type != 'multipart/form-data') return util.warningMsg('数据总数为零！')
- const blob = new Blob([res.data])
- const fileName = `${row.databaseName}.xls`
- if ('download' in document.createElement('a')) { // 非IE下载
- const elink = document.createElement('a')
- elink.download = fileName
- elink.style.display = 'none'
- elink.href = URL.createObjectURL(blob)
- document.body.appendChild(elink)
- elink.click()
- URL.revokeObjectURL(elink.href) // 释放URL 对象
- document.body.removeChild(elink)
- } else { // IE10+下载
- navigator.msSaveBlob(blob, fileName)
- }
+ util.downloadFileDirect(`${row.databaseName}.xls`,new Blob([res.data]))
+
this.$post(`${this.api.saveRecord}?platformUserId=4&tableId=${row.id}&type=1&schoolId=1`).then(res => {}).catch(res => {})
}).catch(res => {
msgObj.close()
diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue
index a6f6eb0..6817618 100644
--- a/src/pages/user/list/index.vue
+++ b/src/pages/user/list/index.vue
@@ -133,10 +133,11 @@
import Setting from '@/setting'
import { mapState } from 'vuex'
import util from '@/libs/util'
+import axios from 'axios'
export default {
data() {
return {
- token: '',
+ token: util.local.get(Setting.tokenKey),
month: '',
monthList: [
{
@@ -163,10 +164,10 @@ export default {
id: '',
label: '不限'
},{
- id: 0,
+ id: 1,
label: '启用'
},{
- id: 1,
+ id: 0,
label: '禁用'
}
],
@@ -271,7 +272,6 @@ export default {
}
},
mounted(){
- this.token = util.local.get(Setting.tokenKey)
this.form.schoolId = this.schoolId
this.getData()
this.getRole()
@@ -397,6 +397,7 @@ export default {
if(this.accountRepeat) return util.warningMsg('该账号已存在')
if(this.workNumberRepeat) return util.warningMsg('该工号已存在')
let data = this.form
+ data.schoolId = data.schoolId ? data.schoolId : this.schoolId
if(!data.userId) data.uniqueIdentification = new Date().getTime()
if(!data.roleId) data.roleId = '0'
if(this.form.userId){
@@ -440,7 +441,9 @@ export default {
phone: ''
}).then((res) => {
val == 1 ? util.successMsg('启用成功') : util.successMsg('禁用成功')
- }).catch((res) => {})
+ }).catch((res) => {
+ row.isEnable = val == 1 ? 0 : 1
+ })
},
handleSelectionChange(val) {
this.multipleSelection = val
@@ -475,11 +478,18 @@ export default {
this.getData()
},
downLoad(){
- location.href = this.api.downloadStaffTemp
+ location.href = this.api.userTemplate
},
showFaild(){
this.importVisible = false
- location.href = `${this.api.export_failure}?token=${this.importToken}`
+ axios.get(`${this.api.export_failure}?token=${this.importToken}`,{
+ headers: {
+ token: this.token
+ },
+ responseType: 'blob'
+ }).then((res) => {
+ util.downloadFileDirect(`导入失败原因.xlsx`,new Blob([res.data]))
+ }).catch(res => {})
},
handleExceed(files, fileList) {
util.warningMsg(
diff --git a/src/plugins/requests/index.js b/src/plugins/requests/index.js
index 85d5bed..4be4800 100644
--- a/src/plugins/requests/index.js
+++ b/src/plugins/requests/index.js
@@ -36,6 +36,8 @@ service.interceptors.response.use(
const res = response.data
if(res.status == 200) {
return Promise.resolve(res).catch(e => {})
+ }else if(res.status == 30001) {
+ return Promise.resolve(res).catch(e => {})
}else if(!res.status){
return Promise.resolve(res).catch(e => {})
}else {
diff --git a/src/router/permission.js b/src/router/permission.js
index 9d4393e..9ff736d 100644
--- a/src/router/permission.js
+++ b/src/router/permission.js
@@ -8,7 +8,7 @@ router.beforeEach((to, from, next) => {
document.title = Setting.titleSuffix
const role = util.local.get(Setting.tokenKey)
if (!role && to.path !== '/login' && to.path !== '/index/list') {
- next('/login')
+ next('/index/list')
} else if(role && to.path == '/login') {
next('/index')
} else {
diff --git a/src/router/routes.js b/src/router/routes.js
index f8bfc0c..7a80835 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -10,7 +10,7 @@ import BasicLayout from '@/layouts/home'
const frameIn = [
{
path: '/',
- redirect: '/login',
+ redirect: '/index/list',
},
{
path: '/',
diff --git a/src/setting.js b/src/setting.js
index 11ff9e5..fb5a5de 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -15,8 +15,8 @@ const Setting = {
// 页面切换时，是否显示模拟的进度条
showProgressBar: true,
// 接口请求地址
- // apiBaseURL: env === 'development' ? 'http://192.168.31.125:8888' : 'http://39.108.250.202:8000',
- apiBaseURL: env === 'development' ? 'http://192.168.31.216:9000' : 'http://www.liuwanr.cn',
+ // apiBaseURL: env === 'development' ? 'http://192.168.31.216:9000' : 'http://39.108.250.202:9000',
+ apiBaseURL: env === 'development' ? 'http://192.168.31.216:9000' : 'http://39.108.250.202:9000',
// 接口请求返回错误时，弹窗的持续时间，单位：秒
modalDuration: 3,
// 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 91f8cb3..e86ecd8 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -12,7 +12,8 @@ export default {
state: {
avatar: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
schoolId: '',
- isManager: false
+ isManager: false,
+ isCustomer: false
},
mutations: {
SET_INFO: (state, info) => {
@@ -25,10 +26,13 @@ export default {
SET_MANAGER: (state, isManager) => {
state.isManager = isManager
},
+ SET_CUSTOMER: (state, isCustomer) => {
+ state.isCustomer = isCustomer
+ },
},
actions: {
login({ state,commit }, userInfo) {
- const { account, password, code, random } = userInfo
+ const { account, password, code, random, distinguish } = userInfo
return new Promise((resolve, reject) => {
post(api.logins,{
account,
@@ -36,16 +40,17 @@ export default {
code,
platform: Setting.platformId,
random,
+ distinguish
}).then(res => {
- setTimeout(() => {
- post(api.saveRecord,{
- type: 3,
- }).then(res => {}).catch(res => {})
- },3000)
-
if(res.status == 200){
- util.local.set(Setting.tokenKey,res.data.token,1296000000)
+ commit('SET_CUSTOMER',res.data.customer)
+ util.local.set(Setting.tokenKey,res.data.token,43200000)
util.successMsg('登录成功')
+ setTimeout(() => {
+ post(api.saveRecord,{
+ type: 3,
+ }).then(res => {}).catch(res => {})
+ },3000)
resolve()
}else{
util.errorMsg(res.message)
@@ -73,5 +78,8 @@ export default {
setManager({ state,commit },isManager) {
commit('SET_MANAGER',isManager)
},
+ setToken({ state,commit },token) {
+ commit('SET_CUSTOMER',token)
+ },
}
}
\ No newline at end of file