Skip to content

C
cloud-platform-ui
Commit 002205b2 authored by xiaosl's avatar xiaosl
Browse files
Options

Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

parents f9d58789 edb250b6
Show whitespace changes
Inline Side-by-side
Showing with 820 additions and 643 deletions
config/dev.env.js
View file @ 002205b2
module.exports = { module.exports = {
NODE_ENV: '"development"', NODE_ENV: '"development"',
BASE_API:'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威) BASE_API:'"https://dev.dfangche.com"',//'"https://xxtest.upyuns.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
APP_ORIGIN: '"https://wallstreetcn.com"' APP_ORIGIN: '"https://wallstreetcn.com"'
} }
src/api/summit/activityShow.js
View file @ 002205b2
...@@ -2,7 +2,7 @@ import fetch from 'utils/fetch'; ...@@ -2,7 +2,7 @@ import fetch from 'utils/fetch';
export function one(activityId) { export function one(activityId) {
return fetch({ return fetch({
url: '/api/summit/activityShow/one/'+activityId, url: '/api/summit/activityShow/app/unauth/one/'+activityId,
method: 'get' method: 'get'
}) })
} }
......
src/views/baseInfo/companyInfo/index.vue
View file @ 002205b2
...@@ -461,6 +461,7 @@ ...@@ -461,6 +461,7 @@
this.page = 1; this.page = 1;
this.list = []; this.list = [];
this.nomore = false; this.nomore = false;
this.loading = false;
this.loadMore(); this.loadMore();
}, },
/** /**
...@@ -510,6 +511,7 @@ ...@@ -510,6 +511,7 @@
if(res.data.length< this.listQuery.limit && this.list.length>0){ if(res.data.length< this.listQuery.limit && this.list.length>0){
//已加载全部 //已加载全部
this.nomore = true; this.nomore = true;
this.loading = false;
} }
} }
this.list = [...this.list, ...allList]; this.list = [...this.list, ...allList];
......
src/views/purseManage/gainRecord.vue
View file @ 002205b2
...@@ -52,13 +52,13 @@ ...@@ -52,13 +52,13 @@
<el-table-column width="200" align="center" label="来源"> <el-table-column width="200" align="center" label="来源">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.sourceName}}</span> <span>{{scope.row.sourceUserName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="订单号"> <el-table-column width="200" align="center" label="订单号">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.cono}}</span> <span>{{scope.row.orderNo}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="订单金额"> <el-table-column width="200" align="center" label="订单金额">
...@@ -68,7 +68,8 @@ ...@@ -68,7 +68,8 @@
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="提成比例"> <el-table-column width="200" align="center" label="提成比例">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.extract}}%</span> <span v-if="scope.row.extract">{{scope.row.extract}}%</span>
<span else></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="100" align="center" label="金额变动"> <el-table-column width="100" align="center" label="金额变动">
......
src/views/summit/index.vue
View file @ 002205b2
...@@ -78,14 +78,13 @@ ...@@ -78,14 +78,13 @@
<el-button <el-button
size="small" size="small"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
v-if
@click="enrollData(scope.row)" @click="enrollData(scope.row)"
>报名信息</el-button> >报名信息</el-button>
<el-button <!-- <el-button
size="small" size="small"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
@click="applyPage(scope.row)" @click="applyPage(scope.row)"
>报名页面</el-button> >报名页面</el-button> -->
<el-button <el-button
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
size="small" size="small"
...@@ -94,7 +93,6 @@ ...@@ -94,7 +93,6 @@
<el-button <el-button
size="small" size="small"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
v-if
@click="review(scope.row)" @click="review(scope.row)"
>回顾页面</el-button> >回顾页面</el-button>
<el-button <el-button
...@@ -136,7 +134,7 @@ ...@@ -136,7 +134,7 @@
v-on:reviewDialogEvent="reviewDialogEvent" v-on:reviewDialogEvent="reviewDialogEvent"
/> />
<applyPage :applyInfo='applyInfo'></applyPage> <!-- <applyPage :applyInfo='applyInfo'></applyPage> -->
</div> </div>
</template> </template>
<script> <script>
...@@ -146,7 +144,7 @@ import { page, update } from "src/api/summit/activity"; ...@@ -146,7 +144,7 @@ import { page, update } from "src/api/summit/activity";
import summitPopup from "src/views/summit/model/summitPopup"; import summitPopup from "src/views/summit/model/summitPopup";
import enrollDataPopup from "src/views/summit/model/enrollDataPopup"; import enrollDataPopup from "src/views/summit/model/enrollDataPopup";
import reviewPopup from "src/views/summit/model/reviewPopup"; import reviewPopup from "src/views/summit/model/reviewPopup";
import applyPage from "src/views/summit/model/applyPage"; // import applyPage from "src/views/summit/model/applyPage";
import { getToken } from "src/utils/auth"; import { getToken } from "src/utils/auth";
...@@ -156,7 +154,7 @@ export default { ...@@ -156,7 +154,7 @@ export default {
summitPopup, summitPopup,
enrollDataPopup, enrollDataPopup,
reviewPopup, reviewPopup,
applyPage // applyPage
}, },
data() { data() {
return { return {
...@@ -210,9 +208,9 @@ export default { ...@@ -210,9 +208,9 @@ export default {
}, },
methods: { methods: {
//报名页面 //报名页面
applyPage(){ // applyPage(){
this.applyInfo.dialogVisible = true; // this.applyInfo.dialogVisible = true;
}, // },
getList() { getList() {
this.listLoading = true; this.listLoading = true;
page(this.query).then(res => { page(this.query).then(res => {
......
src/views/summit/model/reviewPopup.vue
View file @ 002205b2
...@@ -37,11 +37,12 @@ ...@@ -37,11 +37,12 @@
<el-col> <el-col>
<el-form-item label="峰会图片:"> <el-form-item label="峰会图片:">
<el-upload <el-upload
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'" :action="BASE_API+'/api/universal/file/app/unauth/pictureZip'"
list-type="picture-card" list-type="picture-card"
:file-list="list" :file-list="list"
:on-success="handlePictureCardPreview" :on-success="handlePictureCardPreview"
:on-remove="handleRemove" :on-remove="handleRemove"
:before-upload="beforeAvatarUpload"
> >
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</el-upload> </el-upload>
...@@ -53,11 +54,13 @@ ...@@ -53,11 +54,13 @@
<el-col> <el-col>
<el-form-item label="峰会视频:"> <el-form-item label="峰会视频:">
<el-upload <el-upload
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'" :action="BASE_API+'/api/universal/file/app/unauth/uploadVideo'"
list-type="picture-card" list-type="picture-card"
:headers="getHeaderWithToken" :headers="getHeaderWithToken"
:on-preview="handlePreview" :on-preview="handlePreview"
:on-remove="handleRemove" :on-remove="handleRemove"
:before-upload="videoUpload"
:on-success="vidioSuccess"
> >
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</el-upload> </el-upload>
...@@ -76,7 +79,7 @@ ...@@ -76,7 +79,7 @@
<el-col> <el-col>
<el-form-item> <el-form-item>
<el-button class="button" @click="cancelHandel">取 消</el-button> <el-button class="button" @click="cancelHandel">取 消</el-button>
<el-button class="button" type="primary" @click="cre">确 定</el-button> <!-- <el-button class="button" type="primary" @click="cre">确 定</el-button> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -88,17 +91,17 @@ ...@@ -88,17 +91,17 @@
</template> </template>
<script> <script>
import ElRow from "element-ui/packages/row/src/row"; import ElRow from 'element-ui/packages/row/src/row'
import ElInput from "../../../../node_modules/element-ui/packages/input/src/input.vue"; import ElInput from '../../../../node_modules/element-ui/packages/input/src/input.vue'
import ElCol from "element-ui/packages/col/src/col"; import ElCol from 'element-ui/packages/col/src/col'
import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue"; import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue'
import { getToken } from "src/utils/auth"; import { getToken } from 'src/utils/auth'
import { mapGetters } from "vuex"; import { mapGetters } from 'vuex'
import { one, save } from "src/api/summit/activityShow"; import { one, save } from 'src/api/summit/activityShow'
export default { export default {
props: ["reviewRow"], props: ['reviewRow'],
name: "reviewPopup", name: 'reviewPopup',
components: { components: {
ElFormItem, ElFormItem,
ElCol, ElCol,
...@@ -123,102 +126,135 @@ export default { ...@@ -123,102 +126,135 @@ export default {
videoPath: undefined, videoPath: undefined,
picturePath: undefined picturePath: undefined
} }
}; }
}, },
watch: { watch: {
dialogVisible(newValue, oldValue) { dialogVisible(newValue, oldValue) {
if (!newValue) { if (!newValue) {
this.$emit("reviewDialogEvent", this.result); this.$emit('reviewDialogEvent', this.result)
} }
} }
}, },
computed: { computed: {
...mapGetters(["elements"]), ...mapGetters(['elements']),
getHeaderWithToken() { getHeaderWithToken() {
return { Authorization: getToken() }; return { Authorization: getToken() }
} }
}, },
watch: { watch: {
dialogVisible(newValue, oldValue) { dialogVisible(newValue, oldValue) {
if (!newValue) { if (!newValue) {
this.$emit("summitDialogEvent", this.result); this.$emit('summitDialogEvent', this.result)
} }
} }
}, },
mounted() { mounted() {
this.getOrderInfo(); this.getOrderInfo()
}, },
methods: { methods: {
vidioSuccess(res) {
console.log(res)
this.$notify({
title: '成功',
message: res.message,
type: 'success',
duration: 2000
})
},
beforeAvatarUpload(file) {
const zip = file.type === 'application/zip'
if (!zip) {
this.$message.error('上传头像图片只能是 zip 格式!')
}
return zip
},
videoUpload(file) {
console.log(file.type)
const isJPG = file.type === 'video/mp4'
if (!isJPG) {
this.$message.error('上传头像图片只能是 mp4 格式!')
}
return isJPG
},
getOrderInfo() { getOrderInfo() {
console.log(this.reviewRow.id)
one(this.reviewRow.id).then(res => { one(this.reviewRow.id).then(res => {
this.form = res.data; this.form = res.data
this.dialogVisible = true; this.dialogVisible = true
this.imgDialogVisible = true; this.imgDialogVisible = true
}); })
}, },
cre() { cre() {
console.log(this.form.picturePath); console.log(this.form.picturePath)
save(this.form).then(res => { save(this.form).then(res => {
this.responseResult(res); this.responseResult(res)
}); })
}, },
responseResult(res) { responseResult(res) {
if (res.status === 200) { if (res.status === 200) {
this.$notify({ this.$notify({
title: "成功", title: '成功',
message: "操作成功", message: '操作成功',
type: "success", type: 'success',
duration: 2000 duration: 2000
}); })
this.setSummitDialogEvent(true); this.setSummitDialogEvent(true)
} else { } else {
this.$notify({ this.$notify({
title: "失败", title: '失败',
message: "操作失败！", message: '操作失败！',
type: "error", type: 'error',
duration: 2000 duration: 2000
}); })
} }
}, },
/** /**
* 弹框-取消 * 弹框-取消
* */ * */
cancelHandel() { cancelHandel() {
this.setSummitDialogEvent(false); this.setSummitDialogEvent(false)
}, },
setSummitDialogEvent(e) { setSummitDialogEvent(e) {
this.cleanForm(); this.cleanForm()
this.result = e; this.result = e
this.dialogVisible = false; this.dialogVisible = false
}, },
/** /**
* 封面图上传 * 封面图上传
* **/ * **/
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
this.percent = 0; this.percent = 0
this.imgFlag = false; this.imgFlag = false
this.form.banner = res.data; this.form.banner = res.data
}, },
/** /**
* 封面图上传进度 * 封面图上传进度
* */ * */
uploadProcess(event, file, fileList) { uploadProcess(event, file, fileList) {
this.imgFlag = true; this.imgFlag = true
this.percent = Math.floor(event.percent); this.percent = Math.floor(event.percent)
}, },
handlePreview(file) { handlePreview(file) {
this.form.videoPath = file.data; this.form.videoPath = file.data
this.imgDialogVisible = true; this.imgDialogVisible = true
}, },
handleRemove(file, fileList) { handleRemove(file, fileList) {
// console.log(file) // console.log(file)
console.log(file, fileList); console.log(file, fileList)
}, },
handlePictureCardPreview(res, file) { handlePictureCardPreview(res, file) {
this.list.push({ url: res.data }); this.$notify({
title: '成功',
message: res.message,
type: 'success',
duration: 2000
})
this.list.push({ url: res.data })
// this.imgDialogVisible = true; // this.imgDialogVisible = true;
}, },
cleanForm() { cleanForm() {
...@@ -229,10 +265,10 @@ export default { ...@@ -229,10 +265,10 @@ export default {
banner: undefined, banner: undefined,
videoPath: undefined, videoPath: undefined,
picturePath: undefined picturePath: undefined
};
} }
} }
}; }
}
</script> </script>
<style> <style>
.label-text { .label-text {
......
src/views/summit/model/summitPopup.vue
View file @ 002205b2
<template> <template>
<el-dialog :title="title" :visible.sync="dialogVisible" class="order-details"> <el-dialog :title="title" :visible.sync="dialogVisible" class="order-details">
<div> <div>
<el-form :model="form" ref="form" label-width="120px"> <!-- <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" label-width="100px" class="demo-ruleForm"> -->
<el-form :model="form" ref="form" :rules="rules" label-width="120px">
<div> <div>
<!-- <div><span><h3>基础信息</h3></span></div> --> <p style="padding:20px 0;border-bottom:1px solid #d9d9d9">基础信息</p>
<div class="steLine"> <div class="steLine">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
...@@ -53,12 +54,7 @@ ...@@ -53,12 +54,7 @@
:editable="true" :editable="true"
placeholder="开始时间" placeholder="开始时间"
></el-date-picker>- ></el-date-picker>-
<el-date-picker <el-date-picker v-model="form.endTime" type="datetime" :editable="true" placeholder="选择日期"></el-date-picker>
v-model="form.endTime"
type="datetime"
:editable="true"
placeholder="选择日期"
></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -76,20 +72,10 @@ ...@@ -76,20 +72,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-form-item style="display:inline-block;margin-left:-120px"> <el-form-item style="display:inline-block;margin-left:-120px">
<el-input <el-input class="content" v-model="form.longitude" placeholder="经度" style="width:100px"></el-input>
class="content"
v-model="form.longitude"
placeholder="经度"
style="width:100px"
></el-input>
</el-form-item> </el-form-item>
<el-form-item style="display:inline-block;margin-left:-120px"> <el-form-item style="display:inline-block;margin-left:-120px">
<el-input <el-input class="content" v-model="form.latitude" placeholder="纬度" style="width:100px"></el-input>
class="content"
v-model="form.latitude"
placeholder="纬度"
style="width:100px"
></el-input>
</el-form-item> </el-form-item>
<!-- <el-col :span="6" class="content"> <!-- <el-col :span="6" class="content">
<el-form-item> <el-form-item>
...@@ -124,19 +110,58 @@ ...@@ -124,19 +110,58 @@
</el-row> </el-row>
</div> </div>
</div> </div>
<!-- <div> <div>
<div><span><h3>报名页面</h3></span></div> <p style="padding:20px 0;border-bottom:1px solid #d9d9d9">报名页面</p>
<div> <div>
<el-row> <el-row>
<el-col :span="10"> <el-col>
<el-form-item label="峰会简介:"> <el-form-item label="峰会主题：">
<el-input class="fhjj" v-model="form.content" :rows="9" type="textarea" <UE
placeholder="请输入车型简介"></el-input> :editorId="activeName"
:defaultMsg="form.content"
:config="config"
ref="ue"
@ready="editorReadyEvent"
></UE>
</el-form-item>
<el-form-item label="诚邀莅临：" prop="name">
<UE
:editorId="activeNameShare"
:defaultMsg="form.actDesc "
:config="config"
ref="ue"
@ready="editorReadyEventShare"
></UE>
</el-form-item>
<el-form-item label="公司简章：" prop="name">
<UE
:editorId="activeNameFirm"
:defaultMsg="form.companyDesc"
:config="config"
ref="ue"
@ready="editorReadyEventFirm"
></UE>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="房车介绍:">
<el-upload
class="upload-demo"
:headers="getHeaderWithToken"
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
:on-remove="handleRemove"
:file-list="fileList2"
:on-success="handleBannerSuccess"
list-type="picture"
>
<div slot="tip" class="el-upload__tip">
<span style="color: red;">建议尺寸：1080*644px</span>
</div>
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
</el-form-item>
<el-form-item label="峰会流程:"> <el-form-item label="峰会流程:">
<el-row class="height" v-for="(item, index) in processJson" :key="index"> <el-row class="height" v-for="(item, index) in processJson" :key="index">
<el-col :span="6"> <el-col :span="6">
...@@ -144,16 +169,19 @@ ...@@ -144,16 +169,19 @@
v-model="item.time" v-model="item.time"
type="datetime" type="datetime"
format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择时间"> placeholder="请选择时间"
</el-date-picker> ></el-date-picker>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-input class="content" v-model="item.content" placeholder="请输入内容"></el-input> <el-input class="content" v-model="item.content" placeholder="请输入内容"></el-input>
</el-col> </el-col>
<el-col class="content" :span="8"> <el-col class="content" :span="8">
<el-button type="danger" size="small" style="margin-left: 10px;" @click="deleteItem(item,index)"> <el-button
删除 type="danger"
</el-button> size="small"
style="margin-left: 10px;"
@click="deleteItem(item,index)"
>删除</el-button>
</el-col> </el-col>
</el-row> </el-row>
</el-form-item> </el-form-item>
...@@ -165,42 +193,59 @@ ...@@ -165,42 +193,59 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
</div> </div>
</div>-->
</el-form>
</div> </div>
<div slot="footer" class="dialog-footer1"> <el-row>
<el-col>
<el-button class="button" @click="cancelHandel">取 消</el-button> <el-button class="button" @click="cancelHandel">取 消</el-button>
<el-button class="button" type="primary" v-if="titleNme=='创建峰会'" @click="create()">确 定</el-button> <el-button class="button" type="primary" v-if="titleNme=='创建峰会'" @click="create('form')">确 定</el-button>
<el-button class="button" type="primary" v-if="titleNme=='编辑峰会'" @click="update1()">确 定</el-button> <el-button class="button" type="primary" v-if="titleNme=='编辑峰会'" @click="update1()">确 定</el-button>
</el-col>
</el-row>
</el-form>
</div> </div>
<!-- <div class="modal_modal" v-show="resetCarVisible"></div>--> <!-- <div class="modal_modal" v-show="resetCarVisible"></div>-->
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import ElRow from "element-ui/packages/row/src/row"; import ElRow from 'element-ui/packages/row/src/row'
import ElInput from "../../../../node_modules/element-ui/packages/input/src/input.vue"; import ElInput from '../../../../node_modules/element-ui/packages/input/src/input.vue'
import ElCol from "element-ui/packages/col/src/col"; import ElCol from 'element-ui/packages/col/src/col'
import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue"; import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue'
import { getOne, update, add } from "src/api/summit/activity"; import { getOne, update, add } from 'src/api/summit/activity'
import { getToken } from "src/utils/auth"; import { getToken } from 'src/utils/auth'
import { mapGetters } from "vuex"; import { mapGetters } from 'vuex'
import UE from '../../modal/Ueditor' // 百度ue富文本
import { formatDate } from 'utils/dateFormattor'
export default { export default {
props: ["popupShow", "popupRow", "titleNme"], props: ['popupShow', 'popupRow', 'titleNme'],
name: "summitPopup", name: 'summitPopup',
components: { components: {
ElFormItem, ElFormItem,
ElCol, ElCol,
ElInput, ElInput,
ElRow ElRow,
UE
}, },
data() { data() {
return { return {
fileList2: [],
config: {
initialFrameWidth: null,
initialFrameHeight: 350
},
dialogVisible: false, dialogVisible: false,
title: "", title: '',
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
percent: 0, //上传进度 percent: 0, // 上传进度
percents: 0, // 上传进度
imgFlag: false, imgFlag: false,
imgFlags: false,
activeName: '',
activeNameShare: '',
activeNameFirm: '',
rules: {},
form: { form: {
title: undefined, title: undefined,
banner: undefined, banner: undefined,
...@@ -210,108 +255,188 @@ export default { ...@@ -210,108 +255,188 @@ export default {
address: undefined, address: undefined,
longitude: undefined, longitude: undefined,
latitude: undefined, latitude: undefined,
state: "默认", state: '默认',
rid: undefined rid: undefined,
content: '', // 峰会主题
contentFirm: '',
actDesc: '', // 诚邀莅临
companyDesc: '', // 公司简章
vehicleImgs: [] // 房车介绍
}, },
result: false, result: false,
processJson: [] processJson: []
}; }
}, },
mounted() { mounted() {
this.cleanForm(); this.cleanForm()
this.getOrderInfo(); this.getOrderInfo()
}, },
computed: { computed: {
...mapGetters(["elements"]), ...mapGetters(['elements']),
getHeaderWithToken() { getHeaderWithToken() {
return { Authorization: getToken() }; return { Authorization: getToken() }
} }
}, },
watch: { watch: {
dialogVisible(newValue, oldValue) { dialogVisible(newValue) {
if (!newValue) { if (!newValue) {
this.$emit("summitDialogEvent", this.result); this.$emit('summitDialogEvent', this.result)
} }
} }
}, },
methods: { methods: {
handleBannerSuccess(res, file) {
this.fileList2.push({ url: res.data })
this.form.vehicleImgs = this.fileList2
},
handleRemove() {},
getOrderInfo() { getOrderInfo() {
this.title = this.titleNme; this.title = this.titleNme
if (this.title === "编辑峰会") { if (this.title === '编辑峰会') {
this.$nextTick(() => {
this.dialogVisible = true
this.activeName = 'first'
this.activeNameShare = 'second'
this.activeNameFirm = 'three'
})
getOne(this.popupRow.id).then(res => { getOne(this.popupRow.id).then(res => {
res.data.state = this.getState(res.data.status); res.data.state = this.getState(res.data.status)
res.data.bmCloseTime = res.data.bmCloseTime; this.form = res.data
this.form = res.data; this.form.bmCloseTime = Number(res.data.bmCloseTime)
let introduce = this.form.vehicleImgs.split(',');
introduce.forEach(element => {
this.fileList2.push({name:'峰会介绍',url:element})
});
if (res.data.processJson) { if (res.data.processJson) {
this.processJson = JSON.parse(res.data.processJson); this.processJson = JSON.parse(res.data.processJson)
} }
this.dialogVisible = true; })
});
} }
if (this.title === "创建峰会") { if (this.title === '创建峰会') {
this.dialogVisible = true; this.dialogVisible = true
this.activeName = 'first'
this.activeNameShare = 'second'
this.activeNameFirm = 'three'
}
},
editorReadyEvent(instance) {
const t = this
instance.addListener('contentChange', () => {
console.log(t.activeName)
if (t.activeName === 'first') {
t.form.content = instance.getContent()
}
})
},
editorReadyEventShare(instance) {
const t = this
instance.addListener('contentChange', () => {
if (t.activeNameShare === 'second') {
t.form.actDesc = instance.getContent()
}
})
},
editorReadyEventFirm(instance) {
const t = this
instance.addListener('contentChange', () => {
if (t.activeNameFirm == 'three') {
t.form.companyDesc = instance.getContent()
} }
})
}, },
/** /**
* 封面图上传进度 * 封面图上传进度
* */ * */
uploadProcess(event, file, fileList) { uploadProcess(event, file, fileList) {
this.imgFlag = true; this.imgFlag = true
this.percent = Math.floor(event.percent); this.percent = Math.floor(event.percent)
}, },
/** /**
* 封面图上传 * 封面图上传
* **/ * **/
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
this.percent = 0; this.percent = 0
this.imgFlag = false; this.imgFlag = false
this.form.banner = res.data; this.form.banner = res.data
}, },
getState(status) { getState(status) {
if (this.$utils.isInteger(status)) { if (this.$utils.isInteger(status)) {
if (status == 0) { if (status == 0) {
return "默认"; return '默认'
} else { } else {
return "自定义"; return '自定义'
} }
} }
return ""; return ''
}, },
setSummitDialogEvent(e) { setSummitDialogEvent(e) {
this.cleanForm(); this.cleanForm()
this.result = e; this.result = e
this.dialogVisible = false; this.dialogVisible = false
}, },
addTag() { addTag() {
let t = { const t = {
time: undefined, time: undefined,
content: "" content: ''
}; }
this.processJson.push(t); this.processJson.push(t)
}, },
/** /**
* 保存修改 * 保存修改
* *
* */ * */
update1() { update1() {
this.dataProcessing(); this.dataProcessing()
update(this.form).then(res => { update(this.form).then(res => {
this.responseResult(res); this.responseResult(res)
}); })
}, },
create() { create(formName) {
this.dataProcessing(); if (
!this.form.title ||
!this.form.startTime ||
!this.form.endTime
) {
this.$notify({
title: '失败',
message: '必填项不能为空',
type: 'error',
duration: 2000
})
return false
} else {
this.form.endTime = this.form.endTime.getTime()
this.form.startTime = this.form.startTime.getTime()
this.form.bmCloseTime = this.form.bmCloseTime.getTime()
let pic = []
this.form.vehicleImgs.forEach(element => {
pic.push(element.url)
})
this.form.vehicleImgs = pic.join(',')
let demo = []
this.processJson.forEach(element => {
demo.push({
time:
formatDate(element.time, 'yyyy-MM-dd hh') +
':00:00',
content: element.content
})
})
this.form.processJson = demo
add(this.form).then(res => { add(this.form).then(res => {
this.responseResult(res); this.responseResult(res)
}); })
this.dataProcessing()
}
}, },
dataProcessing() { dataProcessing() {
if (this.form.state === "默认") { if (this.form.state === '默认') {
this.form.status = 0; this.form.status = 0
} }
this.form.processJson = JSON.stringify(this.processJson); this.form.processJson = JSON.stringify(this.processJson)
}, },
/** /**
* 请求结果判断 * 请求结果判断
...@@ -319,33 +444,33 @@ export default { ...@@ -319,33 +444,33 @@ export default {
responseResult(res) { responseResult(res) {
if (res.status === 200) { if (res.status === 200) {
this.$notify({ this.$notify({
title: "成功", title: '成功',
message: "操作成功", message: '操作成功',
type: "success", type: 'success',
duration: 2000 duration: 2000
}); })
this.setSummitDialogEvent(true); this.setSummitDialogEvent(true)
} else { } else {
this.$notify({ this.$notify({
title: "失败", title: '失败',
message: "操作失败！", message: '操作失败！',
type: "error", type: 'error',
duration: 2000 duration: 2000
}); })
} }
}, },
/** /**
* 删除时间 * 删除时间
* */ * */
deleteItem(obj, index) { deleteItem(obj, index) {
this.processJson.splice(index, 1); this.processJson.splice(index, 1)
}, },
/** /**
* 弹框-取消 * 弹框-取消
* */ * */
cancelHandel() { cancelHandel() {
this.setSummitDialogEvent(false); this.setSummitDialogEvent(false)
}, },
cleanForm() { cleanForm() {
...@@ -358,12 +483,17 @@ export default { ...@@ -358,12 +483,17 @@ export default {
address: undefined, address: undefined,
longitude: undefined, longitude: undefined,
latitude: undefined, latitude: undefined,
state: "默认", state: '默认',
rid: undefined rid: undefined,
}; content: '', // 峰会主题
contentFirm: '',
actDesc: '', // 诚邀莅临
companyDesc: '', // 公司简章
vehicleImgs: [] // 房车介绍
} }
} }
}; }
}
</script> </script>
<style> <style>
.label-text { .label-text {
...@@ -420,14 +550,14 @@ export default { ...@@ -420,14 +550,14 @@ export default {
margin-bottom: 2%; margin-bottom: 2%;
} }
. el-form-item__content { /* . el-form-item__content {
margin-left: 5% !important; margin-left: 5% !important;
} } */
.status { .status {
margin-top: 4%; margin-top: 4%;
} }
.steLine .el-row{ .steLine .el-row {
margin-bottom: 10px; margin-bottom: 10px;
} }
</style> </style>
......
src/views/vehicle/vehicleCount/index.vue
View file @ 002205b2
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
<span>{{scope.row.beforeDepartureNum}}</span> <span>{{scope.row.beforeDepartureNum}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" align="center" label="正常交车"> <el-table-column width="150" align="center" label="正常交车">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.actualDepartureNum}}</span> <span>{{scope.row.actualDepartureNum}}</span>
...@@ -112,6 +111,12 @@ ...@@ -112,6 +111,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" align="center" label="过期未出车">
<template scope="scope">
<span>{{scope.row.noUseNum}}</span>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="日期"> <el-table-column width="200" align="center" label="日期">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.countDate}}</span> <span>{{scope.row.countDate}}</span>
...@@ -145,7 +150,7 @@ ...@@ -145,7 +150,7 @@
{'id':3, "name":"内部用车"} {'id':3, "name":"内部用车"}
], ],
list : [], list : [],
header : ['序号','类型','应交车','提前交车','正常交车','延期交车','应还车','提前还车','正常还车','延期还车','日期'], header : ['序号','类型','应交车','提前交车','正常交车','延期交车','应还车','提前还车','正常还车','延期还车','过期未出车','日期'],
name: 'export' name: 'export'
} }
}, },
...@@ -157,8 +162,12 @@ ...@@ -157,8 +162,12 @@
}, },
methods: { methods: {
handlerSearch() { handlerSearch() {
if (this.listQuery.startTime) {
this.listQuery.startTime = getYMD_date(new Date(this.listQuery.startTime)); this.listQuery.startTime = getYMD_date(new Date(this.listQuery.startTime));
}
if(this.listQuery.endTime) {
this.listQuery.endTime = getYMD_date(new Date(this.listQuery.endTime)); this.listQuery.endTime = getYMD_date(new Date(this.listQuery.endTime));
}
get(this.listQuery).then(response => { get(this.listQuery).then(response => {
if (response.status === 200) { if (response.status === 200) {
this.list = response.data this.list = response.data
...@@ -234,6 +243,7 @@ ...@@ -234,6 +243,7 @@
window.location.href="https://"+domain+"/vehicle/vehicleCount/app/unauth/download?path="+fileName; window.location.href="https://"+domain+"/vehicle/vehicleCount/app/unauth/download?path="+fileName;
}) })
}, },
} }
} }
</script> </script>
src/views/xxOfficialWebsite/modal/popup.vue
View file @ 002205b2
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="发布人" prop="publisher"> <el-form-item label="发布人" prop="publisher">
<el-input v-model="form.publisher" type="text" placeholder="请输入发布人"></el-input> <el-input v-model="form.publisher" type="text"placeholder="请输入发布人"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
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