图标修复

dev
许宏杰 1 year ago
parent 71f09d8a60
commit b82c619962

@ -6,8 +6,8 @@ ENV = 'development'
# 苏州园区志愿服务活动区块链平台/开发环境
# VUE_APP_BASE_API = 'https://vue.ruoyi.vip/prod-api'
# VUE_APP_BASE_API = 'http://39.101.188.84:9034'
VUE_APP_BASE_API = 'http://192.168.0.117:9034'
VUE_APP_BASE_API = 'http://39.101.188.84:9034'
# VUE_APP_BASE_API = 'http://192.168.0.117:9034'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

@ -24,9 +24,14 @@
width="70"
>
</el-table-column>
<el-table-column prop="content" label="活动名称" show-overflow-tooltip width="180">
<el-table-column
prop="content"
label="活动名称"
show-overflow-tooltip
width="180"
>
<template slot-scope="scope">
<div class="activity" >
<div class="activity">
<div>{{ scope.row.name }}</div>
<div>{{ scope.row.content }}</div>
</div>
@ -37,7 +42,6 @@
label="活动地址"
show-overflow-tooltip
width="100"
>
</el-table-column>
<!-- <el-table-column prop="duration" label="服务时长"> </el-table-column> -->
@ -48,7 +52,12 @@
</div>
</template></el-table-column
>
<el-table-column prop="publisher" label="活动举办方" show-overflow-tooltip> </el-table-column>
<el-table-column
prop="publisher"
label="活动举办方"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="activityTime" label="参加时间">
<template slot-scope="scope">
@ -58,7 +67,9 @@
<el-table-column prop="involveStaus" label="状态">
<template slot-scope="scope">
<div class="activity">
<div>{{ scope.row.activityStatus == 2 ? "已报名" : "未报名" }}</div>
<div>
{{ scope.row.activityStatus == 2 ? "已报名" : "未报名" }}
</div>
</div>
</template>
</el-table-column>
@ -66,7 +77,7 @@
<template slot-scope="scope">
<div class="tabs-btns">
<div class="look" @click="look(scope.row)">
<img src="@/assets/images/look.png" alt="" />
<!-- <img src="@/assets/images/look.png" alt="" /> -->
<span>查看</span>
</div>
<div

@ -24,7 +24,12 @@
width="70"
>
</el-table-column>
<el-table-column prop="content" label="活动名称" show-overflow-tooltip width="180">
<el-table-column
prop="content"
label="活动名称"
show-overflow-tooltip
width="180"
>
<template slot-scope="scope">
<div class="activity">
<div>{{ scope.row.name }}</div>
@ -47,7 +52,12 @@
</div>
</template></el-table-column
>
<el-table-column prop="publisher" label="活动举办方" show-overflow-tooltip> </el-table-column>
<el-table-column
prop="publisher"
label="活动举办方"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="activityTime" label="参加时间">
<template slot-scope="scope">
@ -57,7 +67,9 @@
<el-table-column prop="involveStaus" label="状态">
<template slot-scope="scope">
<div class="activity">
<div>{{ scope.row.activityStatus == 2 ? "已报名" : "未报名" }}</div>
<div>
{{ scope.row.activityStatus == 2 ? "已报名" : "未报名" }}
</div>
</div>
</template>
</el-table-column>
@ -65,7 +77,7 @@
<template slot-scope="scope">
<div class="tabs-btns">
<div class="look" @click="look(scope.row)">
<img src="@/assets/images/look.png" alt="" />
<!-- <img src="@/assets/images/look.png" alt="" /> -->
<span>查看</span>
</div>
<div

@ -54,7 +54,7 @@
<template slot-scope="scope">
<div class="tabs-btns">
<div class="look" @click="look(scope.row)">
<img src="@/assets/images/look.png" alt="" />
<!-- <img src="@/assets/images/look.png" alt="" /> -->
<span>查看</span>
</div>
</div>

@ -9,7 +9,11 @@
<template>
<div class="plan-management">
<div class="plan-topBox">
<my-input @changeInput="changeInput" placeholder="请输入活动内容" @changeValue="changeValue"></my-input>
<my-input
@changeInput="changeInput"
placeholder="请输入活动内容"
@changeValue="changeValue"
></my-input>
</div>
<div class="plan-bottomBox">
<div class="tables">
@ -26,13 +30,10 @@
label="序号"
type="index"
header-align="center"
width="70">
</el-table-column>
<el-table-column
prop="name"
label="参与活动"
width="280"
width="70"
>
</el-table-column>
<el-table-column prop="name" label="参与活动" width="280">
<!-- <template slot-scope="scope">
<div class="activity">
<div>{{ scope.row.content.split(' ')[0] }}</div>
@ -47,97 +48,105 @@
width="180"
>
</el-table-column>
<el-table-column
prop="activityTime"
label="服务活动时长"
>
<el-table-column prop="activityTime" label="服务活动时长">
<template slot-scope="scope">
<div>{{ scope.row.activityTime.split(' ')[0] }}</div>
<div>{{ scope.row.activityTime.split(" ")[0] }}</div>
</template>
</el-table-column>
<el-table-column
prop="activityTime"
label="参与时间"
>
<el-table-column prop="activityTime" label="参与时间">
</el-table-column>
<el-table-column
label="操作"
width="250"
>
<el-table-column label="操作" width="250">
<template slot-scope="scope">
<div class="tabs-btns">
<div class="look" @click="look(scope.row)">
<img src="@/assets/images/look.png" alt="">
<!-- <img src="@/assets/images/look.png" alt=""> -->
<span>查看</span>
</div>
<div class="score">评估评分<span class="span" :class="Number(scope.row.points) < 60 ? 'pass':''">{{ scope.row.points }}</span></div>
<div class="score">
评估评分<span
class="span"
:class="Number(scope.row.points) < 60 ? 'pass' : ''"
>{{ scope.row.points }}</span
>
</div>
</div>
</template>
</el-table-column>
</el-table>
</div>
<div class="pagination">
<my-pagination :total="total" @pagesChange="pagesChange"></my-pagination>
<my-pagination
:total="total"
@pagesChange="pagesChange"
></my-pagination>
</div>
</div>
<my-dialog ref="conversion" width="45%">
<el-descriptions class="margin-top" :column="2" border>
<el-descriptions-item label="活动名称">{{ descriptions.name }}</el-descriptions-item>
<el-descriptions-item label="活动时间">{{ descriptions.activityTime }}</el-descriptions-item>
<el-descriptions-item label="活动举办方">{{ descriptions.publisher }}</el-descriptions-item>
<el-descriptions-item label="积分">{{ descriptions.points }}</el-descriptions-item>
<el-descriptions-item label="活动名称">{{
descriptions.name
}}</el-descriptions-item>
<el-descriptions-item label="活动时间">{{
descriptions.activityTime
}}</el-descriptions-item>
<el-descriptions-item label="活动举办方">{{
descriptions.publisher
}}</el-descriptions-item>
<el-descriptions-item label="积分">{{
descriptions.points
}}</el-descriptions-item>
</el-descriptions>
</my-dialog>
</div>
</template>
<script>
import myPagination from "@/views/components/myPagination/index.vue"
import myInput from "@/views/components/myInput/index.vue"
import myDialog from "@/views/components/dialog/index.vue"
import myPagination from "@/views/components/myPagination/index.vue";
import myInput from "@/views/components/myInput/index.vue";
import myDialog from "@/views/components/dialog/index.vue";
export default {
components:{myPagination,myInput,myDialog},
components: { myPagination, myInput, myDialog },
data() {
return {
tableData: [],
input: {
name:''
name: "",
},
pages:{
pageSize:10,
pageNum:1
pages: {
pageSize: 10,
pageNum: 1,
},
total:0,
loading:false,
isClick:false,
descriptions:{
name:'',
activityTime:'',
publisher:'',
points:''
total: 0,
loading: false,
isClick: false,
descriptions: {
name: "",
activityTime: "",
publisher: "",
points: "",
},
}
};
},
methods:{
methods: {
//
pagesChange(pages){
pagesChange(pages) {
// console.log(pages)
this.getList(pages)
this.getList(pages);
},
//
changeInput(value){
changeInput(value) {
this.input.name = value;
this.isClick = true;
this.pages= {
this.pages = {
pageNum: 1,
pageSize: 10,
};
this.getList();
},
//
changeValue(value){
if(this.isClick && value == ''){
this.input.name = '';
this.pages= {
changeValue(value) {
if (this.isClick && value == "") {
this.input.name = "";
this.pages = {
pageNum: 1,
pageSize: 10,
};
@ -157,38 +166,38 @@ export default {
if (columnIndex === 0) {
return `text-align:center`;
} else {
return '';
return "";
}
},
//
async look(row){
async look(row) {
this.$refs.conversion.open();
let data = await this.$api.jifenhuoqu.selectall({id:row.id});
let { name,activityTime,publisher,points } = data.data.list[0];
let data = await this.$api.jifenhuoqu.selectall({ id: row.id });
let { name, activityTime, publisher, points } = data.data.list[0];
this.descriptions = {
name,
activityTime,
publisher,
points
points,
};
console.log(data)
console.log(data);
},
//
async getList(){
async getList() {
this.loading = true;
let obj = { ...this.pages,...this.input }
let obj = { ...this.pages, ...this.input };
let data = await this.$api.jifenhuoqu.selectall(obj);
if(data.code == 200) {
if (data.code == 200) {
this.loading = false;
this.tableData = data.data.list;
this.total = data.data.total;
}
},
},
mounted(){
mounted() {
this.getList();
},
}
};
</script>
<style lang="scss" scoped>
.plan-management {
@ -197,7 +206,7 @@ export default {
height: 100%;
width: 100%;
border-radius: 10px 10px 0 0;
box-shadow: 0px 0px 15px 0px rgba(229,212,212,0.58);
box-shadow: 0px 0px 15px 0px rgba(229, 212, 212, 0.58);
.plan-topBox {
padding: 30px 0 0 0;
}
@ -214,14 +223,14 @@ export default {
line-height: 20px;
&:nth-child(1) {
font-size: 14px;
font-family: 'Alibaba PuHuiTi';
font-family: "Alibaba PuHuiTi";
font-weight: 400;
color: #4D4949;
color: #4d4949;
}
&:nth-child(2) {
width: 180px;
font-size: 14px;
font-family: 'Alibaba PuHuiTi';
font-family: "Alibaba PuHuiTi";
font-weight: 400;
color: #999191;
white-space: nowrap;
@ -235,18 +244,18 @@ export default {
box-sizing: border-box;
// text-align: center;
font-size: 14px;
font-family: 'Alibaba PuHuiTi';
font-family: "Alibaba PuHuiTi";
font-weight: 400;
color: #525966;
padding: 2px 0;
}
th {
height: 45px;
background-color: #F7F5F5;
background-color: #f7f5f5;
font-size: 15px;
font-family: 'Alibaba PuHuiTi';
font-family: "Alibaba PuHuiTi";
font-weight: bold;
color: #4D4949;
color: #4d4949;
.el-checkbox {
display: none;
}
@ -259,7 +268,7 @@ export default {
display: flex;
align-items: center;
// justify-content: center;
.look{
.look {
display: flex;
// align-items: center;
margin-right: 30px;
@ -272,15 +281,15 @@ export default {
font-size: 15px;
font-family: Alibaba PuHuiTi;
font-weight: 400;
color: #045FFD;
color: #045ffd;
}
}
.score {
.span {
color: #2AA984;
color: #2aa984;
}
.pass {
color: #F38447;
color: #f38447;
}
}
}

Loading…
Cancel
Save