jcbranch
fanluyan 11 months ago
parent f509d6075c
commit 4e6242e191

@ -243,7 +243,7 @@ export default {
valueToStore = value * 60000; valueToStore = value * 60000;
} }
if (key == "absHeartbeats") { if (key == "absHeartbeats") {
type = 1; // type = 0; //
valueToStore = this.secondsArray; valueToStore = this.secondsArray;
} }

@ -224,22 +224,39 @@
> >
</template> </template>
</u-table-column> </u-table-column>
<u-table-column <u-table-column label="传图" key="ct">
label="传图" <u-table-column
prop="mntnStatus.reportMap.pic" label="当天"
width="50" width="50"
class-name="picBg" class-name="picBg"
sortable sortable
:sort-method="picSort" :sort-method="picSort"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ {{
scope.row.mntnStatus.reportMap && scope.row.mntnStatus.reportMap &&
scope.row.mntnStatus.reportMap.hasOwnProperty("uploads") scope.row.mntnStatus.reportMap.hasOwnProperty("uploads")
? Number(scope.row.mntnStatus.reportMap.uploads) ? Number(scope.row.mntnStatus.reportMap.uploads)
: 0 : 0
}} }}
</template> </template>
</u-table-column>
<u-table-column
label="历史"
width="50"
class-name="picBg"
sortable
:sort-method="pichistorySort"
>
<template slot-scope="scope">
{{
scope.row.mntnStatus.reportMap &&
scope.row.mntnStatus.reportMap.hasOwnProperty("delayedUploads")
? Number(scope.row.mntnStatus.reportMap.delayedUploads)
: 0
}}
</template>
</u-table-column>
</u-table-column> </u-table-column>
<u-table-column <u-table-column
prop="protocol" prop="protocol"
@ -1729,8 +1746,25 @@ export default {
//pic //pic
picSort(a, b) { picSort(a, b) {
// a b mntnStatus.reportMap // a b mntnStatus.reportMap
const aPic = (a.mntnStatus.reportMap && a.mntnStatus.reportMap.pic) || 0; const aPic =
const bPic = (b.mntnStatus.reportMap && b.mntnStatus.reportMap.pic) || 0; (a.mntnStatus.reportMap && a.mntnStatus.reportMap.uploads) || 0;
const bPic =
(b.mntnStatus.reportMap && b.mntnStatus.reportMap.uploads) || 0;
// pic
const numA = Number(aPic);
const numB = Number(bPic);
//
//
return numA - numB;
// numB - numA
},
//
pichistorySort(a, b) {
// a b mntnStatus.reportMap
const aPic =
(a.mntnStatus.reportMap && a.mntnStatus.reportMap.delayedUploads) || 0;
const bPic =
(b.mntnStatus.reportMap && b.mntnStatus.reportMap.delayedUploads) || 0;
// pic // pic
const numA = Number(aPic); const numA = Number(aPic);
const numB = Number(bPic); const numB = Number(bPic);

@ -97,6 +97,14 @@ export default {
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() {
let logSetparam = JSON.parse(localStorage.getItem("logset"));
if (logSetparam !== null) {
this.logset = logSetparam;
} else {
this.logset = { noSpecData: 0, mTime: 0 };
}
},
mounted() { mounted() {
this.getAuthfn(); this.getAuthfn();
}, },
@ -196,7 +204,7 @@ export default {
} }
.logSet { .logSet {
width: 300px; width: 300px;
border: 1px solid #f00; border: 1px solid #eee;
padding: 12px; padding: 12px;
.logMain { .logMain {
.top, .top,

Loading…
Cancel
Save