From 06bbb5fa68cc5f23e4e254cbe24f65bc7bab163c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 24 Jun 2021 16:02:29 +0800
Subject: [PATCH] 名称修改
---
src/views/clientManagement/clientManagement.vue | 248 ++++---------------------------------------------
1 files changed, 20 insertions(+), 228 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index d1eb303..52dd008 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -39,9 +39,9 @@
v-if="permission.clientManagement_delete"
@click="handleDelete">删 除
</el-button>
- <span><!--图例 components-->
- <Legend :datas="datalistLIU"></Legend>
- </span>
+<!-- <span><!–图例 components–>-->
+<!-- <Legend :datas="datalistLIU"></Legend>-->
+<!-- </span>-->
</template>
<template slot-scope="{ row }" slot="devicestate">
@@ -329,27 +329,6 @@
message: "请输入设备名称",
trigger: "blur"
}],
- },
- {
- label: "到期时间",
- prop: "releaseTimeRange",
- type: "datetime",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- searchRange: true,
- searchSpan: 6,
- hide: true,
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- search: true,
- rules: [
- {
- required: true,
- message: "请输入时间",
- trigger: "blur"
- }
- ]
}
,
{
@@ -409,39 +388,7 @@
// }
// ]
// },
- {
- label: "序列号",
- prop: "serialNumber",
- hide: true,
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- rules: [{
- required: true,
- message: "请输入序列号",
- trigger: "blur"
- }],
- },
- {
- label: "通道号",
- prop: "channelNumber",
- hide: true,
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- rules: [{
- required: true,
- message: "请输入通道号",
- trigger: "blur"
- }],
- }, {
- label: "缴费状态",
- prop: "type",
- slot: true,
- sortable:true,
- addDisplay: false,
- editDisplay: false,
- }, {
+ {
label: "设备厂商",
prop: "manufacturers",
addDisplay: true,
@@ -460,27 +407,6 @@
message: "请选择设备厂商",
trigger: "blur"
}],
- }, {
- label: "布撤防状态",
- prop: "devicestate",
- type: "select",
- slot: true,
- width: 100,
- rules: [{
- required: true,
- message: "请选择布撤防状态",
- trigger: "blur"
- }],
- dicData: [
- {
- label: "撤防",
- value: "0"
- },
- {
- label: "布防",
- value: "1"
- }
- ]
},
{
label: "设备状态",
@@ -489,19 +415,22 @@
sortable:true,
addDisplay: false,
editDisplay: false,
+ }, {
+ label: "地址",
+ prop: "street",
+ span:10,
+ hide: true,
},
{
- label: "故障状态",
- prop: "state",
- addDisplay: false,
- editDisplay: false,
- hide:true
- },
- {
- label: "故障原因",
- prop: "reason",
- addDisplay: false,
- editDisplay: false
+ label: null,
+ prop: "map",
+ labelWidth: "0",
+ searchSpan:0,
+ maxlength:0,
+ hide: true,
+ span: 2,
+ // display:false,
+ component: "AvueMap"
},
{
label: "省份",
@@ -568,22 +497,6 @@
addDisplay: true,
editDisplay: true,
viewDisplay: true,
- }, {
- label: "地址",
- prop: "street",
- span:10,
- hide: true,
- },
- {
- label: null,
- prop: "map",
- labelWidth: "0",
- searchSpan:0,
- maxlength:0,
- hide: true,
- span: 2,
- // display:false,
- component: "AvueMap"
},
{
label: "经度",
@@ -606,113 +519,6 @@
return value = value.substring(0,10);
},
span:5,
- },
-
- {
- label: "主要负责人",
- prop: "oneId",
- type: "tree",
- dicUrl: "/api/blade-system/dept/Batrees",
- props: {
- label: "title"
- },
- width: 72,
- hide: true,
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- rules: [{
- required: true,
- message: "请选择主要负责人",
- trigger: "blur"
- }],
- },
- {
- label: "主要负责人电话",
- prop: "onePhone",
- width: 110,
- hide: true,
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- rules: [{
- required: true,
- message: "请输入负责人电话",
- trigger: "blur"
- }],
- }, {
- label: "负责人1",
- prop: "twoId",
- type: "tree",
- dicUrl: "/api/blade-system/dept/Batrees",
- props: {
- label: "title"
- },
- width: 72,
- hide: true,
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- },
- {
- label: "负责人1电话",
- prop: "twoPhone",
- width: 110,
- hide: true,
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- }, {
- label: "负责人2",
- prop: "threeId",
- type: "tree",
- dicUrl: "/api/blade-system/dept/Batrees",
- props: {
- label: "title"
- },
- width: 72,
- hide: true,
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- },
- {
- label: "负责人2电话",
- prop: "threePhone",
- width: 110,
- hide: true,
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- }, {
- label: "到期时间",
- prop: "expireTime",
- type: "datetime",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- width: 130,
- hide: true,
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- }, {
- label: "缴费信息",
- prop: "pay",
- hide: true,
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- }, {
- label: "安装时间",
- prop: "stime",
- type: "datetime",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- width: 130,
- hide: true,
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
},
{
label: "心跳时间",
@@ -1024,17 +830,9 @@
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) >= (150 * 1000)) {
- data.records[i].dxzt = 0;
- } else if (data.records[i].heartbeat == "") {
- data.records[i].dxzt = 0;
- } else {
if(data.records[i].dtype==1){
- data.records[i].dxzt = data.records[i].dtype;
+ data.records[i].dxzt = 1;
}
if(data.records[i].dtype==2){
data.records[i].dxzt = 2;
@@ -1043,15 +841,9 @@
data.records[i].dxzt = 3;
}
if(data.records[i].dtype=="" || data.records[i].dtype==0){
- data.records[i].dxzt = 1;
+ data.records[i].dxzt = 0;
}
-
- }
}
-
- // data.records.sort((a, b) => {
- // return a.dxzt - b.dxzt;
- // });
this.data = data.records;
this.loading = false;
--
Gitblit v1.9.3