This commit is contained in:
xiaoguangbin 2023-10-09 14:15:42 +08:00
commit 779acbab5c
6 changed files with 778 additions and 800 deletions

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>
@ -31,12 +32,16 @@
<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>
@ -49,12 +54,16 @@
<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>
@ -68,7 +77,7 @@
</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>
@ -85,7 +94,7 @@
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,
@ -94,17 +103,17 @@
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,
@ -112,31 +121,32 @@
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)
@ -144,23 +154,25 @@
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() {
@ -176,168 +188,171 @@
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 () {
// WebSocketwshttpwsshttps // WebSocketwshttpwsshttps
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();//onclosereconnectws.close().reconnect onclose // that.websock.close();//onclosereconnectws.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>

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)

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

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) {

View File

@ -1,6 +1,13 @@
<template> <template>
<div style="height: 100%;"> <div style="height: 100%">
<a-spin :spinning="spinning"> <List
:stationList="stationList"
:columns="columns"
:dataType="dataType"
fileName="CALIBPHD"
pageType="CALIB"
></List>
<!-- <a-spin :spinning="spinning">
<a-card v-if="!isDetail" :bordered="false" style="margin-left: 20px"> <a-card v-if="!isDetail" :bordered="false" style="margin-left: 20px">
<search-form :items="formItems" v-model="queryParam" @search="searchQueryData"> <search-form :items="formItems" v-model="queryParam" @search="searchQueryData">
<a-space style="float: right" class="btn-group" slot="additional"> <a-space style="float: right" class="btn-group" slot="additional">
@ -28,7 +35,7 @@
</custom-table> </custom-table>
</a-card> </a-card>
</a-spin> </a-spin>
<Detail v-if="isDetail" type="BLANKPHD" :sampleId="currSampleId" :allData="detailJson" @back="handleBack"></Detail> <Detail v-if="isDetail" type="BLANKPHD" :sampleId="currSampleId" :allData="detailJson" @back="handleBack"></Detail> -->
</div> </div>
</template> </template>
<script> <script>
@ -81,109 +88,113 @@ const columns = [
dataIndex: 'acquisitionStop', dataIndex: 'acquisitionStop',
}, },
] ]
import { JeecgListMixin } from '@/mixins/JeecgListMixin' // import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction, getFileAction } from '../../../../../api/manage' import { getAction, getFileAction } from '../../../../../api/manage'
import dateFormat from '../../../../../components/jeecg/JEasyCron/format-date' import List from '../../../list.vue'
import Detail from "../../../detail.vue" // import dateFormat from '../../../../../components/jeecg/JEasyCron/format-date'
// import Detail from '../../../detail.vue'
export default { export default {
name: 'menuTree', // name: 'menuTree',
mixins: [JeecgListMixin], // mixins: [JeecgListMixin],
components: { components: {
Detail, List,
}, },
data() { data() {
return { return {
spinning: false, // spinning: false,
isImmediate:true, // isImmediate: true,
isDetail:false, // isDetail: false,
columns, columns,
queryParam: {
dataType: 'B', dataType: 'B',
startTime: dateFormat(new Date(), 'yyyy-MM-dd'), // queryParam: {
endTime: dateFormat(new Date(), 'yyyy-MM-dd'), // dataType: 'B',
stationIds: [], // startTime: dateFormat(new Date(), 'yyyy-MM-dd'),
spectralQualifie:"" // endTime: dateFormat(new Date(), 'yyyy-MM-dd'),
}, // stationIds: [],
// spectralQualifie: '',
// },
url: { url: {
list: '/webStatistics/findParticulatePage', // list: '/webStatistics/findParticulatePage',
findStationList: '/webStatistics/findStationList', findStationList: '/webStatistics/findStationList',
}, },
stationList: [], stationList: [],
dataSource: [], // dataSource: [],
detailJson: {}, // detailJson: {},
strIds: "", // strIds: '',
allChecked: false, // allChecked: false,
currSampleId: "", // currSampleId: '',
pageType:"ACQ" // pageType: 'ACQ',
} }
}, },
created() { created() {
this.findStationList() this.findStationList()
}, },
methods: { methods: {
handleExcel() { // handleExcel() {
if (this.dataSource.length>0) { // if (this.dataSource.length>0) {
let params = { // let params = {
...this.queryParam, // ...this.queryParam,
pageType:this.pageType // pageType:this.pageType
} // }
getFileAction("/webStatistics/radionuclideExport", params).then(res => { // getFileAction("/webStatistics/radionuclideExport", params).then(res => {
if (res.code && res.code == 500) { // if (res.code && res.code == 500) {
this.$message.warning("This operation fails. Contact your system administrator") // this.$message.warning("This operation fails. Contact your system administrator")
} else { // } else {
const blob = new Blob([res], { type: "application/vnd.ms-excel" }) // const blob = new Blob([res], { type: "application/vnd.ms-excel" })
let link = document.createElement('a') // let link = document.createElement('a')
link.href = window.URL.createObjectURL(blob) // link.href = window.URL.createObjectURL(blob)
link.download = "BLANKPHD" // link.download = "BLANKPHD"
document.body.appendChild(link) // document.body.appendChild(link)
link.click() // link.click()
URL.revokeObjectURL(link.href) // URL.revokeObjectURL(link.href)
document.body.removeChild(link) // document.body.removeChild(link)
} // }
}) // })
} else { // } else {
this.$message.warning("No downloadable data") // this.$message.warning("No downloadable data")
} // }
}, // },
searchQueryData() { // searchQueryData() {
this.isImmediate = false // this.isImmediate = false
this.loading = true // this.loading = true
let params = { // let params = {
...this.queryParam, // ...this.queryParam,
pageNo: 1, // pageNo: 1,
pageSize: 10 // pageSize: 10
} // }
getAction(this.url.list, params).then((res) => { // getAction(this.url.list, params).then((res) => {
this.loading = false // this.loading = false
if (res.success) { // if (res.success) {
this.ipagination.current = res.result.current // this.ipagination.current = res.result.current
this.ipagination.pageSize = res.result.size // this.ipagination.pageSize = res.result.size
this.ipagination.total = res.result.total // this.ipagination.total = res.result.total
this.dataSource = res.result.records // this.dataSource = res.result.records
} else { // } else {
this.$message.warning("This operation fails. Contact your system administrator") // this.$message.warning("This operation fails. Contact your system administrator")
} // }
}) // })
}, // },
handleDetail(record) { // handleDetail(record) {
this.spinning = true // this.spinning = true
this.currSampleId = record.sampleId // this.currSampleId = record.sampleId
getAction("webStatistics/findGeneratedReport", { sampleId: record.sampleId }).then(res => { // getAction('webStatistics/findGeneratedReport', { sampleId: record.sampleId })
this.spinning = false // .then((res) => {
if (res.success) { // this.spinning = false
this.detailJson = res.result // if (res.success) {
this.detailJson = JSON.parse(JSON.stringify(this.detailJson)) // this.detailJson = res.result
this.isDetail = true // this.detailJson = JSON.parse(JSON.stringify(this.detailJson))
} else { // this.isDetail = true
this.$message.warning("This operation fails. Contact your system administrator") // } else {
} // this.$message.warning('This operation fails. Contact your system administrator')
}).catch(err => { // }
this.spinning = false // })
}) // .catch((err) => {
}, // this.spinning = false
handleBack(flag) { // })
this.isDetail = flag // },
}, // handleBack(flag) {
// this.isDetail = flag
// },
findStationList() { findStationList() {
getAction(this.url.findStationList, { menuName: 'Particulate' }).then((res) => { getAction(this.url.findStationList, { menuName: 'Particulate' }).then((res) => {
if (res.success) { if (res.success) {
@ -193,109 +204,107 @@ export default {
this.stationList = [] this.stationList = []
} }
} else { } else {
this.$message.warning("This operation fails. Contact your system administrator") this.$message.warning('This operation fails. Contact your system administrator')
} }
}) })
}, },
handleSelectChange(val) { // handleSelectChange(val) {
let length = this.stationList.length // let length = this.stationList.length
if (val.length === length) { // if (val.length === length) {
this.allChecked = true // this.allChecked = true
} else { // } else {
this.allChecked = false // this.allChecked = false
} // }
}, // },
handleSelectChangeAll(val) { // handleSelectChangeAll(val) {
this.allChecked = val // this.allChecked = val
if (val) { // if (val) {
this.queryParam.stationIds = this.stationList.map(item => item.value) // this.queryParam.stationIds = this.stationList.map(item => item.value)
} else { // } else {
this.queryParam.stationIds =[] // this.queryParam.stationIds =[]
} // }
}, // },
filterOption(input, option) { // filterOption(input, option) {
return ( // return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 // },
);
},
},
computed: {
formItems() {
return [
{
type: 'a-input',
label: '',
name: 'search',
props: {
placeholder: 'search...',
style: {
width: '166px',
},
},
style: {
width: 'auto',
},
},
{
type: 'custom-all-select',
label: 'Stations',
name: 'stationIds',
props: {
allChecked: this.allChecked,
filterOption:this.filterOption,
placeholder: 'select stations',
mode: 'multiple',
maxTagCount: 1,
options: [
...this.stationList,
],
style: {
width: '200px',
},
},
on: {
change: this.handleSelectChange,
changeAll: this.handleSelectChangeAll
},
style: {
width: 'auto',
},
},
{
label: 'Start date',
type: 'custom-date-picker',
name: 'startTime',
props: {
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
style: {
minWidth: 'auto',
width: '200px',
},
},
style: {
width: 'auto',
},
},
{
label: 'End date',
type: 'custom-date-picker',
name: 'endTime',
props: {
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
style: {
minWidth: 'auto',
width: '200px',
},
},
style: {
width: 'auto',
},
},
]
},
}, },
// computed: {
// formItems() {
// return [
// {
// type: 'a-input',
// label: '',
// name: 'search',
// props: {
// placeholder: 'search...',
// style: {
// width: '166px',
// },
// },
// style: {
// width: 'auto',
// },
// },
// {
// type: 'custom-all-select',
// label: 'Stations',
// name: 'stationIds',
// props: {
// allChecked: this.allChecked,
// filterOption:this.filterOption,
// placeholder: 'select stations',
// mode: 'multiple',
// maxTagCount: 1,
// options: [
// ...this.stationList,
// ],
// style: {
// width: '200px',
// },
// },
// on: {
// change: this.handleSelectChange,
// changeAll: this.handleSelectChangeAll
// },
// style: {
// width: 'auto',
// },
// },
// {
// label: 'Start date',
// type: 'custom-date-picker',
// name: 'startTime',
// props: {
// format: 'YYYY-MM-DD',
// valueFormat: 'YYYY-MM-DD',
// style: {
// minWidth: 'auto',
// width: '200px',
// },
// },
// style: {
// width: 'auto',
// },
// },
// {
// label: 'End date',
// type: 'custom-date-picker',
// name: 'endTime',
// props: {
// format: 'YYYY-MM-DD',
// valueFormat: 'YYYY-MM-DD',
// style: {
// minWidth: 'auto',
// width: '200px',
// },
// },
// style: {
// width: 'auto',
// },
// },
// ]
// },
// },
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

View File

@ -4,12 +4,11 @@
: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>
@ -18,16 +17,10 @@
</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"
:wrapperCol="wrapperCol"
:label="menuLabel"
prop="name"
hasFeedback >
<a-input v-model="model.name" :readOnly="disableSubmit" /> <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"
@ -35,7 +28,8 @@
: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%"
@ -44,15 +38,12 @@
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"
:wrapperCol="wrapperCol"
prop="url"
label="Menu Route">
<a-input v-model="model.url" :readOnly="disableSubmit" /> <a-input v-model="model.url" :readOnly="disableSubmit" />
</a-form-model-item> </a-form-model-item>
@ -61,7 +52,8 @@
: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>
@ -69,106 +61,58 @@
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"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="perms"
label="Perms">
<a-input placeholder="Enter Perms, like: user:list" v-model="model.perms" :readOnly="disableSubmit" /> <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"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="Auth Category">
<j-dict-select-tag v-model="model.permsType" :type="'radio'" dictCode="global_perms_type" /> <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"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="Status">
<j-dict-select-tag v-model="model.status" :type="'radio'" dictCode="valid_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"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="sortNo"
label="Sort">
<a-input-number v-model="model.sortNo" style="width: 200px" :readOnly="disableSubmit" /> <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"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="Is Route Menu">
<a-switch checkedChildren="Yes" unCheckedChildren="No" v-model="model.route" /> <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"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="Hidden">
<a-switch checkedChildren="Yes" unCheckedChildren="No" v-model="model.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"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="Keep Alive">
<a-switch checkedChildren="Yes" unCheckedChildren="No" v-model="model.keepAlive" /> <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
v-show="show"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="Combine Route">
<a-switch checkedChildren="Yes" unCheckedChildren="No" v-model="model.alwaysShow" /> <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"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="Open Type">
<a-switch checkedChildren="External" unCheckedChildren="Internal" v-model="model.internalOrExternal" /> <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>
@ -180,13 +124,13 @@
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: {},
@ -202,7 +146,7 @@
}, },
confirmLoading: false, confirmLoading: false,
iconChooseVisible: false, iconChooseVisible: false,
validateStatus:"" validateStatus: '',
} }
}, },
computed: { computed: {
@ -212,82 +156,83 @@
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) { if (res.success) {
console.log(res) console.log(res)
that.treeData = []; that.treeData = []
let treeList = res.result.treeList let treeList = res.result.treeList
for (let a = 0; a < treeList.length; a++) { for (let a = 0; a < treeList.length; a++) {
let temp = treeList[a]; let temp = treeList[a]
temp.isLeaf = temp.leaf; temp.isLeaf = temp.leaf
that.treeData.push(temp); that.treeData.push(temp)
} }
} }
}); })
}, },
add() { add() {
// //
this.edit({status:'1', permsType:'1', sortNo:1.0, route:true, menuType:0,component:'layouts/RouteView' }); this.edit({ status: '1', permsType: '1', sortNo: 1.0, route: true, menuType: 0, component: 'layouts/RouteView' })
}, },
edit(record) { edit(record) {
this.resetScreenSize(); // , this.resetScreenSize() // ,
this.model = Object.assign({}, record); this.model = Object.assign({}, record)
// //
console.log('record: ', record) console.log('record: ', record)
this.show = record.menuType==2?false:true; this.show = record.menuType == 2 ? false : true
this.menuLabel = record.menuType==2?'Button/Permission':'Menu Name'; this.menuLabel = record.menuType == 2 ? 'Button/Permission' : 'Menu Name'
this.visible = true; this.visible = true
this.loadTree(); this.loadTree()
}, },
close() { close() {
this.$emit('close'); this.$emit('close')
this.disableSubmit = false; this.disableSubmit = false
this.visible = false; this.visible = false
this.$refs.form.resetFields(); this.$refs.form.resetFields()
}, },
handleOk() { handleOk() {
const that = this; const that = this
// //
this.$refs.form.validate(valid => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
if ((this.model.menuType == 1 || this.model.menuType == 2) && !this.model.parentId) { if ((this.model.menuType == 1 || this.model.menuType == 2) && !this.model.parentId) {
that.validateStatus = 'error'; that.validateStatus = 'error'
that.$message.error("Please Check The Form"); that.$message.error('Please Check The Form')
return; return
} else { } else {
that.validateStatus = 'success'; that.validateStatus = 'success'
} }
that.confirmLoading = true; that.confirmLoading = true
let obj; let obj
if (!this.model.id) { if (!this.model.id) {
obj = addPermission(this.model); obj = addPermission(this.model)
} else { } else {
obj = editPermission(this.model); obj = editPermission(this.model)
} }
obj.then((res) => { obj
.then((res) => {
if (res.success) { if (res.success) {
that.$message.success(res.message); that.$message.success(res.message)
that.$emit('ok'); that.$emit('ok')
} else { } else {
that.$message.warning(res.message); that.$message.warning(res.message)
} }
}).finally(() => { })
that.confirmLoading = false; .finally(() => {
that.close(); that.confirmLoading = false
}); that.close()
})
} else { } else {
return false; return false
} }
}) })
}, },
@ -296,9 +241,9 @@
}, },
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) {
@ -308,13 +253,13 @@
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 {
@ -323,24 +268,24 @@
}, },
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
@ -355,24 +300,26 @@
}, },
// , // ,
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>