msb-public-java
/
RuoYi-Cloud
mirror of https://gitee.com/y_project/RuoYi-Cloud.git
1
0
Code Issues Projects Releases Wiki Activity

1、前端右上角天气鼠标悬浮显示预报天气

Browse Source 
2、个人中心显示登录次数
3、统计天气接口修改时间格式
pull/254/head
xjs 4 years ago
parent 55a4c66a1c
commit f6d56d9b3f
3 changed files with 98 additions and 96 deletions
Show Stats Download Patch File Download Diff File

6
ruoyi-ui/src/layout/components/Navbar.vue
Unescape View File

@ -13,6 +13,7 @@
<el-popover <el-popover
placement="top" placement="top"
width="400" width="400"
trigger="hover"
title="❉预报天气❉" title="❉预报天气❉"
v-model="weatherVisible"> v-model="weatherVisible">
<table style="text-align: center" v-loading="loading"> <table style="text-align: center" v-loading="loading">
@ -183,18 +184,15 @@ export default {
created() { created() {
this.getNowWeather() this.getNowWeather()
this.getForecastWeather()
}, },
methods: { methods: {
//获取预报天气 //获取预报天气
getForecastWeather() { getForecastWeather() {
this.loading = true;
getForecastWeather().then(res => { getForecastWeather().then(res => {
this.forecastWeatherData = res.data this.forecastWeatherData = res.data
this.loading = false;
}) })
this.getNowWeather()
}, },
//获取实时天气 //获取实时天气

186
ruoyi-ui/src/views/system/user/profile/index.vue
Unescape View File

@ -1,91 +1,95 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="6" :xs="24"> <el-col :span="6" :xs="24">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>个人信息</span> <span>个人信息</span>
</div> </div>
<div> <div>
<div class="text-center"> <div class="text-center">
<userAvatar :user="user" /> <userAvatar :user="user" />
</div> </div>
<ul class="list-group list-group-striped"> <ul class="list-group list-group-striped">
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="user" />用户名称 <svg-icon icon-class="user" />用户名称
<div class="pull-right">{{ user.userName }}</div> <div class="pull-right">{{ user.userName }}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="phone" />手机号码 <svg-icon icon-class="phone" />手机号码
<div class="pull-right">{{ user.phonenumber }}</div> <div class="pull-right">{{ user.phonenumber }}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="email" />用户邮箱 <svg-icon icon-class="email" />用户邮箱
<div class="pull-right">{{ user.email }}</div> <div class="pull-right">{{ user.email }}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="tree" />所属部门 <svg-icon icon-class="tree" />所属部门
<div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div> <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="peoples" />所属角色 <svg-icon icon-class="peoples" />所属角色
<div class="pull-right">{{ roleGroup }}</div> <div class="pull-right">{{ roleGroup }}</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="date" />创建日期 <svg-icon icon-class="peoples" />登录次数
<div class="pull-right">{{ user.createTime }}</div> <div class="pull-right">{{ user.loginCount }}次</div>
</li> </li>
</ul> <li class="list-group-item">
</div> <svg-icon icon-class="date" />创建日期
</el-card> <div class="pull-right">{{ user.createTime }}</div>
</el-col> </li>
<el-col :span="18" :xs="24"> </ul>
<el-card> </div>
<div slot="header" class="clearfix"> </el-card>
<span>基本资料</span> </el-col>
</div> <el-col :span="18" :xs="24">
<el-tabs v-model="activeTab"> <el-card>
<el-tab-pane label="基本资料" name="userinfo"> <div slot="header" class="clearfix">
<userInfo :user="user" /> <span>基本资料</span>
</el-tab-pane> </div>
<el-tab-pane label="修改密码" name="resetPwd"> <el-tabs v-model="activeTab">
<resetPwd :user="user" /> <el-tab-pane label="基本资料" name="userinfo">
</el-tab-pane> <userInfo :user="user" />
</el-tabs> </el-tab-pane>
</el-card> <el-tab-pane label="修改密码" name="resetPwd">
</el-col> <resetPwd :user="user" />
</el-row> </el-tab-pane>
</div> </el-tabs>
</template> </el-card>
</el-col>
<script> </el-row>
import userAvatar from "./userAvatar"; </div>
import userInfo from "./userInfo"; </template>
import resetPwd from "./resetPwd";
import { getUserProfile } from "@/api/system/user"; <script>
import userAvatar from "./userAvatar";
export default { import userInfo from "./userInfo";
name: "Profile", import resetPwd from "./resetPwd";
components: { userAvatar, userInfo, resetPwd }, import { getUserProfile } from "@/api/system/user";
data() {
return { export default {
user: {}, name: "Profile",
roleGroup: {}, components: { userAvatar, userInfo, resetPwd },
postGroup: {}, data() {
activeTab: "userinfo" return {
}; user: {},
}, roleGroup: {},
created() { postGroup: {},
this.getUser(); activeTab: "userinfo"
}, };
methods: { },
getUser() { created() {
getUserProfile().then(response => { this.getUser();
this.user = response.data; },
this.roleGroup = response.roleGroup; methods: {
this.postGroup = response.postGroup; getUser() {
}); getUserProfile().then(response => {
} this.user = response.data;
} this.roleGroup = response.roleGroup;
}; this.postGroup = response.postGroup;
</script> });
}
}
};
</script>

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/service/impl/WeatherServiceImpl.java
Unescape View File

@ -104,7 +104,7 @@ public class WeatherServiceImpl implements WeatherService {
if (StringUtils.contains(startDate, today) && StringUtils.contains(endDate,today)) { if (StringUtils.contains(startDate, today) && StringUtils.contains(endDate,today)) {
dateTime.add(DateUtil.format(weather.getReporttime(), "HH:mm")); dateTime.add(DateUtil.format(weather.getReporttime(), "HH:mm"));
} else { } else {
dateTime.add(DateUtil.format(weather.getReporttime(), "MM-dd")); dateTime.add(DateUtil.format(weather.getReporttime(), "MM-dd HH:mm"));
} }
temperature.add(weather.getTemperature()); temperature.add(weather.getTemperature());

Write Preview
Loading…
Cancel
Save