xiaoguangbin/AnalysisSystemForRadionuclide_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature-Alarm-renpy' into master-dev

Browse Source
This commit is contained in:
任珮宇 2023-10-09 14:13:52 +08:00
commit 79e9a3abaa
5 changed files with 577 additions and 608 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

335
src/components/tools/HeaderNotice.vue
View File

@ -6,7 +6,8 @@
:arrowPointAtCenter="true" :arrowPointAtCenter="true"
overlayClassName="header-notice-wrapper" overlayClassName="header-notice-wrapper"
@visibleChange="handleHoverChange" @visibleChange="handleHoverChange"
:overlayStyle="{ width: '300px', top: '50px' }"> :overlayStyle="{ width: '300px', top: '50px' }"
>
<template slot="content"> <template slot="content">
<a-spin :spinning="loadding"> <a-spin :spinning="loadding">
<a-tabs> <a-tabs>
@ -30,17 +31,21 @@
</a-list>--> </a-list>-->
<a-list> <a-list>
<a-list-item :key="index" v-for="(record, index) in announcement1"> <a-list-item :key="index" v-for="(record, index) in announcement1">
<div style="margin-left: 5%;width: 80%"> <div style="margin-left: 5%; width: 80%">
<p><a @click="showAnnouncement(record)">{{ record.titile }}</a></p> <p>
<p style="color: rgba(0,0,0,.45);margin-bottom: 0px">{{ record.createTime }} 发布</p> <a @click="showAnnouncement(record)">{{ record.titile }}</a>
</p>
<p style="color: #c9f6f6; margin-bottom: 0px">{{ record.createTime }} 发布</p>
</div> </div>
<div style="text-align: right"> <div style="text-align: right">
<a-tag @click="showAnnouncement(record)" v-if="record.priority === 'L'" color="blue">一般消息</a-tag> <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'L'" color="blue">一般消息</a-tag>
<a-tag @click="showAnnouncement(record)" v-if="record.priority === 'M'" color="orange">重要消息</a-tag> <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'M'" color="orange"
>重要消息</a-tag
>
<a-tag @click="showAnnouncement(record)" v-if="record.priority === 'H'" color="red">紧急消息</a-tag> <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'H'" color="red">紧急消息</a-tag>
</div> </div>
</a-list-item> </a-list-item>
<div style="margin-top: 5px;text-align: center"> <div style="margin-top: 5px; text-align: center">
<a-button @click="toMyAnnouncement()" type="dashed" block>查看更多</a-button> <a-button @click="toMyAnnouncement()" type="dashed" block>查看更多</a-button>
</div> </div>
</a-list> </a-list>
@ -48,17 +53,21 @@
<a-tab-pane :tab="msg2Title" key="2"> <a-tab-pane :tab="msg2Title" key="2">
<a-list> <a-list>
<a-list-item :key="index" v-for="(record, index) in announcement2"> <a-list-item :key="index" v-for="(record, index) in announcement2">
<div style="margin-left: 5%;width: 80%"> <div style="margin-left: 5%; width: 80%">
<p><a @click="showAnnouncement(record)">{{ record.titile }}</a></p> <p>
<p style="color: rgba(0,0,0,.45);margin-bottom: 0px">{{ record.createTime }} 发布</p> <a @click="showAnnouncement(record)">{{ record.titile }}</a>
</p>
<p style="color: #c9f6f6; margin-bottom: 0px">{{ record.createTime }} 发布</p>
</div> </div>
<div style="text-align: right"> <div style="text-align: right">
<a-tag @click="showAnnouncement(record)" v-if="record.priority === 'L'" color="blue">一般消息</a-tag> <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'L'" color="blue">一般消息</a-tag>
<a-tag @click="showAnnouncement(record)" v-if="record.priority === 'M'" color="orange">重要消息</a-tag> <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'M'" color="orange"
>重要消息</a-tag
>
<a-tag @click="showAnnouncement(record)" v-if="record.priority === 'H'" color="red">紧急消息</a-tag> <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'H'" color="red">紧急消息</a-tag>
</div> </div>
</a-list-item> </a-list-item>
<div style="margin-top: 5px;text-align: center"> <div style="margin-top: 5px; text-align: center">
<a-button @click="toMyAnnouncement()" type="dashed" block>查看更多</a-button> <a-button @click="toMyAnnouncement()" type="dashed" block>查看更多</a-button>
</div> </div>
</a-list> </a-list>
@ -68,102 +77,105 @@
</template> </template>
<span @click="fetchNotice" class="header-notice"> <span @click="fetchNotice" class="header-notice">
<a-badge :count="msgTotal"> <a-badge :count="msgTotal">
<img src="@/assets/images/header/notice.png" alt=""> <img src="@/assets/images/header/notice.png" alt="" />
</a-badge> </a-badge>
</span> </span>
<show-announcement ref="ShowAnnouncement" @ok="modalFormOk"></show-announcement> <show-announcement ref="ShowAnnouncement" @ok="modalFormOk"></show-announcement>
<dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData"/> <dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData" />
</a-popover> </a-popover>
</template> </template>
<script> <script>
import { getAction,putAction } from '@/api/manage' import { getAction, putAction } from '@/api/manage'
import ShowAnnouncement from './ShowAnnouncement' import ShowAnnouncement from './ShowAnnouncement'
import store from '@/store/' import store from '@/store/'
import DynamicNotice from './DynamicNotice' import DynamicNotice from './DynamicNotice'
import Vue from 'vue' import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types' import { ACCESS_TOKEN } from '@/store/mutation-types'
export default { export default {
name: "HeaderNotice", name: 'HeaderNotice',
components: { components: {
DynamicNotice, DynamicNotice,
ShowAnnouncement, ShowAnnouncement,
}, },
data () { data() {
return { return {
loadding: false, loadding: false,
url:{ url: {
listCementByUser:"/sys/annountCement/listByUser", listCementByUser: '/sys/annountCement/listByUser',
editCementSend:"/sys/sysAnnouncementSend/editByAnntIdAndUserId", editCementSend: '/sys/sysAnnouncementSend/editByAnntIdAndUserId',
queryById:"/sys/annountCement/queryById", queryById: '/sys/annountCement/queryById',
}, },
hovered: false, hovered: false,
announcement1:[], announcement1: [],
announcement2:[], announcement2: [],
msg1Count:"0", msg1Count: '0',
msg2Count:"0", msg2Count: '0',
msg1Title:"通知(0)", msg1Title: '通知(0)',
msg2Title:"", msg2Title: '',
stopTimer:false, stopTimer: false,
websock: null, websock: null,
lockReconnect:false, lockReconnect: false,
//websocket错误连接次数 //websocket错误连接次数
wsConnectErrorTime:1, wsConnectErrorTime: 1,
heartCheck:null, heartCheck: null,
formData:{}, formData: {},
openPath:'' openPath: '',
} }
}, },
computed:{ computed: {
msgTotal () { msgTotal() {
return parseInt(this.msg1Count)+parseInt(this.msg2Count); return parseInt(this.msg1Count) + parseInt(this.msg2Count)
} },
}, },
mounted() { mounted() {
this.loadData(); this.loadData()
//this.timerFun(); //this.timerFun();
this.initWebSocket(); this.initWebSocket()
// this.heartCheckFun(); // this.heartCheckFun();
}, },
destroyed: function () { // 离开页面生命周期函数 destroyed: function () {
this.websocketOnclose(); // 离开页面生命周期函数
this.websocketOnclose()
}, },
methods: { methods: {
timerFun() { timerFun() {
this.stopTimer = false; this.stopTimer = false
let myTimer = setInterval(()=>{ let myTimer = setInterval(() => {
// 停止定时器 // 停止定时器
if (this.stopTimer == true) { if (this.stopTimer == true) {
clearInterval(myTimer); clearInterval(myTimer)
return; return
} }
this.loadData() this.loadData()
},6000) }, 6000)
}, },
loadData (){ loadData() {
try { try {
// 获取系统消息 // 获取系统消息
getAction(this.url.listCementByUser).then((res) => { getAction(this.url.listCementByUser)
.then((res) => {
if (res.success) { if (res.success) {
this.announcement1 = res.result.anntMsgList; this.announcement1 = res.result.anntMsgList
this.msg1Count = res.result.anntMsgTotal; this.msg1Count = res.result.anntMsgTotal
this.msg1Title = "通知(" + res.result.anntMsgTotal + ")"; this.msg1Title = '通知(' + res.result.anntMsgTotal + ')'
this.announcement2 = res.result.sysMsgList; this.announcement2 = res.result.sysMsgList
this.msg2Count = res.result.sysMsgTotal; this.msg2Count = res.result.sysMsgTotal
this.msg2Title = "系统消息(" + res.result.sysMsgTotal + ")"; this.msg2Title = '系统消息(' + res.result.sysMsgTotal + ')'
} }
}).catch(error => { })
console.log("系统消息通知异常",error);//这行打印permissionName is undefined .catch((error) => {
this.stopTimer = true; console.log('系统消息通知异常', error) //这行打印permissionName is undefined
console.log("清理timer"); this.stopTimer = true
}); console.log('清理timer')
})
} catch (err) { } catch (err) {
this.stopTimer = true; this.stopTimer = true
console.log("通知异常",err); console.log('通知异常', err)
} }
}, },
fetchNotice () { fetchNotice() {
if (this.loadding) { if (this.loadding) {
this.loadding = false this.loadding = false
return return
@ -173,186 +185,189 @@
this.loadding = false this.loadding = false
}, 200) }, 200)
}, },
showAnnouncement(record){ showAnnouncement(record) {
putAction(this.url.editCementSend,{anntId:record.id}).then((res)=>{ putAction(this.url.editCementSend, { anntId: record.id }).then((res) => {
if(res.success){ if (res.success) {
this.loadData(); this.loadData()
} }
}); })
this.hovered = false; this.hovered = false
if(record.openType==='component'){ if (record.openType === 'component') {
this.openPath = record.openPage; this.openPath = record.openPage
this.formData = {id:record.busId}; this.formData = { id: record.busId }
this.$refs.showDynamNotice.detail(record.openPage); this.$refs.showDynamNotice.detail(record.openPage)
}else{ } else {
this.$refs.ShowAnnouncement.detail(record); this.$refs.ShowAnnouncement.detail(record)
} }
}, },
toMyAnnouncement(){ toMyAnnouncement() {
this.$router.push({ this.$router.push({
path: '/isps/userAnnouncement' path: '/isps/userAnnouncement',
}); })
}, },
modalFormOk(){ modalFormOk() {},
}, handleHoverChange(visible) {
handleHoverChange (visible) { this.hovered = visible
this.hovered = visible;
}, },
initWebSocket: function () { initWebSocket: function () {
// WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https // WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https
var userId = store.getters.userInfo.id; var userId = store.getters.userInfo.id
var url = window._CONFIG['domianURL'].replace("https://","wss://").replace("http://","ws://")+"/websocket/"+userId; var url =
window._CONFIG['domianURL'].replace('https://', 'wss://').replace('http://', 'ws://') + '/websocket/' + userId
//console.log(url); //console.log(url);
//update-begin-author:taoyan date:2022-4-22 for: v2.4.6 的 websocket 服务端，存在性能和安全问题。 #3278 //update-begin-author:taoyan date:2022-4-22 for: v2.4.6 的 websocket 服务端，存在性能和安全问题。 #3278
let token = Vue.ls.get(ACCESS_TOKEN) let token = Vue.ls.get(ACCESS_TOKEN)
this.websock = new WebSocket(url, [token]); this.websock = new WebSocket(url, [token])
//update-end-author:taoyan date:2022-4-22 for: v2.4.6 的 websocket 服务端，存在性能和安全问题。 #3278 //update-end-author:taoyan date:2022-4-22 for: v2.4.6 的 websocket 服务端，存在性能和安全问题。 #3278
this.websock.onopen = this.websocketOnopen; this.websock.onopen = this.websocketOnopen
this.websock.onerror = this.websocketOnerror; this.websock.onerror = this.websocketOnerror
this.websock.onmessage = this.websocketOnmessage; this.websock.onmessage = this.websocketOnmessage
this.websock.onclose = this.websocketOnclose; this.websock.onclose = this.websocketOnclose
}, },
websocketOnopen: function () { websocketOnopen: function () {
console.log("WebSocket连接成功"); console.log('WebSocket连接成功')
//心跳检测重置 //心跳检测重置
//this.heartCheck.reset().start(); //this.heartCheck.reset().start();
}, },
websocketOnerror: function (e) { websocketOnerror: function (e) {
console.log("WebSocket连接发生错误，第%s次",this.wsConnectErrorTime); console.log('WebSocket连接发生错误，第%s次', this.wsConnectErrorTime)
this.wsConnectErrorTime = this.wsConnectErrorTime + 1; this.wsConnectErrorTime = this.wsConnectErrorTime + 1
if(this.wsConnectErrorTime>5){ if (this.wsConnectErrorTime > 5) {
console.log("WebSocket连接错误超过5次，就不再重新连了！"); console.log('WebSocket连接错误超过5次，就不再重新连了！')
this.lockReconnect = true this.lockReconnect = true
return; return
} }
this.reconnect(); this.reconnect()
}, },
websocketOnmessage: function (e) { websocketOnmessage: function (e) {
console.log("-----接收消息-------",e.data); console.log('-----接收消息-------', e.data)
var data = eval("(" + e.data + ")"); //解析对象 var data = eval('(' + e.data + ')') //解析对象
this.voiceBroadcast(data.msgTxt) this.voiceBroadcast(data.msgTxt)
if(data.cmd == "topic"){ if (data.cmd == 'topic') {
//系统通知 //系统通知
this.loadData(); this.loadData()
}else if(data.cmd == "user"){ } else if (data.cmd == 'user') {
//用户消息 //用户消息
this.loadData(); this.loadData()
} }
//心跳检测重置 //心跳检测重置
//this.heartCheck.reset().start(); //this.heartCheck.reset().start();
}, },
websocketOnclose: function (e) { websocketOnclose: function (e) {
console.log("connection closed (" + e + ")"); console.log('connection closed (' + e + ')')
if(e){ if (e) {
console.log("connection closed (" + e.code + ")"); console.log('connection closed (' + e.code + ')')
} }
this.reconnect(); this.reconnect()
}, },
websocketSend(text) { // 数据发送 websocketSend(text) {
// 数据发送
try { try {
this.websock.send(text); this.websock.send(text)
} catch (err) { } catch (err) {
console.log("send failed (" + err.code + ")"); console.log('send failed (' + err.code + ')')
} }
}, },
//语音播报系统通知 //语音播报系统通知
voiceBroadcast(text){ voiceBroadcast(text) {
var url = "http://tts.baidu.com/text2audio?lan=zh&ie=UTF-8&text=" + encodeURI(text); // baidu文字转语音 var url = 'http://tts.baidu.com/text2audio?lan=zh&ie=UTF-8&text=' + encodeURI(text) // baidu文字转语音
var voiceContent = new Audio(url); var voiceContent = new Audio(url)
voiceContent.src = url; voiceContent.src = url
voiceContent.play(); voiceContent.play()
}, },
openNotification (data) { openNotification(data) {
var text = data.msgTxt; var text = data.msgTxt
const key = `open${Date.now()}`; const key = `open${Date.now()}`
this.$notification.open({ this.$notification.open({
message: '消息提醒', message: '消息提醒',
placement:'bottomRight', placement: 'bottomRight',
description: text, description: text,
key, key,
btn: (h)=>{ btn: (h) => {
return h('a-button', { return h(
'a-button',
{
props: { props: {
type: 'primary', type: 'primary',
size: 'small', size: 'small',
}, },
on: { on: {
click: () => this.showDetail(key,data) click: () => this.showDetail(key, data),
}
}, '查看详情')
}, },
}); },
'查看详情'
)
},
})
}, },
reconnect() { reconnect() {
var that = this; var that = this
if(that.lockReconnect) return; if (that.lockReconnect) return
that.lockReconnect = true; that.lockReconnect = true
//没连接上会一直重连，设置延迟避免请求过多 //没连接上会一直重连，设置延迟避免请求过多
setTimeout(function () { setTimeout(function () {
console.info("尝试重连..."); console.info('尝试重连...')
that.initWebSocket(); that.initWebSocket()
that.lockReconnect = false; that.lockReconnect = false
}, 20000); }, 20000)
}, },
heartCheckFun(){ heartCheckFun() {
var that = this; var that = this
//心跳检测,每20s心跳一次 //心跳检测,每20s心跳一次
that.heartCheck = { that.heartCheck = {
timeout: 20000, timeout: 20000,
timeoutObj: null, timeoutObj: null,
serverTimeoutObj: null, serverTimeoutObj: null,
reset: function(){ reset: function () {
clearTimeout(this.timeoutObj); clearTimeout(this.timeoutObj)
//clearTimeout(this.serverTimeoutObj); //clearTimeout(this.serverTimeoutObj);
return this; return this
}, },
start: function(){ start: function () {
var self = this; var self = this
this.timeoutObj = setTimeout(function(){ this.timeoutObj = setTimeout(function () {
//这里发送一个心跳，后端收到后，返回一个心跳消息， //这里发送一个心跳，后端收到后，返回一个心跳消息，
//onmessage拿到返回的心跳就说明连接正常 //onmessage拿到返回的心跳就说明连接正常
that.websocketSend("HeartBeat"); that.websocketSend('HeartBeat')
console.info("客户端发送心跳"); console.info('客户端发送心跳')
//self.serverTimeoutObj = setTimeout(function(){//如果超过一定时间还没重置，说明后端主动断开了 //self.serverTimeoutObj = setTimeout(function(){//如果超过一定时间还没重置，说明后端主动断开了
// that.websock.close();//如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次 // that.websock.close();//如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
//}, self.timeout) //}, self.timeout)
}, this.timeout) }, this.timeout)
} },
} }
}, },
showDetail(key, data) {
showDetail(key,data){ this.$notification.close(key)
this.$notification.close(key); var id = data.msgId
var id = data.msgId; getAction(this.url.queryById, { id: id }).then((res) => {
getAction(this.url.queryById,{id:id}).then((res) => {
if (res.success) { if (res.success) {
var record = res.result; var record = res.result
this.showAnnouncement(record); this.showAnnouncement(record)
} }
}) })
}, },
} },
} }
</script> </script>
<style lang="css"> <style lang="css">
.header-notice-wrapper { .header-notice-wrapper {
top: 50px !important; top: 50px !important;
} }
</style> </style>
<style lang="less" scoped> <style lang="less" scoped>
.header-notice{ .header-notice {
display: inline-block; display: inline-block;
transition: all 0.3s; transition: all 0.3s;
span { span {
vertical-align: initial; vertical-align: initial;
} }
} }
</style> </style>

10
src/views/abnormalAlarm/serverMonitor/instances/cpu.vue
View File

@ -231,7 +231,6 @@ export default {
}, },
methods: { methods: {
getTheData() { getTheData() {
console.log(this.serverOptions)
let hostId = this.serverOptions.find((item) => { let hostId = this.serverOptions.find((item) => {
return item.value == this.currId return item.value == this.currId
}).hostId }).hostId
@ -278,7 +277,6 @@ export default {
totalCpu.push(item) totalCpu.push(item)
} }
}) })
console.log(totalCpu)
this.cpuDiff_xData = totalCpu[0].list.map((item) => { this.cpuDiff_xData = totalCpu[0].list.map((item) => {
return dateFormat(new Date(item.date * 1000), 'hh:mm') return dateFormat(new Date(item.date * 1000), 'hh:mm')
}) })
@ -357,14 +355,17 @@ export default {
onServerChange(val) { onServerChange(val) {
this.currId = val.key this.currId = val.key
this.currLabel = val.label this.currLabel = val.label
this.getTheData()
}, },
onTimeChange(val) { onTimeChange(val) {
this.getBeforeHours(val) this.getBeforeHours(val)
this.getTheData()
}, },
onRangeDateChange(date, dateString) { onRangeDateChange(date, dateString) {
this.queryParams.timer = 0 this.queryParams.timer = 0
this.queryParams.startDate = dateString[0] this.queryParams.startDate = dateString[0]
this.queryParams.endDate = dateString[1] this.queryParams.endDate = dateString[1]
this.getTheData()
}, },
drawChart1() { drawChart1() {
let myLine = echarts.init(document.getElementById('chart1')) let myLine = echarts.init(document.getElementById('chart1'))
@ -754,6 +755,11 @@ export default {
data: item.data, data: item.data,
} }
}) })
option.legend.type = 'scroll'
option.legend.pageIconColor = '#9ab1bc'
option.legend.pageTextStyle = {
color: '#9ab1bc',
}
this.drawLine(option) this.drawLine(option)
} else { } else {
this.drawLine(option) this.drawLine(option)

10
src/views/abnormalAlarm/serverMonitor/instances/details.vue
View File

@ -15,7 +15,7 @@
:class="{ 'ant-list-item-active': index === currIndex }" :class="{ 'ant-list-item-active': index === currIndex }"
slot="renderItem" slot="renderItem"
slot-scope="item, index" slot-scope="item, index"
@click="handleBasicItem(index)" @click="handleBasicItem(index, item)"
> >
<div>{{ item.sourceName }}</div> <div>{{ item.sourceName }}</div>
</a-list-item> </a-list-item>
@ -512,7 +512,6 @@ export default {
methods: { methods: {
// Echarts (时间线) // Echarts (时间线)
EchartsTimeline() { EchartsTimeline() {
console.log(3456789)
const params = { const params = {
itemId: '37550', itemId: '37550',
itemType: 0, itemType: 0,
@ -647,7 +646,6 @@ export default {
} }
getAction('/systemMonitor/queryItemHistoryData', params).then((res) => { getAction('/systemMonitor/queryItemHistoryData', params).then((res) => {
const arr = res.result.map((x) => x.value) const arr = res.result.map((x) => x.value)
console.log(Math.max(...arr), Math.min(...arr))
this.cpuData.max = Math.max(...arr).toFixed(2) this.cpuData.max = Math.max(...arr).toFixed(2)
this.cpuData.min = Math.min(...arr).toFixed(2) this.cpuData.min = Math.min(...arr).toFixed(2)
let sum = arr.reduce((tatal, num) => tatal + num, 0) let sum = arr.reduce((tatal, num) => tatal + num, 0)
@ -743,8 +741,12 @@ export default {
} }
} }
}, },
handleBasicItem(i) { handleBasicItem(i, item) {
this.currIndex = i this.currIndex = i
this.currItemId = item.cpuUsedItemId
this.getBasiclnfo(item.hostId)
this.getCpuUtilizationData()
this.getTimeLineData()
}, },
getServerAlarmHistory(callBack) { getServerAlarmHistory(callBack) {
this.loading = true this.loading = true

1
src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue
View File

@ -333,7 +333,6 @@ export default {
let oneHourAgo = moment().subtract(num, 'hours') let oneHourAgo = moment().subtract(num, 'hours')
this.queryParams.startDate = oneHourAgo.format('YYYY-MM-DD HH:mm:ss') this.queryParams.startDate = oneHourAgo.format('YYYY-MM-DD HH:mm:ss')
this.queryParams.endDate = currentTime.format('YYYY-MM-DD HH:mm:ss') this.queryParams.endDate = currentTime.format('YYYY-MM-DD HH:mm:ss')
console.log(this.queryParams)
}, },
moment, moment,
onRangeDateChange(date, dateString) { onRangeDateChange(date, dateString) {

403
src/views/system/modules/PermissionModal.vue
View File

@ -4,13 +4,12 @@
:width="drawerWidth" :width="drawerWidth"
@close="handleCancel" @close="handleCancel"
:visible="visible" :visible="visible"
:confirmLoading="confirmLoading"> :confirmLoading="confirmLoading"
>
<div :style="{width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}"> <div :style="{ width: '100%', border: '1px solid #e9e9e9', padding: '10px 16px', background: '#fff' }">
<a-spin :spinning="confirmLoading"> <a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :rules="validatorRules"> <a-form-model ref="form" :model="model" :rules="validatorRules">
<a-form-model-item label="Menu Type" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-form-model-item label="Menu Type" :labelCol="labelCol" :wrapperCol="wrapperCol" >
<a-radio-group @change="onChangeMenuType" v-model="model.menuType"> <a-radio-group @change="onChangeMenuType" v-model="model.menuType">
<a-radio :value="0">First Level Menu</a-radio> <a-radio :value="0">First Level Menu</a-radio>
<a-radio :value="1">Child Menu</a-radio> <a-radio :value="1">Child Menu</a-radio>
@ -18,42 +17,34 @@
</a-radio-group> </a-radio-group>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="menuLabel" prop="name" hasFeedback>
:labelCol="labelCol" <a-input v-model="model.name" :readOnly="disableSubmit" />
:wrapperCol="wrapperCol"
:label="menuLabel"
prop="name"
hasFeedback >
<a-input v-model="model.name" :readOnly="disableSubmit"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item
v-show="model.menuType!=0" v-show="model.menuType != 0"
label="Parent Menu" label="Parent Menu"
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
:validate-status="validateStatus" :validate-status="validateStatus"
:hasFeedback="true" :hasFeedback="true"
:required="true"> :required="true"
<span slot="help">{{ validateStatus=='error'?'Please Select Parent Menu':'&nbsp;&nbsp;' }}</span> >
<span slot="help">{{ validateStatus == 'error' ? 'Please Select Parent Menu' : '&nbsp;&nbsp;' }}</span>
<a-tree-select <a-tree-select
style="width:100%" style="width: 100%"
:dropdownStyle="{ maxHeight: '200px', overflow: 'auto' }" :dropdownStyle="{ maxHeight: '200px', overflow: 'auto' }"
:treeData="treeData" :treeData="treeData"
v-model="model.parentId" v-model="model.parentId"
placeholder="Please Select Parent Menu" placeholder="Please Select Parent Menu"
:disabled="disableSubmit" :disabled="disableSubmit"
@change="handleParentIdChange"> @change="handleParentIdChange"
>
</a-tree-select> </a-tree-select>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="url" label="Menu Route">
:labelCol="labelCol" <a-input v-model="model.url" :readOnly="disableSubmit" />
:wrapperCol="wrapperCol"
prop="url"
label="Menu Route">
<a-input v-model="model.url" :readOnly="disableSubmit"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item
@ -61,114 +52,67 @@
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
prop="component" prop="component"
label="Component"> label="Component"
<a-input v-model="model.component" :readOnly="disableSubmit"/> >
<a-input v-model="model.component" :readOnly="disableSubmit" />
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item
v-show="model.menuType==0" v-show="model.menuType == 0"
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="Redirect Params"> label="Redirect Params"
<a-input v-model="model.redirect" :readOnly="disableSubmit"/> >
<a-input v-model="model.redirect" :readOnly="disableSubmit" />
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item v-show="!show" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="perms" label="Perms">
v-show="!show" <a-input placeholder="Enter Perms, like: user:list" v-model="model.perms" :readOnly="disableSubmit" />
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="perms"
label="Perms">
<a-input placeholder="Enter Perms, like: user:list" v-model="model.perms" :readOnly="disableSubmit"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item v-show="!show" :labelCol="labelCol" :wrapperCol="wrapperCol" label="Auth Category">
v-show="!show" <j-dict-select-tag v-model="model.permsType" :type="'radio'" dictCode="global_perms_type" />
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="Auth Category">
<j-dict-select-tag v-model="model.permsType" :type="'radio'" dictCode="global_perms_type"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item v-show="!show" :labelCol="labelCol" :wrapperCol="wrapperCol" label="Status">
v-show="!show" <j-dict-select-tag v-model="model.status" :type="'radio'" dictCode="valid_status" />
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="Status">
<j-dict-select-tag v-model="model.status" :type="'radio'" dictCode="valid_status"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item v-show="show" :labelCol="labelCol" :wrapperCol="wrapperCol" label="Icon">
v-show="show"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="Icon">
<a-input placeholder="Click Select Icon" v-model="model.icon" :readOnly="disableSubmit"> <a-input placeholder="Click Select Icon" v-model="model.icon" :readOnly="disableSubmit">
<a-icon slot="addonAfter" type="setting" @click="selectIcons" /> <a-icon slot="addonAfter" type="setting" @click="selectIcons" />
</a-input> </a-input>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item v-show="show" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sortNo" label="Sort">
v-show="show" <a-input-number v-model="model.sortNo" style="width: 200px" :readOnly="disableSubmit" />
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="sortNo"
label="Sort">
<a-input-number v-model="model.sortNo" style="width: 200px" :readOnly="disableSubmit"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item v-show="show" :labelCol="labelCol" :wrapperCol="wrapperCol" label="Is Route Menu">
v-show="show" <a-switch checkedChildren="Yes" unCheckedChildren="No" v-model="model.route" />
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="Is Route Menu">
<a-switch checkedChildren="Yes" unCheckedChildren="No" v-model="model.route"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item v-show="show" :labelCol="labelCol" :wrapperCol="wrapperCol" label="Hidden">
v-show="show" <a-switch checkedChildren="Yes" unCheckedChildren="No" v-model="model.hidden" />
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="Hidden">
<a-switch checkedChildren="Yes" unCheckedChildren="No" v-model="model.hidden"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item v-show="show" :labelCol="labelCol" :wrapperCol="wrapperCol" label="Keep Alive">
v-show="show" <a-switch checkedChildren="Yes" unCheckedChildren="No" v-model="model.keepAlive" />
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="Keep Alive">
<a-switch checkedChildren="Yes" unCheckedChildren="No" v-model="model.keepAlive"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item v-show="show" :labelCol="labelCol" :wrapperCol="wrapperCol" label="Combine Route">
<a-form-model-item <a-switch checkedChildren="Yes" unCheckedChildren="No" v-model="model.alwaysShow" />
v-show="show"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="Combine Route">
<a-switch checkedChildren="Yes" unCheckedChildren="No" v-model="model.alwaysShow"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item v-show="show" :labelCol="labelCol" :wrapperCol="wrapperCol" label="Open Type">
v-show="show" <a-switch checkedChildren="External" unCheckedChildren="Internal" v-model="model.internalOrExternal" />
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="Open Type">
<a-switch checkedChildren="External" unCheckedChildren="Internal" v-model="model.internalOrExternal"/>
</a-form-model-item> </a-form-model-item>
</a-form-model> </a-form-model>
<!-- 选择图标 --> <!-- 选择图标 -->
<icons @choose="handleIconChoose" @close="handleIconCancel" :iconChooseVisible="iconChooseVisible"></icons> <icons @choose="handleIconChoose" @close="handleIconCancel" :iconChooseVisible="iconChooseVisible"></icons>
</a-spin> </a-spin>
<a-row :style="{textAlign:'right'}"> <a-row :style="{ textAlign: 'right' }">
<a-button :style="{marginRight: '8px'}" @click="handleCancel" type="warn"> <a-button :style="{ marginRight: '8px' }" @click="handleCancel" type="warn"> Cancel </a-button>
Cancel
</a-button>
<a-button :disabled="disableSubmit" @click="handleOk" type="primary">Ok</a-button> <a-button :disabled="disableSubmit" @click="handleOk" type="primary">Ok</a-button>
</a-row> </a-row>
</div> </div>
@ -176,22 +120,22 @@
</template> </template>
<script> <script>
import {addPermission,editPermission,queryTreeList, duplicateCheck} from '@/api/api' import { addPermission, editPermission, queryTreeList, duplicateCheck } from '@/api/api'
import Icons from './icon/Icons' import Icons from './icon/Icons'
export default { export default {
name: "PermissionModal", name: 'PermissionModal',
components: {Icons}, components: { Icons },
data () { data() {
return { return {
drawerWidth:700, drawerWidth: 700,
treeData:[], treeData: [],
title:"操作", title: '操作',
visible: false, visible: false,
disableSubmit:false, disableSubmit: false,
model: {}, model: {},
show:true,//根据菜单类型，动态显示隐藏表单元素 show: true, //根据菜单类型，动态显示隐藏表单元素
menuLabel:'Menu Name', menuLabel: 'Menu Name',
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 5 }, sm: { span: 5 },
@ -202,177 +146,180 @@
}, },
confirmLoading: false, confirmLoading: false,
iconChooseVisible: false, iconChooseVisible: false,
validateStatus:"" validateStatus: '',
} }
}, },
computed:{ computed: {
validatorRules:function() { validatorRules: function () {
return { return {
name:[{ required: true, message: 'Please Enter Menu Name' }], name: [{ required: true, message: 'Please Enter Menu Name' }],
component:[{ required: this.show, message: 'Please Enter Component' }], component: [{ required: this.show, message: 'Please Enter Component' }],
url: [{ required: this.show, message: 'Plaase Enter Route Path' }], url: [{ required: this.show, message: 'Plaase Enter Route Path' }],
permsType: [{ required: true, message: 'Please Enter Auth Category' }], permsType: [{ required: true, message: 'Please Enter Auth Category' }],
perms:[{ required: false, message: 'Please Enter Perms' },{validator: this.validatePerms }] perms: [{ required: false, message: 'Please Enter Perms' }, { validator: this.validatePerms }],
}
} }
}, },
created () {
}, },
created() {},
methods: { methods: {
loadTree(){ loadTree() {
var that = this; var that = this
queryTreeList().then((res)=>{ queryTreeList().then((res) => {
if(res.success){
console.log(res)
that.treeData = [];
let treeList = res.result.treeList
for(let a=0;a<treeList.length;a++){
let temp = treeList[a];
temp.isLeaf = temp.leaf;
that.treeData.push(temp);
}
}
});
},
add () {
//初始化默认值
this.edit({status:'1', permsType:'1', sortNo:1.0, route:true, menuType:0,component:'layouts/RouteView' });
},
edit (record) {
this.resetScreenSize(); // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度
this.model = Object.assign({}, record);
//根据菜单类型，动态展示页面字段
console.log('record: ',record)
this.show = record.menuType==2?false:true;
this.menuLabel = record.menuType==2?'Button/Permission':'Menu Name';
this.visible = true;
this.loadTree();
},
close () {
this.$emit('close');
this.disableSubmit = false;
this.visible = false;
this.$refs.form.resetFields();
},
handleOk () {
const that = this;
// 触发表单验证
this.$refs.form.validate(valid => {
if (valid) {
if ((this.model.menuType == 1 || this.model.menuType == 2) && !this.model.parentId) {
that.validateStatus = 'error';
that.$message.error("Please Check The Form");
return;
} else {
that.validateStatus = 'success';
}
that.confirmLoading = true;
let obj;
if (!this.model.id) {
obj = addPermission(this.model);
} else {
obj = editPermission(this.model);
}
obj.then((res) => {
if (res.success) { if (res.success) {
that.$message.success(res.message); console.log(res)
that.$emit('ok'); that.treeData = []
} else { let treeList = res.result.treeList
that.$message.warning(res.message); for (let a = 0; a < treeList.length; a++) {
let temp = treeList[a]
temp.isLeaf = temp.leaf
that.treeData.push(temp)
} }
}).finally(() => {
that.confirmLoading = false;
that.close();
});
}else{
return false;
} }
}) })
}, },
handleCancel () { add() {
//初始化默认值
this.edit({ status: '1', permsType: '1', sortNo: 1.0, route: true, menuType: 0, component: 'layouts/RouteView' })
},
edit(record) {
this.resetScreenSize() // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度
this.model = Object.assign({}, record)
//根据菜单类型，动态展示页面字段
console.log('record: ', record)
this.show = record.menuType == 2 ? false : true
this.menuLabel = record.menuType == 2 ? 'Button/Permission' : 'Menu Name'
this.visible = true
this.loadTree()
},
close() {
this.$emit('close')
this.disableSubmit = false
this.visible = false
this.$refs.form.resetFields()
},
handleOk() {
const that = this
// 触发表单验证
this.$refs.form.validate((valid) => {
if (valid) {
if ((this.model.menuType == 1 || this.model.menuType == 2) && !this.model.parentId) {
that.validateStatus = 'error'
that.$message.error('Please Check The Form')
return
} else {
that.validateStatus = 'success'
}
that.confirmLoading = true
let obj
if (!this.model.id) {
obj = addPermission(this.model)
} else {
obj = editPermission(this.model)
}
obj
.then((res) => {
if (res.success) {
that.$message.success(res.message)
that.$emit('ok')
} else {
that.$message.warning(res.message)
}
})
.finally(() => {
that.confirmLoading = false
that.close()
})
} else {
return false
}
})
},
handleCancel() {
this.close() this.close()
}, },
validateNumber(rule, value, callback){ validateNumber(rule, value, callback) {
if(!value || new RegExp(/^[0-9]*[1-9][0-9]*$/).test(value)){ if (!value || new RegExp(/^[0-9]*[1-9][0-9]*$/).test(value)) {
callback(); callback()
}else{ } else {
callback("Please Enter Positive Integer"); callback('Please Enter Positive Integer')
} }
}, },
validatePerms(rule, value, callback){ validatePerms(rule, value, callback) {
if(value && value.length>0){ if (value && value.length > 0) {
//校验授权标识是否存在 //校验授权标识是否存在
var params = { var params = {
tableName: 'sys_permission', tableName: 'sys_permission',
fieldName: 'perms', fieldName: 'perms',
fieldVal: value, fieldVal: value,
dataId: this.model.id dataId: this.model.id,
}; }
duplicateCheck(params).then((res) => { duplicateCheck(params).then((res) => {
if (res.success) { if (res.success) {
callback() callback()
} else { } else {
callback("Perms Already Exist") callback('Perms Already Exist')
} }
}) })
}else{ } else {
callback() callback()
} }
}, },
onChangeMenuType(e) { onChangeMenuType(e) {
if(this.model.menuType == 2){ if (this.model.menuType == 2) {
this.show = false; this.show = false
this.menuLabel = 'Menu/Permission'; this.menuLabel = 'Menu/Permission'
}else{ } else {
this.show = true; this.show = true
this.menuLabel = 'Menu Name'; this.menuLabel = 'Menu Name'
} }
//update-begin---author:wangshuai ---date:20220729 for：[VUEN-1834]只有一级菜单，才默认值，子菜单的时候，清空------------ //update-begin---author:wangshuai ---date:20220729 for：[VUEN-1834]只有一级菜单，才默认值，子菜单的时候，清空------------
if(!this.model.id){ if (!this.model.id) {
if(this.model.menuType === 1 && this.model.component === 'layouts/RouteView'){ if (this.model.menuType === 1 && this.model.component === 'layouts/RouteView') {
this.model.component = "" this.model.component = ''
} }
} }
//update-end---author:wangshuai ---date:20220729 for：[VUEN-1834]只有一级菜单，才默认值，子菜单的时候，清空-------------- //update-end---author:wangshuai ---date:20220729 for：[VUEN-1834]只有一级菜单，才默认值，子菜单的时候，清空--------------
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.form.validateField(['url','component']); this.$refs.form.validateField(['url', 'component'])
}); })
}, },
selectIcons(){ selectIcons() {
this.iconChooseVisible = true this.iconChooseVisible = true
}, },
handleIconCancel () { handleIconCancel() {
this.iconChooseVisible = false this.iconChooseVisible = false
}, },
handleIconChoose (value) { handleIconChoose(value) {
console.log(value) console.log(value)
this.model.icon = value this.model.icon = value
this.iconChooseVisible = false this.iconChooseVisible = false
}, },
// 根据屏幕变化,设置抽屉尺寸 // 根据屏幕变化,设置抽屉尺寸
resetScreenSize(){ resetScreenSize() {
let screenWidth = document.body.clientWidth; let screenWidth = document.body.clientWidth
if(screenWidth < 500){ if (screenWidth < 500) {
this.drawerWidth = screenWidth; this.drawerWidth = screenWidth
}else{ } else {
this.drawerWidth = 700; this.drawerWidth = 700
} }
}, },
handleParentIdChange(value){ handleParentIdChange(value) {
if(!value){ if (!value) {
this.validateStatus="error" this.validateStatus = 'error'
}else{ } else {
this.validateStatus="success" this.validateStatus = 'success'
}
}
}
} }
},
},
}
</script> </script>
<style scoped> <style>
.ant-select-dropdown {
background-color: #03353f !important;
}
</style> </style>