From 89d4495d39f259d3cf4a76831b607547d3d4a464 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 31 Mar 2021 13:44:21 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue
---
src/views/clientManagement/clientManagement.vue | 70 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 29 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 0bb3a1d..70e040d 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -18,6 +18,7 @@
@row-update="rowUpdate"
@row-save="rowSave"
:row-style="rowStyle"
+ row-class-name="tabFontSize"
:before-open="beforeOpen"
@search-change="searchChange"
@search-reset="searchReset"
@@ -238,6 +239,7 @@
labelWidth: '100',
dialogWidth: 950,
menuWidth: 250,
+ align:"center",
size: "mini",
tip: false,
searchShow: true,
@@ -246,7 +248,7 @@
border: true,
index: true,
viewBtn: true,
- selection: false,
+ selection: true,
dialogClickModal: false,
column: [
{
@@ -255,23 +257,7 @@
prop: "deviceName",
searchPlaceholder: "设备名称/编号",
search: true,
- },
- {
- label: "上级菜单",
- prop: "deptId",
- type: "tree",
- dicUrl: "/api/blade-system/dept/trees",
- hide: true,
- props: {
- label: "title"
- },
- rules: [
- {
- required: false,
- message: "请选择上级菜单",
- trigger: "click"
- }
- ]
+ sortable:true,
},
{
label: "到期时间",
@@ -304,6 +290,23 @@
{
required: false,
message: "请输入设备编号",
+ trigger: "click"
+ }
+ ]
+ },
+ {
+ label: "使用方",
+ prop: "deptId",
+ width: 200,
+ type: "tree",
+ dicUrl: "/api/blade-system/dept/trees",
+ props: {
+ label: "title"
+ },
+ rules: [
+ {
+ required: false,
+ message: "请选择上级菜单",
trigger: "click"
}
]
@@ -440,11 +443,10 @@
span: 3,
labelWidth: "0",
className: "cityClass3"
- },
- {
- label: "权属",
- prop: "ownership",
- width: 150
+ }, {
+ label: "街道",
+ prop: "street",
+ width: 200
},
{
label: "负责人",
@@ -452,13 +454,9 @@
width: 72
},
{
- label: "负责人联系方式",
+ label: "负责人电话",
prop: "onePhone",
width: 110
- }, {
- label: "街道",
- prop: "street",
- width: 200
}, {
label: "到期时间",
prop: "expireTime",
@@ -477,7 +475,7 @@
valueFormat: "yyyy-MM-dd HH:mm:ss",
width: 130
}, {
- label: "最后上传时间",
+ label: "心跳时间",
prop: "heartbeat",
type: "datetime",
format: "yyyy-MM-dd",
@@ -652,6 +650,16 @@
...this.query
};
}
+
+ //在线设备
+ if(this.$route.query.dxtype != undefined){
+ values = {
+ ...params,
+ dxtype: this.$route.query.dxtype,
+ ...this.query,
+ };
+ }
+
this.loading = true;
getList(page.currentPage, page.pageSize, values, this.treeDeptId).then(res => {
const data = res.data.data;
@@ -787,4 +795,8 @@
color: red;
}
+ .tabFontSize{
+ font-size: 15px;
+ }
+
</style>
--
Gitblit v1.9.3