Commit cbefbc50 authored by neogcg's avatar neogcg

Merge branch 'dev_gcg' into dev

parents edde900f 638c4f18
<template>
<div id="app">
<router-view />
<audio controls="controls" id="my_audio" src="./assets/audio/alarm.mp3" style="display:none;" hidden="hidden" />
<div class="tips" v-if="tflag">
<audio
controls="controls"
id="my_audio"
src="./assets/audio/alarm.mp3"
style="display: none"
hidden="hidden"
/>
<!-- <div class="tips" v-if="tflag">
<p>提示</p>
<span>有一条新告警</span>
</div>
</div> -->
</div>
</template>
<script>
import { receiveMessage } from '@/utils/websocket'
import socket from '@/utils/websocket'
import { mapState } from 'vuex'
import EventBus from '@/utils/bus'
import { receiveMessage } from "@/utils/websocket";
import socket from "@/utils/websocket";
import { mapState } from "vuex";
import EventBus from "@/utils/bus";
export default {
name: 'App',
name: "App",
data() {
return {
return {
websocket: null,
tflag: false,
}
};
},
computed: {
...mapState("user", ['userBaseInfo']),
...mapState("user", ["userBaseInfo", "token"]),
userId() {
return this.userBaseInfo.userId
}
return this.userBaseInfo.userId;
},
usertoken() {
return this.token;
},
},
methods: {
receiveMessage,
closeWebsocket() {
if (this.websocket) {
this.websocket.close()
this.websocket.close();
}
},
},
mounted() {
this.websocket = socket({
onmessage: this.receiveMessage
})
EventBus.$on('dialogAlarm', (data) => {
// this.websocket = socket({
// onmessage: this.receiveMessage,
// });
EventBus.$on("dialogAlarm", (data) => {
// 接收消息之后 声音弹窗显示
this.tflag = data
this.tflag = data;
setTimeout(() => {
this.tflag = false
}, 3000)
})
this.tflag = false;
}, 3000);
});
EventBus.$on("cancelWS", () => {
this.websocket.close();
});
// EventBus.$on("wsOpen", () => {
// this.websocket.onopen();
// });
},
watch: {
userId: {
usertoken: {
immediate: true,
handler(newV) {
if (newV) {
this.closeWebsocket()
this.closeWebsocket();
this.websocket = socket({
onmessage: this.receiveMessage
})
onmessage: this.receiveMessage,
});
}
}
}
},
},
// userId: {
// immediate: true,
// handler(newV) {
// if (newV) {
// this.closeWebsocket();
// this.websocket = socket({
// onmessage: this.receiveMessage,
// });
// }
// },
// },
},
}
};
</script>
<style lang="scss" scoped>
#app {
// & ::v-deep .el-table__body tr:hover>td{
// background-color: #bed5ff !important;
// }
// & ::v-deep .el-table__body tr.current-row>td{
// background-color: #bed5ff !important;
// }
}
.tips{
.tips {
width: 400px;
height: 80px;
background: #fff;
box-shadow: 0px 2px 14px #888888;
border-radius: 5px;
padding: 0 20px 20px 20px;
position: absolute;
position: absolute;
text-align: center;
top:calc(50% - 40px);
left:calc(50% - 200px)
top: calc(50% - 40px);
left: calc(50% - 200px);
}
</style>
......@@ -13,7 +13,7 @@
<el-dropdown-item divided @click.native="logout">
<span style="display:block;">退出登录</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span style="color: white; padding-right: 10px"> {{ dateTime }}</span>
......@@ -27,7 +27,7 @@ import Breadcrumb from '@/components/Breadcrumb'
import Hamburger from '@/components/Hamburger'
import Sidebar from './Sidebar/index.vue'
import { logout } from '@/api/user'
import EventBus from '@/utils/bus'
export default {
data() {
let timer
......@@ -57,8 +57,11 @@ export default {
logout().then(() => {
this.$store.dispatch('user/logout')
this.$router.push(`/login`)
EventBus.$emit('cancelWS')
})
},
// 获取当前时间函数
timeFormate (timeStamp) {
let year = new Date(timeStamp).getFullYear()
......
......@@ -34,12 +34,14 @@ export const constantRoutes = [
{
path: '/login',
component: () => import('@/views/login/index'),
meta:{title:"登录"},
hidden: true
},
{
path: '/404',
component: () => import('@/views/404'),
meta:{title:"404"},
hidden: true
},
......
......@@ -17,6 +17,7 @@ const mutations = {
},
SET_TOKEN: (state, token) => {
state.token = token
console.log(token);
},
SET_BASEINFO: (state, data) => {
state.userBaseInfo = data
......
......@@ -2,6 +2,7 @@ import axios from 'axios'
import { MessageBox, Message } from 'element-ui'
import store from '@/store'
import { getToken } from '@/utils/auth'
import socket from "@/utils/websocket";
import Vue from 'vue'
// create an axios instance
......
......@@ -5,9 +5,10 @@ import EventBus from '@/utils/bus'
export default function socket(handlerOptions) {
let {
onmessage,
onopen
onopen,
// socketUrl
} = handlerOptions
let socketUrl = 'ws://8.142.143.40:8885/websocket/1'
let socketUrl = 'ws://8.142.143.40:8885/websocket/1/1'
let websocket
if ("WebSocket" in window) {
websocket = new WebSocket(socketUrl)
......@@ -21,13 +22,10 @@ export default function socket(handlerOptions) {
console.info("Websocket服务器连接错误")
}
window.onbeforeunload = function() {
websocket.close()
}
//连接成功建立的回调方法
websocket.onopen = function() {
console.info("Websocket连接成功")
console.log(websocket.readyState);
heart.start()
onopen && onopen()
}
......@@ -45,7 +43,6 @@ export default function socket(handlerOptions) {
}
return websocket
}
function heartCheck(websocket) {
return {
timeout: 15000,
......@@ -56,8 +53,10 @@ function heartCheck(websocket) {
},
start: function() {
this.timeoutObj = setInterval(function() {
// if(websocket.readyState==1){
websocket.send("HeartBeat")
console.info("Websocket发送心跳:HeartBeat")
// }
}, this.timeout)
},
}
......
......@@ -13,13 +13,13 @@
<div class="leakage-top">
<div style="color: #666666"></div>
<div class="operate-btn">
<el-button type="primary" @click="getTableData">刷新</el-button>
<el-button type="primary" @click="refresh">刷新</el-button>
<el-button type="primary" @click="isQuery = !isQuery">查询</el-button>
<el-button type="primary" @click="exportList">导出</el-button>
</div>
</div>
<div v-if="isQuery">
<search @search="getTableData" />
<search @search="search" ref="reset" />
</div>
<el-table
:data="tableData"
......@@ -72,11 +72,17 @@
<template slot-scope="scope">
<el-button
type="text"
v-if="scope.row.confirmStatus === 1"
v-if="
scope.row.confirmStatus === 1 &&
scope.row.alarmLevelName == '正常'
"
@click="cancel2(scope.row)"
>取消</el-button
>
<el-button type="text" v-else @click="confirm2(scope.row)"
<el-button
type="text"
v-else-if="scope.row.confirmStatus === 0"
@click="confirm2(scope.row)"
>确认</el-button
>
</template>
......@@ -171,6 +177,7 @@ import { cableTimeList, cableConfirm, cableCancel } from "../api";
import { exportLeakyCable } from "@/api/export";
import search from "@/views/monitor/leakageCable/components/search.vue";
import download from "@/utils/download";
import socket from "@/utils/websocket";
export default {
data() {
return {
......@@ -200,6 +207,8 @@ export default {
],
isQuery: false,
searchOption: {},
exids: [],
wsUrl: "ws://8.142.143.40:8885/websocket/1/1",
};
},
components: { search },
......@@ -210,28 +219,41 @@ export default {
return "emergency";
} else if (row.alarmLevelName == "重要" && column.label == "告警级别") {
return "important";
} else if (row.alarmLevelName == "一般" && column.label == "告警级别") {
return "common";
}
if (rowIndex % 2 == 1) {
return "stripe";
}
},
refresh() {
this.searchOption = {};
if (this.$refs.reset != undefined) {
this.$refs.reset.reset();
}
this.getTableData();
},
handlePageChange(pageData) {
this.params.size = pageData.size;
this.params.current = pageData.page;
this.getTableData();
},
getTableData(option) {
search(option) {
this.searchOption = option;
this.getTableData();
},
getTableData() {
let type = this.confirmStatus == 2 ? "" : this.confirmStatus;
let param = {
confirmStatus: type,
...this.params,
...option,
...this.searchOption,
};
cableTimeList(param).then((res) => {
let list = res.records || [];
this.tableData = list;
this.total = res.total;
this.exids = list.map((i) => i.id);
});
},
confirm(dialogInfo) {
......@@ -271,38 +293,36 @@ export default {
...this.params,
...this.searchOption,
};
exportLeakyCable(param).then((res) => {
exportLeakyCable({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `漏缆监测告警.xls`);
});
},
},
computed: {
getWsMsg:{
get(){
return this.$store.state.websocket.webSocketMsg
},
set(a){
this.$store.state.websocket.webSocketMsg=a
}
},
// getWsMsg:{
// get(){
// return this.$store.state.websocket.webSocketMsg
// },
// set(a){
// this.$store.state.websocket.webSocketMsg=a
// }
// },
},
watch: {
getWsMsg: {
handler(newVal) {
this.getWsMsg=!!newVal
console.log(newVal);
// alert("接收到webSocket推送" + newVal);
},
},
// getWsMsg: {
// handler(newVal) {
// this.getWsMsg=!!newVal
// console.log(newVal);
// // alert("接收到webSocket推送" + newVal);
// },
// },
},
mounted() {
this.getTableData();
},
created(){
this.$ws.createWS("2")
}
created() {
// socket({socketUrl:this.wsUrl});
},
};
</script>
......@@ -338,6 +358,9 @@ export default {
& ::v-deep .important {
background-color: #f89850;
}
& ::v-deep .common {
background-color: #ead906;
}
.page {
display: flex;
align-items: center;
......
<template>
<div>
<el-form class="search-form" :model="form" ref="form" label-width="80px" :inline="true" size="mini">
<el-form-item label="网元设备" >
<el-input v-model="form.pointDeviceName" clearable placeholder="请输入网元设备"></el-input>
</el-form-item>
<el-form-item label="上传时间">
<el-date-picker
v-model="dateRange"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="success" @click="toSearch">查询</el-button>
<el-button type="primary" @click="reset">重置</el-button>
</el-form-item>
</el-form>
</div>
</template>
<script>
import { ConnectStatusEnum } from '@/const/index'
export default {
name: 'search',
data() {
return {
form: formInit(),
ConnectStatusEnum,
dateRange: [],
}
},
mounted() {
},
methods: {
toSearch() {
this.form.startUploadTime = this.dateRange[0]
this.form.endUploadTime = this.dateRange[1]
this.$emit('search', this.form)
},
reset() {
this.dateRange = []
this.form = formInit()
this.$emit('search')
},
}
}
function formInit() {
return {
pointDeviceName: '',
pointConnectStatus: '',
startUploadTime:'',
endUploadTime:''
}
}
</script>
<style scoped lang="scss">
.w200 {
width: 200px;
}
.search-form {
padding: 10px;
background-color: #EAF1FE;
margin-bottom: 20px;
border-radius: 8px;
.el-form-item--mini.el-form-item, .el-form-item--small.el-form-item {
margin-bottom: 0;
}
}
</style>
\ No newline at end of file
......@@ -13,14 +13,13 @@
<div class="leakage-top">
<div style="color: #666666"></div>
<div class="operate-btn">
<el-button type="primary" @click="getTableData">刷新</el-button>
<el-button type="primary" @click="refresh">刷新</el-button>
<el-button type="primary" @click="isQuery = !isQuery">查询</el-button>
<el-button type="primary" @click="exportList">导出</el-button>
</div>
</div>
<div v-if="isQuery">
<search @search="getTableData" />
<search @search="search" ref="reset" />
</div>
<el-table
:data="tableData"
......@@ -50,11 +49,17 @@
<template slot-scope="scope">
<el-button
type="text"
v-if="scope.row.confirmStatus === 1"
v-if="
scope.row.confirmStatus === 1 &&
scope.row.connectStatusName == '连接正常'
"
@click="cancel2(scope.row)"
>取消</el-button
>
<el-button type="text" v-else @click="confirm2(scope.row)"
<el-button
type="text"
v-else-if="scope.row.confirmStatus === 0"
@click="confirm2(scope.row)"
>确认</el-button
>
</template>
......@@ -129,15 +134,15 @@
</template>
<script>
import { deviceList, deviceConfirm, deviceCancel } from "../api";
import { exportConnet } from "@/api/export";
import search from "@/views/monitor/equipment/components/search.vue";
import search from "./components/search.vue";
import download from "@/utils/download";
import socket from "@/utils/websocket";
export default {
data() {
return {
alarmInfo:'',
alarmInfo: "",
dialogInfo: [],
centerDialogVisible: false,
confirmStatus: 2,
......@@ -163,6 +168,8 @@ export default {
],
isQuery: false,
searchOption: {},
exids: [],
wsUrl: "ws://8.142.143.40:8885/websocket/1/2",
};
},
components: { search },
......@@ -186,22 +193,34 @@ export default {
return "stripe";
}
},
refresh() {
this.searchOption = {};
this.getTableData();
if (this.$refs.reset != undefined) {
this.$refs.reset.reset();
}
},
handlePageChange(pageData) {
this.params.size = pageData.size;
this.params.current = pageData.page;
this.getTableData();
},
getTableData(option) {
search(option) {
this.searchOption = option;
this.getTableData();
},
getTableData() {
let type = this.confirmStatus == 2 ? "" : this.confirmStatus;
let param = {
confirmStatus: type,
...this.params,
...option,
...this.searchOption,
};
deviceList(param).then((res) => {
let list = res.records || [];
this.tableData = list;
this.total = res.total;
this.exids = list.map((i) => i.id);
});
},
confirm2(row) {
......@@ -216,7 +235,6 @@ export default {
this.centerDialogVisible = false;
},
cancel2(row) {
console.log(row);
this.centerDialogVisible = true;
this.dialogInfo = row;
},
......@@ -226,7 +244,6 @@ export default {
id: dialogInfo.id,
};
deviceCancel(query).then((res) => {
console.log(res);
this.getTableData();
});
this.centerDialogVisible = false;
......@@ -244,20 +261,18 @@ export default {
...this.params,
...this.searchOption,
};
exportConnet(param).then((res) => {
exportConnet({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `设备连接告警.xls`);
});
},
},
mounted() {
this.getTableData();
},
created(){
}
created() {
// socket({socketUrl:this.wsUrl});
},
};
</script>
<style lang="scss" scoped>
......@@ -290,16 +305,16 @@ export default {
}
}
}
.tips{
.tips {
width: 400px;
height: 80px;
background: #fff;
box-shadow: 0px 2px 14px #888888;
border-radius: 5px;
padding: 0 20px 20px 20px;
position: absolute;
position: absolute;
text-align: center;
top:calc(50% - 40px);
left:calc(50% - 200px)
top: calc(50% - 40px);
left: calc(50% - 200px);
}
</style>
......@@ -4,16 +4,17 @@
<div class="leakage-top">
<div style="color: #666666"></div>
<div class="operate-btn">
<delids :multipleSelection2="multipleSelection" @del="toDelete"
>删除</delids>
<el-button type="primary" @click="getTableData">刷新</el-button>
<delids :multipleSelection2="multipleSelection" @del="toDelete"
>删除</delids
>
<el-button type="primary" @click="refresh">刷新</el-button>
<el-button type="primary" @click="isQuery = !isQuery">查询</el-button>
<el-button type="primary" @click="toExport">导出</el-button>
<el-button type="primary">清空数据</el-button>
</div>
</div>
<div v-if="isQuery">
<search @search="getTableData" />
<search @search="getTableData" ref="reset" />
</div>
<el-table
:data="tableData"
......@@ -23,7 +24,11 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column prop="startPointDeviceName" label="网元设备" align="center" />
<el-table-column
prop="startPointDeviceName"
label="网元设备"
align="center"
/>
<el-table-column
prop="pointConnectStatus_text"
label="连接状态"
......@@ -31,7 +36,11 @@
align="center"
>
</el-table-column>
<el-table-column prop="endPointDeviceName" label="网元设备" align="center">
<el-table-column
prop="endPointDeviceName"
label="网元设备"
align="center"
>
</el-table-column>
<el-table-column prop="userName" label="维修人员信息" align="center">
</el-table-column>
......@@ -51,11 +60,11 @@
</div>
</template>
<script>
import { ConnectMaintainList, ConnectMaintainDelete } from '../api'
import { ConnectStatusEnum } from '@/const/index'
import search from './components/search.vue'
import download from '@/utils/download'
import { exportConnectMaintainHistory } from '@/api/export'
import { ConnectMaintainList, ConnectMaintainDelete } from "../api";
import { ConnectStatusEnum } from "@/const/index";
import search from "./components/search.vue";
import download from "@/utils/download";
import { exportConnectMaintainHistory } from "@/api/export";
export default {
data() {
return {
......@@ -68,47 +77,59 @@ export default {
total: 14,
tableData: [],
isQuery: false,
searchOption: {}
searchOption: {},
exids: [],
};
},
components: {
search
search,
},
methods: {
handleSelectionChange(val) {
let deleteIds = val.map(item => item.id)
this.multipleSelection = deleteIds
let deleteIds = val.map((item) => item.id);
this.multipleSelection = deleteIds;
},
handlePageChange(pageData) {
this.params.size = pageData.size;
this.params.current = pageData.page;
this.getTableData()
this.getTableData();
},
refresh() {
this.$refs.reset != undefined ? (this.$refs.reset.reset()) : (this.getTableData())
},
getTableData(option) {
this.searchOption = option
this.searchOption = option;
let params = {
...this.params,
...option
}
ConnectMaintainList(params).then(res => {
let list = res.records || []
list.forEach(item => {
item.pointConnectStatus_text = this.ConnectStatusEnum[item.pointConnectStatus]
...option,
};
ConnectMaintainList(params).then((res) => {
let list = res.records || [];
list.forEach((item) => {
item.pointConnectStatus_text =
this.ConnectStatusEnum[item.pointConnectStatus];
});
this.tableData = list
this.total = res.total
})
this.tableData = list;
this.total = res.total;
this.exids = list.map((i) => i.id);
});
},
toDelete() {
ConnectMaintainDelete({ids: this.multipleSelection}).then(res => {
this.$message.success('删除成功!')
this.getTableData()
})
ConnectMaintainDelete({ ids: this.multipleSelection }).then((res) => {
this.$message.success("删除成功!");
this.getTableData();
});
},
cellClassFn({ row, column, rowIndex, columnIndex }) {
if (row.pointConnectStatus_text == "连接异常" && column.label == "连接状态") {
if (
row.pointConnectStatus_text == "连接异常" &&
column.label == "连接状态"
) {
return "emergency";
} else if (row.pointConnectStatus_text == "连接正常" && column.label == "连接状态") {
} else if (
row.pointConnectStatus_text == "连接正常" &&
column.label == "连接状态"
) {
return "normal";
}
if (rowIndex % 2 == 1) {
......@@ -116,19 +137,15 @@ export default {
}
},
toExport() {
let params = {
...this.params,
...this.searchOption
}
exportConnectMaintainHistory(params).then(res => {
download(res, 'vnd.ms-excel', `设备连接维修历史.xls`)
})
exportConnectMaintainHistory({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `设备连接维修历史.xls`);
});
},
},
mounted() {
this.getTableData()
this.getTableData();
},
}
};
</script>
<style lang="scss" scoped>
.leakage-cable {
......
......@@ -4,19 +4,17 @@
<div class="leakage-top">
<div style="color: #666666"></div>
<div class="operate-btn">
<delids
:multipleSelection2="multipleSelection"
@click="toDelete"
<delids :multipleSelection2="multipleSelection" @del="toDelete"
>删除</delids
>
<el-button type="primary" @click="getTableData">刷新</el-button>
<el-button type="primary" @click="refresh">刷新</el-button>
<el-button type="primary" @click="isQuery = !isQuery">查询</el-button>
<el-button type="primary" @click="toExport">导出</el-button>
<el-button type="primary">清空数据</el-button>
</div>
</div>
<div v-if="isQuery">
<search @search="getTableData" />
<search @search="getTableData" ref="reset" />
</div>
<el-table
:data="tableData"
......@@ -26,7 +24,11 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column prop="startPointDeviceName" label="网元设备" align="center" />
<el-table-column
prop="startPointDeviceName"
label="网元设备"
align="center"
/>
<el-table-column
prop="pointConnectStatus_text"
label="连接状态"
......@@ -34,7 +36,11 @@
align="center"
>
</el-table-column>
<el-table-column prop="endPointDeviceName" label="网元设备" align="center">
<el-table-column
prop="endPointDeviceName"
label="网元设备"
align="center"
>
</el-table-column>
<el-table-column prop="uploadTime" label="上传时间" align="center" />
<el-table-column prop="cancelTime" label="取消时间" align="center" />
......@@ -54,11 +60,11 @@
</div>
</template>
<script>
import { ConnectStatusList, ConnectStatusDelete } from '../api'
import { ConnectStatusEnum } from '@/const/index'
import search from './components/search.vue'
import { exportConnectStatusHistory } from '@/api/export'
import download from '@/utils/download'
import { ConnectStatusList, ConnectStatusDelete } from "../api";
import { ConnectStatusEnum } from "@/const/index";
import search from "./components/search.vue";
import { exportConnectStatusHistory } from "@/api/export";
import download from "@/utils/download";
export default {
props: [],
data() {
......@@ -72,47 +78,59 @@ export default {
total: 10,
tableData: [],
isQuery: false,
searchOption: {}
}
searchOption: {},
exids: [],
};
},
components: {
search
search,
},
methods: {
handleSelectionChange(val) {
let deleteIds = val.map(item => item.id)
this.multipleSelection = deleteIds
let deleteIds = val.map((item) => item.id);
this.multipleSelection = deleteIds;
},
handlePageChange(pageData) {
this.params.size = pageData.size
this.params.current = pageData.page
this.getTableData()
this.params.size = pageData.size;
this.params.current = pageData.page;
this.getTableData();
},
refresh() {
this.$refs.reset != undefined ? (this.$refs.reset.reset()) : (this.getTableData())
},
getTableData(option) {
this.searchOption = option
let params = {
this.searchOption = option;
let params = {
...this.params,
...option
}
ConnectStatusList(params).then(res => {
let list = res.records || []
list.forEach(item => {
item.pointConnectStatus_text = this.ConnectStatusEnum[item.pointConnectStatus]
})
this.tableData = list
this.total = res.total
})
...option,
};
ConnectStatusList(params).then((res) => {
let list = res.records || [];
list.forEach((item) => {
item.pointConnectStatus_text =
this.ConnectStatusEnum[item.pointConnectStatus];
});
this.tableData = list;
this.total = res.total;
this.exids = list.map((i) => i.id);
});
},
toDelete() {
ConnectStatusDelete({ids: this.multipleSelection}).then(res => {
this.$message.success('删除成功!')
this.getTableData()
})
ConnectStatusDelete({ ids: this.multipleSelection }).then((res) => {
this.$message.success("删除成功!");
this.getTableData();
});
},
cellClassFn({ row, column, rowIndex, columnIndex }) {
if (row.pointConnectStatus_text == "连接异常" && column.label == "连接状态") {
if (
row.pointConnectStatus_text == "连接异常" &&
column.label == "连接状态"
) {
return "emergency";
} else if (row.pointConnectStatus_text == "连接正常" && column.label == "连接状态") {
} else if (
row.pointConnectStatus_text == "连接正常" &&
column.label == "连接状态"
) {
return "normal";
}
if (rowIndex % 2 == 1) {
......@@ -120,17 +138,13 @@ export default {
}
},
toExport() {
let params = {
...this.params,
...this.searchOption
}
exportConnectStatusHistory(params).then(res => {
download(res, 'vnd.ms-excel', `设备连接历史状态.xls`)
})
}
exportConnectStatusHistory({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `设备连接历史状态.xls`);
});
},
},
mounted() {
this.getTableData()
this.getTableData();
},
};
</script>
......
......@@ -4,18 +4,16 @@
<div class="leakage-top">
<div style="color: #666666"></div>
<div class="operate-btn">
<delids
:multipleSelection2="multipleSelection"
@del="deleteCable"
<delids :multipleSelection2="multipleSelection" @del="deleteCable"
>删除</delids
>
<el-button type="primary" @click="getTableData">刷新</el-button>
<el-button type="primary" @click="refresh">刷新</el-button>
<el-button type="primary" @click="isQuery = !isQuery">查询</el-button>
<el-button type="primary" @click="toExport">导出</el-button>
</div>
</div>
<div v-if="isQuery">
<search @search="getTableData" />
<search @search="getTableData" ref="reset" />
</div>
<el-table
:data="tableData"
......@@ -38,11 +36,20 @@
width="180"
align="center"
/>
<el-table-column prop="alarmLevelName" label="告警级别" width="150" align="center">
<el-table-column
prop="alarmLevelName"
label="告警级别"
width="150"
align="center"
>
</el-table-column>
<el-table-column prop="alarmInfo" label="告警信息" align="center">
</el-table-column>
<el-table-column prop="alarmMaintainTime" label="告警维修时间" align="center" />
<el-table-column
prop="alarmMaintainTime"
label="告警维修时间"
align="center"
/>
</el-table>
<Pagination
:limit="params.size"
......@@ -54,10 +61,10 @@
</div>
</template>
<script>
import { MonitorMaintainList, MonitorMaintainDelete } from '../api'
import search from './components/search.vue'
import download from '@/utils/download'
import { exportLeakyMaintainHistory } from '@/api/export'
import { MonitorMaintainList, MonitorMaintainDelete } from "../api";
import search from "./components/search.vue";
import download from "@/utils/download";
import { exportLeakyMaintainHistory } from "@/api/export";
export default {
props: [],
data() {
......@@ -70,62 +77,66 @@ export default {
total: 10,
tableData: [],
isQuery: false,
searchOption: {}
}
searchOption: {},
exids: [],
};
},
components: {
search
search,
},
methods: {
handleSelectionChange(val) {
let deleteIds = val.map(item => item.id)
this.multipleSelection = deleteIds
let deleteIds = val.map((item) => item.id);
this.multipleSelection = deleteIds;
},
handlePageChange(pageData) {
this.params.size = pageData.size;
this.params.current = pageData.page;
this.getTableData()
this.getTableData();
},
refresh() {
this.$refs.reset != undefined ? (this.$refs.reset.reset()) : (this.getTableData())
},
getTableData(option) {
this.searchOption = option
this.searchOption = option;
let params = {
...this.params,
...option
}
MonitorMaintainList(params).then(res => {
let list = res.records || []
this.tableData = list
this.total = res.total
})
...option,
};
MonitorMaintainList(params).then((res) => {
let list = res.records || [];
this.tableData = list;
this.total = res.total;
this.exids = list.map((i) => i.id);
});
},
deleteCable() {
MonitorMaintainDelete({ids: this.multipleSelection}).then(res => {
this.$message.success('删除成功!')
this.getTableData()
})
deleteCable() {
MonitorMaintainDelete({ ids: this.multipleSelection }).then((res) => {
this.$message.success("删除成功!");
this.getTableData();
});
},
cellClassFn({ row, column, rowIndex, columnIndex }) {
if (row.alarmLevelName == '紧急' && column.label == '告警级别') {
return 'emergency'
} else if (row.alarmLevelName == '重要' && column.label == '告警级别') {
return 'important'
if (row.alarmLevelName == "紧急" && column.label == "告警级别") {
return "emergency";
} else if (row.alarmLevelName == "重要" && column.label == "告警级别") {
return "important";
} else if (row.alarmLevelName == "一般" && column.label == "告警级别") {
return "common";
}
if (rowIndex % 2 == 1) {
return 'stripe'
return "stripe";
}
},
toExport() {
let params = {
...this.params,
...this.searchOption
}
exportLeakyMaintainHistory(params).then(res => {
download(res, 'vnd.ms-excel', `漏缆监测维修历史.xls`)
})
}
exportLeakyMaintainHistory({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `漏缆监测维修历史.xls`);
});
},
},
mounted() {
this.getTableData();
},
mounted() { this.getTableData() },
};
</script>
<style lang="scss" scoped>
......@@ -160,6 +171,9 @@ export default {
& ::v-deep .important {
background-color: #f89850;
}
& ::v-deep .common {
background-color: #ead906;
}
.page {
display: flex;
align-items: center;
......
......@@ -4,19 +4,19 @@
<div class="leakage-top">
<div style="color: #666666"></div>
<div class="operate-btn">
<delids
:multipleSelection2="multipleSelection"
@click="deleteCable"
<delids :multipleSelection2="multipleSelection" @del="deleteCable"
>删除</delids
>
<el-button type="primary" @click="getTableData">刷新</el-button>
<el-button type="primary" @click="refresh">刷新</el-button>
<el-button type="primary" @click="isQuery = !isQuery">查询</el-button>
<el-button type="primary" @click="toExport">导出</el-button>
<el-button type="primary">图形报表</el-button>
<el-button :type="multipleSelection.length ? 'primary' : 'info'"
:disabled="!multipleSelection.length">图形报表
</el-button>
</div>
</div>
<div v-if="isQuery">
<search @search="getTableData" />
<search @search="getTableData" ref="reset" />
</div>
<el-table
ref="multipleTable"
......@@ -32,6 +32,9 @@
<el-table-column prop="alarmInfo" label="告警信息" align="center">
</el-table-column>
<el-table-column prop="uploadTime" label="上传日期" align="center" />
<el-table-column label="图形分析" align="center">
<el-button type="text">生成图表</el-button>
</el-table-column>>
</el-table>
<Pagination
:limit="params.size"
......@@ -44,80 +47,83 @@
</template>
<script>
import { MonitorStatusList, MonitorStatusDelete } from '../api'
import search from './components/search.vue'
import download from '@/utils/download'
import { exportLeakyStatusHistory } from '@/api/export'
import { MonitorStatusList, MonitorStatusDelete } from "../api";
import search from "./components/search.vue";
import download from "@/utils/download";
import { exportLeakyStatusHistory } from "@/api/export";
export default {
data() {
return {
params: {
current: 1,
size: 10
size: 10,
},
total: 10,
tableData: [],
multipleSelection: [],
isQuery: false,
searchOption: {}
}
searchOption: {},
exids: [],
};
},
components: {
search
search,
},
methods: {
// 表格背景图颜色
cellClassFn({ row, column, rowIndex, columnIndex }) {
if (row.level === '紧急' && column.label === '告警级别') {
return 'emergency'
} else if (row.level === '重要' && column.label === '告警级别') {
return 'important'
if (row.level === "紧急" && column.label === "告警级别") {
return "emergency";
} else if (row.level === "重要" && column.label === "告警级别") {
return "important";
} else if (row.level == "一般" && column.label == "告警级别") {
return "common";
}
if (rowIndex % 2 === 1) {
return 'stripe'
return "stripe";
}
},
handlePageChange(pageData) {
this.params.size = pageData.size
this.params.current = pageData.page
this.getTableData()
this.params.size = pageData.size;
this.params.current = pageData.page;
this.getTableData();
},
refresh() {
this.$refs.reset != undefined ? (this.$refs.reset.reset()) : (this.getTableData())
},
getTableData(option) {
this.searchOption = option
this.searchOption = option;
let params = {
...this.params,
...option
}
MonitorStatusList(params).then(res => {
let list = res.records || []
this.tableData = list
this.total = res.total
})
...option,
};
MonitorStatusList(params).then((res) => {
let list = res.records || [];
this.tableData = list;
this.total = res.total;
this.exids = list.map((i) => i.id);
});
},
handleSelectionChange(val) {
let deleteIds = val.map(item => item.id)
this.multipleSelection = deleteIds
let deleteIds = val.map((item) => item.id);
this.multipleSelection = deleteIds;
},
deleteCable() {
MonitorStatusDelete({ids: this.multipleSelection}).then(res => {
this.$message.success('删除成功!')
this.getTableData()
})
MonitorStatusDelete({ ids: this.multipleSelection }).then((res) => {
this.$message.success("删除成功!");
this.getTableData();
});
},
toExport() {
let params = {
...this.params,
...this.searchOption
}
exportLeakyStatusHistory(params).then(res => {
download(res, 'vnd.ms-excel', `漏缆监测历史状态.xls`)
})
}
exportLeakyStatusHistory({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `漏缆监测历史状态.xls`);
});
},
},
mounted() {
this.getTableData()
}
}
this.getTableData();
},
};
</script>
<style lang="scss" scoped>
......@@ -152,6 +158,9 @@ export default {
& ::v-deep .important {
background-color: #f89850;
}
& ::v-deep .common {
background-color: #ead906;
}
.page {
display: flex;
align-items: center;
......
......@@ -79,7 +79,7 @@
<script>
import { login } from "@/api/user"
import { setToken } from "@/utils/auth"
import EventBus from '@/utils/bus'
export default {
name: "Login",
data() {
......@@ -160,6 +160,8 @@ export default {
this.$refs.loginForm.validate((valid) => {
if (valid) {
this.toLogin()
// EventBus.$emit('wsOpen')
} else {
console.log("error submit!!");
return false;
......
......@@ -4,13 +4,13 @@
<div class="leakage-top">
<div></div>
<div class="operate-btn">
<el-button type="primary" @click="getTableData">刷新</el-button>
<el-button type="primary" @click="refresh">刷新</el-button>
<el-button type="primary" @click="isQuery = !isQuery">查询</el-button>
<el-button type="primary" @click="toExport">导出</el-button>
</div>
</div>
<div v-if="isQuery">
<search @search="getTableData" />
<search @search="search" ref="reset" />
</div>
<el-table
:data="tableData"
......@@ -18,11 +18,31 @@
:cell-class-name="cellClassFn"
:header-cell-style="{ background: '#EAF1FE', color: '#666666' }"
>
<el-table-column prop="startPointDeviceName" label="网元设备" align="center" />
<el-table-column prop="startPointConnectStatus_text" label="连接状态" align="center" />
<el-table-column prop="endPointDeviceName" label="网元设备" align="center" />
<el-table-column prop="endPointConnectStatus_text" label="连接状态" align="center" />
<el-table-column prop="lastPointDeviceName" label="网元设备" align="center" />
<el-table-column
prop="startPointDeviceName"
label="网元设备"
align="center"
/>
<el-table-column
prop="startPointConnectStatus_text"
label="连接状态"
align="center"
/>
<el-table-column
prop="endPointDeviceName"
label="网元设备"
align="center"
/>
<el-table-column
prop="endPointConnectStatus_text"
label="连接状态"
align="center"
/>
<el-table-column
prop="lastPointDeviceName"
label="网元设备"
align="center"
/>
<el-table-column prop="uploadTime" label="上传时间" align="center" />
</el-table>
<Pagination
......@@ -36,75 +56,96 @@
</template>
<script>
import { DeviceStatusList } from '../api'
import { ConnectStatusEnum } from '@/const/index'
import search from './components/search.vue'
import download from '@/utils/download'
import { exportConnetTime } from '@/api/export'
import { DeviceStatusList } from "../api";
import { ConnectStatusEnum } from "@/const/index";
import search from "./components/search.vue";
import download from "@/utils/download";
import { exportConnetTime } from "@/api/export";
export default {
data() {
return {
ConnectStatusEnum,
params: {
current: 1,
size: 10
size: 10,
},
total: 10,
tableData: [],
isQuery: false,
searchOption: {}
searchOption: {},
exids: [],
};
},
components: { search },
methods: {
// 表格背景图颜色
cellClassFn({ row, column, rowIndex, columnIndex }) {
if ((row.startPointConnectStatus_text == '连接正常' && column.property == 'startPointConnectStatus_text')) {
return 'green'
if (
row.startPointConnectStatus_text == "连接正常" &&
column.property == "startPointConnectStatus_text"
) {
return "green";
}
if ((row.startPointConnectStatus_text == '连接异常' && column.property == 'startPointConnectStatus_text')) {
return 'red'
if (
row.startPointConnectStatus_text == "连接异常" &&
column.property == "startPointConnectStatus_text"
) {
return "red";
}
if ((row.endPointConnectStatus_text == '连接正常' && column.property == 'endPointConnectStatus_text')) {
return 'green'
} else if ((row.endPointConnectStatus_text == '连接异常' && column.property == 'endPointConnectStatus_text')) {
return 'red'
if (
row.endPointConnectStatus_text == "连接正常" &&
column.property == "endPointConnectStatus_text"
) {
return "green";
} else if (
row.endPointConnectStatus_text == "连接异常" &&
column.property == "endPointConnectStatus_text"
) {
return "red";
}
if (rowIndex % 2 == 1) {
return 'stripe'
return "stripe";
}
},
refresh() {
this.$refs.reset != undefined ? (this.$refs.reset.reset()) : (this.getTableData())
},
handlePageChange(pageData) {
this.params.size = pageData.size;
this.params.current = pageData.page;
this.getTableData()
this.getTableData();
},
search(option) {
this.searchOption = option;
this.getTableData();
},
getTableData(option) {
this.searchOption = option
getTableData() {
let params = {
...this.params,
...option
}
DeviceStatusList(params).then(res => {
let list = res.records || []
list.forEach(item => {
item.startPointConnectStatus_text = this.ConnectStatusEnum[item.startPointConnectStatus]
item.endPointConnectStatus_text = this.ConnectStatusEnum[item.endPointConnectStatus]
...this.searchOption,
};
DeviceStatusList(params).then((res) => {
let list = res.records || [];
list.forEach((item) => {
item.startPointConnectStatus_text =
this.ConnectStatusEnum[item.startPointConnectStatus];
item.endPointConnectStatus_text =
this.ConnectStatusEnum[item.endPointConnectStatus];
});
this.tableData = list
this.total = res.total
})
this.tableData = list;
this.total = res.total;
this.exids = list.map((i) => i.id);
});
},
toExport() {
let params = {
...this.params,
...this.searchOption
}
exportConnetTime(params).then(res => { download(res, 'vnd.ms-excel', `设备实时.xls`) })
}
exportConnetTime({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `设备实时.xls`);
});
},
},
mounted() {
this.getTableData()
this.getTableData();
},
};
</script>
......
......@@ -4,13 +4,13 @@
<div class="leakage-top">
<div style="color: #666666"></div>
<div class="operate-btn">
<el-button type="primary" @click="getTableData">刷新</el-button>
<el-button type="primary" @click="refresh">刷新</el-button>
<el-button type="primary" @click="isQuery = !isQuery">查询</el-button>
<el-button type="primary" @click="toExport">导出</el-button>
</div>
</div>
<div v-if="isQuery">
<search @search="getTableData" />
<search @search="search" ref="reset" />
</div>
<el-table
:data="tableData"
......@@ -31,11 +31,20 @@
width="180"
align="center"
/>
<el-table-column prop="alarmLevelName" label="告警级别" width="150" align="center">
<el-table-column
prop="alarmLevelName"
label="告警级别"
width="150"
align="center"
>
</el-table-column>
<el-table-column prop="alarmInfo" label="告警信息" align="center">
</el-table-column>
<el-table-column prop="lateUploadTime" label="最新上传时间" align="center" />
<el-table-column
prop="lateUploadTime"
label="最新上传时间"
align="center"
/>
</el-table>
<Pagination
:limit="params.size"
......@@ -48,68 +57,78 @@
</template>
<script>
import { CableStatusList, CableStatusExport } from '../api'
import { ConnectStatusEnum } from '@/const/index'
import search from './components/search.vue'
import { exportLeakyCableTime } from '@/api/export'
import download from '@/utils/download'
import { CableStatusList, CableStatusExport } from "../api";
import { ConnectStatusEnum } from "@/const/index";
import search from "./components/search.vue";
import { exportLeakyCableTime } from "@/api/export";
import download from "@/utils/download";
export default {
data() {
return {
ConnectStatusEnum,
params: {
curent: 1,
size: 10
size: 10,
},
total: 10,
tableData: [],
isQuery: false,
searchOption: {}
searchOption: {},
exids: [],
};
},
components: { search },
methods: {
// 表格背景图颜色
cellClassFn({ row, column, rowIndex, columnIndex }) {
if (row.alarmLevelName == '紧急' && column.label == '告警级别') {
return 'emergency'
} else if (row.alarmLevelName == '重要' && column.label == '告警级别') {
return 'important'
if (row.alarmLevelName == "紧急" && column.label == "告警级别") {
return "emergency";
} else if (row.alarmLevelName == "重要" && column.label == "告警级别") {
return "important";
} else if (row.alarmLevelName == "一般" && column.label == "告警级别") {
return "common";
}
if (rowIndex % 2 == 1) {
return 'stripe'
return "stripe";
}
},
refresh() {
this.searchOption = {};
this.$refs.reset != undefined ? this.$refs.reset.reset() : this.getTableData();
},
handlePageChange(pageData) {
this.params.size = pageData.size
this.params.curent = pageData.page
this.getTableData()
this.params.size = pageData.size;
this.params.curent = pageData.page;
this.getTableData();
},
getTableData(option) {
this.searchOption = option
search(option) {
this.searchOption = option;
this.getTableData();
},
getTableData() {
let params = {
...this.params,
...option
}
CableStatusList(params).then(res => {
let list = res.records || []
this.tableData = list
this.total = res.records.length
})
...this.searchOption,
};
CableStatusList(params).then((res) => {
let list = res.records || [];
this.tableData = list;
this.total = res.records.length;
this.exids = list.map((i) => i.id);
});
},
toExport() {
let params = {
...this.params,
...this.searchOption
}
exportLeakyCableTime(params).then(res => {
download(res, 'vnd.ms-excel', `漏缆实时.xls`)
})
}
...this.searchOption,
};
exportLeakyCableTime({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `漏缆实时.xls`);
});
},
},
mounted() {
this.getTableData()
this.getTableData();
},
};
</script>
......@@ -146,6 +165,9 @@ export default {
& ::v-deep .important {
background-color: #f89850;
}
& ::v-deep .common {
background-color: #ead906;
}
.page {
display: flex;
align-items: center;
......
......@@ -69,8 +69,8 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button class="seabtn" @click="searchQuery()">查询</el-button>
<el-button class="seabtn" @click="reset">重置</el-button>
<el-button type="success" @click="searchQuery()">查询</el-button>
<el-button type="primary" @click="reset">重置</el-button>
</el-form-item>
</el-form>
<el-table
......@@ -186,7 +186,7 @@ export default {
fsubatchDelete({ ids }).then((res) => {
if (res.code == 200) {
successAlert("删除成功");
this.getTableData();
} else {
warningAlert("删除失败");
......@@ -194,8 +194,7 @@ export default {
});
},
refresh() {
this.reset();
this.getTableData();
this.reset();
},
searchQuery() {
this.istrue = 1;
......@@ -203,24 +202,20 @@ export default {
},
reset() {
this.FSUForm = formInit();
this.getTableData();
},
exportData() {
fsulist({size:this.total}).then((res) => {
let list = res.records || [];
this.exids = list.map((i) => i.id);
});
exportFsu({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `FSU表.xls`);
});
// let ids = [];
// this.ids.length != 0 ? (ids = this.ids) : (ids = this.exids);
exportFsu({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `FSU表.xls`);
});
},
handleSelectionChange(val) {
this.multipleSelection = val;
this.ids = this.multipleSelection.map((i) => i.id);
},
handleView(row) {
this.$router.push({
path: "/detail",
......@@ -240,6 +235,7 @@ export default {
let list = res.records || [];
this.tableData = list;
this.total = res.total;
this.exids = list.map((i) => i.id);
if (this.istrue == 1) {
if (this.tableData.length != 0) {
......
......@@ -109,8 +109,8 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button class="seabtn" @click="searchQuery()">查询</el-button>
<el-button class="seabtn" @click="reset()">重置</el-button>
<el-button type="success" @click="searchQuery()">查询</el-button>
<el-button type="primary" @click="reset">重置</el-button>
</el-form-item>
</el-form>
<el-table
......@@ -131,9 +131,6 @@
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
prop="leakyCableDescribe"
label="漏缆描述"
......@@ -146,19 +143,18 @@
show-overflow-tooltip
align="center"
/>
<el-table-column
<el-table-column
prop="leakyCableMode"
label="漏缆型号"
show-overflow-tooltip
align="center"
/>
<el-table-column prop="railWayName" label="所在铁路线" align="center" />
<el-table-column prop="siteName" label="所在站点" align="center" />
<el-table-column prop="fsuName" label="所在FSU" align="center" />
<el-table-column prop="equipName" label="所在监测设备" align="center" />
<el-table-column
prop="action"
label="详细信息"
......@@ -247,7 +243,7 @@ export default {
leakyCablebatchDelete({ ids }).then((res) => {
if (res.code == 200) {
successAlert("删除成功");
this.getTableData();
} else {
warningAlert("删除失败");
......@@ -255,8 +251,7 @@ export default {
});
},
refresh() {
this.reset();
this.getTableData();
this.reset();
},
searchQuery() {
this.istrue = 1;
......@@ -264,17 +259,13 @@ export default {
},
reset() {
this.leakyCableForm = formInit();
this.getTableData();
},
exportData() {
leakyCablelist({size:this.total}).then((res) => {
let list = res.records || [];
this.exids = list.map((i) => i.id);
});
exportLeaky({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `漏缆表.xls`);
});
exportLeaky({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `漏缆表.xls`);
});
},
handleSelectionChange(val) {
this.multipleSelection = val;
......@@ -301,7 +292,7 @@ export default {
let list = res.records || [];
this.tableData = list;
this.total = res.total;
this.exids = list.map((i) => i.id);
if (this.istrue == 1) {
if (this.tableData.length) {
successAlert("查询成功");
......@@ -352,7 +343,7 @@ function formInit(data = {}) {
monitor: "",
leakyCableCode: "",
leakyCableDescribe: "",
siteName:"",
siteName: "",
leakyCableMode: "",
current: 1,
size: 10,
......
......@@ -83,9 +83,9 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="铁路名称:">
<el-button class="seabtn" @click="searchQuery()">查询</el-button>
<el-button class="seabtn" @click="reset()">重置</el-button>
<el-form-item>
<el-button type="success" @click="searchQuery()">查询</el-button>
<el-button type="primary" @click="reset">重置</el-button>
</el-form-item>
</el-form>
<el-table
......@@ -197,7 +197,7 @@ export default {
monitorEquipbatchDelete({ ids }).then((res) => {
if (res.code == 200) {
successAlert("删除成功");
this.getTableData();
} else {
warningAlert("删除失败");
......@@ -206,7 +206,6 @@ export default {
},
refresh() {
this.reset();
this.getTableData();
},
searchQuery() {
this.istrue = 1;
......@@ -214,17 +213,13 @@ export default {
},
reset() {
this.monitorForm = formInit();
this.getTableData();
},
exportData() {
monitorEquiplist({size:this.total}).then((res) => {
let list = res.records || [];
this.exids = list.map((i) => i.id);
});
exportMonitorEquip({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `监测设备表.xls`);
});
exportMonitorEquip({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `监测设备表.xls`);
});
},
handleSelectionChange(val) {
this.multipleSelection = val;
......@@ -251,7 +246,7 @@ export default {
let list = res.records || [];
this.tableData = list;
this.total = res.total;
this.exids = list.map((i) => i.id);
if (this.istrue == 1) {
if (this.tableData.length) {
successAlert("查询成功");
......@@ -288,7 +283,6 @@ export default {
};
function formInit(data = {}) {
return {
wayId: "",
parentId: "",
ip: "",
......
......@@ -49,9 +49,9 @@
</el-input>
</el-form-item>
<el-form-item>
<el-button class="seabtn" @click="searchQuery()">查询</el-button>
<el-button class="seabtn" @click="reset()">重置</el-button>
<el-form-item>
<el-button type="success" @click="searchQuery()">查询</el-button>
<el-button type="primary" @click="reset">重置</el-button>
</el-form-item>
</el-form>
<el-table
......@@ -158,8 +158,7 @@ export default {
});
},
refresh() {
this.reset();
this.getTableData();
this.reset();
},
searchQuery() {
this.istrue = 1;
......@@ -167,17 +166,13 @@ export default {
},
reset() {
this.railData = formInit();
this.getTableData();
},
exportData() {
railWaylist({size:this.total}).then((res) => {
let list = res.records || [];
this.exids = list.map((i) => i.id);
});
exportRailWay({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `铁路线表.xls`);
});
exportRailWay({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `铁路线表.xls`);
});
},
handleSelectionChange(val) {
this.multipleSelection = val;
......@@ -204,7 +199,7 @@ export default {
let list = res.records || [];
this.tableData = list;
this.total = res.total;
this.exids = list.map((i) => i.id);
if (this.istrue == 1) {
if (this.tableData.length) {
successAlert("查询成功");
......
......@@ -57,8 +57,8 @@
></el-option> </el-select
></el-form-item>
<el-form-item>
<el-button class="seabtn" @click="searchQuery()">查询</el-button>
<el-button class="seabtn" @click="reset()">重置</el-button>
<el-button type="success" @click="searchQuery()">查询</el-button>
<el-button type="primary" @click="reset">重置</el-button>
</el-form-item>
</el-form>
<el-table
......@@ -159,7 +159,7 @@ export default {
},
refresh() {
this.reset();
this.getTableData();
},
searchQuery() {
this.istrue = 1;
......@@ -167,12 +167,9 @@ export default {
},
reset() {
this.siteForm = formInit();
this.getTableData();
},
exportData() {
sitelist({ size: this.total }).then((res) => {
let list = res.records || [];
this.exids = list.map((i) => i.id);
});
exportSite({ ids: this.exids }).then((res) => {
download(res, "vnd.ms-excel", `站点表.xls`);
});
......@@ -200,6 +197,7 @@ export default {
let list = res.records || [];
this.tableData = list;
this.total = res.total;
this.exids = list.map((i) => i.id);
if (this.istrue == 1) {
if (this.tableData.length) {
successAlert("查询成功");
......
......@@ -4,13 +4,13 @@
<div class="leakage-top">
<div style="color: #666666"></div>
<div class="operate-btn">
<el-button type="primary" @click="getTableData">刷新</el-button>
<el-button type="primary" @click="refresh">刷新</el-button>
<el-button type="primary" @click="isQuery = !isQuery">查询</el-button>
<el-button type="primary" @click="exportLog">导出</el-button>
</div>
</div>
<div v-if="isQuery">
<search @search="getTableData" />
<search @search="getTableData" ref="reset" />
</div>
<el-table
:data="tableData"
......@@ -21,15 +21,15 @@
:header-cell-style="{ background: '#EAF1FE', color: '#666666' }"
>
<el-table-column prop="userName" label="用户名" align="center" />
<el-table-column prop="operateTypeValue" label="操作类别" align="center" />
<el-table-column prop="operateObj" label="操作对象" align="center" />
<el-table-column prop="operateTypeName" label="操作类别" align="center" />
<el-table-column prop="operateObjName" label="操作对象" align="center" />
<el-table-column prop="objectName" label="对象名称" align="center" />
<el-table-column
prop="operateContent"
label="操作内容"
align="center"
/>
<el-table-column prop="operateResultValue" label="操作结果" align="center" />
<el-table-column prop="operateResultName" label="操作结果" align="center" />
<el-table-column prop="creationTime" label="操作时间" align="center" />
</el-table>
<Pagination
......@@ -57,7 +57,8 @@ export default {
total: 10,
tableData: [],
isQuery: false,
searchOption: {}
searchOption: {},
exids:[]
};
},
components: {
......@@ -68,6 +69,9 @@ export default {
this.params.size = pageData.size;
this.params.current = pageData.page;
this.getTableData()
},
refresh() {
this.$refs.reset != undefined ? (this.$refs.reset.reset()) : (this.getTableData())
},
getTableData(option) {
this.searchOption = option
......@@ -79,17 +83,14 @@ export default {
let list = res.records || []
this.tableData = list
this.total = res.total
this.exids = list.map((i)=>i.id)
})
},
tableRowClassName({ row, rowIndex }) {
return rowIndex % 2 === 0 ? '' : 'single-row'
},
exportLog() {
let params = {
...this.params,
...this.searchOption
}
exportLog(params).then(res => {
exportLog({ids:this.exids}).then(res => {
download(res, 'vnd.ms-excel', `用户日志.xls`)
})
}
......
......@@ -12,7 +12,7 @@ const port = process.env.port || process.env.npm_config_port || 8886 // dev port
const rewriteDefaultConfig = {
changeOrigin: true,
target: 'http://8.142.143.40:8886',
// target: 'http://192.168.0.111:8886',
// target: 'http://192.168.0.123:8886',
// ws: true,
headers: {
referer: 'laddercloud.cn'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment