web/apsDashboard-1.git

			@@ -23,18 +23,19 @@
			v-model="fuzzySearch"
			size="small"
			class="input-with-select"
			@keyup.enter.native="getPushLog(1)"
			>
			<span
			class="icon iconfont"
			@click="getOperationLog(1)"
			slot="append"
			>
			<span class="icon iconfont icon_clear" @click="clearSearch" slot="append" v-if="fuzzySearch">
			
			</span>
			<span class="icon iconfont icon_search" @click="getPushLog(1)" slot="append">
			
			</span>

			<!-- <el-button
			slot="append"
			icon="el-icon-search"
			@click="getOperationLog(1)"
			@click="getPushLog(1)"
			></el-button> -->
			</el-input>
			</div>
			@@ -43,20 +44,8 @@
			<div class="bar">
			<div class="name">状态：</div>

			<el-select
			v-model="level"
			placeholder="请选择"
			size="small"
			@change="levelChange"
			>
			<el-option label="全部" :value="''"> </el-option>
			<el-option
			v-for="item in levelOptions"
			:key="item.proc_name"
			:label="item.proc_name"
			:value="item.proc_name"
			>
			</el-option>
			<el-select v-model="state" placeholder="请选择" size="small" @change="stateChange">
			<el-option v-for="(item, i) in stateOptions" :key="i" :label="item.label" :value="item.value"> </el-option>
			</el-select>
			</div>
			</div>
			@@ -64,7 +53,6 @@
			<div class="table">
			<el-table
			class="tableBox"
			@cell-click="clickFaults"
			ref="multipleTable"
			:cell-style="styleFunc"
			highlight-current-row
			@@ -72,49 +60,30 @@
			:header-cell-style="{ background: '#f8f8f8', color: '#222222' }"
			style="width: 100%"
			v-if="!showSubTable"
			border
			>
			<el-table-column :align="'center'" label="序号" type="index" width="50">
			<template slot="empty">
			<img :src="png1" class="empty_img" alt="" />
			</template>
			<el-table-column :align="'center'" label="序号" type="index" width="50"> </el-table-column>
			<el-table-column sortable :align="'center'" prop="name" label="任务名称"></el-table-column>
			<el-table-column :align="'center'" sortable prop="state" label="状态"></el-table-column>
			<el-table-column :align="'center'" sortable prop="lastSendDate" label="最近一次推送时间"></el-table-column>
			<el-table-column :align="'center'" prop="lastSendState" label="最近一次推送状态">
			<template #default="{ row }">
			<span v-show="row.lastSendState != ''" :style="row.lastSendState === 'true' ? 'color:green' : 'color:red'"
			>{{ row.lastSendState === "true" ? "成功" : "失败" }}
			</span>
			</template>
			</el-table-column>
			<el-table-column
			:align="'center'"
			sortable
			prop="add_time"
			label="状态"
			></el-table-column>
			<el-table-column
			sortable
			:align="'center'"
			prop="userName"
			label="任务名称"
			></el-table-column>
			<el-table-column
			:align="'center'"
			sortable
			prop="module"
			label="最近一次推送时间"
			></el-table-column>
			<el-table-column
			:align="'center'"
			prop="procName"
			label="最近一次推送状态"
			></el-table-column>
			<el-table-column
			:align="'center'"
			sortable
			prop="result"
			label="成功总量"
			></el-table-column>
			<el-table-column
			:align="'center'"
			prop="msg"
			min-width="100px"
			label="失败总量"
			></el-table-column>
			<el-table-column :align="'center'" sortable prop="totalSuccess" label="成功总量"></el-table-column>
			<el-table-column :align="'center'" prop="totalFailure" label="失败总量"></el-table-column>
			<!-- <el-table-column :align="'center'" prop="totalCached" label="等待重推"></el-table-column> -->
			</el-table>

			<div class="back" v-if="showSubTable" @click="showSubTable = false">
			<span class="icon iconfont"></span>
			<span class="title">事件推送日志</span>
			<span class="title" style="color: #4e94ff">事件推送日志</span>
			</div>
			<el-table
			class="tableBox"
			@@ -125,38 +94,17 @@
			:header-cell-style="{ background: '#f8f8f8', color: '#222222' }"
			style="width: 100%"
			v-if="showSubTable"
			border
			>
			<el-table-column :align="'center'" label="序号" type="index" width="50">
			</el-table-column>
			<el-table-column
			:align="'center'"
			sortable
			prop="add_time"
			label="推送时间"
			></el-table-column>
			<el-table-column
			sortable
			:align="'center'"
			prop="userName"
			label="推送状态"
			></el-table-column>
			<el-table-column
			:align="'center'"
			sortable
			prop="module"
			label="详细信息"
			></el-table-column>
			<el-table-column
			:align="'center'"
			prop="procName"
			label="再次推送时间"
			></el-table-column>
			<el-table-column
			:align="'center'"
			sortable
			prop="result"
			label="再次推送状态"
			></el-table-column>
			<template slot="empty">
			<img :src="png2" class="empty_img2" alt="" />
			</template>
			<el-table-column :align="'center'" label="序号" type="index" width="50"> </el-table-column>
			<el-table-column :align="'center'" sortable prop="add_time" label="推送时间"></el-table-column>
			<el-table-column sortable :align="'center'" prop="userName" label="推送状态"></el-table-column>
			<el-table-column :align="'center'" sortable prop="module" label="详细信息"></el-table-column>
			<el-table-column :align="'center'" prop="procName" label="再次推送时间"></el-table-column>
			<el-table-column :align="'center'" sortable prop="result" label="再次推送状态"></el-table-column>
			</el-table>
			</div>

			@@ -174,37 +122,34 @@
			</template>

			<script>
			import { deleteDate } from "@/api/system";
			import { pad0 } from "@/api/utils";
			import {} from "@/api/log";
			import { pad0 } from "@/api/utils"
			import { queryDataPushLog } from "@/api/log"

			export default {
			data() {
			return {
			png1: "",
			png2: require("../../../../public/images/syslog/没数据.png"),
			loading: false,
			loadingText: "",
			showSubTable: false,
			tableData: [
			{ msg: 2, userName: "车辆识别" },
			{ userName: "人脸识别", msg: 4 },
			],
			tableData: [],
			subTableData: [],
			dateArr: ["今日", "近三天", "近七天", "近一个月", "近六个月"],
			levelOptions: [],
			hostNameOptions: [],
			resultOptions: [
			stateOptions: [
			{
			value: "",
			label: "全部",
			label: "全部"
			},
			{
			value: "成功",
			label: "成功",
			value: "完成",
			label: "完成"
			},
			{
			value: "失败",
			label: "失败",
			},
			value: "进行中",
			label: "进行中"
			}
			],
			value: "",
			page: 1,
			@@ -212,107 +157,95 @@
			activeDateChoise: 0,
			hostName: "",
			result: "",
			level: "",
			state: "",
			timeStart: "",
			timeEnd: "",
			fuzzySearch: "",
			total: 0,
			};
			total: 0
			}
			},
			mounted() {
			this.getTimeRange(24 * 60 * 60 * 1000);
			// this.getOperationLog();
			this.getOptions();
			this.getTimeRange(24 * 60 * 60 * 1000)
			this.getPushLog()
			},
			methods: {
			styleFunc({ row, column, rowIndex, columnIndex }) {
			if (columnIndex == 6) {
			return { cursor: "pointer" };
			return { cursor: "pointer" }
			}
			return {};
			return {}
			},
			handleSizeChange(val) {
			this.pageSize = val;
			// this.getOperationLog();
			this.pageSize = val
			// this.getPushLog();
			},
			handleCurrentChange(val) {
			this.page = val;
			// this.getOperationLog();
			this.page = val
			// this.getPushLog();
			},
			levelChange(val) {
			// this.getOperationLog(1);
			// this.hostName = "";
			// getOperations({
			// module: this.level,
			// }).then((res) => {
			// this.hostNameOptions = res.data;
			// });
			},
			getOptions() {
			getModules().then((res) => {
			this.levelOptions = res.data;
			});
			},
			clickFaults(row, column, cell, event) {
			this.showSubTable = true;
			stateChange(val) {
			this.getPushLog(1)
			},
			choseRange(item, i) {
			switch (item) {
			case "今日":
			this.getTimeRange(24 * 60 * 60 * 1000);
			break;
			this.getTimeRange(24 * 60 * 60 * 1000)
			break
			case "近三天":
			this.getTimeRange(24 * 60 * 60 * 1000 * 3);
			break;
			this.getTimeRange(24 * 60 * 60 * 1000 * 3)
			break
			case "近七天":
			this.getTimeRange(24 * 60 * 60 * 1000 * 7);
			break;
			this.getTimeRange(24 * 60 * 60 * 1000 * 7)
			break
			case "近一个月":
			this.getTimeRange(24 * 60 * 60 * 1000 * 30);
			break;
			this.getTimeRange(24 * 60 * 60 * 1000 * 30)
			break
			case "近六个月":
			this.getTimeRange(24 * 60 * 60 * 1000 * 30 * 6);
			break;
			this.getTimeRange(24 * 60 * 60 * 1000 * 30 * 6)
			break
			default:
			break;
			break
			}
			// this.getOperationLog(1);
			this.activeDateChoise = i;
			this.getPushLog(1)
			this.activeDateChoise = i
			},
			getOperationLog(typ) {
			getPushLog(typ) {
			if (typ == 1) {
			this.page = 1;
			this.page = 1
			}
			// queryOperationLog({
			// timeStart: this.timeStart,
			// timeEnd: this.timeEnd,
			// page: this.page,
			// pageSize: this.pageSize,
			// module: this.level,
			// function: this.hostName,
			// result: this.result,
			// fuzzySearch: this.fuzzySearch,
			// }).then((res) => {
			// this.tableData = res.data.logs;
			// this.total = res.data.total;
			// });
			queryDataPushLog({
			timeStart: this.timeStart,
			timeEnd: this.timeEnd,
			page: this.page,
			pageSize: this.pageSize,
			state: this.state,
			function: this.hostName,
			result: this.result,
			fuzzySearch: this.fuzzySearch
			}).then((res) => {
			this.tableData = res.data.logs
			this.total = res.data.total
			})
			},
			getTimeStr(date) {
			var month = pad0(date.getMonth() + 1); //月
			var day = pad0(date.getDate()); //日
			var hour = pad0(date.getHours()); //时
			var minute = pad0(date.getMinutes()); //分
			var second = pad0(date.getSeconds()); //秒
			return `${date.getFullYear()}-${month}-${day} ${hour}:${minute}:${second}`;
			var month = pad0(date.getMonth() + 1) //月
			var day = pad0(date.getDate()) //日
			return `${date.getFullYear()}-${month}-${day}`
			},
			getTimeRange(gap) {
			var date = new Date(); //当前时间
			var preDay = new Date(new Date().getTime() - gap);
			this.timeStart = this.getTimeStr(preDay);
			this.timeEnd = this.getTimeStr(date);
			var date = new Date() //当前时间
			// 计算出来的时间会多一天, 为了不修改上边的代码, 计算时增加一天
			// 修正时间从起始日期的, 0点开始到24点结束
			var preDay = new Date(new Date().getTime() - gap + 24 * 60 * 60 * 1000)
			this.timeStart = this.getTimeStr(preDay) + " 00:00:00"
			this.timeEnd = this.getTimeStr(date) + " 23:59:59"
			},
			},
			};
			clearSearch() {
			this.fuzzySearch = ""
			this.getPushLog(1)
			}
			}
			}
			</script>
			<style lang="scss">
			.push-log {
			@@ -451,6 +384,14 @@
			border-radius: 5px;
			padding: 12px;
			background-color: white;
			.empty_img {
			margin: 80px auto;
			width: 164px;
			}
			.empty_img2 {
			margin: 50px auto;
			width: 164px;
			}
			.back {
			display: flex;
			align-items: center;
			@@ -466,15 +407,43 @@
			}
			}
			.tableBox {
			border: none;
			&::before,
			&::after {
			display: none;
			}

			tr {
			td:first-child {
			border-radius: 4px 0 0 4px;
			}
			td:last-child {
			border-radius: 0 4px 4px 0;
			}
			&.current-row td {
			background-color: #4e94ff !important;
			color: #fff;
			}
			&:hover td {
			background-color: rgb(242, 242, 247);
			}
			}
			th {
			padding: 0 !important;
			height: 40px;
			line-height: 40px;
			border-color: #fff !important;
			border-right: 2px solid #fff;
			border-radius: 4px;
			font-size: 12px;
			background: #f2f2f7;
			}
			td {
			padding: 0 !important;
			height: 34px;
			line-height: 34px;
			border: none;
			font-size: 12px;
			}
			}
			}