From cecf184fa181ab30882b889ba34029c954e9f63a Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 03 Feb 2021 10:28:23 +0800
Subject: [PATCH] 客户列表
---
src/views/realTimePolice/real.vue | 6 +++++-
vue.config.js | 1 +
src/views/clientManagement/clientManagement.vue | 31 ++++++++++++++++++++++++++++---
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index f0b8a05..78c2d1f 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -54,7 +54,7 @@
<template slot-scope="{ row }" slot="expireTime">
<span>
{{
- row.expireTime
+ 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>
@@ -149,6 +149,27 @@
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: "设备编号",
prop: "deviceNumber",
width: 130
@@ -211,6 +232,10 @@
type: "select",
slot: true,
width: 100,
+ rules: [{
+ required: true,
+ trigger: "blur"
+ }],
dicData: [
{
label: "撤防",
@@ -402,8 +427,8 @@
if (releaseTimeRange) {
values = {
...params,
- releaseTime_datege: releaseTimeRange[0],
- releaseTime_datelt: releaseTimeRange[1],
+ beginTime: releaseTimeRange[0],
+ endTime: releaseTimeRange[1],
...this.query
};
values.releaseTimeRange = null;
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 91b517c..769b7fe 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -613,7 +613,6 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
- debugger
const { releaseTimeRange } = this.query;
let values = {
...params
@@ -636,6 +635,11 @@
getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
+
+ data.records.sort((a,b)=>{
+ return a.jtype - b.jtype;
+ });
+
this.data = data.records;
this.loading = false;
this.selectionClear();
diff --git a/vue.config.js b/vue.config.js
index c69f3a5..803ac04 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,6 +34,7 @@
proxy: {
'/api': {
//本地服务接口地址
+ //target: 'http://192.168.0.102:82/',
target: 'https://s16s652780.51mypc.cn/api/',
//远程演示服务地址,可用于直接启动项目
//target: 'https://saber.bladex.vip/api',
--
Gitblit v1.9.3