wyh
/
gan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

~;2C

main
王宇航 2024-05-08 15:26:06 +08:00
parent f81eeef168
commit 56ab84f6b5
15 changed files with 287 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppAreaController.java
View File

@ -92,4 +92,13 @@ public class AppAreaController extends BaseController {
return AjaxResult.success(appProvinceService.selectAppProvinceTree());
}
/**
* 区id查询区名称
*/
@GetMapping("/getTownById")
@ApiOperation(value = "省市区树状结构", notes = "省市区树状结构", httpMethod = "GET")
public AjaxResult getTownById(@RequestParam("townId") Integer townId) {
return AjaxResult.success(appTownService.getTownById(townId));
}
}

31
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserController.java
View File

@ -12,6 +12,7 @@ import com.alipay.api.domain.AlipayTradeCreateModel;
import com.alipay.api.request.AlipayTradeCreateRequest;
import com.alipay.api.response.AlipayTradeCreateResponse;
import com.ruoyi.app.domain.dto.PayConfig;
import com.ruoyi.app.domain.vo.AppUserVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -56,23 +57,23 @@ public class AppUserController extends BaseController
public TableDataInfo list(AppUser appUser)
{
startPage();
List<AppUser> list = appUserService.selectAppUserList(appUser);
List<AppUserVo> list = appUserService.selectAppUserList(appUser);
return getDataTable(list);
}
/**
* 导出app用户列表
*/
// @RequiresPermissions("app:user:export")
@Log(title = "app用户", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation(value = "导出用户", notes = "导出用户", httpMethod = "POST")
public void export(HttpServletResponse response, AppUser appUser)
{
List<AppUser> list = appUserService.selectAppUserList(appUser);
ExcelUtil<AppUser> util = new ExcelUtil<AppUser>(AppUser.class);
util.exportExcel(response, list, "app用户数据");
}
// /**
// * 导出app用户列表
// */
//// @RequiresPermissions("app:user:export")
// @Log(title = "app用户", businessType = BusinessType.EXPORT)
// @PostMapping("/export")
// @ApiOperation(value = "导出用户", notes = "导出用户", httpMethod = "POST")
// public void export(HttpServletResponse response, AppUser appUser)
// {
// List<AppUser> list = appUserService.selectAppUserList(appUser);
// ExcelUtil<AppUser> util = new ExcelUtil<AppUser>(AppUser.class);
// util.exportExcel(response, list, "app用户数据");
// }
/**
* 获取app用户详细信息
@ -100,7 +101,7 @@ public class AppUserController extends BaseController
/**
* 修改app用户
*/
@RequiresPermissions("app:user:edit")
// @RequiresPermissions("app:user:edit")
@Log(title = "app用户", businessType = BusinessType.UPDATE)
@PutMapping("/edit")
@ApiOperation(value = "修改app用户信息", notes = "修改app用户信息", httpMethod = "PUT")

4
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppTopic.java
View File

@ -30,7 +30,7 @@ public class AppTopic extends BaseEntity
/** 类型：0-话题分类，1-话题数据 */
@Excel(name = "类型：0-话题分类，1-话题数据")
private Long type;
private String type;
public void setId(Long id)
{
this.id = id;
@ -60,6 +60,8 @@ public class AppTopic extends BaseEntity
.append("createBy", getCreateBy())
.append("updateBy", getUpdateBy())
.append("remark", getRemark())
.append("parentId", getParentId())
.append("type", getType())
.toString();
}
}

4
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java
View File

@ -149,7 +149,7 @@ public class AppUserDynamic extends BaseEntity
return imgUrls;
}
@Override
/*@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
@ -167,5 +167,5 @@ public class AppUserDynamic extends BaseEntity
.append("imgUrls", getImgUrls())
.append("isTop", getIsTop())
.toString();
}
}*/
}

2
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java
View File

@ -54,7 +54,7 @@ public class AppUserDynamicVo extends AppUserDynamic
private int countComment;
// 是否会员；0是1否
private int isMember;
private Integer isMember;
private String cityName;

2
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppTownMapper.java
View File

@ -61,4 +61,6 @@ public interface AppTownMapper
public int deleteAppTownByIds(Long[] ids);
List<AppTown> getTownByCityId(@Param("cityId") Integer cityId);
AppTown getTownById(@Param("townId") Integer townId);
}

2
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppTownService.java
View File

@ -60,4 +60,6 @@ public interface IAppTownService
public int deleteAppTownById(Long id);
List<AppTown> getTownByCityId(Integer cityId);
AppTown getTownById(Integer townId);
}

2
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserService.java
View File

@ -27,7 +27,7 @@ public interface IAppUserService
* @param appUser app用户
* @return app用户集合
*/
public List<AppUser> selectAppUserList(AppUser appUser);
public List<AppUserVo> selectAppUserList(AppUser appUser);
/**
* 新增app用户

6
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppTopicServiceImpl.java
View File

@ -50,7 +50,7 @@ public class AppTopicServiceImpl implements IAppTopicService
@Override
public List<AppTopicVo> topicList(AppTopic appTopic) {
appTopic.setType(0l);
appTopic.setType("0");
List<AppTopic> list = appTopicMapper.selectAppTopicList(appTopic);
List<AppTopicVo> appTopicVos = new ArrayList<>();
for (AppTopic topic : list) {
@ -73,8 +73,8 @@ public class AppTopicServiceImpl implements IAppTopicService
@Override
public int insertAppTopic(AppTopic appTopic) {
appTopic.setCreateTime(DateUtils.getNowDate());
if(appTopic.getType() == 0) {
appTopic.setParentId(0l);
if("0".equals(appTopic.getType()) || null == appTopic.getType()) {
appTopic.setParentId(0L);
}
return appTopicMapper.insertAppTopic(appTopic);
}

6
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppTownServiceImpl.java
View File

@ -96,4 +96,10 @@ public class AppTownServiceImpl implements IAppTownService
return appTownMapper.getTownByCityId(cityId);
}
@Override
public AppTown getTownById(Integer townId) {
return appTownMapper.getTownById(townId);
}
}

32
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java
View File

@ -1,19 +1,20 @@
package com.ruoyi.app.service.impl;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
import com.ruoyi.app.domain.AppSchool;
import com.ruoyi.app.domain.AppUserFriend;
import com.ruoyi.app.domain.UserSkill;
import com.ruoyi.app.domain.vo.AppUserDataVo;
import com.ruoyi.app.domain.vo.AppUserNetVo;
import com.ruoyi.app.domain.vo.AppUserVo;
import com.ruoyi.app.mapper.AppSchoolMapper;
import com.ruoyi.app.mapper.AppUserFriendMapper;
import com.ruoyi.app.mapper.UserSkillMapper;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -39,6 +40,9 @@ public class AppUserServiceImpl implements IAppUserService
@Autowired
private AppUserFriendMapper appUserFriendMapper;
@Autowired
private AppSchoolMapper appSchoolMapper;
/**
* 查询app用户
*
@ -62,9 +66,25 @@ public class AppUserServiceImpl implements IAppUserService
* @return app用户
*/
@Override
public List<AppUser> selectAppUserList(AppUser appUser)
public List<AppUserVo> selectAppUserList(AppUser appUser)
{
return appUserMapper.selectAppUserList(appUser);
List<AppUser> appUsers = appUserMapper.selectAppUserList(appUser);
List<AppUserVo> appUserVos = new ArrayList<>();
if (CollectionUtils.isNotEmpty(appUsers)) {
appUserVos = appUsers.stream().map(appUserSource -> {
AppUserVo appUserVo = new AppUserVo();
BeanUtils.copyProperties(appUserSource, appUserVo);
if (appUserSource.getSchool() != null) {
AppSchool appSchool = appSchoolMapper.selectAppSchoolById(appUserSource.getSchool());
if (appSchool != null) {
appUserVo.setSchoolName(appSchool.getName());
}
}
return appUserVo;
}).collect(Collectors.toList());
}
return appUserVos;
}
/**

5
gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppTownMapper.xml
View File

@ -63,4 +63,9 @@
<select id="getTownByCityId" resultType="com.ruoyi.app.domain.AppTown">
<include refid="selectAppTownVo"/> where city_id = #{cityId} </select>
<select id="getTownById" resultType="com.ruoyi.app.domain.AppTown">
<include refid="selectAppTownVo"/>
where id = #{townId}
</select>
</mapper>

6
gan-ui/src/views/app/topic/index.vue
View File

@ -103,7 +103,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="24">
<el-form-item label="话题类型" prop="menuType">
<el-form-item label="话题类型" prop="type">
<el-radio-group v-model="form.type">
<el-radio label="0">分类</el-radio>
<el-radio label="1">话题</el-radio>
@ -189,7 +189,7 @@ export default {
},
created() {
this.getList();
// this.getAppTopic();
},
methods: {
/** 查询话题信息列表 */
@ -259,7 +259,7 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.getAppTopic();
this.getList();
const id = row.id || this.ids
getTopic(id).then(response => {
this.form = response.data;

442
gan-ui/src/views/app/user/index.vue
View File

@ -33,174 +33,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="专业" prop="major">
<el-input
v-model="queryParams.major"
placeholder="请输入专业"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="学历开始时间" prop="startTime">
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择学历开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="学历结束时间" prop="endTime">
<el-date-picker clearable
v-model="queryParams.endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择学历结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="在校经历" prop="experience">
<el-input
v-model="queryParams.experience"
placeholder="请输入在校经历"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="公司名称" prop="companyName">
<el-input
v-model="queryParams.companyName"
placeholder="请输入公司名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="行业" prop="industry">
<el-input
v-model="queryParams.industry"
placeholder="请输入行业"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="在职时间" prop="jobTime">
<el-date-picker clearable
v-model="queryParams.jobTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择在职时间">
</el-date-picker>
</el-form-item>
<el-form-item label="职位名称" prop="jobName">
<el-input
v-model="queryParams.jobName"
placeholder="请输入职位名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="技能id" prop="skillId">
<el-input
v-model="queryParams.skillId"
placeholder="请输入技能id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出生年月" prop="birthday">
<el-date-picker clearable
v-model="queryParams.birthday"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择出生年月">
</el-date-picker>
</el-form-item>
<el-form-item label="共享资源" prop="shareResource">
<el-input
v-model="queryParams.shareResource"
placeholder="请输入共享资源"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否是技术人员，0是1否" prop="isTech">
<el-input
v-model="queryParams.isTech"
placeholder="请输入是否是技术人员，0是1否"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创业想法" prop="idea">
<el-input
v-model="queryParams.idea"
placeholder="请输入创业想法"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否是合伙人,0是1否" prop="isPartner">
<el-input
v-model="queryParams.isPartner"
placeholder="请输入是否是合伙人,0是1否"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="业余爱好" prop="hobby">
<el-input
v-model="queryParams.hobby"
placeholder="请输入业余爱好"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="生活城市" prop="city">
<el-input
v-model="queryParams.city"
placeholder="请输入生活城市"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="其他信息" prop="other">
<el-input
v-model="queryParams.other"
placeholder="请输入其他信息"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否是会员0是1否" prop="isMember">
<el-input
v-model="queryParams.isMember"
placeholder="请输入是否是会员0是1否"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单记录" prop="orderId">
<el-input
v-model="queryParams.orderId"
placeholder="请输入订单记录"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="开始时间" prop="orderStartTime">
<el-date-picker clearable
v-model="queryParams.orderStartTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="orderEndTime">
<el-date-picker clearable
v-model="queryParams.orderEndTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -256,91 +88,110 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="用户名" align="center" prop="username" />
<el-table-column label="邮箱" align="center" prop="email" />
<el-table-column label="电话" align="center" prop="phone" />
<el-table-column label="地址" align="center" prop="address" />
<!-- <el-table-column label="邮箱" align="center" prop="email" />-->
<el-table-column
prop="avatarUrl"
header-align="center"
align="center"
label="头像"
>
<template slot-scope="scope" class="demo-image__preview">
<img
:src="scope.row.avatarUrl"
width="40"
height="40"
class="head_pic"
/>
</template>
</el-table-column>
<el-table-column label="学历" align="center" prop="education" />
<el-table-column label="学校" align="center" prop="school" />
<el-table-column label="专业" align="center" prop="major" />
<el-table-column label="学历开始时间" align="center" prop="startTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
prop="avatarUrl"
header-align="center"
align="center"
label="头像"
>
<template slot-scope="scope" class="demo-image__preview">
<img
:src="scope.row.avatarUrl"
width="40"
height="40"
class="head_pic"
/>
</template>
</el-table-column>
<el-table-column label="学历结束时间" align="center" prop="endTime" width="180">
<el-table-column label="是否为会员" align="center" prop="isMember" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="在校经历" align="center" prop="experience" />
<el-table-column label="公司名称" align="center" prop="companyName" />
<el-table-column label="行业" align="center" prop="industry" />
<el-table-column label="在职时间" align="center" prop="jobTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.jobTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="职位名称" align="center" prop="jobName" />
<el-table-column label="职位类别" align="center" prop="jobType" />
<el-table-column label="技能id" align="center" prop="skillId" />
<el-table-column label="工作内容" align="center" prop="jobContent" />
<el-table-column label="权限：0公开1私密" align="center" prop="type" />
<el-table-column label="0:男，1女" align="center" prop="sex" >
<template slot-scope="scope">
{{ scope.row.sex == 0 ? '男' : scope.row.sex == 1 ? '女' : '' }}
{{ scope.row.sex == 0 ? '是' : scope.row.sex == 1 ? '否' : '未知' }}
</template>
</el-table-column>
<el-table-column label="出生年月" align="center" prop="birthday" width="180">
<el-table-column label="电话" align="center" prop="phone" />
<el-table-column label="性别" align="center" prop="sex" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
{{ scope.row.sex == 0 ? '男' : scope.row.sex == 1 ? '女' : '未知' }}
</template>
</el-table-column>
<el-table-column label="共享资源" align="center" prop="shareResource" />
<el-table-column label="是否是技术人员，0是1否" align="center" prop="isTech" />
<el-table-column label="创业想法" align="center" prop="idea" />
<el-table-column label="是否是合伙人,0是1否" align="center" prop="isPartner" />
<el-table-column label="业余爱好" align="center" prop="hobby" />
<el-table-column label="生活城市" align="center" prop="city" />
<el-table-column label="其他信息" align="center" prop="other" />
<el-table-column label="是否是会员0是1否" align="center" prop="isMember" />
<el-table-column label="订单记录" align="center" prop="orderId" />
<el-table-column label="开始时间" align="center" prop="orderStartTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.orderStartTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="结束时间" align="center" prop="orderEndTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.orderEndTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="150">
<el-table-column label="地址" align="center" prop="address" />
<el-table-column label="学校" align="center" prop="schoolName" />
<el-table-column label="学历" align="center" prop="education" />
<el-table-column label="专业" align="center" prop="major" />
<!-- <el-table-column label="学历开始时间" align="center" prop="startTime" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="学历结束时间" align="center" prop="endTime" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="在校经历" align="center" prop="experience" />-->
<!-- <el-table-column label="公司名称" align="center" prop="companyName" />-->
<!-- <el-table-column label="行业" align="center" prop="industry" />-->
<!-- <el-table-column label="在职时间" align="center" prop="jobTime" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.jobTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="职位名称" align="center" prop="jobName" />-->
<!-- <el-table-column label="职位类别" align="center" prop="jobType" />-->
<!-- <el-table-column label="技能id" align="center" prop="skillId" />-->
<!-- <el-table-column label="工作内容" align="center" prop="jobContent" />-->
<!-- <el-table-column label="权限：0公开1私密" align="center" prop="type" />-->
<!-- <el-table-column label="性别" align="center" prop="sex" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.sex == 0 ? '男' : scope.row.sex == 1 ? '女' : '未知' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="出生年月" align="center" prop="birthday" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="共享资源" align="center" prop="shareResource" />-->
<!-- <el-table-column label="是否是技术人员，0是1否" align="center" prop="isTech" />-->
<!-- <el-table-column label="创业想法" align="center" prop="idea" />-->
<!-- <el-table-column label="是否是合伙人,0是1否" align="center" prop="isPartner" />-->
<!-- <el-table-column label="业余爱好" align="center" prop="hobby" />-->
<!-- <el-table-column label="生活城市" align="center" prop="city" />-->
<!-- <el-table-column label="其他信息" align="center" prop="other" />-->
<!-- <el-table-column label="是否是会员0是1否" align="center" prop="isMember" />-->
<!-- <el-table-column label="订单记录" align="center" prop="orderId" />-->
<!-- <el-table-column label="开始时间" align="center" prop="orderStartTime" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.orderStartTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="结束时间" align="center" prop="orderEndTime" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.orderEndTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
type="text"
icon="el-icon-view"
@click="handleDetail(scope.row)"
>
详情
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['app:user:edit']"
>修改</el-button>
<el-button
size="mini"
type="danger"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['app:user:remove']"
@ -489,6 +340,84 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 抽屉 -->
<el-drawer
title="移动用户详情"
:visible.sync="drawer"
direction="rtl"
size="50%"
class="user-info"
>
<el-form :model="userDetail" ref="drawerForm" label-width="100px" >
<el-row>
<el-col :span="12">
<el-form-item label="用户名称" class="userId">
<el-tag type="success" class="rotate-text">{{ userDetail.username }}</el-tag>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="手机号">
<el-tag type="success">{{ userDetail.phone }}</el-tag>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="性别" class="userId">
<el-tag type="success"> {{ userDetail.sex == 0 ? '男' : userDetail.sex == 1 ? '女' : '未知' }}</el-tag>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否会员">
<el-tag type="success">{{ userDetail.isMember == 0 ? '是' : userDetail.isMember == 1 ? '否' : '未知' }}</el-tag>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="学校">
<el-tag type="success">{{ userDetail.schoolName }}</el-tag>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="学历">
<el-tag type="success">{{ userDetail.education }}</el-tag>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="专业" >
<el-tag type="success">{{ userDetail.major }}</el-tag>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="注册时间">
<el-tag type="success">{{ userDetail.createTime }}</el-tag>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="公司名称" class="userId">
<el-tag type="success">{{ userDetail.companyName }}</el-tag>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="技能">
<el-tag type="success" v-for="skill in userSkillList" :key="skill.id">{{ skill.name }}</el-tag>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="demo-drawer__footer" >
<el-button @click="drawer = false">关闭</el-button>
<el-button type="primary" @click="drawer = false" :loading="loading">查看动态</el-button>
</div>
</el-drawer>
</div>
</template>
@ -499,6 +428,8 @@ export default {
name: "User",
data() {
return {
// 抽屉
drawer: false,
// 遮罩层
loading: true,
// 选中数组
@ -558,6 +489,8 @@ export default {
},
// 表单参数
form: {},
userDetail: {},
userSkillList: [],
// 表单校验
rules: {
}
@ -624,6 +557,17 @@ export default {
};
this.resetForm("form");
},
/** 查询用户详情 */
handleDetail(row) {
this.drawer = true
getUser(row.id).then(response => {
this.userDetail = response.data;
this.userSkillList = response.data.userSkillList;
console.log(this.userSkillList)
})
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
@ -695,3 +639,31 @@ export default {
}
};
</script>
<style lang="scss" scoped>
.user-info{
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 10px;
}
.rotate-text {
animation: rotate 5s infinite linear;
}
@keyframes rotate {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
.demo-drawer__footer{
text-align: center;
.el-button{
margin-left: 20px;
margin-top: 50%;
}
}
</style>

2
gan-ui/src/views/system/dict/data.vue
View File

@ -399,4 +399,4 @@ export default {
}
}
};
</script>
</script>