Commit b45a5d92 authored by liuzhaoh's avatar liuzhaoh

解决main.js文件的冲突

parents 465f2219 f1047d6a
......@@ -5,9 +5,11 @@ import { router } from './router'
import ElementPlus from 'element-plus'
import 'element-plus/dist/index.css'
import * as ElementPlusIconsVue from '@element-plus/icons-vue'
import { createPinia } from 'pinia'
const app = createApp(App)
for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
app.component(key, component)
}
app.use(router).use(ElementPlus).mount('#app')
app.use(router).use(ElementPlus).use(createPinia()).mount('#app')
//创娃store很简单,调用pinia中的definestore函数即可,该函数族收两个参数:
import {defineStore} from 'pinia'
import user from './user'
console.log(user.actions)
//第一个参敬是应用程序中store的唯一id,就是给数据仓库起个名字
//第二个参数是一个对象,store的配置项,比如配置store内的嫩据,修改数据的方法等等
export const useUsersStore = defineStore('user',{
//其他配置项
//这里的state与vue2中用来存放初始化变量的data的写法相似,需要return
state: user.state,
actions: user.actions,
})
import { defineStore } from 'pinia'
import { getToken, removeToken, setToken } from '@/utils/auth'
import { getInfo, findPcMenu, getLogin, getWeather, login, logout, getFunctionList, captchaLoginFun } from '@/request/user.js'
//第一个参敬是应用程序中store的唯一id,就是给数据仓库起个名字
//第二个参数是一个对象,store的配置项,比如配置store内的嫩据,修改数据的方法等等
export const useUsersStore = defineStore('user', {
//其他配置项
//这里的state与vue2中用来存放初始化变量的data的写法相似,需要return
state: () => {
return {
token: getToken('TOKEN'),
name: '',
avatar: '',
introduction: '',
rememberMe: '',
dataBranchFactoryId: '',
roles: [],
menuLimitsObj: {},
weather: null,
customerId: getToken('customerId'),
office: {},
istrue: false,
functionAuthority: getToken('FUNC_AUTHORITY') ? JSON.parse(getToken('FUNC_AUTHORITY')) : '',
}
},
actions: {
login(userInfo) {
debugger
const { account, password, rememberMe } = userInfo
return new Promise((resolve, reject) => {
login(JSON.stringify(userInfo)).then(response => {
if (response.code != 1 && response.msg != "密码已过期,请重置!") {
return reject(response)
}
const { data } = response
setToken('TOKEN', data)
setToken('rememberMe', rememberMe)
resolve(response)
}).catch(error => {
resolve(response)
})
})
},
captchaLogin(userInfo) {
const { account, password, rememberMe } = userInfo
return new Promise((resolve, reject) => {
captchaLoginFun(JSON.stringify(userInfo)).then(response => {
if (response.code != 1) {
return reject(response)
}
const { data } = response
setToken('TOKEN', data)
setToken('rememberMe', rememberMe)
resolve(response)
}).catch(error => {
resolve(response)
})
})
},
getFunctionList(customerId) {
return new Promise((resolve, reject) => {
getFunctionList(customerId).then(response => {
const { data } = response
let obj = {}
if (data && data.length) {
for (let item of data) {
obj[item.code] = item
}
}
this.functionAuthority = obj
setToken('FUNC_AUTHORITY', JSON.stringify(obj))
resolve(obj)
}).catch(error => {
reject(error)
})
})
},
},
})
import request from "./index.js";
export function login(data) {
return request({
url: '/user/login',
method: 'post',
data
})
}
export function captchaLoginFun(data) {
return request({
url: '/user/captchaLogin',
method: 'post',
data
})
}
export function getLogin() {
return request({
url: '/login',
method: 'get'
})
}
export function getInfo() {
return request({
url: '/system/permission?appCode=bme-pc-service&userId=1',
method: 'get'
})
}
export function findPcMenu(customerId) {
return request({
url:'/modelConfigController/findPcMenu?customerId=' + customerId,
method: 'get'
})
}
export function getWeather(customerId) {
return request({
url:'/system/weather?customerId=' + customerId,
method: 'get'
})
}
export function getFunctionList(customerId) {
return request({
url:'/system/function/listAllEnable?customerId=' + customerId + "&isEnable=" + true,
method: 'get'
})
}
export function logout() {
return request({
url:'/user/logout',
method: 'post'
})
}
export function upload(url, data) {
url.indexOf('admin') > -1 ? url = process.env.VUE_APP_BASE_API4 + url
: url = process.env.VUE_APP_BASE_API1 + url
return request({
url: url,
method: 'post',
data: data
})
}
export function exportFlie(url, data) {
url.indexOf('admin') > -1 ? url = process.env.VUE_APP_BASE_API4 + url
: url = process.env.VUE_APP_BASE_API1 + url
return request({
url: url,
headers: {
responseType: 'blob'
},
method: 'post',
data: data
})
}
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment