Commit a3108de8 authored by 高宇's avatar 高宇

修改bug

parent 8312b9a5
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="90px"> <el-form ref="form" :model="form" :rules="rules" size="small" label-width="90px">
<el-form-item label="分类" prop="type"> <el-form-item label="分类" prop="type">
<!-- <el-input v-model.trim="form.type" show-word-limit :maxlength="32" placeholder="请输入类型" />--> <!-- <el-input v-model.trim="form.type" show-word-limit :maxlength="32" placeholder="请输入类型" />-->
<el-select v-model.trim="form.type" show-word-limit placeholder="请输入类型" style="width: 70%"> <el-select v-model.trim="form.type" show-word-limit placeholder="请输入类型" style="width: 100%">
<el-option label="课程资源" value="0" /> <el-option label="课程资源" value="0" />
<el-option label="其他资源" value="1" /> <el-option label="其他资源" value="1" />
</el-select> </el-select>
...@@ -161,15 +161,15 @@ ...@@ -161,15 +161,15 @@
</el-form-item> </el-form-item>
<el-form-item label="图片" prop="bannerPicture"> <el-form-item label="图片" prop="bannerPicture">
<el-upload <el-upload
:show-file-list="false" class="avatar-uploader"
list-type="picture-card"
action="#" action="#"
:http-request="handleUpload" :http-request="handleUpload"
:show-file-list="false"
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload" :before-upload="beforeAvatarUpload"
:on-remove="handleRemove"
> >
<img v-if="form.url" :src="form.url" style="height: 150px;width: 150px"> <!-- <img v-if="imageUrl" :src="imageUrl" style="height: 200px;width: 200px">-->
<img v-if="imageUrl" :src="imageUrl" style="height: 200px;width: 200px">
<i v-else class="el-icon-plus avatar-uploader-icon" /> <i v-else class="el-icon-plus avatar-uploader-icon" />
</el-upload> </el-upload>
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
<el-input v-model.trim="form.linkUrl" show-word-limit :maxlength="255" placeholder="请输入链接地址" /> <el-input v-model.trim="form.linkUrl" show-word-limit :maxlength="255" placeholder="请输入链接地址" />
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="weight"> <el-form-item label="排序" prop="weight">
<el-input-number v-model.trim="form.weight" controls-position="right" :min="0" /> <el-input-number v-model.trim="form.weight" style="width: 100%" controls-position="right" :min="0" />
</el-form-item> </el-form-item>
<el-form-item label="状态"> <el-form-item label="状态">
<el-radio-group v-model="form.flag"> <el-radio-group v-model="form.flag">
...@@ -248,6 +248,7 @@ export default { ...@@ -248,6 +248,7 @@ export default {
linkUrl: undefined, linkUrl: undefined,
flag: '' flag: ''
}, },
showImg: false,
imagUrl: '', imagUrl: '',
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -313,18 +314,20 @@ export default { ...@@ -313,18 +314,20 @@ export default {
formData.append('file', file.file) formData.append('file', file.file)
formData.append('temp', 'CmsBanner') formData.append('temp', 'CmsBanner')
uploadPublic(formData).then(res => { uploadPublic(formData).then(res => {
console.log('url',res.data.url)
this.imageUrl = res.data.url
this.showImg = true
this.form.bannerPicture = res.data.businessId this.form.bannerPicture = res.data.businessId
this.form.url = res.data.url
}) })
}, },
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
console.log('res', res) console.log('res', res)
this.imageUrl = URL.createObjectURL(file.raw) // this.imageUrl = URL.createObjectURL(file.raw)
this.form.bannerPicture = res.data.businessId // this.form.bannerPicture = res.data.businessId
this.form.url = res.data.url // this.form.url = res.data.url
}, },
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
this.file = file // this.file = file
}, },
step(index) { step(index) {
...@@ -395,7 +398,7 @@ export default { ...@@ -395,7 +398,7 @@ export default {
const id = row.businessId const id = row.businessId
getCmsBanner(id).then(response => { getCmsBanner(id).then(response => {
this.form = response.data this.form = response.data
this.form.url = this.imagePath + response.data.url this.imageUrl = this.imagePath + response.data.url
this.open = true this.open = true
this.title = '修改banner' this.title = '修改banner'
}) })
...@@ -481,6 +484,27 @@ export default { ...@@ -481,6 +484,27 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.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;
border: 1px solid #dcdfe6;
}
.app-container { .app-container {
font-size: 18px; font-size: 18px;
padding: 0; padding: 0;
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<el-form-item> <el-form-item>
<!-- //新增按钮--> <!-- //新增按钮-->
<el-button <el-button
v-has-permi="hasAddPerm"
:class="commonField.addClass" :class="commonField.addClass"
:type="commonField.typePrimary" :type="commonField.typePrimary"
:icon="commonField.addIcon" :icon="commonField.addIcon"
...@@ -81,6 +82,7 @@ ...@@ -81,6 +82,7 @@
<el-table-column label="操作" width="120"> <el-table-column label="操作" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-has-permi="hasUpdatePerm"
:class="commonField.updateClass" :class="commonField.updateClass"
:type="commonField.typeParent" :type="commonField.typeParent"
:size="commonField.size" :size="commonField.size"
...@@ -120,6 +122,8 @@ export default { ...@@ -120,6 +122,8 @@ export default {
// }, // },
data() { data() {
return { return {
hasAddPerm: ['sys:contentNewssInformation:add'],
hasUpdatePerm: ['sys:contentNewssInformation:update'],
imageSrc: require('@/assets/image/test.png'), imageSrc: require('@/assets/image/test.png'),
imagePath: 'http://49.232.167.247:20020/teaServer/', imagePath: 'http://49.232.167.247:20020/teaServer/',
// 显示开关 // 显示开关
...@@ -292,7 +296,7 @@ export default { ...@@ -292,7 +296,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
console.log('我是修改') console.log('我是修改')
this.$router.push({ this.$router.push({
path: '/contentManagement/centralCase/info/index', path: '/contentManagement/centralCase/info/update',
query: { query: {
isOperation: '2', isOperation: '2',
bussinessId: row.businessId bussinessId: row.businessId
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</el-table-column> </el-table-column>
<el-table-column label="大赛时间" prop="contestDate" :show-overflow-tooltip="true" width="170px"> <el-table-column label="大赛时间" prop="contestDate" :show-overflow-tooltip="true" width="170px">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.contestDate | transformDateByFormat('YYYY-MM-DD hh:mm') }}</span> <span>{{ scope.row.contestDate | transformDateByFormat('YYYY-MM-DD') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="大赛描述" prop="contestDiscribe" :show-overflow-tooltip="true"> <el-table-column label="大赛描述" prop="contestDiscribe" :show-overflow-tooltip="true">
...@@ -152,7 +152,6 @@ ...@@ -152,7 +152,6 @@
<el-upload <el-upload
class="avatar-uploader" class="avatar-uploader"
action="#" action="#"
v-model="form.contestPicture"
:http-request="handleUpload" :http-request="handleUpload"
:show-file-list="false" :show-file-list="false"
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
...@@ -164,20 +163,25 @@ ...@@ -164,20 +163,25 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="排序" prop="weight">
<el-input-number v-model="form.weight" controls-position="right" @change="handleChange" :min="1" :max="10" placeholder="请输入排序" style="width: 100%"/>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-row>
<el-form-item label="状态"> <el-col :span="12">
<el-radio-group v-model="form.flag"> <el-form-item label="排序" prop="weight">
<el-radio label="1">启用</el-radio> <el-input-number v-model="form.weight" controls-position="right" @change="handleChange" :min="1" :max="10" placeholder="请输入排序" style="width: 100%"/>
<el-radio label="0">停用</el-radio> </el-form-item>
</el-radio-group> </el-col>
</el-form-item> </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="状态">
<el-radio-group v-model="form.flag">
<el-radio label="1">启用</el-radio>
<el-radio label="0">停用</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
......
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
<el-form-item> <el-form-item>
<!-- //新增按钮--> <!-- //新增按钮-->
<el-button <el-button
v-has-permi="hasAddPerm"
:class="commonField.addClass" :class="commonField.addClass"
:type="commonField.typePrimary" :type="commonField.typePrimary"
:icon="commonField.addIcon" :icon="commonField.addIcon"
...@@ -54,13 +55,13 @@ ...@@ -54,13 +55,13 @@
@click="handleAdd" @click="handleAdd"
>{{ commonField.addName }}</el-button> >{{ commonField.addName }}</el-button>
<!-- //新增按钮--> <!-- //新增按钮-->
<el-button <!-- <el-button-->
:class="commonField.addClass" <!-- :class="commonField.addClass"-->
:type="commonField.typePrimary" <!-- :type="commonField.typePrimary"-->
:icon="commonField.addIcon" <!-- :icon="commonField.addIcon"-->
:size="commonField.smallSize" <!-- :size="commonField.smallSize"-->
@click="handleExamination" <!-- @click="handleExamination"-->
>{{ "跳转考试临时" }}</el-button> <!-- >{{ "跳转考核临时" }}</el-button>-->
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
...@@ -128,12 +129,14 @@ ...@@ -128,12 +129,14 @@
<el-table-column align="center" label="操作" width="150"> <el-table-column align="center" label="操作" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-has-permi="hasDetailPerm"
:class="commonField.updateClass" :class="commonField.updateClass"
:type="commonField.typeParent" :type="commonField.typeParent"
:size="commonField.size" :size="commonField.size"
@click="handleView(scope.row)" @click="handleView(scope.row)"
>查看</el-button> >查看</el-button>
<el-button <el-button
v-has-permi="hasUpdatePerm"
:class="commonField.updateClass" :class="commonField.updateClass"
:type="commonField.typeParent" :type="commonField.typeParent"
:size="commonField.size" :size="commonField.size"
...@@ -178,6 +181,9 @@ export default { ...@@ -178,6 +181,9 @@ export default {
// }, // },
data() { data() {
return { return {
hasAddPerm: ['sys:contentNewsInformation:add'],
hasUpdatePerm: ['sys:contentNewsInformation:update'],
hasDetailPerm: ['sys:contentNewsInformation:query'],
imageSrc: require('@/assets/image/test.png'), imageSrc: require('@/assets/image/test.png'),
imagePath: 'http://49.232.167.247:20020/teaServer/', imagePath: 'http://49.232.167.247:20020/teaServer/',
// 显示开关 // 显示开关
...@@ -415,7 +421,7 @@ export default { ...@@ -415,7 +421,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
console.log('我是修改') console.log('我是修改')
this.$router.push({ this.$router.push({
path: '/contentManagement/newsInformation/info/index', path: '/contentManagement/centralCase/info/update',
query: { query: {
isOperation: '2', isOperation: '2',
bussinessId: row.businessId bussinessId: row.businessId
...@@ -447,7 +453,7 @@ export default { ...@@ -447,7 +453,7 @@ export default {
**/ **/
handleView(row) { handleView(row) {
this.$router.push({ this.$router.push({
path: '/contentManagement/newsInformation/info/index', path: '/contentManagement/newsInformation/info/detail',
query: { query: {
isOperation: '3', isOperation: '3',
bussinessId: row.businessId bussinessId: row.businessId
......
...@@ -122,6 +122,7 @@ ...@@ -122,6 +122,7 @@
<el-form-item> <el-form-item>
<!-- //新增按钮--> <!-- //新增按钮-->
<el-button <el-button
v-has-permi="hasAddPerm"
:class="commonField.addClass" :class="commonField.addClass"
:type="commonField.typePrimary" :type="commonField.typePrimary"
:icon="commonField.addIcon" :icon="commonField.addIcon"
...@@ -532,6 +533,9 @@ export default { ...@@ -532,6 +533,9 @@ export default {
} }
} }
return { return {
hasAddPerm: ['sys:lesson:add'],
hasUpdatePerm: ['sys:lesson:update'],
hasDetailPerm: ['sys:lesson:detail'],
flag: '1', flag: '1',
HTTPApi: process.env.VUE_APP_BASE_APIS, HTTPApi: process.env.VUE_APP_BASE_APIS,
// interfaceUrl:"http://"+url.apiIP+":"+url.apiPORT+url.apiPrefix, // API服务访问的URL // interfaceUrl:"http://"+url.apiIP+":"+url.apiPORT+url.apiPrefix, // API服务访问的URL
......
...@@ -126,6 +126,7 @@ ...@@ -126,6 +126,7 @@
<el-table-column label="操作" class-name="small-padding fixed-width" width="130px"> <el-table-column label="操作" class-name="small-padding fixed-width" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-has-permi="hasDetailPerm"
:class="commonField.updateClass" :class="commonField.updateClass"
:type="commonField.typeParent" :type="commonField.typeParent"
:size="commonField.size" :size="commonField.size"
...@@ -212,6 +213,7 @@ export default { ...@@ -212,6 +213,7 @@ export default {
name: 'CmsFeedback', name: 'CmsFeedback',
data() { data() {
return { return {
hasDetailPerm: ['sys:feedBack:detail'],
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 总条数 // 总条数
......
...@@ -129,10 +129,10 @@ ...@@ -129,10 +129,10 @@
<el-dialog :title="title" :visible.sync="open" width="750px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="750px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="90px"> <el-form ref="form" :model="form" :rules="rules" size="small" label-width="90px">
<el-form-item label="姓名" prop="name"> <el-form-item label="姓名" prop="name">
<el-input v-model.trim="form.name" placeholder="请输入讲师姓名" /> <el-input v-model.trim="form.name" :maxlength="20" placeholder="请输入讲师姓名" />
</el-form-item> </el-form-item>
<el-form-item label="头衔" prop="title"> <el-form-item label="头衔" prop="title">
<el-input v-model.trim="form.title" placeholder="请输入讲师头衔" /> <el-input v-model.trim="form.title" :maxlength="100" placeholder="请输入讲师头衔" />
</el-form-item> </el-form-item>
<el-form-item label="简介" prop="details"> <el-form-item label="简介" prop="details">
<el-input <el-input
......
This diff is collapsed.
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 to comment