From 90ee0a2139d541cfd5ea6cfa2ee179cee90352a7 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 03 Mar 2021 09:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/clientManagement/clientManagement.vue | 138 +++++++++++++++++++++++++++++++++------------
1 files changed, 101 insertions(+), 37 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index f5254a7..368eb50 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -44,18 +44,27 @@
</el-tag>
</template>
- <template slot-scope="{ row }" slot="dtype">
+ <template slot-scope="{ row }" slot="dxzt">
<el-tag>{{
- row.dtype == "0" ? "掉线" : row.dtype == "1" ? "在线" : "无"
+ row.dxzt == "0" ? "掉线" : row.dxzt == "1" ? "在线" : "无"
}}
</el-tag>
+ </template>
+
+ <template slot-scope="{ row }" slot="expireTime">
+ <span>
+ {{
+ row.expireTime == "" ? row.expireTime : row.expireTime == null ? row.expireTime : row.expireTime.split(" ")[0]
+ }}
+ </span>
+ <i class="el-icon-warning" v-if="row.type == 1"></i>
</template>
</avue-crud>
</basic-container>
</el-col>
- <el-dialog title="缴费提醒" :visible.sync="dialogTableVisible" custom-class="payWin" append-to-body="true">
+ <el-dialog title="缴费提醒" :visible.sync="dialogTableVisible" top="280px" custom-class="payWin" append-to-body="true">
<el-table :data="gridData">
<el-table-column property="xb" label="序号" width="50"></el-table-column>
<el-table-column property="deviceName" label="设备名称" width="150"></el-table-column>
@@ -68,7 +77,7 @@
</template>
<script>
- import {getList, remove, update, add, getclient, getDeptLazyTree,getAll} from "@/api/client/client";
+ import {getList, remove, update, add, getclient, getDeptLazyTree, getAll} from "@/api/client/client";
import {mapGetters} from "vuex";
export default {
@@ -86,7 +95,7 @@
total: 0
},
dialogTableVisible: false,
- gridData:null,
+ gridData: null,
selectionList: [],
treeDeptId: '',
treeData: [],
@@ -121,6 +130,7 @@
labelWidth: '100',
dialogWidth: 950,
menuWidth: 160,
+ size: "mini",
tip: false,
searchShow: true,
searchMenuSpan: 4,
@@ -135,8 +145,29 @@
label: "设备名称",
width: 130,
prop: "deviceName",
- searchPlaceholder: "请输入设备名称/编号",
+ searchPlaceholder: "设备名称/编号",
search: true,
+ },
+ {
+ label: "到期时间",
+ prop: "releaseTimeRange",
+ type: "datetime",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ searchRange: true,
+ searchSpan: 5,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入时间",
+ trigger: "blur"
+ }
+ ]
},
{
label: "设备编号",
@@ -201,6 +232,10 @@
type: "select",
slot: true,
width: 100,
+ rules: [{
+ required: true,
+ trigger: "blur"
+ }],
dicData: [
{
label: "撤防",
@@ -213,26 +248,30 @@
]
}, {
label: "设备状态",
- prop: "dtype",
- search: true,
+ prop: "dxzt",
slot: true,
- type: "select",
- dicData: [
- {
- label: "掉线",
- value: "0"
- },
- {
- label: "在线",
- value: "1"
- }
- ]
+ addDisplay: false,
+ editDisplay: false,
}, {
+ label: "缴费信息",
+ prop: "pay",
+ },
+ {
label: "设备类型",
prop: "deviceType",
- width: 150,
search: true,
- }, {
+ searchSpan: 3,
+ searchLabelWidth: 80,
+ searchPlaceholder: "请选择",
+ type: "select",
+ props: {
+ label: "dictValue",
+ value: "dictValue"
+ },
+ dicUrl: "/api/blade-system/dict-biz/child-list?parentId=1357568691367661569",
+ span: 6
+ },
+ {
label: "权属",
prop: "ownership",
}, {
@@ -240,19 +279,26 @@
prop: "street",
width: 150
}, {
- label: "缴费信息",
- prop: "pay",
- }, {
label: "安装时间",
prop: "stime",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
width: 130
}, {
label: "到期时间",
prop: "expireTime",
- width: 130
+ type: "datetime",
+ slot: true,
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ width: 150
}, {
label: "最后上传时间",
prop: "heartbeat",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
width: 130
},
@@ -392,12 +438,12 @@
if (releaseTimeRange) {
values = {
...params,
- releaseTime_datege: releaseTimeRange[0],
- releaseTime_datelt: releaseTimeRange[1],
+ beginTime: releaseTimeRange[0],
+ endTime: releaseTimeRange[1],
...this.query
};
values.releaseTimeRange = null;
- }else{
+ } else {
values = {
...params,
...this.query
@@ -407,30 +453,48 @@
getList(page.currentPage, page.pageSize, values, this.treeDeptId).then(res => {
const data = res.data.data;
this.page.total = data.total;
+
+ var Dqdate = new Date().getTime();
+
+ for (var i = 0; i < data.records.length; i++) {
+ var date = new Date(data.records[i].heartbeat).getTime();
+ if ((Dqdate - date) >= (60 * 60 * 24 * 1000)) {
+ data.records[i].dxzt = 0;
+ } else if (data.records[i].heartbeat == "") {
+ data.records[i].dxzt = 0;
+ } else {
+ data.records[i].dxzt = 1;
+ }
+ }
+
+ data.records.sort((a,b)=>{
+ return a.dxzt - b.dxzt;
+ });
+
this.data = data.records;
this.loading = false;
this.selectionClear();
});
}, rowStyle({row, column, rowIndex}) {
- if (row.heartbeat != null && row.heartbeat != "" ) {
+ if (row.heartbeat != null && row.heartbeat != "") {
var date = new Date(row.heartbeat).getTime();
var Dqdate = new Date().getTime();
if ((Dqdate - date) >= (60 * 60 * 24 * 1000)) {
return {
- color: "#15a2fe"
+ color: "#fe1515"
};
}
- }else if(row.heartbeat == ""){
+ } else if (row.heartbeat == "") {
return {
- color: "#15a2fe"
+ color: "#fe1515"
};
}
},
- payWin(){
+ payWin() {
var that = this;
getAll().then(res => {
- var data =res.data.data;
+ var data = res.data.data;
var lists = [];
var xb = 0;
for (var i = 0; i < data.length; i++) {
@@ -440,7 +504,7 @@
lists.push(data[i]);
}
}
- if (lists.length > 0){
+ if (lists.length > 0) {
that.gridData = lists;
that.dialogTableVisible = true;
}
@@ -452,12 +516,12 @@
</script>
<style>
- .payWin{
+ .payWin {
overflow-y: auto;
height: 350px;
}
- .payWin .el-dialog__body{
+ .payWin .el-dialog__body {
padding-top: 0px !important;
}
--
Gitblit v1.9.3