Skip to content

html / happiness-plus-platform-admin

Go to a project
Commit 50870ee6 by dongjipeng
Options

add

parent a38491a7
Showing with 120 additions and 49 deletions
src/components/Layout.vue
......@@ -56,7 +56,7 @@ export default {
},
mounted () {
this.getRouter()
console.log(this.$router.options.routes[0].children)
// console.log(this.$router.options.routes[0].children)
},
methods: {
getRouter () {
......
src/main.js
......@@ -32,6 +32,7 @@ if (process.env.NODE_ENV === 'development') { // 开发
axios.defaults.baseURL = 'http://10.2.98.32:8091/admin/'
Vue.prototype.$baseURL = 'http://10.2.98.32:8091/admin/'
Vue.prototype.$imgUrl = 'http://10.2.98.32:8091/admin/images/'
Vue.prototype.$imgUrlFitness = 'http://10.2.98.32:8091/admin/exerciseImages/'
} else { // 生产
ssoHttp = 'http://sso.' + DOMAIN_NAME + '.com/'
Vue.prototype.$ssoHttp = ssoHttp
......@@ -40,6 +41,7 @@ if (process.env.NODE_ENV === 'development') { // 开发
axios.defaults.baseURL = 'http://happy.' + DOMAIN_NAME + '.com/admin/'
Vue.prototype.$baseURL = 'http://happy.' + DOMAIN_NAME + '.com/admin/'
Vue.prototype.$imgUrl = 'http://happy.' + DOMAIN_NAME + '.com/admin/images/'
Vue.prototype.$imgUrlFitness = 'http://happy.' + DOMAIN_NAME + '.com/admin/exerciseImages/'
}
// Loading效果
......
src/views/fitness/ActivityShenhe.vue
<template>
<div>
<!-- 活动审核：活动标题 账号 姓名 部门 活动图片 公里数 实际公里数（文本框） 审核按钮 -->
<el-table
:data="photoList"
border
......@@ -10,17 +9,17 @@
label="活动标题">
</el-table-column>
<el-table-column
prop="activityCount"
prop="personIdMdm"
width="180"
label="账号">
</el-table-column>
<el-table-column
prop="activityName"
prop="personName"
width="180"
label="姓名">
</el-table-column>
<el-table-column
prop="mcont"
prop="dept"
label="部门">
</el-table-column>
<el-table-column
......@@ -28,29 +27,28 @@
width="400"
label="活动照片">
<template scope="scope">
<img :src="$imgUrl + scope.row.picturePath" width="220" height="60" style="margin: auto" />
<img :src="$imgUrlFitness + scope.row.submitPhotoPath" width="220" height="60" style="margin: auto" />
</template>
</el-table-column>
<el-table-column
prop="gongli"
prop="submitDistance"
width="100"
align="center"
label="公里数">
</el-table-column>
<el-table-column
prop="sjgongli"
width="200"
label="实际公里数">
<template>
<el-input class="width100" placeholder="输入实际公里数"></el-input>
<template scope="scope">
<el-input class="width100" v-model="scope.row.checkSubmitDistance" placeholder="输入实际公里数"></el-input>
</template>
</el-table-column>
<el-table-column
align="center"
label="操作"
width="100">
<template>
<el-button type="primary" size="small" >审核</el-button>
<template slot-scope="scope">
<el-button type="primary" size="small" @click="onShenhe(scope.row)">审核</el-button>
</template>
</el-table-column>
</el-table>
......@@ -73,21 +71,66 @@ export default {
data () {
return {
photoList: [
{
activityTitle: 'daniaanafnanjkvakak你简单',
activityCount: 'saasdsasd',
activityName: '张三',
gongli: '100',
mcont: '华夏事业部'
},
{
activityTitle: 'daniaanafnanjkvakak你简单',
activityCount: 'saasdsasd',
activityName: '张三',
gongli: '123',
mcont: '华夏事业部'
// {
// activityTitle: 'daniaanafnanjkvakak你简单',
// activityCount: 'saasdsasd',
// activityName: '张三',
// gongli: '100',
// mcont: '华夏事业部'
// }
],
currentPage: 1,
pageSize: 10,
totalPage: null,
personIdMdm: '',
dept: '',
p: '',
c: ''
}
},
mounted () {
this.getActivityList()
},
methods: {
handleSizeChange: function (size) {
this.pageSize = size
},
handleCurrentChange: function (currentPage) {
this.currentPage = currentPage
this._getPhotoList()
},
getActivityList () {
this.$axios.get('/exercise/exerciseActivityApplySubmitList', {
params: {
'p': this.currentPage,
'c': this.pageSize,
'personIdMdm': this.$store.state.userInfor.personIdMdm,
'dept': this.$store.state.userInfor.deptId
}
}).then(res => {
console.log(res)
if (res) {
this.totalPage = res.count
this.photoList = res.list
}
})
},
onShenhe (data) {
console.log(data)
this.$axios.get('/exercise/exerciseActivityApplySubmitCheck', {
params: {
'applySubmitId': data.id,
'checkSubmitDistance': data.checkSubmitDistance
}
}).then(res => {
if (res) {
this.$message({
type: 'success',
message: '审核成功!'
})
this.getActivityList()
}
]
})
}
}
}
......
src/views/fitness/FitActivity.vue
<template>
<div>
<div class="btn-warp tr mb20">
<el-button type="primary" size="small">导出</el-button>
<!-- <el-button type="primary" size="small">导出</el-button> -->
<el-button type="primary" class="el-button-link"><router-link to="/fitness/activityShenhe" style="color: #fff">活动审核</router-link></el-button>
</div>
<el-table
......@@ -15,27 +15,27 @@
<el-table-column
prop="activityTime"
align="center"
width="140"
width="160"
label="活动时间">
</el-table-column>
<el-table-column
prop="activityCount"
prop="personIdMdm"
width="180"
label="账号">
</el-table-column>
<el-table-column
prop="activityName"
prop="personName"
width="150"
label="姓名">
</el-table-column>
<el-table-column
prop="time"
prop="createTime"
align="center"
width="140"
width="160"
label="时间">
</el-table-column>
<el-table-column
prop="mcont"
prop="dept"
label="部门">
</el-table-column>
</el-table>
......@@ -58,23 +58,49 @@ export default {
data () {
return {
photoList: [
{
activityTitle: 'daniaanafnanjkvakak你简单',
activityTime: '2020-04-27',
activityCount: 'saasdsasd',
activityName: '张三',
time: '2020-04-27',
mcont: '华夏事业部'
},
{
activityTitle: 'daniaanafnanjkvakak你简单',
activityTime: '2020-04-27',
activityCount: 'saasdsasd',
activityName: '张三',
time: '2020-04-27',
mcont: '华夏事业部'
// {
// activityTitle: 'daniaanafnanjkvakak你简单',
// activityTime: '2020-04-27',
// activityCount: 'saasdsasd',
// activityName: '张三',
// time: '2020-04-27',
// mcont: '华夏事业部'
// }
],
currentPage: 1,
pageSize: 10,
totalPage: null,
personIdMdm: '',
dept: '',
p: '',
c: ''
}
},
mounted () {
this.getActivityList()
},
methods: {
handleSizeChange: function (size) {
this.pageSize = size
},
handleCurrentChange: function (currentPage) {
this.currentPage = currentPage
this._getPhotoList()
},
getActivityList () {
this.$axios.get('/exercise/exerciseActivityApplyList', {
params: {
'p': this.currentPage,
'c': this.pageSize,
'personIdMdm': this.$store.state.userInfor.personIdMdm,
'dept': this.$store.state.userInfor.deptId
}
}).then(res => {
if (res) {
this.totalPage = res.count
this.photoList = res.list
}
]
})
}
}
}
......
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 sign in to comment