From 0357cd11e6cd7ce095ab72eb41c563cccb0f9617 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期四, 11 十一月 2021 15:42:41 +0800
Subject: [PATCH] 暂存
---
src/pages/syslog/views/operationLog.vue | 43 +++++++++-
public/images/syslog/没数据.png | 0
src/pages/syslog/views/systemLog.vue | 43 +++++++++-
src/pages/syslog/views/pollingLog.vue | 76 ++++++++++++++++++
src/pages/syslog/views/eventPushLog.vue | 50 +++++++++++-
5 files changed, 195 insertions(+), 17 deletions(-)
diff --git "a/public/images/syslog/\346\262\241\346\225\260\346\215\256.png" "b/public/images/syslog/\346\262\241\346\225\260\346\215\256.png"
new file mode 100644
index 0000000..6408b12
--- /dev/null
+++ "b/public/images/syslog/\346\262\241\346\225\260\346\215\256.png"
Binary files differ
diff --git a/src/pages/syslog/views/eventPushLog.vue b/src/pages/syslog/views/eventPushLog.vue
index 7125ace..5dd8941 100644
--- a/src/pages/syslog/views/eventPushLog.vue
+++ b/src/pages/syslog/views/eventPushLog.vue
@@ -51,8 +51,8 @@
>
<el-option label="鍏ㄩ儴" :value="''"> </el-option>
<el-option
- v-for="item in levelOptions"
- :key="item.proc_name"
+ v-for="(item, i) in levelOptions"
+ :key="i"
:label="item.proc_name"
:value="item.proc_name"
>
@@ -72,7 +72,11 @@
:header-cell-style="{ background: '#f8f8f8', color: '#222222' }"
style="width: 100%"
v-if="!showSubTable"
+ border
>
+ <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
@@ -107,14 +111,13 @@
<el-table-column
:align="'center'"
prop="msg"
- min-width="100px"
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,7 +128,11 @@
:header-cell-style="{ background: '#f8f8f8', color: '#222222' }"
style="width: 100%"
v-if="showSubTable"
+ border
>
+ <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
@@ -176,11 +183,13 @@
<script>
import { deleteDate } from "@/api/system";
import { pad0 } from "@/api/utils";
-import {} from "@/api/log";
+import { getModules } from "@/api/log";
export default {
data() {
return {
+ png1: "",
+ png2: require("../../../../public/images/syslog/娌℃暟鎹�.png"),
loading: false,
loadingText: "",
showSubTable: false,
@@ -251,6 +260,7 @@
getOptions() {
getModules().then((res) => {
this.levelOptions = res.data;
+ this.png1 = require("../../../../public/images/syslog/娌℃暟鎹�.png");
});
},
clickFaults(row, column, cell, event) {
@@ -451,6 +461,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 +484,37 @@
}
}
.tableBox {
+ border: none;
+ &::before,
+ &::after {
+ display: none;
+ }
+
+ tr {
+ &.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;
}
}
}
diff --git a/src/pages/syslog/views/operationLog.vue b/src/pages/syslog/views/operationLog.vue
index a7425ec..5c67956 100644
--- a/src/pages/syslog/views/operationLog.vue
+++ b/src/pages/syslog/views/operationLog.vue
@@ -51,8 +51,8 @@
>
<el-option label="鍏ㄩ儴" :value="''"> </el-option>
<el-option
- v-for="item in moduleOptions"
- :key="item.proc_name"
+ v-for="(item, i) in moduleOptions"
+ :key="i"
:label="item.proc_name"
:value="item.proc_name"
>
@@ -70,8 +70,8 @@
>
<!-- :disabled="gongnengOptions.length==0" -->
<el-option
- v-for="item in gongnengOptions"
- :key="item.name"
+ v-for="(item, i) in gongnengOptions"
+ :key="i"
:label="item.name"
:value="item.name"
>
@@ -87,8 +87,8 @@
@change="getOperationLog(1)"
>
<el-option
- v-for="item in resultOptions"
- :key="item.value"
+ v-for="(item, i) in resultOptions"
+ :key="i"
:label="item.label"
:value="item.value"
>
@@ -105,7 +105,11 @@
:data="tableData"
:header-cell-style="{ background: '#f8f8f8', color: '#222222' }"
style="width: 100%"
+ border
>
+ <template slot="empty">
+ <img :src="png" class="empty_img" alt="" />
+ </template>
<el-table-column :align="'center'" label="搴忓彿" type="index" width="50">
</el-table-column>
<el-table-column
@@ -175,6 +179,7 @@
name: "operationLog",
data() {
return {
+ png: "",
loading: false,
loadingText: "",
input3: "",
@@ -288,6 +293,7 @@
}).then((res) => {
this.tableData = res.data.logs;
this.total = res.data.total;
+ this.png = require("../../../../public/images/syslog/娌℃暟鎹�.png");
});
},
getTimeStr(date) {
@@ -445,16 +451,41 @@
border-radius: 5px;
padding: 12px;
background-color: white;
+ .empty_img {
+ margin: 80px auto;
+ width: 164px;
+ }
.tableBox {
+ border: none;
+ &::before,
+ &::after {
+ display: none;
+ }
+ tr {
+ &.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;
}
}
}
diff --git a/src/pages/syslog/views/pollingLog.vue b/src/pages/syslog/views/pollingLog.vue
index db7f82b..895c3cf 100644
--- a/src/pages/syslog/views/pollingLog.vue
+++ b/src/pages/syslog/views/pollingLog.vue
@@ -36,7 +36,7 @@
</div>
</div>
<div class="second">
- <span>鏃ユ湡鏃堕棿锛�</span>
+ <span class="title">鏃ユ湡鏃堕棿锛�</span>
<el-date-picker
v-model="dateRange"
size="small"
@@ -46,6 +46,7 @@
start-placeholder="寮�濮嬫棩鏈�"
@change="dateChange"
end-placeholder="缁撴潫鏃ユ湡"
+ :picker-options="pickerOptions"
>
</el-date-picker>
</div>
@@ -59,7 +60,11 @@
:header-cell-style="{ background: '#f8f8f8', color: '#222222' }"
@selection-change="handleSelectionChange"
style="width: 100%"
+ border
>
+ <template slot="empty">
+ <img :src="png" class="empty_img" alt="" />
+ </template>
<el-table-column :align="'center'" label="搴忓彿" type="index" width="50">
</el-table-column>
<el-table-column
@@ -137,6 +142,7 @@
export default {
data() {
return {
+ png: "",
loading: false,
loadingText: "",
tableData: [],
@@ -161,6 +167,37 @@
procID: "",
procName: "",
pickNum: 0,
+ pickerOptions: {
+ shortcuts: [
+ {
+ text: "鏈�杩戜竴鍛�",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "鏈�杩戜竴涓湀",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "鏈�杩戜笁涓湀",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ ],
+ },
};
},
mounted() {
@@ -229,6 +266,7 @@
queryScheduleLog(data).then((res) => {
this.tableData = res.data.logs;
this.total = res.data.total;
+ this.png = require("../../../../public/images/syslog/娌℃暟鎹�.png");
});
},
dateChange(val) {
@@ -250,6 +288,8 @@
this.timeEnd = this.getTimeStr(date);
this.dateRange = [this.timeStart, this.timeEnd];
},
+ handleSelectionChange() {},
+ handleClose() {},
},
};
</script>
@@ -374,8 +414,15 @@
}
.second {
display: flex;
+ align-items: center;
margin: 15px 0 20px 0;
padding: 0 20px;
+ .title {
+ margin-right: 10px;
+ min-width: fit-content;
+ font-weight: bold;
+ font-size: 12px;
+ }
.bar {
display: flex;
align-items: baseline;
@@ -398,16 +445,43 @@
padding: 12px;
background-color: white;
+ .empty_img {
+ margin: 80px auto;
+ width: 164px;
+ }
+
.tableBox {
+ border: none;
+ &::before,
+ &::after {
+ display: none;
+ }
+
+ tr {
+ &.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;
}
}
}
diff --git a/src/pages/syslog/views/systemLog.vue b/src/pages/syslog/views/systemLog.vue
index 364d658..3c1abcd 100644
--- a/src/pages/syslog/views/systemLog.vue
+++ b/src/pages/syslog/views/systemLog.vue
@@ -51,8 +51,8 @@
>
<el-option label="鍏ㄩ儴" :value="''"> </el-option>
<el-option
- v-for="item in levelOptions"
- :key="item.proc_name"
+ v-for="(item, index) in levelOptions"
+ :key="index"
:label="item.proc_name"
:value="item.proc_name"
>
@@ -68,8 +68,8 @@
@change="getOperationLog(1)"
>
<el-option
- v-for="item in hostNameOptions"
- :key="item.value"
+ v-for="(item, index) in hostNameOptions"
+ :key="index"
:label="item.label"
:value="item.value"
>
@@ -86,7 +86,11 @@
:data="tableData"
:header-cell-style="{ background: '#f8f8f8', color: '#222222' }"
style="width: 100%"
+ border
>
+ <template slot="empty">
+ <img :src="png" class="empty_img" alt="" />
+ </template>
<!-- <el-table-column :align="'center'" label="搴忓彿" type="index" width="50">
</el-table-column> -->
<el-table-column
@@ -142,12 +146,14 @@
<script>
import { deleteDate } from "@/api/system";
+import { getModules } from "@/api/log";
import { pad0 } from "@/api/utils";
import {} from "@/api/log";
export default {
data() {
return {
+ png: "",
loading: false,
loadingText: "",
input3: "",
@@ -208,6 +214,7 @@
getOptions() {
getModules().then((res) => {
this.levelOptions = res.data;
+ this.png = require("../../../../public/images/syslog/娌℃暟鎹�.png");
});
},
choseRange(item, i) {
@@ -404,17 +411,43 @@
margin-top: 16px;
border-radius: 5px;
padding: 12px;
- background-color: white;
+ background-color: rgb(255, 255, 255);
+ .empty_img {
+ margin: 80px auto;
+ width: 164px;
+ }
.tableBox {
+ border: none;
+ &::before,
+ &::after {
+ display: none;
+ }
+
+ tr {
+ &.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;
}
}
}
--
Gitblit v1.8.0