Skip to content

E
ElectricitySheep
Commit eaf96a66 authored by Mac's avatar Mac
Browse files
Options

1

parent f658e01c
Hide whitespace changes
Inline Side-by-side
Showing with 447 additions and 98 deletions
src/components/tradePavilion/addbillboard.vue
View file @ eaf96a66
...@@ -203,19 +203,6 @@ ...@@ -203,19 +203,6 @@
//广告 //广告
let advertising = this.$refs.ue.getUEContent(); let advertising = this.$refs.ue.getUEContent();
this.addMsg.content = advertising; this.addMsg.content = advertising;
if (this.addMsg.BuiltUpArea === '' || this.addMsg.EndBuiltUpArea === '') {
this.Error('请输入建筑面积')
return
}
if (this.addMsg.AreaRequirement === '' || this.addMsg.EndAreaRequirement === '') {
this.Error('请输入需求面积')
return
}
if (this.ShopWish == 0) {
this.addMsg.OpenShopWish = -1
}
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
this.apipost("/api/Trade/GetSetBrand", this.addMsg, (res) => { this.apipost("/api/Trade/GetSetBrand", this.addMsg, (res) => {
......
src/components/tradePavilion/billboardList.vue
View file @ eaf96a66
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="JoinNum" label="报名人数"> <el-table-column prop="JoinNum" label="报名人数">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="dialogTableVisible = true,getItem(scope.row)"> <el-button type="text" @click="getItem(scope.row)">
{{scope.row.JoinNum}} 人 {{scope.row.JoinNum}} 人
</el-button> </el-button>
</template> </template>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="放榜" placement="top"> <el-tooltip class="item" effect="dark" content="放榜" placement="top">
<img src="../../assets/img/setup/fangbang.png" alt="" class="imgstyle" /> <img src="../../assets/img/setup/fangbang.png" alt="" class="imgstyle" @click="fangbang(scope.row)"/>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="编辑" placement="top"> <el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img src="../../assets/img/setup/edit.png" alt="" class="imgstyle" <img src="../../assets/img/setup/edit.png" alt="" class="imgstyle"
...@@ -103,8 +103,6 @@ ...@@ -103,8 +103,6 @@
:total="total"> :total="total">
</el-pagination> </el-pagination>
</div> </div>
<!-- 报名人数的展示 --> <!-- 报名人数的展示 -->
<el-dialog title="报名信息" :visible.sync="dialogTableVisible"> <el-dialog title="报名信息" :visible.sync="dialogTableVisible">
<el-table :data="joinData"> <el-table :data="joinData">
...@@ -196,14 +194,28 @@ ...@@ -196,14 +194,28 @@
}, },
}); });
}, },
getItem(row) { getItem(row) {//跳转到报名列表
this.$router.push({
name: "listRegistration",
query: {
UserId: 0,
blank: "y",
},
});
}, },
goadd() {//新增修改 goadd() {//新增修改
this.$router.push({ this.$router.push({
name: "addbillboard", name: "addbillboard",
}); });
} },
fangbang(){//放榜功能
this.$router.push({
name: "publishAlist",
query: {
UserId: 0,
},
});
},
}, },
mounted() { } mounted() { }
......
src/components/tradePavilion/listRegistration.vue
View file @ eaf96a66
<template> <template>
<div class="listRegistration"> <div class="listRegistration">
<div class="head-title"> <div class="head-title">
榜单管理 <span @click="CommonJump('billboardList')" class="blue point">榜单管理</span>
<div style="float:right;margin-top:5px"> / 报名列表
<el-button style="float:right;margin-top: -5px;" size="small" type="primary" @click="CommonJump('addbillboard')">新增 <div style="float:right;">
<el-button style="float:right;margin-top: -5px;" size="small" type="primary" @click="CommonJump('addbillboard')">导出
</el-button> </el-button>
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<div> <div>
...@@ -32,66 +32,63 @@ ...@@ -32,66 +32,63 @@
</div> </div>
<el-table :data="tableData" v-loading="loading" border style="width: 100%;margin:20px 0"> <el-table :data="tableData" v-loading="loading" border style="width: 100%;margin:20px 0">
<el-table-column prop="EnterpriseName" label="报名企业">
<el-table-column prop="UserName" label="榜单信息"> </el-table-column>
<el-table-column prop="UserName" label="参与对象">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="app-image" <div class="app-image"
:style="{backgroundImage:'url(' + scope.row.CoverImage + ')',backgroundSize:'cover'}"> :style="{backgroundImage:'url(' + scope.row.Logo + ')',backgroundSize:'cover'}">
</div> </div>
<div flex="dir:left cross:center"> <div flex="dir:left cross:center">
{{scope.row.Name}} {{scope.row.Name}}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="UserName" label="关联图片/视频">
<el-table-column prop="Sponsor" label="主办方">
</el-table-column>
<el-table-column prop="TypeName" label="榜单类型">
</el-table-column>
<el-table-column prop="group" label="面向群体">
</el-table-column>
<el-table-column prop="Endtime" label="报名截止时间">
</el-table-column>
<el-table-column prop="publicitytime" label="公示日期">
</el-table-column>
<el-table-column prop="Area" label="是否启用排名">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.rankingType==1" style="color:green;">启用</span> <div class="app-image"
<span v-if="scope.row.rankingType==2" style="color:#e95252;">不启用</span> :style="{backgroundImage:'url(' + scope.row.images[0] + ')',backgroundSize:'cover'}">
</div>
<div flex="dir:left cross:center" @click="joinData = scope.row,dialogTableVisible=true" style="margin-top:14px;cursor: pointer;color: blue;">
查看更多
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="description" width='400' label="参与说明">
</el-table-column>
<el-table-column prop="Telephone" width='100' label="联系电话">
</el-table-column>
<el-table-column prop="Status" label="状态"> <el-table-column prop="Status" label="状态" width='140'>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.Status==1">报名中</span> <span v-if="scope.row.Status==1">入榜（第x名）</span>
<span v-if="scope.row.Status==2">评比中</span> <span v-if="scope.row.Status==2">淘汰</span>
<span v-if="scope.row.Status==3">已放榜</span> <span v-if="scope.row.Status==3">未评比</span>
<span v-if="scope.row.Status==4">取消</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="JoinNum" label="报名人数">
<template slot-scope="scope"> <el-table-column label="操作" width="180">
<el-button type="text" @click="dialogTableVisible = true,getItem(scope.row)">
{{scope.row.JoinNum}} 人
</el-button>
</template>
</el-table-column>
<el-table-column label="操作" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="放榜" placement="top"> <el-tooltip class="item" effect="dark" content="详情" placement="top">
<img src="../../assets/img/setup/fangbang.png" alt="" class="imgstyle" /> <img src="../../assets/img/userman/icon-show.png" alt="" class="imgstyle" />
</el-tooltip>
<el-tooltip class="item" effect="dark" content="淘汰" placement="top">
<img src="../../assets/img/userman/nopass.png" alt="" class="imgstyle"
@click="eliminate(scope.row)" />
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="编辑" placement="top"> <el-tooltip class="item" effect="dark" content="候选" placement="top">
<img src="../../assets/img/setup/edit.png" alt="" class="imgstyle" <img src="../../assets/img/userman/pass.png" alt="" class="imgstyle"
@click="EditgoUrl(scope.row)" /> @click="candidate(scope.row)" />
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="重置" placement="top">
<img src="../../assets/img/setup/del.png" alt="" class="imgstyle" <img src="../../assets/img/userman/reset.png" alt="" class="imgstyle"
@click="delete_b(scope.row)" /> @click="delete_b(scope.row)" />
</el-tooltip> </el-tooltip>
...@@ -103,15 +100,24 @@ ...@@ -103,15 +100,24 @@
:total="total"> :total="total">
</el-pagination> </el-pagination>
</div> </div>
<el-dialog title="关联图片/视频" :visible.sync="dialogTableVisible">
<div style="display: flex;flex-wrap: wrap;" v-if='joinData'>
<!-- 报名人数的展示 --> <div v-for="(x,y) in joinData.images" :key='y'>
<el-dialog title="报名信息" :visible.sync="dialogTableVisible"> <el-image
<el-table :data="joinData"> style="width: 100px; height: 100px;margin-right: 10px;margin-bottom: 10px;"
<el-table-column property="LinkMan" label="联系人" width="150"></el-table-column> :src="x"
<el-table-column property="LinkTel" label="联系电话" width="200"></el-table-column> :preview-src-list="joinData.images">
</el-table> </el-image>
</div>
</div>
<div v-if='joinData' style="margin-top: 15px;">
<video width="320" height="240" controls="controls" v-if="joinData.video!=''">
<source :src="joinData.video" type="video/mp4" />
<source :src="joinData.video" type="video/ogg">
</video>
</div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -130,18 +136,16 @@ ...@@ -130,18 +136,16 @@
}, },
total: 0, total: 0,
tableData: [{ tableData: [{
CoverImage: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616557590000_450.png', EnterpriseName:'四川和平旅行社',
Name: '成都优质火锅', Name:"旅游",
Sponsor: "小龙坎", Logo:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616557590000_450.png',
TypeName: "招引贡献", images:['https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616557590000_450.png'],
group: '服务商', video:'http://192.168.20.214:8130/Upload/Video/202108301146507760000000003.mp4',
Endtime: '2021-10-01', description:'我们呢撒洪都拉斯看家里的积分劳动局两地分居登录；发几个了打飞机给；的了房价高；东方丽景；东哥房间个；来得及高；砥砺奋进；哦给大家发；了京东方；老规矩的；发链接给对方；链接给对方',
publicitytime: "2021-08-31", Telephone:'12112131231',
rankingType: 1,//1启用 2不启用 Status:1,//1入榜（第x名），2淘汰，3未评比
Status: 1,//1报名中，2评比中，3已放榜，4取消
JoinNum: 2,
}], //数据列表 }], //数据列表
joinData: [], joinData:null
}; };
}, },
created() { created() {
...@@ -164,7 +168,18 @@ ...@@ -164,7 +168,18 @@
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
}, },
eliminate(row){//淘汰对象
let that = this;
that.Confirm("你确定要将改对象淘汰吗?", function () {
console.log('你确定要将改对象淘汰吗')
});
},
candidate(row){//候选对象
let that = this;
that.Confirm("你确定将该对象纳入为候选吗?", function () {
console.log('你确定将该对象纳入为候选吗')
});
},
delete_b(row) { delete_b(row) {
let that = this; let that = this;
that.Confirm("是否删除?", function () { that.Confirm("是否删除?", function () {
...@@ -187,23 +202,9 @@ ...@@ -187,23 +202,9 @@
EditgoUrl() { EditgoUrl() {
}, },
guanlianbrand(UserId) {
this.$router.push({
name: "brandManagement",
query: {
UserId: UserId,
blank: "y",
},
});
},
getItem(row) {
},
goadd() {//新增修改
this.$router.push({
name: "addbillboard",
});
}
}, },
mounted() { } mounted() { }
......
src/components/tradePavilion/publishAlist.vue 0 → 100644
View file @ eaf96a66
<template>
<div v-loading="loading" class="publishAlist">
<div class="head-title">
<span @click="CommonJump('billboardList')" class="blue point">榜单管理</span>
/ 放榜
</div>
<div class="content">
<div v-for="(x,y) in msgList" :key='y' style="margin-bottom: 15px;border-bottom: 1px solid #e2e2e2;">
<div style="display: flex;align-items: flex-start;">
<span v-if="dataobj.rankingType==1" style="line-height: 32px;margin-right: 15px;">{{y+1}}:</span>
<el-select class="w300" v-model="x.Id" size="small" placeholder="请选择" @change="selectdis()" clearable>
<el-option v-for="item in enterpriseList" :key="item.Id" :label="item.Name" :value="item.Id" :disabled="item.disabled" >
</el-option>
</el-select>
<span style="margin-left: 15px;line-height: 32px">小奖章</span>
<div style="margin-left: 5px">
<el-button @click="openChangeDig(1,y)" size="small">选择文件</el-button>
<div class="app-gallery-item" style="position: relative; width: 100px; margin-top: 10px">
<img v-if="!x.SmallMedal || x.SmallMedal == ''" src="../../assets/img/default.png"
style="width: 80px; height: 80px" alt="" />
<el-image v-else style="width: 80px; height: 80px" :src="x.SmallMedal">
</el-image>
</div>
</div>
<span style="margin-left: 15px;line-height: 32px;">大奖章</span>
<div style="margin-left: 5px">
<el-button @click="openChangeDig(2,y)" size="small">选择文件</el-button>
<div class="app-gallery-item" style="position: relative; width: 100px; margin-top: 10px">
<img v-if="!x.GrandMedal || x.GrandMedal == ''" src="../../assets/img/default.png"
style="width: 80px; height: 80px" alt="" />
<el-image v-else style="width: 80px; height: 80px" :src="x.GrandMedal">
</el-image>
</div>
</div>
<!-- <el-button @click="synchro()" size="small" type="primary" style="margin-left: 15px">奖章同步</el-button> -->
<el-tooltip class="item" effect="dark" content="奖章同步" placement="top">
<img src="../../assets/img/userman/reset.png" alt="" class="imgstyle"
@click="synchro(y)" />
</el-tooltip>
<span style="margin-left: 15px;line-height: 32px;">评语</span>
<el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="x.comment" class='w400' style='margin-left: 15px;'>
</el-input>
</div>
<!-- <div style="margin: 20px 0;display: flex;align-items: flex-start;">
评语:
<el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="x.comment" class='w400' style='margin-left: 15px;'>
</el-input>
</div> -->
</div>
</div>
<div style="margin-top: 20px">
<el-button size="small" type="primary" @click="Save('addMsg')">保存</el-button>
</div>
<!-- 选择文件 -->
<el-dialog title="选择文件" :visible.sync="changeState" width="1240px">
<ChooseImg @SelectId="SelectId"></ChooseImg>
</el-dialog>
</div>
</template>
<script>
import ChooseImg from "@/components/global/ChooseImg.vue";
import UE from "@/components/global/UE.vue";
export default {
components: {
ChooseImg,
UE,
},
data() {
return {
loading: false,
addMsg: {
},
imgType: 0,
changeState: false,
dataobj: {
rankingType: 1,// 1排名， 2为不排名
Finalists: 6
},
msgList: [],
enterpriseList: [],//入围企业
msgListindex:0
};
},
created() {
this.msgList = []
this.enterpriseList = []
for (let i = 0; i < this.dataobj.Finalists; i++) {
let obj = {
Id: '',//企业ID
comment: '',//评语
SmallMedal: '',//小奖章
GrandMedal: '',//大奖章
}
let obj2 = {
Name: '企业' + i,
Id: i+1,
disabled:false
}
this.msgList.push(obj)
this.enterpriseList.push(obj2)
}
},
mounted() {
if (this.$route.query.ID) {
this.getData(this.$route.query.ID);
}
},
methods: {
//选择图片
SelectId(msg) {
let url = this.getIconLink(msg.url);
if (this.imgType == 1) {
this.msgList[this.msgListindex].SmallMedal = url
}else{
this.msgList[this.msgListindex].GrandMedal = url
}
this.changeState = false;
},
openChangeDig(num,index) {
this.changeState = true;
this.imgType = num;
this.msgListindex = index
},
synchro(index){//奖章同步
let Small='';
let Grand='';
this.msgList.forEach((x,y)=>{
if(y== index){
Small = x.SmallMedal
Grand = x.GrandMedal
}
if(y>index){//之后同步数据
x.SmallMedal = Small
x.GrandMedal = Grand
}
})
},
selectdis(){//企业下拉禁止选择处理
this.enterpriseList.forEach((x,y)=>{
let ishow= false
this.msgList.map((j,ji)=>{
if(ishow == false){
if(x.Id== j.Id){
x.disabled = true;
ishow= true
return
}else{
x.disabled = false;
}
}
})
})
},
//保存品牌
Save(formName) {
},
//获取详情
getData(ID) {
this.loading = true;
this.apipost(
"/api/Trade/GetBrandDetails",
{
ID: ID,
},
(res) => {
this.loading = false;
if (res.data.resultCode == 1) {
}
}
);
},
},
};
</script>
<style>
.app-add-cat .el-checkbox-group {
font-size: 14px !important;
}
.app-add-cat .el-checkbox {
margin-right: 0;
}
.app-add-cat .el-dialog__body {
padding: 10px 20px !important;
}
.app-add-cat .tag-box .tag-item {
margin-right: 5px;
}
.app-add-cat .tag-box {
margin: 20px 0;
}
.app-add-cat .app-goods-cat-list .active {
background: #fafafa;
}
.app-add-cat .app-goods-cat-list .cat-item {
cursor: pointer;
padding: 5px 10px;
}
.app-add-cat .app-goods-cat-list {
border: 1px solid #e8eaee;
border-radius: 5px;
margin-top: -5px;
padding: 10px 0;
overflow: scroll;
height: 400px;
}
.publishAlist .blue {
color: #409eff;
}
.publishAlist .content {
background: #fff;
margin-top: 10px;
padding: 20px;
box-sizing: border-box;
}
.publishAlist .gez_list {
/*width: 650px;*/
margin-bottom: 12px;
padding: 20px;
border: 1px solid #ebeef5;
background-color: #fff;
color: #303133;
}
.publishAlist .quyu {
background-color: #f4f4f5;
color: #909399;
padding: 10px;
line-height: 30px;
height: 30px;
font-size: 12px;
border-radius: 4px;
white-space: nowrap;
margin: 5px;
}
.publishAlist .el-tag+.el-tag {
margin-left: 10px;
}
.publishAlist .button-new-tag {
margin-left: 10px;
height: 32px;
line-height: 30px;
padding-top: 0;
padding-bottom: 0;
}
.publishAlist .input-new-tag {
width: 90px;
margin-left: 10px;
vertical-align: bottom;
}
.publishAlist .ue-style .el-form-item__content {
line-height: 0;
}
.publishAlist .app-gallery-item {
border: none;
}
.publishAlist .nav_Main {
display: flex;
flex-wrap: wrap;
justify-content: flex-start;
}
.publishAlist .nav_IconContent {
display: flex;
flex-wrap: wrap;
justify-content: flex-start;
}
/* .publishAlist .nav_IconContent div>div {
display: inline-block;
} */
.publishAlist .colapp-image {
background-size: cover;
background-position: center center;
width: 100px;
height: 100px;
border-radius: 0%;
}
.publishAlist .add-image-btn {
width: 100px;
height: 100px;
line-height: 100px;
color: #419efb;
border: 1px solid #e2e2e2;
cursor: pointer;
text-align: center;
}
.publishAlist .delBtn {
position: absolute;
right: -8px;
top: -8px;
padding: 4px 4px !important;
}
.publishAlist .w600 {
width: 600px;
}
.publishAlist .brandShuxing {
display: flex;
justify-content: space-between;
width: 850px;
}
.publishAlist .brandShuxing_item {
display: flex;
justify-content: space-between;
width: 50%;
}
</style>
\ No newline at end of file
src/router/index.js
View file @ eaf96a66
...@@ -830,6 +830,12 @@ export default new Router({ ...@@ -830,6 +830,12 @@ export default new Router({
name: 'listRegistration', name: 'listRegistration',
component: resolve => require(['@/components/tradePavilion/listRegistration'], resolve), component: resolve => require(['@/components/tradePavilion/listRegistration'], resolve),
}, },
//贸易管理--放榜页面
{
path: '/publishAlist',
name: 'publishAlist',
component: resolve => require(['@/components/tradePavilion/publishAlist'], resolve),
},
] ]
......
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