Skip to content

html / happiness-plus-platform-admin

Go to a project
Commit 556c010d by dongjipeng
Options

add

parent e30d1e7f
Showing with 730 additions and 324 deletions
src/components/Layout.vue
......@@ -18,43 +18,40 @@
<el-menu-item index="/home/messageManagement"><div class="tc">留言管理</div></el-menu-item>
</el-submenu>
<el-submenu index="2">
<template slot="title"><div class="tc">幸福差旅</div></template>
<el-menu-item index="/travel/hotelList"><div class="tc">协议酒店</div></el-menu-item>
<el-menu-item index="/travel/hotelAdd"><div class="tc">新增酒店</div></el-menu-item>
<template slot="title"><div class="tc">幸福餐厅</div></template>
<el-menu-item index="/restaurant/ationalRestaurant"><div class="tc">全国餐厅</div></el-menu-item>
<el-menu-item index="/restaurant/restaurantMenus"><div class="tc">餐厅菜单</div></el-menu-item>
<!--<el-menu-item index="/restaurant/foodVideo"><div class="tc">美食视频</div></el-menu-item>-->
<el-menu-item index="/restaurant/solarCalendar"><div class="tc">节气日历</div></el-menu-item>
<el-menu-item index="/restaurant/themeActivities"><div class="tc">主题活动</div></el-menu-item>
</el-submenu>
<el-submenu index="3">
<template slot="title"><div class="tc">幸福洗衣</div></template>
<el-menu-item index="/wash/washBranches"><div class="tc">洗衣网点</div></el-menu-item>
<el-menu-item index="/wash/newBranches"><div class="tc">新增网点</div></el-menu-item>
<el-menu-item index="/wash/commonSense"><div class="tc">洗衣小常识</div></el-menu-item>
</el-submenu>
<el-menu-item index="/randomHouse"><div class="tc">幸福书屋</div></el-menu-item>
<el-submenu index="5">
<template slot="title"><div class="tc">幸福农场</div></template>
<el-menu-item index="/farm/farmWonderful"><div class="tc">农场精彩</div></el-menu-item>
<el-menu-item index="/farm/specialEvents"><div class="tc">特色活动</div></el-menu-item>
</el-submenu>
<el-submenu index="6">
<el-submenu index="4">
<template slot="title"><div class="tc">幸福健身</div></template>
<el-menu-item index="/fitness/eventCalendar"><div class="tc">赛事日历</div></el-menu-item>
<el-menu-item index="/fitness/happyRunning"><div class="tc">幸福长跑</div></el-menu-item>
</el-submenu>
<el-submenu index="7">
<template slot="title"><div class="tc">幸福餐厅</div></template>
<el-menu-item index="/restaurant/ationalRestaurant"><div class="tc">全国餐厅</div></el-menu-item>
<el-menu-item index="/restaurant/restaurantMenus"><div class="tc">餐厅菜单</div></el-menu-item>
<el-menu-item index="/restaurant/foodVideo"><div class="tc">美食视频</div></el-menu-item>
<el-menu-item index="/restaurant/solarCalendar"><div class="tc">节气日历</div></el-menu-item>
<el-menu-item index="/restaurant/themeActivities"><div class="tc">主题活动</div></el-menu-item>
<el-menu-item index="/community"><div class="tc">幸福社团</div></el-menu-item>
<el-menu-item index="/office"><div class="tc">无忧办公</div></el-menu-item>
<el-submenu index="5">
<template slot="title"><div class="tc">幸福洗衣</div></template>
<el-menu-item index="/wash/washBranches"><div class="tc">洗衣网点</div></el-menu-item>
<el-menu-item index="/wash/newBranches"><div class="tc">新增网点</div></el-menu-item>
<el-menu-item index="/wash/commonSense"><div class="tc">洗衣小常识</div></el-menu-item>
</el-submenu>
<el-submenu index="8">
<template slot="title"><div class="tc">幸福班车</div></template>
<el-menu-item index="2-3"><div class="tc">选项3</div></el-menu-item>
<el-submenu index="6">
<template slot="title"><div class="tc">幸福差旅</div></template>
<el-menu-item index="/travel/hotelList"><div class="tc">协议酒店</div></el-menu-item>
<el-menu-item index="/travel/hotelAdd"><div class="tc">新增酒店</div></el-menu-item>
</el-submenu>
<el-menu-item index="/office"><div class="tc">幸福办公</div></el-menu-item>
<el-menu-item index="/mom"><div class="tc">萌妈工作室</div></el-menu-item>
<el-menu-item index="/randomHouse"><div class="tc">幸福书屋</div></el-menu-item>
<el-menu-item index="/pass"><div class="tc">幸福传递</div></el-menu-item>
<el-menu-item index="/community"><div class="tc">幸福社团</div></el-menu-item>
<el-menu-item index="/administrator"><div class="tc">管理员</div></el-menu-item>
</el-menu>
</el-aside>
<el-main class="main">
......
src/main.js
......@@ -26,12 +26,11 @@ if (process.env.VUE_APP_API_PREFIX === 'development') { // 开发
Vue.prototype.$baseURL = 'http://10.2.98.32:8081/admin/'
Vue.prototype.$imgUrl = 'http://10.2.98.32:8081/admin/images/'
Vue.prototype.$export = 'http://10.2.98.32:8081/admin/export/'
Vue.prototype.$uploaderUrl = 'http://10.2.98.32:8081/admin/'
} else { // 生产
axios.defaults.baseURL = 'http://happy.cfldpe.com/admin/'
Vue.prototype.$imgUrl = 'http://happy.cfldpe.com/admin/images/'
Vue.prototype.$baseURL = 'http://happy.cfldpe.com/admin/'
Vue.prototype.$uploaderUrl = 'http://happy.cfldpe.com/admin/'
Vue.prototype.$imgUrl = 'http://happy.cfldpe.com/admin/images/'
Vue.prototype.$export = 'http://happy.cfldpe.com/admin/export/'
}
axios.interceptors.response.use(function (response) {
......
src/router.js
......@@ -39,6 +39,8 @@ import HotelAdd from './views/travel/HotelAdd'
import RandomHouse from './views/randomHouse/index'
import Administrator from './views/administrator/index'
Vue.use(Router)
export default new Router({
......@@ -347,6 +349,14 @@ export default new Router({
}
}
]
},
{
path: '/administrator',
name: 'administrator',
component: Administrator,
meta: {
title: '管理员'
}
}
]
}
......
src/views/administrator/index.vue 0 → 100644
<template>
<div class="administrator">
<el-form :inline="true" class="demo-form-inline" size="small">
<el-form-item style="float: right">
<el-button type="primary" size="small" @click="userDialogVisible = true">新增</el-button>
</el-form-item>
</el-form>
<el-table
:data="userList"
:header-cell-style="{'background-color': '#F5F7FA', 'color': '#333'}"
style="width: 100%">
<el-table-column
type="index"
align="center"
label="序号">
</el-table-column>
<el-table-column
prop="roleName"
align="center"
label="角色">
</el-table-column>
<el-table-column
prop="personIdMdm"
align="center"
label="账号">
</el-table-column>
<el-table-column
prop="createUser"
align="center"
label="创建人">
</el-table-column>
<el-table-column
prop="createTime"
align="center"
label="创建日期">
</el-table-column>
<el-table-column
align="center"
label="操作"
width="150">
<template slot-scope="scope">
<el-button icon="el-icon-delete" size="small" @click="userDel(scope.row.id)"></el-button>
</template>
</el-table-column>
</el-table>
<div class="pagination">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-size="pageSize"
layout="prev, pager, next"
:total="totalPage">
</el-pagination>
</div>
<el-dialog
title="添加管理员"
:visible.sync="userDialogVisible"
width="30%"
center>
<el-form label-width="100px">
<el-form-item label="姓名">
<el-col :sm="18">
<el-input v-model="administratorName" autocomplete="off"></el-input>
</el-col>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-row type="flex" justify="center">
<el-col :sm="10">
<div class="btn-warp">
<el-button @click="userDialogVisible = false">取 消</el-button>
<el-button type="danger" @click="bannerAddHandle">确 定</el-button>
</div>
</el-col>
</el-row>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
name: 'administrator',
data () {
return {
userList: [],
currentPage: 1,
pageSize: 10,
totalPage: null,
userDialogVisible: false,
administratorName: ''
}
},
mounted () {
this._getUserList()
},
methods: {
_getUserList () {
let _this = this
this.$axios.get('/user/list', {
params: {
'p': _this.currentPage,
'c': _this.pageSize
}
}).then(function (res) {
_this.totalPage = res.count
_this.userList = res.list
})
},
handleSizeChange: function (size) {
this.pageSize = size
},
handleCurrentChange: function (currentPage) {
this.currentPage = currentPage
this._getUserList()
},
userDel (id) { // 删除管理员
this.$confirm('确定删除该管理员吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let _this = this
this.$axios.get('/user/delete', {
params: {
'id': id
}
}).then(function (res) {
if (res) {
_this._getUserList()
_this.$message({
type: 'success',
message: '删除成功!'
})
}
})
})
},
bannerAddHandle () { // 添加管理员
let _this = this
this.$axios.post('/user/add', {
'personIdMdm': _this.administratorName
}).then(function (res) {
if (res) {
_this.$message({
type: 'success',
message: '添加成功!'
})
_this._getUserList()
_this.userDialogVisible = false
}
})
}
}
}
</script>
<style scoped>
</style>
src/views/community/index.vue
<template>
<div>
<div class="btn-warp mb20">
<div class="btn-warp mb15">
<el-select v-model="classifyId" @change="_getPhotoList" placeholder="图集分类" size="small" class="mr30">
<el-option
v-for="item in classifyList"
......@@ -10,8 +10,8 @@
:value="item.id">
</el-option>
</el-select>
<p style="display: inline-block; vertical-align: middle; font-size: 14px; color: #666666; margin-right: 20px">领队人：{{leaderName}} <span style="padding-left: 20px">电话：{{leaderTel}}</span></p>
<el-button type="text" size="small" style="font-size: 14px" @click="centerDialogVisible1 = true">修改</el-button>
<p v-if="classifyId !== qjClassifyId" style="display: inline-block; vertical-align: middle; font-size: 14px; color: #666666; margin-right: 20px">领队人：{{leaderName}} <span style="padding-left: 20px">电话：{{leaderTel}}</span></p>
<el-button v-if="classifyId !== qjClassifyId" type="text" size="small" style="font-size: 14px" @click="leaderInforOpen">修改</el-button>
<el-button type="primary" size="small" @click="centerDialogVisible = true" class="fr">新增</el-button>
</div>
<el-table
......@@ -136,7 +136,7 @@
</el-dialog>
<el-dialog
title="领队"
:visible.sync="centerDialogVisible1"
:visible.sync="leaderDialogVisible"
width="25%"
center>
<el-form :model="form1">
......@@ -155,8 +155,8 @@
<el-row type="flex" justify="center">
<el-col :sm="10">
<div class="btn-warp">
<el-button @click="centerDialogVisible1 = false" size="small" style="margin-right: 30px">取 消</el-button>
<el-button type="danger" size="small">确 定</el-button>
<el-button @click="leaderDialogVisible = false" size="small" style="margin-right: 30px">取 消</el-button>
<el-button type="danger" size="small" @click="leaderInforHandle">确 定</el-button>
</div>
</el-col>
</el-row>
......@@ -172,6 +172,7 @@ export default {
return {
classifyList: [], // 图集分类
classifyId: '', // 图集ID
qjClassifyId: '',
currentPage: 1,
pageSize: 5,
totalPage: null,
......@@ -186,7 +187,7 @@ export default {
pictureOrder: '',
pictureMark: ''
},
centerDialogVisible1: false,
leaderDialogVisible: false,
formLabelWidth1: '80px',
form1: {
leaderName: '',
......@@ -202,12 +203,17 @@ export default {
this._getLeaderList()
},
methods: {
_getClassify () {
_getClassify () { // 图集
let _this = this
this.$axios.get('/module/classify/幸福社团')
.then(function (res) {
_this.classifyId = res[0].id
_this.classifyList = res
_this.classifyList.forEach(function (item, index) {
if (item.classifyName === '秋季文化节') {
_this.qjClassifyId = item.id
}
})
_this._getPhotoList()
})
},
......@@ -217,6 +223,7 @@ export default {
.then(function (res) {
if (res) {
_this.leaderList = res
_this._handleLeader()
}
})
},
......@@ -228,7 +235,25 @@ export default {
}
})
},
_getPhotoList () { // 图集列表
leaderInforOpen () {
this.form1.leaderName = this.leaderName
this.form1.leaderTel = this.leaderTel
this.leaderDialogVisible = true
},
leaderInforHandle () { // 领队人修改
let _this = this
let params = {
'classify_id': _this.classifyId,
'leader_name': _this.form1.leaderName,
'tel': _this.form1.leaderTel
}
this.$axios.post('/team/update', params)
.then(function (res) {
_this._getLeaderList()
_this.leaderDialogVisible = false
})
},
_getPhotoList () { // 图片列表
let _this = this
_this.leaderName = ''
_this.leaderTel = ''
......@@ -277,7 +302,7 @@ export default {
}
this.$axios.post('/team/save', params)
.then(function (res) {
if (res === 'OK') {
if (res) {
_this._getPhotoList()
_this.centerDialogVisible = false
}
......
src/views/farm/FarmWonderful.vue
......@@ -208,7 +208,7 @@ export default {
}
this.$axios.post('/farm/photoAdd', params)
.then(function (res) {
if (res === 'OK') {
if (res) {
_this._getPhotoList()
_this.centerDialogVisible = false
}
......
src/views/farm/SpecialEvents.vue
......@@ -182,7 +182,12 @@ export default {
}
this.$axios.post('/farm/activityAdd', params)
.then(function (res) {
console.log(res)
if (res) {
_this.$message({
type: 'success',
message: '操作成功!'
})
}
})
}
},
......
src/views/fitness/CoolRunning.vue
......@@ -4,14 +4,14 @@
<el-form-item style="float: right">
<el-upload
style="display: inline-block; margin-right: 20px"
:action="$uploaderUrl + '/exercise/dailyImportModel'"
:action="$baseURL + '/exercise/dailyImportModel'"
:multiple="false"
accept=".xls,.docx,.xlsx"
:on-success="handleSuccessMarathon"
:show-file-list="false">
<el-button size="small" type="primary">导入数据</el-button>
</el-upload>
<el-button size="small" class="el-button-link"><a :href="$export + marathonExportHref" target="_blank" download="download">导出模板</a></el-button>
<el-button size="small" class="el-button-link"><a :href="$baseURL + 'exercise/dailyExportModel'">导出模板</a></el-button>
</el-form-item>
</el-form>
<el-table
......@@ -44,7 +44,8 @@
label="操作"
width="300">
<template slot-scope="scope">
<el-button icon="el-icon-download" size="small" @click="importCoolRunHandle(scope.row.id)"></el-button>
<!-- <el-button icon="el-icon-download" size="small" @click="importCoolRunHandle(scope.row.id)"></el-button>-->
<el-button icon="el-icon-download" size="small"><a :href="$baseURL + '/exercise/dailyDateExport?exerciseDailyId=' + scope.row.id"></a></el-button>
<el-switch
v-model="scope.row.isShow"
@change="switchChange(scope.row)"
......@@ -85,7 +86,7 @@ export default {
},
mounted () {
this._getDailyList()
this._getMarathonExportHref()
// this._getMarathonExportHref()
},
methods: {
_getDailyList () { // 酷跑列表
......
src/views/fitness/HappyRunning.vue
<template>
<div>HappyRunning</div>
<div>
<div class="btn-warp tr mb20">
<el-select v-model="classifyId" @change="selectClassfiyHandle" placeholder="图集分类" size="small" class="mr30">
<el-option
v-for="item in classifyList"
:key="item.id"
:v="item.id"
:label="item.classifyName"
:value="item.id">
</el-option>
</el-select>
<el-button type="primary" size="small" @click="centerDialogVisible = true">新增</el-button>
</div>
<el-table
:data="photoList"
:header-cell-style="{'background-color': '#F5F7FA', 'color': '#333', 'line-height': '45px', 'height': '45px', 'padding': 0}"
style="width: 100%">
<el-table-column
type="index"
align="center"
label="序号"
width="100">
</el-table-column>
<el-table-column
align="center"
width="220"
label="照片">
<template scope="scope">
<img :src="$imgUrl + scope.row.picturePath" width="220" height="60" />
</template>
</el-table-column>
<el-table-column
prop="pictureOriginalName"
align="center"
label="名称">
</el-table-column>
<el-table-column
prop="pictureOrder"
align="center"
label="图片排序">
</el-table-column>
<el-table-column
prop="pictureSize"
align="center"
label="大小">
</el-table-column>
<el-table-column
prop="createTime"
align="center"
label="上传时间"
width="180">
</el-table-column>
<el-table-column
prop="updateUser"
align="center"
label="操作人">
</el-table-column>
<el-table-column
prop="pictureMark"
align="center"
label="图片备注">
</el-table-column>
<el-table-column
align="center"
label="操作"
width="100">
<template slot-scope="scope">
<el-button icon="el-icon-delete" size="small" @click="pictureDel(scope.row)"></el-button>
</template>
</el-table-column>
</el-table>
<div class="pagination" v-if="photoList && photoList.length">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-size="pageSize"
layout="prev, pager, next"
:total="totalPage">
</el-pagination>
</div>
<el-dialog
title="幸福长跑"
:visible.sync="centerDialogVisible"
width="35%"
center>
<el-form :model="form">
<el-form-item label="图片上传" :label-width="formLabelWidth">
<el-col :sm="24">
<el-row class="img_load">
<el-col :sm="18">
<el-upload
class="avatar-uploader"
:action="$baseURL + '/exercise/photoUpdate'"
name="img"
:show-file-list="false"
:multiple="true"
:on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload">
<img v-if="form.picturePath" :src="$imgUrl + form.picturePath" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
<p style="font-size: 12px; line-height: 14px">*请上传尺寸为 <em>1920*502</em>，大小不超过5M的图片</p>
</el-col>
</el-row>
</el-col>
</el-form-item>
<el-form-item label="标题" :label-width="formLabelWidth">
<el-col :sm="18">
<el-input v-model="form.pictureOriginalName" autocomplete="off" disabled="disabled"></el-input>
</el-col>
</el-form-item>
<el-form-item label="图片大小" :label-width="formLabelWidth">
<el-col :sm="18">
<el-input v-model="form.pictureSize" autocomplete="off" disabled="disabled"></el-input>
</el-col>
</el-form-item>
<el-form-item label="图片排序" :label-width="formLabelWidth">
<el-col :sm="18">
<el-input-number v-model="form.pictureOrder" controls-position="right" :min="1"></el-input-number>
</el-col>
</el-form-item>
<el-form-item label="备注" :label-width="formLabelWidth">
<el-col :sm="18">
<el-input v-model="form.pictureMark" autocomplete="off"></el-input>
</el-col>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-row type="flex" justify="center">
<el-col :sm="10">
<div class="btn-warp">
<el-button @click="centerDialogVisible = false">取 消</el-button>
<el-button type="danger" @click="savePicture">确 定</el-button>
</div>
</el-col>
</el-row>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
name: 'HappyRunning'
name: 'HappyRunning',
data () {
return {
classifyList: [], // 图集分类
classifyId: '', // 图集ID
currentPage: 1,
pageSize: 10,
totalPage: null,
photoList: [],
centerDialogVisible: false,
formLabelWidth: '120px',
form: {
pictureName: '',
pictureOriginalName: '',
picturePath: '',
pictureSize: '',
pictureOrder: '',
pictureMark: ''
}
}
},
mounted () {
this._getClassify()
},
methods: {
_getClassify () {
let _this = this
this.$axios.get('/module/classify/幸福健身')
.then(function (res) {
_this.classifyId = res[0].id
_this.classifyList = res
_this._getPhotoList()
})
},
handleSizeChange: function (size) {
this.pageSize = size
},
handleCurrentChange: function (currentPage) {
this.currentPage = currentPage
this._getPhotoList()
},
selectClassfiyHandle () {
this.currentPage = 1
this._getPhotoList()
},
_getPhotoList () { // 图集列表
let _this = this
this.$axios.get('/exercise/photoList', {
params: {
'p': _this.currentPage,
'c': _this.pageSize,
'exerciseClassifyId': _this.classifyId
}
}).then(function (res) {
_this.totalPage = res.count
_this.photoList = res.list
})
},
handleAvatarSuccess (res, file) { // 上传
this.form.pictureName = res.data.fileName
this.form.pictureOriginalName = res.data.fileOriginalName
this.form.picturePath = res.data.filePath
this.form.pictureSize = res.data.fileSize
},
beforeAvatarUpload (file) {
const isLt5M = file.size / 1024 / 1024 < 5
if (!isLt5M) {
this.$message.error('上传头像图片大小不能超过 5MB!')
}
return isLt5M
},
savePicture () { // 新增
let _this = this
let params = {
'classifyId': _this.classifyId,
'pictureMark': _this.form.pictureMark,
'pictureName': _this.form.pictureName,
'pictureOriginalName': _this.form.pictureOriginalName,
'picturePath': _this.form.picturePath,
'pictureSize': _this.form.pictureSize
}
this.$axios.post('/exercise/photoAdd', params)
.then(function (res) {
if (res) {
_this._getPhotoList()
_this.centerDialogVisible = false
}
})
},
pictureDel (item) { // 删除
this.$confirm('确定删除这条数据吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let _this = this
this.$axios.get('/exercise/photoDelete', {
params: {
'exercisePhotoId': item.id
}
})
.then(function (res) {
if (res === 'OK') {
_this._getPhotoList()
_this.$message({
type: 'success',
message: '删除成功!'
})
}
})
}).catch(() => { console.log('取消删除') })
}
}
}
</script>
<style scoped>
<style scoped lang="scss">
.avatar {
width: 178px;
height: auto;
max-height: 100px;
overflow: hidden;
display: block;
margin: auto;
}
.upload_infor {
padding-left: 20px;
p {
em {color: #D0021B;}
}
}
</style>
src/views/fitness/Marathon.vue
......@@ -10,14 +10,14 @@
<el-form-item style="float: right">
<el-upload
style="display: inline-block; margin-right: 20px"
:action="$uploaderUrl + '/exercise/marathonImport'"
:action="$baseURL + '/exercise/marathonImport'"
:multiple="false"
accept=".xls,.docx,.xlsx"
:on-success="handleSuccessMarathon"
:show-file-list="false">
<el-button size="small" type="primary">导入数据</el-button>
</el-upload>
<el-button size="small" class="el-button-link"><a :href="$export + marathonExportHref" target="_blank" download="download">导出模板</a></el-button>
<el-button size="small" class="el-button-link"><a :href="$baseURL + 'exercise/marathonExportModel'">导出模板</a></el-button>
</el-form-item>
</el-form>
<el-table
......@@ -99,7 +99,7 @@ export default {
},
mounted () {
this._getMarathonList()
this._getMarathonExportHref()
// this._getMarathonExportHref()
},
methods: {
handleSizeChangeMarathon: function (size) {
......
src/views/home/ActivityPropaganda.vue
......@@ -69,11 +69,8 @@
</el-tab-pane>
<el-tab-pane label="活动文章" name="second">
<div class="btn-warp tr mb15">
<!--<el-button type="primary" size="small"><router-link tag="a" to="/home/textEditing" target="_blank" style="color: #fff">文章编辑</router-link></el-button>-->
<!--<el-button type="primary" size="small"><router-link tag="a" to="/home/articleLink" target="_blank" style="color: #fff">文章链接</router-link></el-button>-->
<el-button type="primary" size="small" @click="articleDialogVisible = true; articleForm.articleTitle = ''; articleForm.editorContent = ''; articleForm.articleType = ''; articleId = ''">文章编辑</el-button>
<el-button type="primary" size="small" @click="outLinkDialogVisible = true; outLink.articleName = ''; outLink.articleType = ''; outLink.articleLink = ''; articleId = ''">文章链接</el-button>
<!--<el-button type="primary" size="small" @click="imgUpdate">活动banner</el-button>-->
</div>
<el-table
:data="activityList"
......@@ -139,7 +136,7 @@
active-color="#13ce66"
inactive-color="#666">
</el-switch>
<el-button icon="el-icon-delete" size="small"></el-button>
<el-button icon="el-icon-delete" size="small" @click="articleDel(scope.row.id)"></el-button>
</div>
</template>
</el-table-column>
......@@ -168,7 +165,7 @@
<el-col :sm="18">
<el-upload
class="avatar-uploader"
action="http://10.2.98.32:8081/active/banner/upload"
:action="$uploaderUrl + '/active/banner/upload'"
:multiple="false"
:show-file-list="false"
:on-success="handleAvatarSuccess"
......@@ -364,7 +361,6 @@ export default {
this._getActiveBannerList()
},
handleAvatarSuccess (res, file) { // 图片上传
// this.imageUrl = URL.createObjectURL(file.raw)
this.actBannerForm.imgFilePath = res.data.filePath // 图片路径
this.actBannerForm.bannerFileName = res.data.fileName // 图片名称
this.actBannerForm.bannerOriginalName = res.data.fileOriginalName // 图片原名称
......@@ -489,6 +485,26 @@ export default {
}
})
},
articleDel (id) { // 活动文章删除
this.$confirm('确定删除这条数据吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let _this = this
this.$axios.get('/active/delete/' + id)
.then(function (res) {
if (res === 'OK') {
_this.currentPage2 = 1
_this._getActiveList()
_this.$message({
type: 'success',
message: '删除成功!'
})
}
})
}).catch(() => { console.log('取消删除') })
},
articleEdit (item) {
this.articleId = item.id
if (item.linkType === 1) {
......
src/views/home/BannerManage.vue
<template>
<div class="banner">
<el-form :inline="true" class="demo-form-inline" size="small">
<!-- <el-form-item label="图片名称">
<el-input v-model="bannerName" placeholder="图片名称"></el-input>
</el-form-item>-->
<!-- <el-form-item>
<el-button size="small" @click="searchImgList">搜索</el-button>
</el-form-item>-->
<el-form-item style="float: right">
<!--<el-button type="primary" size="small"><router-link tag="a" target="_blank" to="/home/bannerAdd" style="color: #ffffff">新增banner</router-link></el-button>-->
<el-button type="primary" size="small" @click="addBannerHandle">新增banner</el-button>
</el-form-item>
</el-form>
......@@ -91,40 +84,24 @@
width="35%"
center>
<el-form :model="form">
<!--<el-form-item label="图片名称" :label-width="formLabelWidth">
<el-col :sm="18">
<el-input v-model="form.bannerName" autocomplete="off"></el-input>
</el-col>
</el-form-item>-->
<el-form-item label="图片上传" :label-width="formLabelWidth">
<el-col :sm="24">
<el-row class="img_load">
<el-col :sm="18">
<el-upload
class="avatar-uploader"
action="http://10.2.98.32:8081/index/banner/upload"
:action="$uploaderUrl + '/index/banner/upload'"
:show-file-list="false"
:on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload">
<img v-if="imageUrl" :src="imageUrl" class="avatar">
<img v-if="form.imgFilePath" :src="$imgUrl + form.imgFilePath" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
<p style="font-size: 12px; line-height: 14px">*请上传尺寸为 <em>1920*502</em>，大小不超过5M的图片</p>
</el-col>
<!--<el-col :sm="12">
<div class="upload_infor">
<el-button type="primary" size="small">预览</el-button><br>
<p style="font-size: 12px">*请上传尺寸为 <em>1920*502</em>，大小不超过5M的图片</p>
</div>
</el-col>-->
</el-row>
</el-col>
</el-form-item>
<!--<el-form-item label="图片尺寸" :label-width="formLabelWidth">
<el-col :sm="18">
<el-input v-model="form.bannerPixel" autocomplete="off"></el-input>
</el-col>
</el-form-item>-->
<el-form-item label="图片大小" :label-width="formLabelWidth">
<el-col :sm="18">
<el-input v-model="form.bannerSize" autocomplete="off" disabled="disabled"></el-input>
......@@ -149,9 +126,6 @@
</el-select>
<p style="font-size: 12px">*首页轮播图最多8张</p>
</el-col>
<!-- <el-col :sm="12">
<p style="padding-left: 20px; font-size: 12px">*首页轮播图最多8张</p>
</el-col>-->
</el-form-item>
<el-form-item label="外链文章" :label-width="formLabelWidth">
<el-col :sm="18">
......@@ -191,9 +165,9 @@ export default {
bannerOrder: '',
bannerLinks: '',
imgFilePath: '',
bannerFileName: ''
bannerFileName: '',
bannerOriginalName: ''
},
imageUrl: '',
bannerStatus: '1',
bannerPixel: '1920*502',
formLabelWidth: '100px',
......@@ -225,13 +199,19 @@ export default {
})
},
switchChange (item) { // 修改状态
let _this = this
this.$axios.get('/index/banner/update/status/', {
params: {
'indexBannerId': item.id,
'bannerStatus': item.bannerStatus
}
}).then(function (res) {
console.log(res)
if (res) {
_this.$message({
type: 'success',
message: '状态修改成功!'
})
}
})
},
bannerDel (item) { // 删除
......@@ -255,13 +235,12 @@ export default {
}).catch(() => { console.log('取消删除') })
},
handleAvatarSuccess (res, file) { // 图片上传
this.imageUrl = URL.createObjectURL(file.raw)
this.form.bannerSize = res.data.fileSize
this.form.imgFilePath = res.data.filePath
this.form.bannerFileName = res.data.fileOriginalName
this.form.bannerFileName = res.data.fileName
this.form.bannerOriginalName = res.data.fileOriginalName
},
beforeAvatarUpload (file) {
console.log(file)
const isLt5M = file.size / 1024 / 1024 < 5
if (!isLt5M) {
this.$message.error('上传头像图片大小不能超过 5MB!')
......@@ -269,19 +248,21 @@ export default {
return isLt5M
},
addBannerHandle () { // 新增
this.form.imgFilePath = ''
this.form.bannerSize = ''
this.form.bannerLinks = ''
this.form.bannerOrder = ''
this.dialogTitle = '新增banner'
this.centerDialogVisible = true
this.imageUrl = ''
this.form = {}
},
bannerEdit (item) { // 编辑
this.dialogTitle = '编辑banner'
this.centerDialogVisible = true
this.imageUrl = this.$imgUrl + item.bannerPath
this.form.imgFilePath = item.bannerPath
this.form.bannerSize = item.bannerSize
this.form.bannerOrder = item.bannerOrder
this.form.bannerLinks = item.bannerLinks
this.indexBannerId = item.id
this.dialogTitle = '编辑banner'
this.centerDialogVisible = true
},
bannerAddHandle () { // 编辑 or 添加
var _this = this
......@@ -308,12 +289,20 @@ export default {
this.$axios.post('/index/banner/add', paramsAdd)
.then(function (res) {
_this.searchImgList()
_this.$message({
type: 'success',
message: '添加成功!'
})
_this.centerDialogVisible = false
})
} else {
this.$axios.post('/index/banner/update', paramsEdit)
.then(function (res) {
_this.searchImgList()
_this.$message({
type: 'success',
message: '修改成功!'
})
_this.centerDialogVisible = false
})
}
......
src/views/home/MessageManagement.vue
......@@ -12,7 +12,7 @@
</el-select>
</el-col>
<el-col :span="4" align="right">
<el-button size="small" class="el-button-link"><a :href="$baseURL + exportHref" target="_blank" download="download">导出</a></el-button>
<el-button size="small" class="el-button-link"><a :href="$baseURL + 'leave/message/export/?moduleId=' + moduleVal">导出</a></el-button>
</el-col>
</el-row>
<el-table
......@@ -97,11 +97,21 @@
</el-table-column>
<el-table-column
align="center"
prop="messageStatus"
label="处理状态"
width="120">
<template slot-scope="scope">
{{messageStatusComp(scope.row.messageStatus)}}
</template>
</el-table-column>
<el-table-column
align="center"
fixed="right"
label="操作"
width="150">
<template slot-scope="scope">
<el-button type="text" size="small" @click="confirmDeal(scope.row.id)">确认处理</el-button>
<el-button type="text" size="small" @click="confirmDeal(scope.row.id)" v-if="scope.row.messageStatus === 1">确认处理</el-button>
<el-button type="text" disabled size="small" v-if="scope.row.messageStatus === 2">已确认</el-button>
<el-button type="text" size="small" @click="noteHandle(scope.row.id)">备注</el-button>
</template>
</el-table-column>
......@@ -157,13 +167,11 @@ export default {
leaveMessageId: '',
centerDialogVisible: false,
remarks: '',
exportHref: ''
}
},
mounted () {
this._getModuleList()
this._getMessageList()
this.exportFile()
},
methods: {
noteHandle (id) {
......@@ -205,7 +213,6 @@ export default {
}
this.$axios.post('/leave/message/add/remarks', params)
.then(function (res) {
console.log(res)
if (res === 'OK') {
_this.centerDialogVisible = false
}
......@@ -218,10 +225,10 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(function () {
_this.$axios.post('/leave/message/update/status', { 'leaveMessageId': id })
_this.$axios.post('/leave/message/update/status?leaveMessageId=' + id)
.then(function (res) {
console.log(res)
if (res === 'OK') {
if (res) {
_this._getMessageList()
_this.$message({
type: 'success',
message: '确认处理成功!'
......@@ -231,18 +238,17 @@ export default {
}).catch(function () {
console.log('取消此操作')
})
},
exportFile () { // 导出
let _this = this
this.$axios.get('/leave/message/export', {
params: {
'moduleId': _this.moduleVal
}
}).then(function (res) {
if (res) {
_this.exportHref = res
}
},
computed: {
messageStatusComp (messageStatus) {
return function (messageStatus) {
if (messageStatus === 1) {
return '未确认'
} else {
return '已确认'
}
})
}
}
}
}
......
src/views/mom/index.vue
......@@ -43,7 +43,7 @@
width="180">
</el-table-column>
<el-table-column
prop="updateUser"
prop="createUser"
align="center"
label="操作人">
</el-table-column>
......@@ -88,12 +88,12 @@
<el-col :sm="18">
<el-upload
class="avatar-uploader"
action="http://10.2.98.32:8081/roomofmother/picture/upload"
:action="$baseURL + '/roomofmother/picture/upload'"
:show-file-list="false"
:multiple="true"
:on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload">
<img v-if="imageUrl" :src="imageUrl" class="avatar">
<img v-if="form.picturePath" :src="$imgUrl + form.picturePath" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
<p style="font-size: 12px; line-height: 14px">*请上传尺寸为 <em>1920*502</em>，大小不超过5M的图片</p>
......@@ -149,8 +149,7 @@ export default {
pictureSize: '',
pictureOrder: '',
pictureMark: ''
},
imageUrl: ''
}
}
},
mounted () {
......@@ -186,7 +185,6 @@ export default {
})
},
handleAvatarSuccess (res, file) { // 上传
this.imageUrl = URL.createObjectURL(file.raw)
this.form.pictureName = res.data[0].fileName
this.form.pictureOriginalName = res.data[0].fileOriginalName
this.form.pictureSize = res.data[0].fileSize
......
src/views/office/index.vue
<template>
<div>
<div class="btn-warp tr mb20">
<el-select v-model="classifyId" @change="_getPhotoList" placeholder="图集分类" size="small" class="mr30">
<el-select v-model="classifyId" @change="selectClassfiyHandle" placeholder="图集分类" size="small" class="mr30">
<el-option
v-for="item in classifyList"
:key="item.id"
......@@ -11,7 +11,6 @@
</el-option>
</el-select>
<el-button type="primary" size="small" @click="centerDialogVisible = true">新增</el-button>
<!--<el-button type="primary" size="small" @click="addClassifyImg(item)" v-for="(item, index) in classifyList" :key="index">{{item.classifyName}}</el-button>-->
</div>
<el-table
:data="photoList"
......@@ -98,12 +97,13 @@
<el-col :sm="18">
<el-upload
class="avatar-uploader"
action="http://10.2.98.32:8081/index/banner/upload"
:action="$baseURL + '/office/picture/upload'"
name="files"
:show-file-list="false"
:multiple="true"
:on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload">
<img v-if="imageUrl" :src="imageUrl" class="avatar">
<img v-if="form.picturePath" :src="$imgUrl + form.picturePath" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
<p style="font-size: 12px; line-height: 14px">*请上传尺寸为 <em>1920*502</em>，大小不超过5M的图片</p>
......@@ -160,8 +160,7 @@ export default {
pictureSize: '',
pictureOrder: '',
pictureMark: ''
},
imageUrl: ''
}
}
},
mounted () {
......@@ -184,6 +183,10 @@ export default {
this.currentPage = currentPage
this._getPhotoList()
},
selectClassfiyHandle () {
this.currentPage = 1
this._getPhotoList()
},
_getPhotoList () { // 图集列表
let _this = this
this.$axios.get('/office/picture/list', {
......@@ -198,11 +201,10 @@ export default {
})
},
handleAvatarSuccess (res, file) { // 上传
this.imageUrl = URL.createObjectURL(file.raw)
this.form.pictureName = res.data.fileName
this.form.pictureOriginalName = res.data.fileOriginalName
this.form.pictureSize = res.data.fileSize
this.form.picturePath = res.data.filePath
this.form.pictureName = res.data[0].fileName
this.form.pictureOriginalName = res.data[0].fileOriginalName
this.form.pictureSize = res.data[0].fileSize
this.form.picturePath = res.data[0].filePath
},
beforeAvatarUpload (file) {
console.log(file)
......
src/views/randomHouse/index.vue
......@@ -117,7 +117,7 @@
<el-col :sm="15">
<el-upload
class="avatar-uploader"
:action="$uploaderUrl + 'library/cover/upload'"
:action="$baseURL + 'library/cover/upload'"
:show-file-list="false"
:on-success="handleAvatarSuccess">
<img v-if="bookDialogForm.bookOver" :src="$imgUrl + bookDialogForm.bookOver" class="avatar">
......@@ -274,7 +274,14 @@ export default {
}
this.$axios.post('/library/book/update', params)
.then(function (res) {
console.log(res)
if (res) {
_this.$message({
type: 'success',
message: '修改成功!'
})
_this.bookDialogVisible = false
_this._getBookList()
}
})
},
bookDel (id) { // 删除
......
src/views/restaurant/NationalRestaurant.vue
......@@ -19,7 +19,9 @@
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary"><router-link to="/restaurant/restaurantAdd" style="color: #fff">新增餐厅</router-link></el-button>
<el-button>导出</el-button>
<el-button size="small" class="el-button-link">
<a :href="$baseURL + '/diningroom/export/?diningRoomName=' + diningRoomName + '&provinceId=' + provinceId + '&cityId=' + cityId">导出</a>
</el-button>
</el-form-item>
</el-form>
<el-table
......@@ -40,6 +42,18 @@
label="餐厅名称">
</el-table-column>
<el-table-column
prop="provinceName"
align="center"
label="省份"
width="100">
</el-table-column>
<el-table-column
prop="cityName"
align="center"
label="市"
width="100">
</el-table-column>
<el-table-column
prop="countyName"
align="center"
label="区/县"
......@@ -149,13 +163,14 @@ export default {
data () {
return {
provinceId: '',
quguoId: '',
provinceTableData: [],
cityId: '',
cityTableData: [],
diningRoomName: '',
restaurantList: [],
currentPage: 1,
pageSize: 5,
pageSize: 10,
totalPage: null,
restaurantImgDialogVisible: false,
imageUrl: '',
......@@ -167,22 +182,20 @@ export default {
},
mounted () {
this._getProvinceList()
this._getRestaurantList()
},
methods: {
_getProvinceList () { // 获取省份列表
let _this = this
this.$axios.get('/diningroom/province/list')
.then(function (res) {
let provinceTableData = res
provinceTableData.forEach(function (val, key) {
_this.provinceTableData = res
_this.provinceTableData.forEach(function (val, key) {
if (val.provinceName === '全国') {
val.id = ''
_this.quguoId = val.id
}
})
_this.provinceTableData = provinceTableData
_this.provinceId = provinceTableData[0].id
_this._getCityList()
_this._getRestaurantList()
})
},
_getCityList () { // 获取城市列表
......@@ -193,7 +206,6 @@ export default {
}
}).then(function (res) {
_this.cityTableData = res
_this.cityId = res[0].id
})
},
_getRestaurantList () { // 餐厅列表
......@@ -203,7 +215,7 @@ export default {
'p': _this.currentPage,
'c': _this.pageSize,
'diningRoomName': _this.diningRoomName,
'provinceId': _this.provinceId,
'provinceId': _this.provinceId === _this.quguoId ? '' : _this.provinceId,
'cityId': _this.cityId
}
}).then(function (res) {
......
src/views/restaurant/RestaurantClassify.vue
......@@ -114,7 +114,7 @@
<el-button size="small">取消</el-button>
</el-col>
<el-col :sm="2">
<el-button type="danger" size="small">确认</el-button>
<el-button type="danger" size="small" @click="saveHandle">确认</el-button>
</el-col>
</el-row>
</el-col>
......@@ -188,19 +188,6 @@ export default {
_this.classifyList = res
})
},
handleAvatarSuccess (res, file) { // 上传
this.pictureName = res.data[0].fileName
this.pictureOriginalName = res.data[0].fileOriginalName
this.pictureSize = res.data[0].fileSize
this.picturePath = res.data[0].filePath
},
beforeAvatarUpload (file) {
const isLt5M = file.size / 1024 / 1024 < 5
if (!isLt5M) {
this.$message.error('上传头像图片大小不能超过 5MB!')
}
return isLt5M
},
addNewClassfiyHandle () { // 添加图集
let _this = this
let params = {
......@@ -240,7 +227,7 @@ export default {
}
})
},
delClassfiyHandle (id) { // 修改删除
delClassfiyHandle (id) { // 删除图集
let _this = this
this.$axios.get('/diningroom/picture/classify/delete', {
params: { 'id': id }
......@@ -254,6 +241,40 @@ export default {
})
}
})
},
handleAvatarSuccess (res, file) { // 上传图片
this.pictureName = res.data[0].fileName
this.pictureOriginalName = res.data[0].fileOriginalName
this.pictureSize = res.data[0].fileSize
this.picturePath = res.data[0].filePath
},
beforeAvatarUpload (file) {
const isLt5M = file.size / 1024 / 1024 < 5
if (!isLt5M) {
this.$message.error('上传头像图片大小不能超过 5MB!')
}
return isLt5M
},
saveHandle () { // 图片添加
let _this = this
this.$axios.post('/diningroom/picture/add', {
'classifyId': _this.classifyId,
'pictureMark': _this.pictureMark,
'pictureName': _this.pictureName,
'pictureOrder': _this.pictureOrder,
'pictureOriginalName': _this.pictureOriginalName,
'picturePath': _this.picturePath,
'pictureSize': _this.pictureSize
}).then(function (res) {
console.log(res)
if (res) {
_this.$message({
type: 'success',
message: '添加成功!'
})
_this.$router.go(-1)
}
})
}
}
}
......
src/views/restaurant/SolarCalendar.vue
......@@ -5,10 +5,10 @@
<el-date-picker v-model="termYear" align="right" type="year" placeholder="选择年"></el-date-picker>
</el-form-item>
<el-form-item>
<el-input v-model="solarTerm" placeholder="餐厅名称"></el-input>
<el-input v-model="solarTerm" placeholder="节气名称"></el-input>
</el-form-item>
<el-form-item>
<el-button>搜索</el-button>
<el-button @click="_getSolarList">搜索</el-button>
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" @click="newSolarHandle">新增</el-button>
......
src/views/restaurant/ThemeActivities.vue
......@@ -64,7 +64,6 @@
label="操作"
width="100">
<template slot-scope="scope">
<!--<el-button icon="el-icon-edit" size="small" @click="pictureEditHandle(scope.row)"></el-button>-->
<el-button icon="el-icon-delete" size="small" @click="pictureDelHandle(scope.row)"></el-button>
</template>
</el-table-column>
......@@ -79,65 +78,6 @@
:total="totalPage">
</el-pagination>
</div>
<el-dialog
title="幸福餐厅"
:visible.sync="centerDialogVisible"
width="35%"
center>
<el-form :model="form" label-width="100px">
<el-form-item label="图集管理">
<el-col :sm="18">
<el-input v-model="form.pictureOriginalName" autocomplete="off" disabled="disabled"></el-input>
</el-col>
</el-form-item>
<el-form-item label="图片上传">
<el-col :sm="24">
<el-row class="img_load">
<el-col :sm="18">
<el-upload
class="avatar-uploader"
:action="$uploaderUrl + '/diningroom/picture/upload'"
:show-file-list="false"
:multiple="true"
name="files"
:on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload">
<img v-if="form.picturePath" :src="$imgUrl + form.picturePath" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
<p style="font-size: 12px; line-height: 14px">*请上传尺寸为 <em>1920*502</em>，大小不超过5M的图片</p>
</el-col>
</el-row>
</el-col>
</el-form-item>
<el-form-item label="图片大小">
<el-col :sm="18">
<el-input v-model="form.pictureSize" autocomplete="off" disabled="disabled"></el-input>
</el-col>
</el-form-item>
<el-form-item label="图片排序">
<el-col :sm="18">
<el-input-number v-model="form.pictureOrder" controls-position="right" :min="1"></el-input-number>
</el-col>
</el-form-item>
<el-form-item label="备注">
<el-col :sm="18">
<el-input v-model="form.pictureMark" autocomplete="off"></el-input>
</el-col>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-row type="flex" justify="center">
<el-col :sm="10">
<div class="btn-warp">
<el-button @click="centerDialogVisible = false">取 消</el-button>
<el-button type="danger" @click="addPictureHandle" v-if="!picId">确 定</el-button>
<el-button type="danger" @click="savePictureHandle" v-if="picId">保 存</el-button>
</div>
</el-col>
</el-row>
</div>
</el-dialog>
</div>
</template>
......@@ -151,18 +91,7 @@ export default {
currentPage: 1,
pageSize: 5,
totalPage: null,
photoList: [],
centerDialogVisible: false,
formLabelWidth: '120px',
form: {
pictureName: '',
picturePath: '',
pictureOriginalName: '',
pictureSize: '',
pictureOrder: '',
pictureMark: ''
},
picId: ''
photoList: []
}
},
mounted () {
......@@ -202,38 +131,6 @@ export default {
this.currentPage = 1
this._getPhotoList()
},
handleAvatarSuccess (res, file) { // 上传
this.form.pictureName = res.data[0].fileName
this.form.pictureOriginalName = res.data[0].fileOriginalName
this.form.pictureSize = res.data[0].fileSize
this.form.picturePath = res.data[0].filePath
},
beforeAvatarUpload (file) {
const isLt5M = file.size / 1024 / 1024 < 5
if (!isLt5M) {
this.$message.error('上传头像图片大小不能超过 5MB!')
}
return isLt5M
},
addPictureHandle () { // 新增
let _this = this
let params = {
'classifyId': _this.classifyId,
'pictureMark': _this.form.pictureMark,
'pictureName': _this.form.pictureName,
'pictureOrder': _this.form.pictureOrder,
'pictureOriginalName': _this.form.pictureOriginalName,
'picturePath': _this.form.picturePath,
'pictureSize': _this.form.pictureSize
}
this.$axios.post('/diningroom/picture/add', params)
.then(function (res) {
if (res === 'OK') {
_this._getPhotoList()
_this.centerDialogVisible = false
}
})
},
pictureDelHandle (item) { // 删除
this.$confirm('确定删除这条数据吗?', '提示', {
confirmButtonText: '确定',
......@@ -246,7 +143,7 @@ export default {
'id': item.id
}
}).then(function (res) {
if (res === 'OK') {
if (res) {
_this._getPhotoList()
_this.$message({
type: 'success',
......@@ -254,45 +151,8 @@ export default {
})
}
})
}).catch(() => { console.log('取消删除') })
},
savePictureHandle () {
let _this = this
let params = {
'classifyId': _this.classifyId,
'pictureMark': _this.form.pictureMark,
'pictureName': _this.form.pictureName,
'pictureOrder': _this.form.pictureOrder,
'pictureOriginalName': _this.form.pictureOriginalName,
'picturePath': _this.form.picturePath,
'pictureSize': _this.form.pictureSize,
'id': _this.picId
}
this.$axios.post('/diningroom/picture/classify/update', params)
.then(function (res) {
if (res === 'OK') {
_this._getPhotoList()
_this.centerDialogVisible = false
}
})
})
}
}
}
</script>
<style scoped lang="scss">
.avatar {
width: 178px;
height: auto;
max-height: 100px;
overflow: hidden;
display: block;
margin: auto;
}
.upload_infor {
padding-left: 20px;
p {
em {color: #D0021B;}
}
}
</style>
src/views/travel/HotelList.vue
......@@ -25,14 +25,16 @@
<el-button type="primary" class="el-button-link" style="margin-right: 20px"><router-link to="/travel/hotelAdd">新增酒店</router-link></el-button>
<el-upload
style="display: inline-block; margin-right: 20px"
:action="$uploaderUrl + '/travel/import'"
:action="$baseURL + '/travel/import'"
:multiple="false"
accept=".xls,.docx,.xlsx"
:on-success="handleSuccessMarathon"
:show-file-list="false">
<el-button>导入</el-button>
</el-upload>
<el-button size="small" class="el-button-link"><a :href="$baseURL + exportHref" target="_blank" download="download">导出</a></el-button>
<el-button size="small" class="el-button-link">
<a :href="$baseURL + '/travel/export/?province=' + province + '&city=' + city + '&starclass=' + starclass + '&hotelname=' + hotelname">导出</a>
</el-button>
</el-form-item>
</el-form>
<el-table
......@@ -164,7 +166,7 @@ export default {
starclass: '',
hotelname: '',
currentPage: 1,
pageSize: 8,
pageSize: 10,
totalPage: null,
tableData: [],
exportHref: ''
......@@ -172,7 +174,7 @@ export default {
},
mounted () {
this._getHodelList()
this._exportHotel()
// this._exportHotel()
},
methods: {
handleSizeChange: function (size) {
......
src/views/wash/CommonSense.vue
<template>
<div class="commonSense">
<div style="min-height: 500px">
<el-row class="title-warp mb15" type="flex" justify="center">
<el-col :sm="6">
<el-input v-model="title" placeholder="请输入内容" size="medium"></el-input>
</el-col>
</el-row>
<div class="mb20">
<quill-editor
v-model="content"
ref="myQuillEditor"
:options="editorOption"
@blur="onEditorBlur($event)" @focus="onEditorFocus($event)"
@change="onEditorChange($event)">
:options="editorOption">
</quill-editor>
</div>
<div class="btn-warp tc">
<el-button>默认按钮</el-button>
<el-button type="primary" style="margin-left: 30px; margin-right: 30px">主要按钮</el-button>
<el-button type="danger">危险按钮</el-button>
<el-button>取 消</el-button>
<el-button type="danger" @click="saveHandle">确 定</el-button>
</div>
</div>
</template>
......@@ -22,7 +24,8 @@ export default {
name: 'commonSense',
data () {
return {
content: '1121212',
title: '',
content: '',
editorOption: {
style: {
'height': '400px'
......@@ -30,12 +33,34 @@ export default {
}
}
},
mounted () {
this._getInfor()
},
methods: {
onEditorBlur () { // 失去焦点事件
},
onEditorFocus () { // 获得焦点事件
_getInfor () { // 获取内容
let _this = this
this.$axios.get('/promptMessage/typeFindInfo', {
params: { 'title': '洗衣小常识' }
}).then(function (res) {
_this.title = res.title
_this.content = res.content
})
},
onEditorChange () { // 内容改变事件
saveHandle () { // 修改内容
let _this = this
let params = {
'title': _this.title,
'content': _this.content
}
this.$axios.post('/promptMessage/typeUpdate', params)
.then(function (res) {
if (res) {
_this.$message({
type: 'success',
message: '保存成功!'
})
}
})
}
}
}
......
src/views/wash/WashBranches.vue
......@@ -21,7 +21,10 @@
<el-button size="small" @click="searchWash">搜索</el-button>
</el-form-item>
<el-form-item style="float: right">
<el-button size="small"><a :href="marathonExportHref" download="download">导出</a></el-button>
<el-button size="small" type="primary" class="el-button-link"><router-link to="/wash/newBranches">新增网点</router-link></el-button>
<el-button size="small" class="el-button-link">
<a :href="$baseURL + '/laundry/export?city=' + formInline.city + '&province=' + formInline.province + '&pickWay=' + formInline.pickWay+ '&laundryName=' + formInline.laundryName">导出</a>
</el-button>
</el-form-item>
</el-form>
<el-table
......@@ -95,7 +98,7 @@
</template>
</el-table-column>
</el-table>
<div class="pagination">
<div class="pagination" v-if="tableData.length">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
......@@ -127,7 +130,7 @@ export default {
}
},
mounted () {
this._getExportUrl()
// this._getExportUrl()
this.searchDefaultWash()
},
methods: {
......@@ -146,9 +149,12 @@ export default {
let _this = this
this.$axios.get('/laundry/list', {
params: {
'pickWay': _this.formInline.pickWay,
'p': _this.currentPage,
'c': _this.pageSize
'c': _this.pageSize,
'pickWay': _this.formInline.pickWay,
'province': _this.formInline.province,
'city': _this.formInline.city,
'laundryName': _this.formInline.laundryName
}
}).then(function (res) {
_this.totalPage = res.count
......@@ -179,7 +185,7 @@ export default {
}).then(() => {
let _this = this
let laundryId = {
'id': item.id
'laundryId': item.id
}
this.$axios.post('/laundry/delete', laundryId)
.then(function (res) {
......
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