Browse Source

Merge remote-tracking branch 'origin/master' into feature/lc_understandjs

feature/syp_points
liuchuang 5 years ago
parent
commit
f4fa3f9070
  1. 176
      src/views/modules/api/imgconfig-add-or-update.vue
  2. 119
      src/views/modules/api/imgconfig.vue
  3. 268
      src/views/modules/case/typicalcase-add-or-update.vue
  4. 16
      src/views/modules/case/typicalcase-detail.vue
  5. 168
      src/views/modules/heart/actbanner-add-or-update.vue
  6. 55
      src/views/modules/heart/actbanner.vue
  7. 56
      src/views/modules/heart/actinfo-add-or-update.vue
  8. 28
      src/views/modules/heart/actinfo-detail-view.vue
  9. 2
      src/views/modules/heart/actinfo-list.vue
  10. 7
      src/views/modules/heart/actphrase.vue
  11. 4
      src/views/modules/heart/address-check.vue

176
src/views/modules/api/imgconfig-add-or-update.vue

@ -0,0 +1,176 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
<el-form-item label="类型" prop="imgType">
<el-select v-model="dataForm.imgType" placeholder="请选择类型">
<el-option
v-for="item in optionImgType"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-row>
<el-form-item label="图片" prop="imgUrl"
v-loading="loading">
<el-upload class="avatar-uploader"
:action="uploadUrl"
:show-file-list="false"
:on-success="handleAvatarActSuccess"
:on-error="handelError"
:before-upload="beforeAvatarUpload">
<img v-if="dataForm.imgUrl"
:src="dataForm.imgUrl"
class="avatar">
<i v-else
class="el-icon-plus avatar-uploader-icon"></i>
<div slot="tip"
class="el-upload__tip">只能上传jpg/png文件且不超过500kb</div>
</el-upload>
</el-form-item>
</el-row>
<el-form-item label="排序" prop="sort">
<el-input-number v-model="dataForm.sort" :min="0"></el-input-number>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
</template>
</el-dialog>
</template>
<script>
import debounce from 'lodash/debounce'
import Cookies from 'js-cookie'
export default {
data () {
return {
visible: false,
dataForm: {
id: '',
imgType: '',
imgUrl: '',
sort: '',
revision: '',
delFlag: '',
createdBy: '',
createdTime: '',
updatedBy: '',
updatedTime: ''
},
optionImgType: [],
//
loading: false,
uploadUrl: ''
}
},
computed: {
dataRule () {
return {
imgType: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
imgUrl: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
},
created () {
this.getListImgTypeByHeartImgType()
this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
this.dataForm.imgUrl = ''
},
methods: {
init () {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.getInfo()
}
})
},
//
getListImgTypeByHeartImgType () {
this.$http.get(`/api/imgconfig/heartImgType/heart_img_type`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.optionImgType = res.data
}).catch(() => {})
},
//
getInfo () {
this.$http.get(`/api/imgconfig/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.dataForm = {
...this.dataForm,
...res.data
}
}).catch(() => {})
},
handleAvatarActSuccess (res, file) {
this.loading = false
this.dataForm.imgUrl = res.data.url
},
beforeAvatarUpload (file) {
this.loading = true
},
handelError () {
this.loading = false
},
//
dataFormSubmitHandle: debounce(function () {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}
this.$http[!this.dataForm.id ? 'post' : 'put']('/api/imgconfig/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
}
})
}).catch(() => {})
})
}, 1000, { 'leading': true, 'trailing': false })
}
}
</script>
<style>
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 178px;
height: 178px;
line-height: 178px;
text-align: center;
}
.avatar {
width: 178px;
height: 178px;
display: block;
}
</style>

119
src/views/modules/api/imgconfig.vue

@ -0,0 +1,119 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-api__imgconfig}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="类型" prop="imgType">
<el-select v-model="dataForm.imgType" placeholder="请选择类型" clearable>
<el-option
v-for="item in optionImgType"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('api:imgconfig:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('api:imgconfig:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="imgType" label="类型" :formatter="imgTypeFormat" header-align="center" align="center"></el-table-column>
<el-table-column align="center" label="图片" :show-overflow-tooltip="true" prop="imgUrl">
<template slot-scope="scope">
<el-popover placement="right"
title=""
trigger="click"
class="big_image">
<el-image slot="reference"
min-width="70"
height="70"
:src="scope.row.imgUrl"
:alt="scope.row.imgUrl"></el-image>
<img class="big_image"
:src="scope.row.imgUrl" />
</el-popover>
</template>
</el-table-column>
<el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
<el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-button v-if="$hasPermission('api:imgconfig:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button v-if="$hasPermission('api:imgconfig:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
</div>
</el-card>
</template>
<script>
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './imgconfig-add-or-update'
import 'element-ui/lib/theme-chalk/image.css'
export default {
mixins: [mixinViewModule],
data () {
return {
mixinViewModuleOptions: {
getDataListURL: '/api/imgconfig/page',
getDataListIsPage: true,
deleteURL: '/api/imgconfig',
deleteIsBatch: true
},
dataForm: {
id: ''
},
optionImgType: []
}
},
components: {
AddOrUpdate
},
created () {
this.getListImgTypeByHeartImgType()
},
methods: {
//
getListImgTypeByHeartImgType () {
this.$http.get(`/api/imgconfig/heartImgType/heart_img_type`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.optionImgType = res.data
}).catch(() => {})
},
imgTypeFormat (row, column) {
if (row.imgType === '0') {
return '志愿者咨询热线'
} else {
return ' '
}
}
}
}
</script>
<style scoped>
.big_image {
width: 300px;
height: 240px;
}
</style>

268
src/views/modules/case/typicalcase-add-or-update.vue

@ -124,11 +124,6 @@ export default {
// //
this.hideUpload = false this.hideUpload = false
this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}` this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
// if (this.quillEditor) {
// this.quillEditor.deleteText(0, this.quillEditor.getLength())
// } else {
// this.quillEditorHandle()
// }
// end // end
}) })
}, },
@ -145,36 +140,36 @@ export default {
loading: false, loading: false,
isAble: false, isAble: false,
editorOption: { editorOption: {
placeholder: 'Please enter it here...', placeholder: 'Please enter it here...',
modules:{ modules: {
toolbar:{ toolbar: {
container: [ container: [
['bold', 'italic', 'underline', 'strike'],// 线线 ['bold', 'italic', 'underline', 'strike'], // 线线
['blockquote'],// ['blockquote'], //
[{ 'header': 1 }, { 'header': 2 }],// 12 [{ 'header': 1 }, { 'header': 2 }], // 12
[{ 'list': 'ordered'}, { 'list': 'bullet' }],// [{ 'list': 'ordered' }, { 'list': 'bullet' }], //
[{ 'indent': '-1'}, { 'indent': '+1' }],// [{ 'indent': '-1' }, { 'indent': '+1' }], //
[{ 'direction': 'rtl' }],// [{ 'direction': 'rtl' }], //
[{ 'size': ['small', false, 'large', 'huge'] }],// [{ 'size': ['small', false, 'large', 'huge'] }], //
[{ 'header': [1, 2, 3, 4, 5, 6, false] }],// [{ 'header': [1, 2, 3, 4, 5, 6, false] }], //
[{ 'color': [] }, { 'background': [] }],// [{ 'color': [] }, { 'background': [] }], //
[{ 'font': [] }],// [{ 'font': [] }], //
[{ 'align': [] }],// [{ 'align': [] }], //
['clean'],// ['clean'], //
['image']// ['image'] //
], ],
handlers: { handlers: {
'image': function (value) { 'image': function (value) {
if (value) { if (value) {
// Element-uiinput // Element-uiinput
document.querySelector('#quill-upload input').click() document.querySelector('#quill-upload input').click()
} else { } else {
this.quill.format('image', false); this.quill.format('image', false)
} }
}
}
} }
}
} }
}
}, },
uploadUrl: '', uploadUrl: '',
dataForm: { dataForm: {
@ -186,7 +181,7 @@ export default {
typicalAbstract: '', typicalAbstract: '',
dynamicItem: [] dynamicItem: []
}, },
imgIndex: 0, imgIndex: 0,
requiredFlag: false requiredFlag: false
} }
}, },
@ -206,95 +201,92 @@ export default {
typicalAbstract: [ typicalAbstract: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
], ],
associatedId: [ associatedId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
] ]
} }
} }
}, },
methods: { methods: {
onEditorFocus(index) { onEditorFocus (index) {
this.imgIndex = index this.imgIndex = index
}, },
handleChange (file) { handleChange (file) {
this.beforeAvatarUpload(file) this.beforeAvatarUpload(file)
}, },
back () { back () {
this.$parent.selectComponent = 'CaseInfoList' this.$parent.selectComponent = 'CaseInfoList'
this.$router.push({ path: '/case-typicalcase'}) this.$router.push({ path: '/case-typicalcase' })
}, },
connectResponse (connectResponse) { connectResponse (connectResponse) {
// //
this.dataForm.dynamicItem[connectResponse.caseIndex].caseSource = connectResponse.allDeptNames this.dataForm.dynamicItem[connectResponse.caseIndex].caseSource = connectResponse.allDeptNames
// //
this.dataForm.dynamicItem[connectResponse.caseIndex].associatedType = connectResponse.associatedType this.dataForm.dynamicItem[connectResponse.caseIndex].associatedType = connectResponse.associatedType
// //
if (connectResponse.associatedType == 0) { if (connectResponse.associatedType == 0) {
this.dataForm.dynamicItem[connectResponse.caseIndex].contentDescription = connectResponse.issueContent this.dataForm.dynamicItem[connectResponse.caseIndex].contentDescription = connectResponse.issueContent
} else if (connectResponse.associatedType == 1) { } else if (connectResponse.associatedType == 1) {
this.dataForm.dynamicItem[connectResponse.caseIndex].contentDescription = connectResponse.itemContent this.dataForm.dynamicItem[connectResponse.caseIndex].contentDescription = connectResponse.itemContent
} else if (connectResponse.associatedType == 2) { } else if (connectResponse.associatedType == 2) {
this.dataForm.dynamicItem[connectResponse.caseIndex].contentDescription = connectResponse.topicContent this.dataForm.dynamicItem[connectResponse.caseIndex].contentDescription = connectResponse.topicContent
} }
// //
this.dataForm.dynamicItem[connectResponse.caseIndex].category = connectResponse.categoryName this.dataForm.dynamicItem[connectResponse.caseIndex].category = connectResponse.categoryName
// ID // ID
this.dataForm.dynamicItem[connectResponse.caseIndex].associatedId = connectResponse.id this.dataForm.dynamicItem[connectResponse.caseIndex].associatedId = connectResponse.id
// Id // Id
this.dataForm.dynamicItem[connectResponse.caseIndex].sourceGridId = connectResponse.gridId this.dataForm.dynamicItem[connectResponse.caseIndex].sourceGridId = connectResponse.gridId
// //
if (connectResponse.associatedType == 0) { if (connectResponse.associatedType == 0) {
this.dataForm.dynamicItem[connectResponse.caseIndex].publisherName = connectResponse.nickName this.dataForm.dynamicItem[connectResponse.caseIndex].publisherName = connectResponse.nickName
} else if (connectResponse.associatedType == 1) { } else if (connectResponse.associatedType == 1) {
this.dataForm.dynamicItem[connectResponse.caseIndex].publisherName = connectResponse.nickName this.dataForm.dynamicItem[connectResponse.caseIndex].publisherName = connectResponse.nickName
} else if (connectResponse.associatedType == 2) { } else if (connectResponse.associatedType == 2) {
this.dataForm.dynamicItem[connectResponse.caseIndex].publisherName = connectResponse.nickname this.dataForm.dynamicItem[connectResponse.caseIndex].publisherName = connectResponse.nickname
} }
// //
this.dataForm.dynamicItem[connectResponse.caseIndex].publisherHeader = connectResponse.userFace this.dataForm.dynamicItem[connectResponse.caseIndex].publisherHeader = connectResponse.userFace
// //
if (connectResponse.associatedType == 0) { if (connectResponse.associatedType == 0) {
this.dataForm.dynamicItem[connectResponse.caseIndex].content = connectResponse.issueContent this.dataForm.dynamicItem[connectResponse.caseIndex].content = connectResponse.issueContent
} else if (connectResponse.associatedType == 1) { } else if (connectResponse.associatedType == 1) {
this.dataForm.dynamicItem[connectResponse.caseIndex].content = connectResponse.itemContent this.dataForm.dynamicItem[connectResponse.caseIndex].content = connectResponse.itemContent
} else if (connectResponse.associatedType == 2) { } else if (connectResponse.associatedType == 2) {
this.dataForm.dynamicItem[connectResponse.caseIndex].content = connectResponse.topicContent this.dataForm.dynamicItem[connectResponse.caseIndex].content = connectResponse.topicContent
} }
if (connectResponse.associatedType == 0) { if (connectResponse.associatedType == 0) {
this.dataForm.dynamicItem[connectResponse.caseIndex].releaseTime = connectResponse.distributeTime this.dataForm.dynamicItem[connectResponse.caseIndex].releaseTime = connectResponse.distributeTime
} else if (connectResponse.associatedType == 1) { } else if (connectResponse.associatedType == 1) {
this.dataForm.dynamicItem[connectResponse.caseIndex].releaseTime = connectResponse.distributeTime this.dataForm.dynamicItem[connectResponse.caseIndex].releaseTime = connectResponse.distributeTime
} else if (connectResponse.associatedType == 2) { } else if (connectResponse.associatedType == 2) {
this.dataForm.dynamicItem[connectResponse.caseIndex].releaseTime = connectResponse.createdTime this.dataForm.dynamicItem[connectResponse.caseIndex].releaseTime = connectResponse.createdTime
} }
this.dataForm.dynamicItem[connectResponse.caseIndex].expressingAttitude = connectResponse.participantsNum this.dataForm.dynamicItem[connectResponse.caseIndex].expressingAttitude = connectResponse.participantsNum
this.requiredFlag = true
this.requiredFlag = true
}, },
addConnect(index){ addConnect (index) {
this.connectListVisible = true this.connectListVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.connectList.init(index) this.$refs.connectList.init(index)
}) })
}, },
// //
addItem () { addItem () {
this.dataForm.dynamicItem.push({ this.dataForm.dynamicItem.push({
caseSource: '', caseSource: '',
associatedType: '', associatedType: '',
contentDescription: '', contentDescription: '',
category: '', category: '',
associatedId: '', associatedId: '',
sourceGridId: '', sourceGridId: '',
publisherName: '', publisherName: '',
publisherHeader: '', publisherHeader: '',
releaseTime: '', releaseTime: '',
content: '', content: '',
expressingAttitude: '' expressingAttitude: ''
}) })
}, },
// //
quillEditorHandle () { quillEditorHandle () {
this.quillEditor = new Quill('#J_quillEditor', { this.quillEditor = new Quill('#J_quillEditor', {
@ -323,11 +315,9 @@ export default {
return false return false
} }
}, },
// () // ()
uploadSuccessHandle (res) { uploadSuccessHandle (res) {
let quill = this.$refs.myQuillEditor[this.imgIndex].quill; let quill = this.$refs.myQuillEditor[this.imgIndex].quill
console.log(quill)
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
@ -340,22 +330,22 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
if (this.dataForm.id) { if (this.dataForm.id) {
this.getInfo() this.getInfo()
} }
}) })
}, },
// //
getInfo () { getInfo () {
this.$http.get(`/cloudAnalysis/typicalcase/${this.dataForm.id}`).then(({ data: res }) => { this.$http.get(`/cloudAnalysis/typicalcase/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.dataForm = { this.dataForm = {
...this.dataForm, ...this.dataForm,
...res.data ...res.data
} }
}).catch(() => {}) }).catch(() => {})
this.requiredFlag = true this.requiredFlag = true
}, },
// //
dataFormSubmitHandle: debounce(function () { dataFormSubmitHandle: debounce(function () {
@ -363,19 +353,19 @@ export default {
if (!valid) { if (!valid) {
return false return false
} }
if(!this.requiredFlag){ if (!this.requiredFlag) {
alert("请关联案例!") alert('请关联案例!')
return false return false
} }
for(let item of this.dataForm.dynamicItem) { for (let item of this.dataForm.dynamicItem) {
if(item.associatedId != '') { if (item.associatedId != '') {
this.dataForm.caseNumber = this.dataForm.caseNumber + 1 this.dataForm.caseNumber = this.dataForm.caseNumber + 1
}
} }
this.isAble = true; }
this.isAble = true
this.$http[!this.dataForm.id ? 'post' : 'put']('/cloudAnalysis/typicalcase', this.dataForm).then(({ data: res }) => { this.$http[!this.dataForm.id ? 'post' : 'put']('/cloudAnalysis/typicalcase', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
this.isAble = false; this.isAble = false
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.$message({ this.$message({
@ -383,23 +373,23 @@ export default {
type: 'success', type: 'success',
duration: 500, duration: 500,
onClose: () => { onClose: () => {
this.isAble = false; this.isAble = false
this.back() this.back()
} }
}) })
}).catch(() => {}) }).catch(() => {})
}) })
}, 1000, { 'leading': true, 'trailing': false }), }, 1000, { 'leading': true, 'trailing': false }),
handleAvatarActSuccess (res, file) { handleAvatarActSuccess (res, file) {
this.loading = false this.loading = false
this.dataForm.mainPicture = res.data.url this.dataForm.mainPicture = res.data.url
}, },
beforeAvatarUpload (file) { beforeAvatarUpload (file) {
this.loading = true this.loading = true
}, },
handelError () { handelError () {
this.loading = false this.loading = false
}, }
} }
} }
</script> </script>

16
src/views/modules/case/typicalcase-detail.vue

@ -77,18 +77,18 @@ export default {
getDataListURL: '/cloudAnalysis/typicalcase/detail' + '/' + this.$route.query.id getDataListURL: '/cloudAnalysis/typicalcase/detail' + '/' + this.$route.query.id
}, },
dataForm: { dataForm: {
id: '', id: '',
caseTitle: '', caseTitle: '',
caseNumber: 0, caseNumber: 0,
mainPicture: '', mainPicture: '',
typicalAbstract: '', typicalAbstract: '',
dynamicItem: [] dynamicItem: []
} }
} }
}, },
mounted () { mounted () {
this.dataForm.id = this.$route.query.id this.dataForm.id = this.$route.query.id
this.init() this.init()
}, },
methods: { methods: {
back () { back () {

168
src/views/modules/heart/actbanner-add-or-update.vue

@ -1,53 +1,31 @@
<template> <template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '200px' : '120px'">
<el-form-item label="活动ID" prop="actId">
<el-input v-model="dataForm.actId" placeholder="活动ID"></el-input>
</el-form-item>
<el-form-item label="标题" prop="title"> <el-form-item label="标题" prop="title">
<el-input v-model="dataForm.title" placeholder="标题"></el-input> <el-input v-model="dataForm.title" placeholder="标题" maxlength="30" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="banner图片" prop="bannerImg"> <el-row>
<el-input v-model="dataForm.bannerImg" placeholder="banner图片"></el-input> <el-form-item label="banner图片"
</el-form-item> v-loading="loading"
<el-form-item label="banner类型 0-活动,1-连接" prop="bannerType"> prop="bannerImg">
<el-input v-model="dataForm.bannerType" placeholder="banner类型 0-活动,1-连接"></el-input> <el-upload class="avatar-uploader"
</el-form-item> :action="uploadUrl"
<el-form-item label="连接地址" prop="url"> :show-file-list="false"
<el-input v-model="dataForm.url" placeholder="连接地址"></el-input> :on-success="handleAvatarActSuccess"
</el-form-item> :on-error="handelError"
<el-form-item label="上下架状态 0-下架,1-上架" prop="statue"> :before-upload="beforeAvatarUpload">
<el-input v-model="dataForm.statue" placeholder="上下架状态 0-下架,1-上架"></el-input> <img v-if="dataForm.bannerImg"
</el-form-item> :src="dataForm.bannerImg"
<el-form-item label="上下架时间" prop="statueTime"> class="avatar">
<el-input v-model="dataForm.statueTime" placeholder="上下架时间"></el-input> <i v-else
</el-form-item> class="el-icon-plus avatar-uploader-icon"></i>
<el-form-item label="banner位置 0-顶部" prop="bannerPosition"> <div slot="tip"
<el-input v-model="dataForm.bannerPosition" placeholder="banner位置 0-顶部"></el-input> class="el-upload__tip">只能上传jpg/png文件且不超过500kb</div>
</el-form-item> </el-upload>
<el-form-item label="浏览数量" prop="browseNum"> </el-form-item>
<el-input v-model="dataForm.browseNum" placeholder="浏览数量"></el-input> </el-row>
</el-form-item> <el-form-item label="排序" prop="sort">
<el-form-item label="创建部门ID" prop="deptId"> <el-input-number v-model="dataForm.sort" :min="0" :max="4"></el-input-number>
<el-input v-model="dataForm.deptId" placeholder="创建部门ID"></el-input>
</el-form-item>
<el-form-item label="乐观锁" prop="revision">
<el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
</el-form-item>
<el-form-item label="删除标识 0-否,1-是" prop="delFlag">
<el-input v-model="dataForm.delFlag" placeholder="删除标识 0-否,1-是"></el-input>
</el-form-item>
<el-form-item label="创建人" prop="createdBy">
<el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
</el-form-item>
<el-form-item label="创建时间" prop="createdTime">
<el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
</el-form-item>
<el-form-item label="更新人" prop="updatedBy">
<el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
</el-form-item>
<el-form-item label="更新时间" prop="updatedTime">
<el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template slot="footer"> <template slot="footer">
@ -59,6 +37,7 @@
<script> <script>
import debounce from 'lodash/debounce' import debounce from 'lodash/debounce'
import Cookies from 'js-cookie'
export default { export default {
data () { data () {
return { return {
@ -70,9 +49,9 @@ export default {
bannerImg: '', bannerImg: '',
bannerType: '', bannerType: '',
url: '', url: '',
statue: '', status: 1, //
statueTime: '', statusTime: '',
bannerPosition: '', bannerPosition: 0, // banner 0-
browseNum: '', browseNum: '',
deptId: '', deptId: '',
revision: '', revision: '',
@ -80,64 +59,33 @@ export default {
createdBy: '', createdBy: '',
createdTime: '', createdTime: '',
updatedBy: '', updatedBy: '',
updatedTime: '' updatedTime: '',
} sort: 0
},
//
loading: false,
uploadUrl: ''
} }
}, },
computed: { computed: {
dataRule () { dataRule () {
return { return {
actId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
title: [ title: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
], ],
bannerImg: [ bannerImg: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
], ],
bannerType: [ sort: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
url: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
statue: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
statueTime: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
bannerPosition: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
browseNum: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
deptId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
revision: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
delFlag: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
createdBy: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
createdTime: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
updatedBy: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
updatedTime: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
] ]
} }
} }
}, },
created () {
this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
this.dataForm.bannerImg = ''
},
methods: { methods: {
init () { init () {
this.visible = true this.visible = true
@ -160,12 +108,23 @@ export default {
} }
}).catch(() => {}) }).catch(() => {})
}, },
handleAvatarActSuccess (res, file) {
this.loading = false
this.dataForm.bannerImg = res.data.url
},
beforeAvatarUpload (file) {
this.loading = true
},
handelError () {
this.loading = false
},
// //
dataFormSubmitHandle: debounce(function () { dataFormSubmitHandle: debounce(function () {
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (!valid) { if (!valid) {
return false return false
} }
this.dataForm.statusTime = new Date()
this.$http[!this.dataForm.id ? 'post' : 'put']('/heart/actbanner/', this.dataForm).then(({ data: res }) => { this.$http[!this.dataForm.id ? 'post' : 'put']('/heart/actbanner/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
@ -185,3 +144,28 @@ export default {
} }
} }
</script> </script>
<style>
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 178px;
height: 178px;
line-height: 178px;
text-align: center;
}
.avatar {
width: 178px;
height: 178px;
display: block;
}
</style>

55
src/views/modules/heart/actbanner.vue

@ -8,42 +8,40 @@
<el-option label="下架" :value="0"></el-option> <el-option label="下架" :value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="时间"
prop="startTime">
<el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('heart:actbanner:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column> <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
<el-table-column prop="title" label="标题" header-align="center" align="center"></el-table-column> <el-table-column prop="title" label="标题" header-align="center" align="center"></el-table-column>
<el-table-column align="center" label="Banner图片" :show-overflow-tooltip="true" prop="bannerImg">
<template slot-scope="scope">
<el-popover placement="right"
title=""
trigger="click"
class="big_image">
<el-image slot="reference"
min-width="70"
height="70"
:src="scope.row.bannerImg"
:alt="scope.row.bannerImg"></el-image>
<img class="big_image"
:src="scope.row.bannerImg" />
</el-popover>
</template>
</el-table-column>
<el-table-column prop="status" label="状态" :formatter="formatState" header-align="center" align="center"></el-table-column> <el-table-column prop="status" label="状态" :formatter="formatState" header-align="center" align="center"></el-table-column>
<el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
<el-table-column prop="statusTime" label="上下架时间" header-align="center" align="center"></el-table-column> <el-table-column prop="statusTime" label="上下架时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="browseNum" label="浏览数量" header-align="center" align="center"></el-table-column>
<el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('heart:actbanner:grounding')" type="text" size="small" @click="changeGroundingHandle(scope.row)">{{ changeGroundingText(scope.row.status) }}</el-button> <el-button v-if="$hasPermission('heart:actbanner:grounding')" type="text" size="small" @click="changeGroundingHandle(scope.row)">{{ changeGroundingText(scope.row.status) }}</el-button>
<el-button v-if="$hasPermission('heart:actbanner:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -65,7 +63,7 @@
<script> <script>
import mixinViewModule from '@/mixins/view-module' import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './actbanner-add-or-update' import AddOrUpdate from './actbanner-add-or-update'
import {debounce} from 'lodash' import { debounce } from 'lodash'
export default { export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
data () { data () {
@ -87,7 +85,7 @@ export default {
AddOrUpdate AddOrUpdate
}, },
methods: { methods: {
changeGroundingText(status){ changeGroundingText (status) {
let state = status let state = status
if (state === '1') { if (state === '1') {
return '下架' return '下架'
@ -105,7 +103,6 @@ export default {
}, },
changeGroundingHandle: debounce(function (row) { changeGroundingHandle: debounce(function (row) {
this.$confirm(this.$t('prompt.info', { 'handle': this.changeGroundingText(row.status) }), this.$t('prompt.title'), { this.$confirm(this.$t('prompt.info', { 'handle': this.changeGroundingText(row.status) }), this.$t('prompt.title'), {
confirmButtonText: this.$t('confirm'), confirmButtonText: this.$t('confirm'),
cancelButtonText: this.$t('cancel'), cancelButtonText: this.$t('cancel'),
@ -130,3 +127,9 @@ export default {
} }
} }
</script> </script>
<style scoped>
.big_image {
width: 300px;
height: 240px;
}
</style>

56
src/views/modules/heart/actinfo-add-or-update.vue

@ -70,8 +70,7 @@
<template> <template>
<el-radio v-model="dataForm.actQuotaCategory" <el-radio v-model="dataForm.actQuotaCategory"
label="1">固定名额</el-radio>&emsp;&emsp; label="1">固定名额</el-radio>&emsp;&emsp;
<el-input-number v-enter-number <el-input-number type="number"
type="number"
:min="1" :min="1"
v-model="dataForm.actQuota" v-model="dataForm.actQuota"
placeholder="固定名额" placeholder="固定名额"
@ -176,8 +175,7 @@
<el-form-item label="打卡范围:" <el-form-item label="打卡范围:"
prop="clockRadius"> prop="clockRadius">
<div> <div>
<el-input-number v-enter-number <el-input-number type="number"
type="number"
:min="0" :min="0"
:max="5000" :max="5000"
v-model="dataForm.clockRadius" v-model="dataForm.clockRadius"
@ -222,8 +220,7 @@
<el-row> <el-row>
<el-form-item label="奖励积分:" <el-form-item label="奖励积分:"
prop="reward"> prop="reward">
<el-input-number v-enter-number <el-input-number type="number"
type="number"
:min="0" :min="0"
v-model="dataForm.reward" v-model="dataForm.reward"
clearable clearable
@ -234,8 +231,7 @@
<el-row> <el-row>
<el-form-item label="惩罚积分:" <el-form-item label="惩罚积分:"
prop="punishmentPoints"> prop="punishmentPoints">
<el-input-number v-enter-number <el-input-number type="number"
type="number"
:min="0" :min="0"
v-model="dataForm.punishmentPoints" v-model="dataForm.punishmentPoints"
clearable clearable
@ -262,39 +258,6 @@
</div> </div>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row>
<el-form-item label="banner展示:"
prop="isBanner">
<template>
<el-radio v-model="dataForm.isBanner"
label="1"
@change="changeHandler"></el-radio>
<el-radio v-model="dataForm.isBanner"
label="0"
@change="changeHandler"></el-radio>
</template>
</el-form-item>
</el-row>
<el-row>
<el-form-item label=" "
v-loading="loading"
prop="bannerUrl">
<el-upload class="avatar-uploader"
:action="uploadUrl"
:show-file-list="false"
:on-success="handleAvatarBannerSuccess"
:on-error="handelError"
:before-upload="beforeAvatarUpload">
<img v-if="dataForm.bannerUrl"
:src="dataForm.bannerUrl"
class="avatar">
<i v-else
class="el-icon-plus avatar-uploader-icon"></i>
<div slot="tip"
class="el-upload__tip">只能上传jpg/png文件且不超过500kb</div>
</el-upload>
</el-form-item>
</el-row>
<el-row> <el-row>
<el-form-item label-width="500px"> <el-form-item label-width="500px">
<el-button type="primary" <el-button type="primary"
@ -350,9 +313,7 @@ export default {
deptId: '', deptId: '',
punishmentPoints: '', punishmentPoints: '',
reward: '', reward: '',
isBanner: '1', actUserDefaultState: '1'
actUserDefaultState: '1',
bannerUrl: ''
}, },
isSignupEndTime: { isSignupEndTime: {
disabledDate (time) { disabledDate (time) {
@ -538,9 +499,6 @@ export default {
], ],
updatedTime: [ updatedTime: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
bannerUrl: [
{ required: this.isImgRequired, message: this.$t('validate.required'), trigger: 'blur' }
] ]
} }
} }
@ -699,10 +657,6 @@ export default {
this.loading = false this.loading = false
this.dataForm.headPic = res.data.url this.dataForm.headPic = res.data.url
}, },
handleAvatarBannerSuccess (res, file) {
this.loading = false
this.dataForm.bannerUrl = res.data.url
},
beforeAvatarUpload (file) { beforeAvatarUpload (file) {
this.loading = true this.loading = true
}, },

28
src/views/modules/heart/actinfo-detail-view.vue

@ -46,10 +46,10 @@
</div> </div>
<div> <div>
<el-radio v-model="dataForm.actUserDefaultState" <el-radio v-model="dataForm.actUserDefaultState"
disabled="true" :disabled="true"
label="1">通过</el-radio> label="1">通过</el-radio>
<el-radio v-model="dataForm.actUserDefaultState" <el-radio v-model="dataForm.actUserDefaultState"
disabled="true" :disabled="true"
label="4">不通过</el-radio> label="4">不通过</el-radio>
</div> </div>
</el-form-item> </el-form-item>
@ -134,27 +134,6 @@
<p v-html="dataForm.actContent"></p> <p v-html="dataForm.actContent"></p>
</el-form-item> </el-form-item>
</el-row> </el-row>
<!-- <el-row>-->
<!-- <el-form-item label="banner展示:"-->
<!-- prop="isBanner">-->
<!-- <template>-->
<!-- <el-radio v-model="dataForm.isBanner"-->
<!-- label="1"></el-radio>-->
<!-- <el-radio v-model="dataForm.isBanner"-->
<!-- label="0"></el-radio>-->
<!-- </template>-->
<!-- </el-form-item>-->
<!-- </el-row>-->
<el-row>
<el-form-item label=" "
v-loading="loading"
prop="bannerUrl">
<img v-if="dataForm.bannerUrl"
:src="dataForm.bannerUrl"
class="avatar">
</el-form-item>
</el-row>
<el-row> <el-row>
<el-form-item label-width="500px"> <el-form-item label-width="500px">
<el-button size="small" <el-button size="small"
@ -210,7 +189,8 @@ export default {
punishmentPoints: '', punishmentPoints: '',
actUserDefaultState: '1', actUserDefaultState: '1',
reward: '' reward: ''
} },
loading: false
} }
}, },
mounted () { mounted () {

2
src/views/modules/heart/actinfo-list.vue

@ -144,7 +144,7 @@ export default {
addAction () { addAction () {
this.$parent.selectComponent = 'ActInfoAdd' this.$parent.selectComponent = 'ActInfoAdd'
this.$router.push( this.$router.push(
{ path: '/heart-actinfo'} { path: '/heart-actinfo' }
) )
}, },
joinManage (id) { joinManage (id) {

7
src/views/modules/heart/actphrase.vue

@ -5,9 +5,6 @@
<el-form :inline="true" <el-form :inline="true"
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataList()"> @keyup.enter.native="getDataList()">
<!--<el-form-item label="ID" prop="id">
<el-input v-model="dataForm.id" placeholder="ID" clearable></el-input>
</el-form-item>-->
<el-form-item label="常用语:" <el-form-item label="常用语:"
prop="phrase"> prop="phrase">
<el-input v-model="dataForm.phrase" <el-input v-model="dataForm.phrase"
@ -24,7 +21,7 @@
prop="showFlag"> prop="showFlag">
<el-select v-model="dataForm.showFlag" <el-select v-model="dataForm.showFlag"
placeholder="是否显示" placeholder="是否显示"
clearable=true> clearable>
<el-option v-for="item in showFlagArr" <el-option v-for="item in showFlagArr"
:key="item.dictValue" :key="item.dictValue"
:label="item.dictName" :label="item.dictName"
@ -54,7 +51,7 @@
align="center" align="center"
width="50"></el-table-column> width="50"></el-table-column>
<el-table-column prop="phrase" <el-table-column prop="phrase"
label="常用语" label="常用语" show-overflow-tooltip
header-align="center" header-align="center"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column prop="code" <el-table-column prop="code"

4
src/views/modules/heart/address-check.vue

@ -30,8 +30,8 @@ export default {
visible: false, visible: false,
dataForm: { dataForm: {
address: '', address: '',
longitude: 0,// longitude: 0, //
latitude: 0,// latitude: 0, //
city: '' city: ''
} }
} }

Loading…
Cancel
Save