From 57282048850d03ee8db828f586c364577a44f02f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 03 Feb 2021 11:53:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/clientManagement/clientManagement.vue | 92 +++++++++++++++++++++++++++++----------------
1 files changed, 59 insertions(+), 33 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 0309872..78c2d1f 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -51,11 +51,13 @@
</el-tag>
</template>
- <template slot-scope="{ row }" slot="jfzt">
- <el-tag>{{
- row.type == "0" ? "已缴费" : row.type == "1" ? "待缴费" : "无"
+ <template slot-scope="{ row }" slot="expireTime">
+ <span>
+ {{
+ row.expireTime == "" ? row.expireTime : row.expireTime == null ? row.expireTime : row.expireTime.split(" ")[0]
}}
- </el-tag>
+ </span>
+ <i class="el-icon-warning" v-if="row.type == 1"></i>
</template>
</avue-crud>
@@ -75,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 {
@@ -93,7 +95,7 @@
total: 0
},
dialogTableVisible: false,
- gridData:null,
+ gridData: null,
selectionList: [],
treeDeptId: '',
treeData: [],
@@ -128,7 +130,7 @@
labelWidth: '100',
dialogWidth: 950,
menuWidth: 160,
- size:"mini",
+ size: "mini",
tip: false,
searchShow: true,
searchMenuSpan: 4,
@@ -145,6 +147,27 @@
prop: "deviceName",
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: "设备编号",
@@ -209,6 +232,10 @@
type: "select",
slot: true,
width: 100,
+ rules: [{
+ required: true,
+ trigger: "blur"
+ }],
dicData: [
{
label: "撤防",
@@ -223,15 +250,8 @@
label: "设备状态",
prop: "dxzt",
slot: true,
- addDisplay:false,
- editDisplay:false,
- }, {
- label: "缴费状态",
- prop: "jfzt",
- width: 100,
- addDisplay:false,
- editDisplay:false,
- slot: true,
+ addDisplay: false,
+ editDisplay: false,
}, {
label: "缴费信息",
prop: "pay",
@@ -251,21 +271,22 @@
label: "安装时间",
prop: "stime",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd hh:mm:ss",
width: 130
}, {
label: "到期时间",
prop: "expireTime",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
+ slot: true,
+ format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd hh:mm:ss",
- width: 130
+ width: 150
}, {
label: "最后上传时间",
prop: "heartbeat",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd hh:mm:ss",
width: 130
},
@@ -406,12 +427,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
@@ -424,22 +445,27 @@
var Dqdate = new Date().getTime();
- for(var i = 0;i< data.records.length;i++){
+ 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 == ""){
+ } else if (data.records[i].heartbeat == "") {
data.records[i].dxzt = 0;
- }else{
+ } 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)) {
@@ -448,16 +474,16 @@
};
}
- }else if(row.heartbeat == ""){
+ } else if (row.heartbeat == "") {
return {
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++) {
@@ -467,7 +493,7 @@
lists.push(data[i]);
}
}
- if (lists.length > 0){
+ if (lists.length > 0) {
that.gridData = lists;
that.dialogTableVisible = true;
}
@@ -479,12 +505,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