提交 258a7270 authored 作者: CRS's avatar CRS

new

上级 210055e0
...@@ -86,12 +86,11 @@ export default { ...@@ -86,12 +86,11 @@ export default {
}, },
methods: { methods: {
add(){ add(){
console.log(this.$store.state.userData.userName)
this.$router.push({ this.$router.push({
name: 'assessmentReport', name: 'assessmentReport',
query: { query: {
username:this.$store.state.userData.userName, username:this.$store.getters.getUserData.userName,
authority: this.$store.state.userData.type, authority: this.$store.getters.getUserData.type,
id: null, id: null,
} }
}); });
...@@ -107,13 +106,10 @@ export default { ...@@ -107,13 +106,10 @@ export default {
}, },
// 初始请求 // 初始请求
init() { init() {
let username = ''
if (this.$store.state.userData.userName !== 'admin'){
username =this.$store.state.userData.userName
}
let val = { let val = {
'username':username, searchMap: {
'projectName': this.searchVal, 'username':this.$store.getters.getUserData.userName
}
} }
this.$server.getEvaluationList(this.currentPage,this.pagesize,val).then(res=>{ this.$server.getEvaluationList(this.currentPage,this.pagesize,val).then(res=>{
console.log(res.data) console.log(res.data)
...@@ -144,11 +140,10 @@ export default { ...@@ -144,11 +140,10 @@ export default {
// 评估 // 评估
evaluation(row) { evaluation(row) {
console.log(row) console.log(row)
console.log(this.$store.state.userData)
this.$router.push({name:'assessmentReport', query: { this.$router.push({name:'assessmentReport', query: {
username: row.username, username: row.username,
id: row.id, id: row.id,
authority: this.$store.state.userData.type authority: this.$store.getters.getUserData.type
}}) }})
// // return // // return
// let Logistics= this.$router.resolve({ // let Logistics= this.$router.resolve({
...@@ -178,7 +173,7 @@ export default { ...@@ -178,7 +173,7 @@ export default {
this.$router.push({name:'reportAssess',query: { this.$router.push({name:'reportAssess',query: {
username: row.username, username: row.username,
id:row.id, id:row.id,
authority:this.$store.state.userData.type, authority:this.$store.getters.getUserData.type,
}}) }})
}, },
// 删除 // 删除
......
...@@ -10,7 +10,7 @@ import axios from '@/services/axios'; ...@@ -10,7 +10,7 @@ import axios from '@/services/axios';
* dataType * dataType
*/ */
import qs from 'qs'; import qs from 'qs';
const assess = 'http://120.55.57.35:8079' const assess = 'http://192.168.1.248:8079'
const server = { const server = {
getloginOut(id) { // 用户退出 getloginOut(id) { // 用户退出
return axios('/user/loginOut/' + id, { return axios('/user/loginOut/' + id, {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论