Browse Source

edit

master
chutingting 1 year ago
parent
commit
c0c19ab2dc
21 changed files with 71 additions and 85 deletions
  1. +3
    -7
      src/api/common.js
  2. +3
    -3
      src/api/homePage.js
  3. +2
    -2
      src/components/ueditor/index.vue
  4. +11
    -6
      src/components/uploadFile/index.vue
  5. +0
    -1
      src/router/index.js
  6. +2
    -1
      src/views/about/company.vue
  7. +2
    -1
      src/views/aigc/banner1.vue
  8. +2
    -1
      src/views/aigc/banner2.vue
  9. +2
    -1
      src/views/car/banner1.vue
  10. +2
    -1
      src/views/car/banner2.vue
  11. +2
    -1
      src/views/car/carousel.vue
  12. +2
    -1
      src/views/homePage/banner1.vue
  13. +2
    -1
      src/views/homePage/banner2.vue
  14. +1
    -1
      src/views/homePage/carHot.vue
  15. +3
    -2
      src/views/homePage/carousel.vue
  16. +8
    -13
      src/views/news/car.vue
  17. +4
    -14
      src/views/news/hot.vue
  18. +8
    -13
      src/views/news/yyz/depth.vue
  19. +8
    -13
      src/views/news/yyz/info.vue
  20. +2
    -1
      src/views/yyzrb/banner1.vue
  21. +2
    -1
      src/views/yyzrb/banner2.vue

+ 3
- 7
src/api/common.js View File

@@ -10,8 +10,8 @@ export function upload(data) {
data: formData,
timeout: 1000 * 60 * 2, // 超时时间两分钟
params: {
width: 200,
hight: 200
width: data.width || 200,
hight: data.height || 200
}
})
}
@@ -24,11 +24,7 @@ export function videoUpload(data) {
url: '/video/upload',
method: 'post',
data: formData,
timeout: 1000 * 60 * 2, // 超时时间两分钟
params: {
width: 200,
hight: 200
}
timeout: 1000 * 60 * 2 // 超时时间两分钟
})
}



+ 3
- 3
src/api/homePage.js View File

@@ -85,10 +85,10 @@ export function newsList(data) {
})
}

export function yuanyuzhouHotSave(data) {
export function yuanyuzhouHotSave(newsIdList) {
return request({
url: '/news/yuanyuzhouHotSave',
url: '/index/yuanyuzhouHotSave',
method: 'post',
data
data: { newsIdList }
})
}

+ 2
- 2
src/components/ueditor/index.vue View File

@@ -1,8 +1,8 @@
<template>
<div>
<!-- @beforeInit="addCustomButtom" -->
<VueUeditorWrap
class="ueditor"
@beforeInit="addCustomButtom"
:id="setSessionid()"
@ready="readyCustom"
v-model="content"
@@ -122,7 +122,7 @@ export default {
initialFrameWith: '100%',
postParams: this.postParams,
// serverUrl: process.env.baseUrl + '/product/uploadFiles', // 上传文件地址
UEDITOR_HOME_URL: process.env.VUE_APP_BASE_API + '/ueditor/' // UEditor资源文件的存放路径
UEDITOR_HOME_URL: 'https://admin.meta-autotv.com/ueditor/' // UEditor资源文件的存放路径
}
}
},


+ 11
- 6
src/components/uploadFile/index.vue View File

@@ -33,6 +33,14 @@ export default {
type: {
type: String,
default: ''
},
width: {
type: String,
default: ''
},
height: {
type: String,
default: ''
}
},
data() {
@@ -113,13 +121,10 @@ export default {
})
},
uploadHttpRequest(file) {
console.log('pid:', this.$route.params.pid)
let obj = {
'page': 'OPERATE',
'template': 'FORMWORK'
}
let _data = {
file: file.file
file: file.file,
width: this.width,
height: this.height
}
let api = this.type === 'video' ? videoUpload(_data) : upload(_data)
api.then(res => {


+ 0
- 1
src/router/index.js View File

@@ -288,7 +288,6 @@ export const constantRoutes = [
]
const createRouter = () => new Router({
base: '/',
mode: 'history', // require service support
scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes
})


+ 2
- 1
src/views/about/company.vue View File

@@ -7,7 +7,8 @@
<div class="app-container">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="resetform">
<el-form-item label="图片" prop="image">
<uploadFile :url.sync="ruleForm.image" type="image" />
<uploadFile :url.sync="ruleForm.image" type="image" width="640" height="434"/>
<p style="color: #909399;">*请上传640*434的图片</p>
</el-form-item>
<el-form-item label="标题" prop="title">
<el-input v-model="ruleForm.title"></el-input>


+ 2
- 1
src/views/aigc/banner1.vue View File

@@ -7,7 +7,8 @@
<div class="app-container">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="resetform">
<el-form-item label="图片" prop="image">
<uploadFile :url.sync="ruleForm.image" type="image" />
<uploadFile :url.sync="ruleForm.image" type="image" width="1200" height="120"/>
<p style="color: #909399;">*请上传1200*120的图片</p>
</el-form-item>
<el-form-item label="链接" prop="link">
<el-input v-model="ruleForm.link"></el-input>


+ 2
- 1
src/views/aigc/banner2.vue View File

@@ -7,7 +7,8 @@
<div class="app-container">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="resetform">
<el-form-item label="图片" prop="image">
<uploadFile :url.sync="ruleForm.image" type="image" />
<uploadFile :url.sync="ruleForm.image" type="image" width="1200" height="120"/>
<p style="color: #909399;">*请上传1200*120的图片</p>
</el-form-item>
<el-form-item label="链接" prop="link">
<el-input v-model="ruleForm.link"></el-input>


+ 2
- 1
src/views/car/banner1.vue View File

@@ -7,7 +7,8 @@
<div class="app-container">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="resetform">
<el-form-item label="图片" prop="image">
<uploadFile :url.sync="ruleForm.image" type="image" />
<uploadFile :url.sync="ruleForm.image" type="image" width="1200" height="120"/>
<p style="color: #909399;">*请上传1200*120的图片</p>
</el-form-item>
<el-form-item label="链接" prop="link">
<el-input v-model="ruleForm.link"></el-input>


+ 2
- 1
src/views/car/banner2.vue View File

@@ -7,7 +7,8 @@
<div class="app-container">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="resetform">
<el-form-item label="图片" prop="image">
<uploadFile :url.sync="ruleForm.image" type="image" />
<uploadFile :url.sync="ruleForm.image" type="image" width="1200" height="120"/>
<p style="color: #909399;">*请上传1200*120的图片</p>
</el-form-item>
<el-form-item label="链接" prop="link">
<el-input v-model="ruleForm.link"></el-input>


+ 2
- 1
src/views/car/carousel.vue View File

@@ -57,7 +57,8 @@
<el-dialog v-if="dialogVisible" title="轮播" :visible.sync="dialogVisible" append-to-body width="600px">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="resetform">
<el-form-item label="图片" prop="image">
<uploadFile :url.sync="ruleForm.image" type="image" />
<uploadFile :url.sync="ruleForm.image" type="image" width="1920" height="600"/>
<p style="color: #909399;">*请上传1920*600的图片</p>
</el-form-item>
<el-form-item label="序号" prop="serialNumber">
<el-input v-model="ruleForm.serialNumber"></el-input>


+ 2
- 1
src/views/homePage/banner1.vue View File

@@ -7,7 +7,8 @@
<div class="app-container">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="resetform">
<el-form-item label="图片" prop="image">
<uploadFile :url.sync="ruleForm.image" type="image" />
<uploadFile :url.sync="ruleForm.image" type="image" width="1200" height="120" />
<p style="color: #909399;">*请上传1200*120的图片</p>
</el-form-item>
<el-form-item label="链接" prop="link">
<el-input v-model="ruleForm.link"></el-input>


+ 2
- 1
src/views/homePage/banner2.vue View File

@@ -7,7 +7,8 @@
<div class="app-container">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="resetform">
<el-form-item label="图片" prop="image">
<uploadFile :url.sync="ruleForm.image" type="image" />
<uploadFile :url.sync="ruleForm.image" type="image" width="1200" height="120" />
<p style="color: #909399;">*请上传1200*120的图片</p>
</el-form-item>
<el-form-item label="链接" prop="link">
<el-input v-model="ruleForm.link"></el-input>


+ 1
- 1
src/views/homePage/carHot.vue View File

@@ -103,7 +103,7 @@ export default {
let data = {
pageNum: this.pageNum,
pageSize: this.pageSize,
type: 2,
type: 3,
status: 2,
videHas: 1
}


+ 3
- 2
src/views/homePage/carousel.vue View File

@@ -56,8 +56,9 @@
<!-- 新增修改弹窗 -->
<el-dialog v-if="dialogVisible" title="轮播" :visible.sync="dialogVisible" append-to-body width="600px">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="resetform">
<el-form-item label="活动名称" prop="image">
<uploadFile :url.sync="ruleForm.image" type="image" />
<el-form-item label="图片" prop="image">
<uploadFile :url.sync="ruleForm.image" type="image" width="1920" height="600"/>
<p style="color: #909399;">*请上传1920*600的图片</p>
</el-form-item>
<el-form-item label="序号" prop="serialNumber">
<el-input v-model="ruleForm.serialNumber"></el-input>


+ 8
- 13
src/views/news/car.vue View File

@@ -99,7 +99,7 @@
<el-input v-model="ruleForm.subTitle"></el-input>
</el-form-item>
<el-form-item label="详情" prop="detail">
<el-input v-model="ruleForm.detail"></el-input>
<ueditor :come-content="ruleForm.detail" @editorChange="editorChange($event)"></ueditor>
</el-form-item>
<el-form-item label="图片" prop="image">
<uploadFile :url.sync="ruleForm.image" type="image" />
@@ -129,9 +129,10 @@ import CRUD, { presenter, header, crud } from '@crud/crud'
import pagination from '@crud/Pagination'
import uploadFile from '@/components/uploadFile'
import rrOperation from '@crud/RR.operation'
import ueditor from '@/components/ueditor'

export default {
components: { rrOperation, pagination, uploadFile },
components: { rrOperation, pagination, uploadFile, ueditor },
mixins: [presenter(), header(), crud()],
data() {
return {
@@ -147,17 +148,8 @@ export default {
status: ''
},
rules: {
name: [
{ required: true, message: '请上传图片', trigger: 'blur' }
],
serialNumber: [
{ required: true, message: '请输入序号', trigger: 'blur' }
],
link: [
{ required: true, message: '请输入链接', trigger: 'blur' }
],
desc: [
{ required: true, message: '请填写活动形式', trigger: 'blur' }
title: [
{ required: true, message: '请输入标题', trigger: 'blur' }
]
},
loadingBtn: false
@@ -259,6 +251,9 @@ export default {
},
resetForm(formName) {
this.$refs[formName].resetFields()
},
editorChange(e) {
this.$set(this.ruleForm, 'detail', e)
}
}
}


+ 4
- 14
src/views/news/hot.vue View File

@@ -132,7 +132,7 @@ import ueditor from '@/components/ueditor'
import rrOperation from '@crud/RR.operation'

export default {
components: { rrOperation, pagination, uploadFile },
components: { rrOperation, pagination, uploadFile, ueditor },
mixins: [presenter(), header(), crud()],
data() {
return {
@@ -148,17 +148,8 @@ export default {
status: ''
},
rules: {
name: [
{ required: true, message: '请上传图片', trigger: 'blur' }
],
serialNumber: [
{ required: true, message: '请输入序号', trigger: 'blur' }
],
link: [
{ required: true, message: '请输入链接', trigger: 'blur' }
],
desc: [
{ required: true, message: '请填写活动形式', trigger: 'blur' }
title: [
{ required: true, message: '请输入标题', trigger: 'blur' }
]
},
loadingBtn: false
@@ -262,8 +253,7 @@ export default {
this.$refs[formName].resetFields()
},
editorChange(e) {
debugger
// this.$set(this.ruleForm, '' , e)
this.$set(this.ruleForm, 'detail', e)
}
}
}


+ 8
- 13
src/views/news/yyz/depth.vue View File

@@ -112,7 +112,7 @@
</el-form-item>
<el-form-item label="详情" prop="detail">
<el-input v-model="ruleForm.detail"></el-input>
<ueditor :come-content="ruleForm.detail" @editorChange="editorChange($event)"></ueditor>
</el-form-item>
<el-form-item label="图片" prop="image">
<uploadFile :url.sync="ruleForm.image" type="image" />
@@ -142,9 +142,10 @@ import CRUD, { presenter, header, crud } from '@crud/crud'
import pagination from '@crud/Pagination'
import uploadFile from '@/components/uploadFile'
import rrOperation from '@crud/RR.operation'
import ueditor from '@/components/ueditor'

export default {
components: { rrOperation, pagination, uploadFile },
components: { rrOperation, pagination, uploadFile, ueditor },
mixins: [presenter(), header(), crud()],
data() {
return {
@@ -161,17 +162,8 @@ export default {
status: ''
},
rules: {
name: [
{ required: true, message: '请上传图片', trigger: 'blur' }
],
serialNumber: [
{ required: true, message: '请输入序号', trigger: 'blur' }
],
link: [
{ required: true, message: '请输入链接', trigger: 'blur' }
],
desc: [
{ required: true, message: '请填写活动形式', trigger: 'blur' }
title: [
{ required: true, message: '请输入标题', trigger: 'blur' }
]
},
loadingBtn: false
@@ -274,6 +266,9 @@ export default {
},
resetForm(formName) {
this.$refs[formName].resetFields()
},
editorChange(e) {
this.$set(this.ruleForm, 'detail', e)
}
}
}


+ 8
- 13
src/views/news/yyz/info.vue View File

@@ -104,7 +104,7 @@
<el-input v-model="ruleForm.subTitle"></el-input>
</el-form-item>
<el-form-item label="详情" prop="detail">
<el-input v-model="ruleForm.detail"></el-input>
<ueditor :come-content="ruleForm.detail" @editorChange="editorChange($event)"></ueditor>
</el-form-item>
<el-form-item label="图片" prop="image">
<uploadFile :url.sync="ruleForm.image" type="image" />
@@ -134,9 +134,10 @@ import CRUD, { presenter, header, crud } from '@crud/crud'
import pagination from '@crud/Pagination'
import uploadFile from '@/components/uploadFile'
import rrOperation from '@crud/RR.operation'
import ueditor from '@/components/ueditor'

export default {
components: { rrOperation, pagination, uploadFile },
components: { rrOperation, pagination, uploadFile, ueditor },
mixins: [presenter(), header(), crud()],
data() {
return {
@@ -153,17 +154,8 @@ export default {
status: ''
},
rules: {
name: [
{ required: true, message: '请上传图片', trigger: 'blur' }
],
serialNumber: [
{ required: true, message: '请输入序号', trigger: 'blur' }
],
link: [
{ required: true, message: '请输入链接', trigger: 'blur' }
],
desc: [
{ required: true, message: '请填写活动形式', trigger: 'blur' }
title: [
{ required: true, message: '请输入标题', trigger: 'blur' }
]
},
loadingBtn: false
@@ -266,6 +258,9 @@ export default {
},
resetForm(formName) {
this.$refs[formName].resetFields()
},
editorChange(e) {
this.$set(this.ruleForm, 'detail', e)
}
}
}


+ 2
- 1
src/views/yyzrb/banner1.vue View File

@@ -7,7 +7,8 @@
<div class="app-container">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="resetform">
<el-form-item label="图片" prop="image">
<uploadFile :url.sync="ruleForm.image" type="image" />
<uploadFile :url.sync="ruleForm.image" type="image" width="1200" height="120"/>
<p style="color: #909399;">*请上传1200*120的图片</p>
</el-form-item>
<el-form-item label="链接" prop="link">
<el-input v-model="ruleForm.link"></el-input>


+ 2
- 1
src/views/yyzrb/banner2.vue View File

@@ -7,7 +7,8 @@
<div class="app-container">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="resetform">
<el-form-item label="图片" prop="image">
<uploadFile :url.sync="ruleForm.image" type="image" />
<uploadFile :url.sync="ruleForm.image" type="image" width="1200" height="120"/>
<p style="color: #909399;">*请上传1200*120的图片</p>
</el-form-item>
<el-form-item label="链接" prop="link">
<el-input v-model="ruleForm.link"></el-input>


Loading…
Cancel
Save