Yangwl
/
LJ-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工厂数据源切换

Browse Source
yangwl
zhaoxiaolin 1 year ago
parent fcbf8f911c
commit f3c14a5417
4 changed files with 303 additions and 64 deletions
Show Stats Download Patch File Download Diff File

12
src/api/system/user.js
Unescape Escape View File

@ -133,3 +133,15 @@ export function deptTreeSelect() {
method: 'get'
})
}
// 用户状态修改
export function changePoolName(poolName) {
const data = {
poolName
}
return request({
url: '/system/user/changePoolName',
method: 'put',
data: data
})
}

320
src/layout/components/Navbar.vue
Unescape Escape View File

@ -1,33 +1,60 @@
<template>
<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" v-if="!topNav"/>
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
<breadcrumb
id="breadcrumb-container"
class="breadcrumb-container"
v-if="!topNav"
/>
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
<div class="right-menu">
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
<el-tooltip content="源码地址" effect="dark" placement="bottom">
<open-platform id="op-git" class="right-menu-item hover-effect" />
<template v-if="device !== 'mobile'">
<el-select
v-model="poolName"
placeholder="请选择园区"
@change="handleChange"
:disabled="poolNameList.length <= 1"
class="right-menu-item hover-effect"
>
<el-option
v-for="item in poolNameList"
:key="item.poolName"
:label="item.parkName"
:value="item.poolName"
></el-option>
</el-select>
<el-tooltip content="异常处理">
<span
class="exceptionHandling"
:class="{ warnTxt: (typeList && typeList.length) || 0 }"
@click="getAlarmData(true)"
><i class="el-icon-message"></i>{{
(typeList && typeList.length > 0 && typeList.length) || ""
}}
</span>
</el-tooltip>
<el-tooltip content="文档地址" effect="dark" placement="bottom">
<open-platform-doc id="op-doc" class="right-menu-item hover-effect" />
</el-tooltip>
<screenfull id="screenfull" class="right-menu-item hover-effect" />
<el-tooltip content="布局大小" effect="dark" placement="bottom">
<size-select id="size-select" class="right-menu-item hover-effect" />
</el-tooltip>
</template>
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<el-dropdown
class="avatar-container right-menu-item hover-effect"
trigger="click"
>
<div class="avatar-wrapper">
<img :src="avatar" class="user-avatar">
<!-- <img :src="avatar" class="user-avatar" /> -->
<!-- admin -->
{{ nickName }}
<i class="el-icon-caret-bottom" />
</div>
<el-dropdown-menu slot="dropdown">
@ -43,21 +70,111 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<!-- 警告对话框 -->
<el-dialog
:title="title1"
:visible.sync="open1"
width="800px"
append-to-body
>
<el-table
v-loading="deviceloading"
:data="typeList"
@selection-change="handleSelectionChange1"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
label="计量设备名称"
align="center"
prop="monitorName"
/>
<el-table-column
label="采集设备编号"
align="center"
prop="collectDeviceId"
/>
<el-table-column label="记录时间" align="center" prop="collectTime" />
<el-table-column label="异常类型" align="center" prop="alarmType">
<template slot-scope="scope">
<dict-tag
:options="dict.type.alarmType"
:value="scope.row.alarmType"
/>
</template>
</el-table-column>
<el-table-column label="异常状态" align="center" prop="alarmStatus">
<template slot-scope="scope">
<dict-tag
:options="dict.type.alarmStatus"
:value="scope.row.alarmStatus"
/>
</template>
</el-table-column>
<el-table-column label="异常数据" align="center" prop="alarmData" />
<el-table-column label="备注" align="center" prop="cause" />
</el-table>
<!-- <pagination
v-show="devicetotal > 0"
:total="devicetotal"
:page.sync="queryParams1.pageNum"
:limit.sync="queryParams1.pageSize"
@pagination="getDeviceList"
/> -->
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="editAlarmStatus">确 定</el-button>
<el-button @click="open1 = false">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import TopNav from '@/components/TopNav'
import Hamburger from '@/components/Hamburger'
import Screenfull from '@/components/Screenfull'
import SizeSelect from '@/components/SizeSelect'
import Search from '@/components/HeaderSearch'
import OpenPlatformGit from '@/components/OpenPlatform/Git'
import OpenPlatformDoc from '@/components/OpenPlatform/Doc'
import { mapGetters } from "vuex";
import Breadcrumb from "@/components/Breadcrumb";
import TopNav from "@/components/TopNav";
import Hamburger from "@/components/Hamburger";
import Screenfull from "@/components/Screenfull";
import SizeSelect from "@/components/SizeSelect";
import Search from "@/components/HeaderSearch";
import RuoYiGit from "@/components/RuoYi/Git";
import RuoYiDoc from "@/components/RuoYi/Doc";
import {
listNotice,
getNotice,
delNotice,
addNotice,
updateNotice,
} from "@/api/system/notice";
//import { listData, editAlarmStatus } from "@/api/energy/exception/data.js";
import { changePoolName } from "@/api/system/user";
export default {
dicts: ["alarmType", "alarmStatus"],
data() {
return {
poolNameList: [],
poolName: "",
title1: "异常处理",
open1: false,
deviceloading: false,
typeList: null,
devicetotal: null,
// 选中数组
ids1: [],
// 非单个禁用
single1: true,
// 非多个禁用
multiple1: true,
};
},
created() {
localStorage.setItem("this.devicetotal", 0);
},
mounted() {
this.getAlarmData();
setInterval(() => this.getAlarmData(), 1000 * 60);
this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST"));
this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT");
},
components: {
Breadcrumb,
TopNav,
@ -65,69 +182,150 @@ export default {
Screenfull,
SizeSelect,
Search,
OpenPlatformGit,
OpenPlatformDoc
RuoYiGit,
RuoYiDoc,
},
computed: {
...mapGetters([
'sidebar',
'avatar',
'device'
]),
...mapGetters(["sidebar", "avatar", "device", "nickName"]),
setting: {
get() {
return this.$store.state.settings.showSettings
return this.$store.state.settings.showSettings;
},
set(val) {
this.$store.dispatch('settings/changeSetting', {
key: 'showSettings',
value: val
})
}
this.$store.dispatch("settings/changeSetting", {
key: "showSettings",
value: val,
});
},
},
topNav: {
get() {
return this.$store.state.settings.topNav
}
}
return this.$store.state.settings.topNav;
},
},
},
methods: {
// 打开右下角异常
openAlarm() {
this.$notify({
title: "异常数据提示",
position: "bottom-right",
message: this.$createElement(
"div",
{
on: {
click: () => {
this.getAlarmData(true);
},
},
},
[this.$createElement("el-button", {}, ["点击查看"])]
),
});
},
// 处理报警
editAlarmStatus() {
/**editAlarmStatus({ objIds: this.ids1 }).then((res) => {
this.$message({
type: "success",
message: "异常数据已处理！",
duration: 1500,
});
this.getAlarmData();
});
**/
},
/** 报警列表 */
getAlarmData(open) {
/**this.open1 = open;
this.deviceloading = true;
listData({ alarmStatus: 1 }).then((response) => {
this.typeList = response.rows;
this.devicetotal = response.total;
this.deviceloading = false;
if (localStorage.getItem("this.devicetotal") != this.devicetotal) {
localStorage.setItem("this.devicetotal", this.devicetotal);
this.openAlarm();
}
});
**/
},
// 多选框选中数据
handleSelectionChange1(selection) {
this.ids1 = selection.map((item) => item.objId);
this.single1 = selection.length !== 1;
this.multiple1 = !selection.length;
},
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
this.$store.dispatch("app/toggleSideBar");
},
async logout() {
this.$confirm('确定注销并退出系统吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$store.dispatch('LogOut').then(() => {
location.href = '/index';
this.$confirm("确定注销并退出系统吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$store.dispatch("LogOut").then(() => {
location.href = "/index";
});
})
}).catch(() => {});
}
}
}
.catch(() => {});
},
// 选中数据源
handleChange(value) {
//修改后台数据源
changePoolName(value).then((res) => {
localStorage.setItem("USER_POOL_NAME_CURRENT", value);
this.poolName = value;
window.location.reload();
});
},
},
};
</script>
<style lang="scss" scoped>
@keyframes color-cycle {
0% {
color: red;
}
50% {
color: rgb(186, 186, 16);
}
100% {
color: red;
}
}
.navbar {
.warnTxt {
animation-name: color-cycle;
animation-duration: 0.5s;
animation-iteration-count: infinite;
}
height: 50px;
overflow: hidden;
position: relative;
background: #fff;
box-shadow: 0 1px 4px rgba(0,21,41,.08);
box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
.exceptionHandling {
/* line-height: 50px;
display: inline-block;
color: black;*/
vertical-align: text-bottom;
cursor: pointer;
padding: 0.8px;
}
.hamburger-container {
line-height: 46px;
height: 100%;
float: left;
cursor: pointer;
transition: background .3s;
-webkit-tap-highlight-color:transparent;
transition: background 0.3s;
-webkit-tap-highlight-color: transparent;
&:hover {
background: rgba(0, 0, 0, .025)
background: rgba(0, 0, 0, 0.025);
}
}
@ -164,10 +362,10 @@ export default {
&.hover-effect {
cursor: pointer;
transition: background .3s;
transition: background 0.3s;
&:hover {
background: rgba(0, 0, 0, .025)
background: rgba(0, 0, 0, 0.025);
}
}
}

32
src/store/modules/user.js
Unescape Escape View File

@ -1,10 +1,11 @@
import { login, logout, getInfo, refreshToken } from '@/api/login'
import { login, logout, getInfo, refreshToken,casValidate } from '@/api/login'
import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth'
const user = {
state: {
token: getToken(),
name: '',
nickName:'',
avatar: '',
roles: [],
permissions: []
@ -20,6 +21,9 @@ const user = {
SET_NAME: (state, name) => {
state.name = name
},
SET_NICKNAME: (state, name) => {
state.nickName = name
},
SET_AVATAR: (state, avatar) => {
state.avatar = avatar
},
@ -51,7 +55,22 @@ const user = {
})
})
},
// CAS登录
LoginCas({ commit }, qrcodeStatus) {
return new Promise((resolve, reject) => {
//CAS认证
casValidate(qrcodeStatus).then(res => {
let data = res.data
setToken(data.access_token)
commit('SET_TOKEN', data.access_token)
setExpiresIn(data.expires_in)
commit('SET_EXPIRES_IN', data.expires_in)
resolve()
}).catch(error => {
reject(error)
})
})
},
// 获取用户信息
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
@ -65,7 +84,10 @@ const user = {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_NAME', user.userName)
commit('SET_NICKNAME', user.nickName)
commit('SET_AVATAR', avatar)
localStorage.setItem('POOL_NAME_LIST',JSON.stringify(res.poolNameList))
localStorage.setItem('USER_POOL_NAME_CURRENT',user.poolName)
resolve(res)
}).catch(error => {
reject(error)
@ -85,7 +107,7 @@ const user = {
})
})
},
// 退出系统
LogOut({ commit, state }) {
return new Promise((resolve, reject) => {
@ -93,6 +115,8 @@ const user = {
commit('SET_TOKEN', '')
commit('SET_ROLES', [])
commit('SET_PERMISSIONS', [])
localStorage.setItem('POOL_NAME_LIST',[])
localStorage.setItem('USER_POOL_NAME_CURRENT','')
removeToken()
resolve()
}).catch(error => {
@ -105,6 +129,8 @@ const user = {
FedLogOut({ commit }) {
return new Promise(resolve => {
commit('SET_TOKEN', '')
localStorage.setItem('POOL_NAME_LIST',[])
localStorage.setItem('USER_POOL_NAME_CURRENT','')
removeToken()
resolve()
})

3
src/utils/request.js
Unescape Escape View File

@ -22,6 +22,9 @@ const service = axios.create({
// request拦截器
service.interceptors.request.use(config => {
if(localStorage.getItem('USER_POOL_NAME_CURRENT')){
config.headers['poolName'] = localStorage.getItem('USER_POOL_NAME_CURRENT');
}
// 是否需要设置 token
const isToken = (config.headers || {}).isToken === false
// 是否需要防止数据重复提交

Write Preview
Loading…
Cancel
Save