ly.fan
/
ops-fronted
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化表格

Browse Source
master
fanluyan 2 years ago
parent 92ccd9e0f8
commit 5a0af44875
5 changed files with 94 additions and 70 deletions
Show Stats Download Patch File Download Diff File

40
package-lock.json generated
Unescape Escape View File

@ -3172,20 +3172,9 @@
} }
}, },
"codepage": { "codepage": {
"version": "1.14.0", "version": "1.15.0",
"resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.14.0.tgz", "resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz",
"integrity": "sha512-iz3zJLhlrg37/gYRWgEPkaFTtzmnEv1h+r7NgZum2lFElYQPi0/5bnmuDfODHxfp0INEfnRqyfyeIJDbb7ahRw==", "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA=="
"requires": {
"commander": "~2.14.1",
"exit-on-epipe": "~1.0.1"
},
"dependencies": {
"commander": {
"version": "2.14.1",
"resolved": "https://registry.npmmirror.com/commander/-/commander-2.14.1.tgz",
"integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="
}
}
}, },
"color-convert": { "color-convert": {
"version": "1.9.3", "version": "1.9.3",
@ -4698,11 +4687,6 @@
"websocket-driver": ">=0.5.1" "websocket-driver": ">=0.5.1"
} }
}, },
"fflate": {
"version": "0.3.11",
"resolved": "https://registry.npmmirror.com/fflate/-/fflate-0.3.11.tgz",
"integrity": "sha512-Rr5QlUeGN1mbOHlaqcSYMKVpPbgLy0AWT/W0EHxA6NGI12yO1jpoui2zBBvU2G824ltM6Ut8BFgfHSBGfkmS0A=="
},
"figures": { "figures": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmmirror.com/figures/-/figures-2.0.0.tgz", "resolved": "https://registry.npmmirror.com/figures/-/figures-2.0.0.tgz",
@ -9132,27 +9116,17 @@
"dev": true "dev": true
}, },
"xlsx": { "xlsx": {
"version": "0.17.0", "version": "0.17.5",
"resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.17.0.tgz", "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.17.5.tgz",
"integrity": "sha512-bZ36FSACiAyjoldey1+7it50PMlDp1pcAJrZKcVZHzKd8BC/z6TQ/QAN8onuqcepifqSznR6uKnjPhaGt6ig9A==", "integrity": "sha512-lXNU0TuYsvElzvtI6O7WIVb9Zar1XYw7Xb3VAx2wn8N/n0whBYrCnHMxtFyIiUU1Wjf09WzmLALDfBO5PqTb1g==",
"requires": { "requires": {
"adler-32": "~1.2.0", "adler-32": "~1.2.0",
"cfb": "^1.1.4", "cfb": "^1.1.4",
"codepage": "~1.14.0", "codepage": "~1.15.0",
"commander": "~2.17.1",
"crc-32": "~1.2.0", "crc-32": "~1.2.0",
"exit-on-epipe": "~1.0.1",
"fflate": "^0.3.8",
"ssf": "~0.11.2", "ssf": "~0.11.2",
"wmf": "~1.0.1", "wmf": "~1.0.1",
"word": "~0.3.0" "word": "~0.3.0"
},
"dependencies": {
"commander": {
"version": "2.17.1",
"resolved": "https://registry.npmmirror.com/commander/-/commander-2.17.1.tgz",
"integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
}
} }
}, },
"y18n": { "y18n": {

2
package.json
Unescape Escape View File

@ -20,7 +20,7 @@
"vue": "^2.6.14", "vue": "^2.6.14",
"vue-router": "^3.5.1", "vue-router": "^3.5.1",
"vuex": "^3.6.2", "vuex": "^3.6.2",
"xlsx": "^0.17.0" "xlsx": "^0.17.5"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.12.16", "@babel/core": "^7.12.16",

118
src/views/homePage/components/tableMain.vue
Unescape Escape View File

@ -155,6 +155,7 @@
{{ scope.row.raw_report.pic }} {{ scope.row.raw_report.pic }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="protocol" prop="protocol"
label="规约" label="规约"
@ -177,7 +178,7 @@
</el-table-column> </el-table-column>
<el-table-column label="心跳信息" v-if="xtcheck"> <el-table-column label="心跳信息" v-if="xtcheck">
<el-table-column label="次数" min-width="48" v-if="xtcs"> <el-table-column label="次数" min-width="48">
<template slot-scope="scope"> <template slot-scope="scope">
{{ {{
scope.row.raw_report.hasOwnProperty("msgs") scope.row.raw_report.hasOwnProperty("msgs")
@ -186,7 +187,7 @@
}} }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="周期" min-width="48" v-if="xtzq"> <el-table-column label="周期" min-width="48">
<template slot-scope="scope"> <template slot-scope="scope">
{{ {{
scope.row.raw_report.hasOwnProperty("msgs") scope.row.raw_report.hasOwnProperty("msgs")
@ -237,22 +238,41 @@
</el-table-column> </el-table-column>
<el-table-column label="网络信号" v-if="wlcheck"> <el-table-column label="网络信号" v-if="wlcheck">
<el-table-column label="卡1" min-width="60"> <el-table-column label="卡1" min-width="60" prop="signature1">
<template slot-scope="scope"> <template slot-scope="scope">
{{ <el-tooltip
scope.row.raw_report.hasOwnProperty("msgs") class="item"
? scope.row.raw_report.msgs.signature1 effect="dark"
: "" :content="scope.row.raw_report.msgs.signature1"
}} placement="top"
>
<span>{{
scope.row.raw_report.msgs.hasOwnProperty("signature1")
? scope.row.raw_report.msgs.signature1.split("/")[0]
: ""
}}</span>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="卡2" min-width="60"> <el-table-column label="卡2" min-width="60" prop="signature2">
<template slot-scope="scope"> <template slot-scope="scope">
{{ <el-tooltip
scope.row.raw_report.hasOwnProperty("msgs") class="item"
? scope.row.raw_report.msgs.signature2 effect="dark"
:content="scope.row.raw_report.msgs.signature2"
placement="top"
>
<span>{{
scope.row.raw_report.msgs.hasOwnProperty("signature2")
? scope.row.raw_report.msgs.signature2.split("/")[0]
: ""
}}</span>
</el-tooltip>
<!-- {{
scope.row.raw_report.msgs.hasOwnProperty("signature2")
? scope.row.raw_report.msgs.signature2.split("/")[0]
: "" : ""
}} }} -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="错误" min-width="48"> <el-table-column label="错误" min-width="48">
@ -267,16 +287,22 @@
</el-table-column> </el-table-column>
<el-table-column label="重启次数" v-if="cqcheck"> <el-table-column label="重启次数" v-if="cqcheck">
<el-table-column label="系统" min-width="48"> <el-table-column
label="系统"
min-width="48"
prop="rebootTimes"
sortable
:sort-method="sortNumbers"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ {{
scope.row.raw_report.hasOwnProperty("msgs") scope.row.raw_report.msgs.hasOwnProperty("rebootTimes")
? scope.row.raw_report.msgs.rebootTimes ? Number(scope.row.raw_report.msgs.rebootTimes)
: "" : ""
}} }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="I1" min-width="48"> <el-table-column label="I1" min-width="48" prop="i1RebootTimes">
<template slot-scope="scope"> <template slot-scope="scope">
{{ {{
scope.row.raw_report.hasOwnProperty("msgs") scope.row.raw_report.hasOwnProperty("msgs")
@ -296,22 +322,24 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="SIM卡" v-if="simcheck" min-width="160"> <el-table-column label="SIM卡" v-if="simcheck" min-width="160">
<template slot-scope="scope"> <el-table-column label="卡1" min-width="48" prop="simcard1">
<p> <template slot-scope="scope">
{{ {{
scope.row.raw_report.hasOwnProperty("msgs") scope.row.raw_report.hasOwnProperty("msgs")
? scope.row.raw_report.msgs.simcard1 ? scope.row.raw_report.msgs.simcard1
: "" : ""
}} }}
</p> </template>
<p> </el-table-column>
<el-table-column label="卡2" min-width="48" prop="simcard2">
<template slot-scope="scope">
{{ {{
scope.row.raw_report.hasOwnProperty("msgs") scope.row.raw_report.hasOwnProperty("msgs")
? scope.row.raw_report.msgs.simcard2 ? scope.row.raw_report.msgs.simcard2
: "" : ""
}} }}
</p> </template>
</template> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="版本" label="版本"
@ -373,12 +401,12 @@
<el-checkbox v-model="xtcheck" @change="saveLocalStorage" <el-checkbox v-model="xtcheck" @change="saveLocalStorage"
>心跳信息</el-checkbox >心跳信息</el-checkbox
> >
<el-checkbox v-model="xtcs" @change="saveLocalStorage" <!-- <el-checkbox v-model="xtcs" @change="saveLocalStorage"
>心跳次数</el-checkbox >心跳次数</el-checkbox
> >
<el-checkbox v-model="xtzq" @change="saveLocalStorage" <el-checkbox v-model="xtzq" @change="saveLocalStorage"
>心跳周期</el-checkbox >心跳周期</el-checkbox
> > -->
<el-checkbox v-model="pzcheck" @change="saveLocalStorage" <el-checkbox v-model="pzcheck" @change="saveLocalStorage"
>拍照</el-checkbox >拍照</el-checkbox
> >
@ -591,6 +619,8 @@
import { getdoActionApi, getqueryUpgradesApi } from "@/utils/api/index"; import { getdoActionApi, getqueryUpgradesApi } from "@/utils/api/index";
import rowMsgDialog from "./rowMsgDialog.vue"; import rowMsgDialog from "./rowMsgDialog.vue";
import htmlToExcel from "@/utils/htmlToExcel"; import htmlToExcel from "@/utils/htmlToExcel";
import { saveAs } from "file-saver";
import XLSX from "xlsx";
export default { export default {
props: ["tableData", "onlineNum", "offlineNum", "noPicNum"], props: ["tableData", "onlineNum", "offlineNum", "noPicNum"],
components: { components: {
@ -643,8 +673,8 @@ export default {
gycheck: false, gycheck: false,
dccheck: true, dccheck: true,
xtcheck: true, xtcheck: true,
xtcs: false, // xtcs: false,
xtzq: false, // xtzq: false,
pzcheck: true, pzcheck: true,
wlcheck: true, wlcheck: true,
cqcheck: true, cqcheck: true,
@ -815,6 +845,24 @@ export default {
}, },
methods: { methods: {
sortNumbers(a, b) {
return (
Number(a.raw_report.msgs.rebootTimes) -
Number(b.raw_report.msgs.rebootTimes)
);
},
// sortSignature1(a, b) {
// return (
// Number(a.raw_report.msgs.signature1.split("/")[0]) -
// Number(b.raw_report.msgs.signature1.split("/")[0])
// );
// },
// sortSignature2(a, b) {
// return (
// Number(a.raw_report.msgs.signature2.split("/")[0]) -
// Number(b.raw_report.msgs.signature2.split("/")[0])
// );
// },
//获取运维勾选和快心跳勾选个数 //获取运维勾选和快心跳勾选个数
getNumber() { getNumber() {
console.log(this.tableData); console.log(this.tableData);
@ -1184,8 +1232,8 @@ export default {
localStorage.setItem("gycheck", this.gycheck); localStorage.setItem("gycheck", this.gycheck);
localStorage.setItem("dccheck", this.dccheck); localStorage.setItem("dccheck", this.dccheck);
localStorage.setItem("xtcheck", this.xtcheck); localStorage.setItem("xtcheck", this.xtcheck);
localStorage.setItem("xtcs", this.xtcs); // localStorage.setItem("xtcs", this.xtcs);
localStorage.setItem("xtzq", this.xtzq); // localStorage.setItem("xtzq", this.xtzq);
localStorage.setItem("pzcheck", this.pzcheck); localStorage.setItem("pzcheck", this.pzcheck);
localStorage.setItem("wlcheck", this.wlcheck); localStorage.setItem("wlcheck", this.wlcheck);
localStorage.setItem("cqcheck", this.cqcheck); localStorage.setItem("cqcheck", this.cqcheck);
@ -1209,12 +1257,12 @@ export default {
this.xtcheck = localStorage.getItem("xtcheck") this.xtcheck = localStorage.getItem("xtcheck")
? JSON.parse(localStorage.getItem("xtcheck")) ? JSON.parse(localStorage.getItem("xtcheck"))
: true; : true;
this.xtcs = localStorage.getItem("xtcs") // this.xtcs = localStorage.getItem("xtcs")
? JSON.parse(localStorage.getItem("xtcs")) // ? JSON.parse(localStorage.getItem("xtcs"))
: false; // : false;
this.xtzq = localStorage.getItem("xtzq") // this.xtzq = localStorage.getItem("xtzq")
? JSON.parse(localStorage.getItem("xtzq")) // ? JSON.parse(localStorage.getItem("xtzq"))
: false; // : false;
this.pzcheck = localStorage.getItem("pzcheck") this.pzcheck = localStorage.getItem("pzcheck")
? JSON.parse(localStorage.getItem("pzcheck")) ? JSON.parse(localStorage.getItem("pzcheck"))
: true; : true;

2
src/views/login/index.vue
Unescape Escape View File

@ -151,7 +151,7 @@ export default {
.loginMain { .loginMain {
width: 400px; width: 400px;
height: auto; height: auto;
background-color: #0c1622; // background-color: #0c1622;
margin: 100px auto; margin: 100px auto;
border-radius: 10px; border-radius: 10px;
box-shadow: 0 15px 25px 0 rgba(0, 0, 0, 0.6); box-shadow: 0 15px 25px 0 rgba(0, 0, 0, 0.6);

2
src/views/report/index.vue
Unescape Escape View File

@ -29,6 +29,7 @@
}}</span }}</span
> >
<el-button <el-button
v-if="leftCommand.length > 0"
class="deletebtn" class="deletebtn"
type="danger" type="danger"
icon="el-icon-delete" icon="el-icon-delete"
@ -87,6 +88,7 @@
}}</span }}</span
> >
<el-button <el-button
v-if="rightCommand.length > 0"
class="deletebtn" class="deletebtn"
type="danger" type="danger"
icon="el-icon-delete" icon="el-icon-delete"

Write Preview
Loading…
Cancel
Save