Commit ca0554b0 authored by 李鹏 's avatar 李鹏

bugfix

parent 2025f13a
...@@ -8,10 +8,7 @@ ...@@ -8,10 +8,7 @@
: getImageUrl('bg.png') : getImageUrl('bg.png')
})`, })`,
}"> }">
<el-alert <el-alert v-if="showValidityDays" class="bg-warning" :title="validityTips" type="warning" />
class="bg-warning"
title="系统有效期剩余345 天,请管理员及时更换license!"
type="warning" />
<div class="bg-main"> <div class="bg-main">
<!-- <div class="bg-logo"> <!-- <div class="bg-logo">
<img class="logo" src="../../assets/imgs/login_img_logo.png" /> <img class="logo" src="../../assets/imgs/login_img_logo.png" />
...@@ -69,7 +66,8 @@ import { ElMessage } from "element-plus"; ...@@ -69,7 +66,8 @@ import { ElMessage } from "element-plus";
import { ref, onBeforeMount, onMounted } from "vue"; import { ref, onBeforeMount, onMounted } from "vue";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import store from "../../store"; import store from "../../store";
import { getImageUrl } from "@/services/helper.js"; import { getImageUrl, timeDifference } from "@/services/helper.js";
import { result } from "lodash";
const router = useRouter(); const router = useRouter();
const pageType = ref("login"); const pageType = ref("login");
...@@ -77,6 +75,15 @@ const loginTab = ref("account"); ...@@ -77,6 +75,15 @@ const loginTab = ref("account");
const configOptions = ref({}); const configOptions = ref({});
const dialogPasswordChange = ref(false); const dialogPasswordChange = ref(false);
//剩余有效期提醒文案
const validityTips = ref("");
//是否展示剩余有效期提醒
const showValidityDays = ref(false);
onBeforeMount(() => {
getLoginPageConfig();
getSysOptions();
});
const switchPageType = (type) => { const switchPageType = (type) => {
// pageType.value = type // pageType.value = type
...@@ -95,7 +102,34 @@ const getLoginPageConfig = () => { ...@@ -95,7 +102,34 @@ const getLoginPageConfig = () => {
} }
}); });
}; };
//获取首选项配置
const getSysOptions = () => {
axios.get(`/apaas/system/v5/sysOptions`).then((res) => {
if (res.data.code == 200) {
const result = res.data.data || {};
if (result.license_dead_date && result.license_inform_day) {
calculateValidityDays(
new Date().getTime(),
new Date(result.license_dead_date).getTime(),
result.license_inform_day
);
}
} else {
ElMessage.error(res.data.data);
}
});
};
const calculateValidityDays = (start, end, validityTipsLimit) => {
if (start > end) {
validityTips.value = "系统已过有效期,请管理员更换license!";
showValidityDays.value = true;
return;
}
const leaveTimeConfig = timeDifference(start, end);
if (leaveTimeConfig.days > validityTipsLimit) return;
validityTips.value = `系统有效期剩余${leaveTimeConfig.days}天,请管理员及时更换license!`;
showValidityDays.value = true;
};
const open = (url) => { const open = (url) => {
if (url !== "") { if (url !== "") {
window.open(url); window.open(url);
...@@ -103,9 +137,6 @@ const open = (url) => { ...@@ -103,9 +137,6 @@ const open = (url) => {
return; return;
} }
}; };
onBeforeMount(() => {
getLoginPageConfig();
});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
...@@ -223,6 +223,21 @@ var timeForMatAdd = function (count) { ...@@ -223,6 +223,21 @@ var timeForMatAdd = function (count) {
}; };
}; };
//计算时间差
var timeDifference = function (startTime, endTime) {
//可以传日期时间或时间戳
let start = typeof startTime == "number" ? startTime : new Date(startTime).getTime(),
end = typeof endTime == "number" ? endTime : new Date(endTime).getTime(),
difference = end - start, //时间差的毫秒数
days = Math.floor(difference / (24 * 3600 * 1000)), //计算出相差天数
leave1 = difference % (24 * 3600 * 1000), //计算天数后剩余的毫秒数
hours = Math.floor(leave1 / (3600 * 1000)), //计算相差小时数
leave2 = leave1 % (3600 * 1000), //计算小时数后剩余的毫秒数
minutes = Math.floor(leave2 / (60 * 1000)), //计算相差分钟数
leave3 = leave2 % (60 * 1000), //计算分钟数后剩余的毫秒数
seconds = Math.round(leave3 / 1000);
return { days, hours, minutes, seconds };
};
var useConsole = function () { var useConsole = function () {
//改写console.log,防止打印数据泄露 //改写console.log,防止打印数据泄露
window.isDebug = false; // 控制是否屏蔽全局console.log 日志;isDebug设为false即可屏蔽 window.isDebug = false; // 控制是否屏蔽全局console.log 日志;isDebug设为false即可屏蔽
...@@ -297,6 +312,7 @@ export { ...@@ -297,6 +312,7 @@ export {
getQueryString, getQueryString,
timeForMatReduce, timeForMatReduce,
timeForMatAdd, timeForMatAdd,
timeDifference,
useConsole, useConsole,
getFirstChild, getFirstChild,
getImageUrl, getImageUrl,
......
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