From b9db46787e3e106207f1625958e3ca7adbc41032 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 19 Mar 2021 11:19:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/healthcode/healthcode.vue | 52 +++++++++++++++++++++++++---------------------------
1 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index 977466e..97dfb95 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -75,26 +75,11 @@
},
{
label: "检测时间",
- prop: "createTime"
+ prop: "dtime"
},
{
- label: "体温",
- prop: "tempRed"
- },
- {
- label: '图片',
- prop: 'picture',
- type: 'upload',
- width: 300,
- listType: 'picture-img',
- span: 24,
- propsHttp: {
- res: 'data'
- },
- canvasOption: {
- text: 'avue',
- ratio: 0.1
- }
+ label: '性别',
+ prop: 'sex'
},
{
label: "检测时间",
@@ -118,21 +103,37 @@
]
},
{
- label: "体温状态",
+ label: "行政区",
+ searchSpan: 4,
+ prop: "addvcd",
+ search: true,
+ type: "tree",
+ dicUrl: "/api/blade-jfpts/district/district/selectd",
+ props: {
+ label: "addvnm",
+ value: "addvcds"
+ }
+ },
+ {
+ label: "健康码颜色",
search: true,
searchLabelWidth: 120,
- prop: "status",
+ prop: "type",
searchSpan: 5,
width:110,
type: "select",
dicData: [
{
- label: "正常",
- value: 0
+ label: "绿色",
+ value: 1
},
{
- label: "异常",
- value: 1
+ label: "黄色",
+ value: 2
+ },
+ {
+ label: "红色",
+ value: 3
}
],
}
@@ -198,9 +199,6 @@
this.loading = false;
this.selectionClear();
});
- },
- handleHealthcode(row) {
- this.$router.push({ path: `/healthcode/healthcode/${row.deviceNumber}` });
}
}
};
--
Gitblit v1.9.3