|
@@ -1,14 +1,22 @@
|
|
<template>
|
|
<template>
|
|
<div class="navbar">
|
|
<div class="navbar">
|
|
- <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
|
|
|
|
- @toggleClick="toggleSideBar" />
|
|
|
|
|
|
+ <hamburger
|
|
|
|
+ id="hamburger-container"
|
|
|
|
+ :is-active="sidebar.opened"
|
|
|
|
+ class="hamburger-container"
|
|
|
|
+ @toggleClick="toggleSideBar"
|
|
|
|
+ />
|
|
|
|
|
|
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
|
|
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
|
|
|
|
|
|
<div class="right-menu">
|
|
<div class="right-menu">
|
|
<template v-if="device !== 'mobile'">
|
|
<template v-if="device !== 'mobile'">
|
|
- <i v-if="isShow" class="el-icon-message-solid right-menu-item hover-effect shake" @click="openNotice()"
|
|
|
|
- style="height: 50px; width: 40px; line-height: 52px; font-size: 22px" />
|
|
|
|
|
|
+ <i
|
|
|
|
+ v-if="isShow"
|
|
|
|
+ class="el-icon-message-solid right-menu-item hover-effect shake"
|
|
|
|
+ @click="openNotice()"
|
|
|
|
+ style="height: 50px; width: 40px; line-height: 52px; font-size: 22px"
|
|
|
|
+ />
|
|
<screenfull id="screenfull" class="right-menu-item hover-effect" />
|
|
<screenfull id="screenfull" class="right-menu-item hover-effect" />
|
|
|
|
|
|
<!-- <el-tooltip content="Global Size" effect="dark" placement="bottom">
|
|
<!-- <el-tooltip content="Global Size" effect="dark" placement="bottom">
|
|
@@ -20,7 +28,7 @@
|
|
<div class="avatar-wrapper">
|
|
<div class="avatar-wrapper">
|
|
<img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" />
|
|
<img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" />
|
|
<div class="username">
|
|
<div class="username">
|
|
- {{$store.state.user.name}}
|
|
|
|
|
|
+ {{ $store.state.user.name }}
|
|
<i class="el-icon-caret-bottom" />
|
|
<i class="el-icon-caret-bottom" />
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -42,18 +50,40 @@
|
|
</el-dropdown>
|
|
</el-dropdown>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
- <el-dialog title="系统公告" :center="true" align="left" top="6vh" width="900px" @close="submit"
|
|
|
|
- :close-on-click-modal="false" :visible.sync="showModel" element-loading-text="拼命加载中"
|
|
|
|
- element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" append-to-body>
|
|
|
|
|
|
+ <el-dialog
|
|
|
|
+ title="系统公告"
|
|
|
|
+ :center="true"
|
|
|
|
+ align="left"
|
|
|
|
+ top="6vh"
|
|
|
|
+ width="900px"
|
|
|
|
+ @close="submit"
|
|
|
|
+ :close-on-click-modal="false"
|
|
|
|
+ :visible.sync="showModel"
|
|
|
|
+ element-loading-text="拼命加载中"
|
|
|
|
+ element-loading-spinner="el-icon-loading"
|
|
|
|
+ element-loading-background="rgba(0, 0, 0, 0.8)"
|
|
|
|
+ append-to-body
|
|
|
|
+ >
|
|
<el-card style="margin-top: -20px">
|
|
<el-card style="margin-top: -20px">
|
|
<el-row :gutter="10" v-if="activeMsg !== null">
|
|
<el-row :gutter="10" v-if="activeMsg !== null">
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
<div style="padding: 0 0 22px 0">
|
|
<div style="padding: 0 0 22px 0">
|
|
- <el-alert :closable="false" show-icon center class="my-el-alert" :title="activeMsg.module"
|
|
|
|
- :type="activeMsg.sys_type === 'VER' ? 'success' : 'warning'"></el-alert>
|
|
|
|
|
|
+ <el-alert
|
|
|
|
+ :closable="false"
|
|
|
|
+ show-icon
|
|
|
|
+ center
|
|
|
|
+ class="my-el-alert"
|
|
|
|
+ :title="activeMsg.module"
|
|
|
|
+ :type="activeMsg.sys_type === 'VER' ? 'success' : 'warning'"
|
|
|
|
+ ></el-alert>
|
|
</div>
|
|
</div>
|
|
- <el-form :size="'mini'" label-position="left" label-width="82px" class="demo-table-expand"
|
|
|
|
- style="padding-left: 25px">
|
|
|
|
|
|
+ <el-form
|
|
|
|
+ :size="'mini'"
|
|
|
|
+ label-position="left"
|
|
|
|
+ label-width="82px"
|
|
|
|
+ class="demo-table-expand"
|
|
|
|
+ style="padding-left: 25px"
|
|
|
|
+ >
|
|
<el-row>
|
|
<el-row>
|
|
<el-col :span="12" v-if="activeMsg.sys_type === 'VER'">
|
|
<el-col :span="12" v-if="activeMsg.sys_type === 'VER'">
|
|
<el-form-item label="版本编号:">
|
|
<el-form-item label="版本编号:">
|
|
@@ -61,9 +91,9 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="activeMsg.sys_type === 'VER' ? 12 : 24">
|
|
<el-col :span="activeMsg.sys_type === 'VER' ? 12 : 24">
|
|
- <el-form-item :label="
|
|
|
|
- activeMsg.sys_type === 'VER' ? '更新时间:' : '预计时间:'
|
|
|
|
- ">
|
|
|
|
|
|
+ <el-form-item
|
|
|
|
+ :label="activeMsg.sys_type === 'VER' ? '更新时间:' : '预计时间:'"
|
|
|
|
+ >
|
|
<p style="margin: 0">
|
|
<p style="margin: 0">
|
|
{{ activeMsg.addtime }}
|
|
{{ activeMsg.addtime }}
|
|
</p>
|
|
</p>
|
|
@@ -75,8 +105,11 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="24" style="text-align: right">
|
|
<el-col :span="24" style="text-align: right">
|
|
- <el-checkbox v-model="checked" class="fl" style="padding-top: 5px">我已知晓,后续不再提示!</el-checkbox>
|
|
|
|
- <el-button @click="submit" type="primary" plain :size="'mini'">关闭
|
|
|
|
|
|
+ <!-- <el-checkbox v-model="checked" class="fl" style="padding-top: 5px"
|
|
|
|
+ >我已知晓,后续不再提示!</el-checkbox
|
|
|
|
+ > -->
|
|
|
|
+ <el-button @click="submit" type="primary" plain :size="'mini'"
|
|
|
|
+ >关闭
|
|
</el-button>
|
|
</el-button>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
@@ -122,21 +155,22 @@ export default {
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
async openNotice(is) {
|
|
async openNotice(is) {
|
|
- if (getNotice() && getNotice().length > 0) {
|
|
|
|
- this.lastNotice = JSON.parse(getNotice());
|
|
|
|
- } else {
|
|
|
|
- this.lastNotice = null;
|
|
|
|
- }
|
|
|
|
|
|
+ // if (getNotice() && getNotice().length > 0) {
|
|
|
|
+ // this.lastNotice = JSON.parse(getNotice());
|
|
|
|
+ // } else {
|
|
|
|
+ // this.lastNotice = null;
|
|
|
|
+ // }
|
|
const { code, count, item, message } = await this.initData();
|
|
const { code, count, item, message } = await this.initData();
|
|
if (code === 0) {
|
|
if (code === 0) {
|
|
if (count != 0) {
|
|
if (count != 0) {
|
|
this.activeMsg = item;
|
|
this.activeMsg = item;
|
|
console.log(this.activeMsg);
|
|
console.log(this.activeMsg);
|
|
- if (is) {
|
|
|
|
- this.typeShow();
|
|
|
|
- } else {
|
|
|
|
- this.showModel = true;
|
|
|
|
- }
|
|
|
|
|
|
+ this.showModel = true;
|
|
|
|
+ // if (is) {
|
|
|
|
+ // this.typeShow();
|
|
|
|
+ // } else {
|
|
|
|
+ // this.showModel = true;
|
|
|
|
+ // }
|
|
} else {
|
|
} else {
|
|
this.$message.warning("暂无系统消息!");
|
|
this.$message.warning("暂无系统消息!");
|
|
}
|
|
}
|
|
@@ -177,11 +211,7 @@ export default {
|
|
if (this.lastNotice + "" === "null" && is) {
|
|
if (this.lastNotice + "" === "null" && is) {
|
|
this.showModel = true;
|
|
this.showModel = true;
|
|
} else {
|
|
} else {
|
|
- const {
|
|
|
|
- addtime: laddtime,
|
|
|
|
- type: ltype,
|
|
|
|
- sys_type: lsys_type,
|
|
|
|
- } = this.lastNotice;
|
|
|
|
|
|
+ const { addtime: laddtime, type: ltype, sys_type: lsys_type } = this.lastNotice;
|
|
const { sys_type, addtime } = this.activeMsg;
|
|
const { sys_type, addtime } = this.activeMsg;
|
|
|
|
|
|
if (laddtime === addtime && lsys_type === sys_type) {
|
|
if (laddtime === addtime && lsys_type === sys_type) {
|
|
@@ -244,7 +274,6 @@ export default {
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
<style lang="scss" scoped>
|
|
@keyframes shake {
|
|
@keyframes shake {
|
|
-
|
|
|
|
/* 水平抖动,核心代码 */
|
|
/* 水平抖动,核心代码 */
|
|
10%,
|
|
10%,
|
|
90% {
|
|
90% {
|