Skip to content

html / happiness-plus-platform-admin

Go to a project
Commit 50870ee6 by dongjipeng
Options

add

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