From 2d566accb6eae2fdadf4a4b6e6443a9030d5acdb Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 08 May 2021 11:36:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/supervisoryConsole/data.vue | 2 +-
src/views/zc/zc.vue | 4 ++--
src/page/login/codelogin.vue | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/page/login/codelogin.vue b/src/page/login/codelogin.vue
index b33f53d..88c2ad8 100644
--- a/src/page/login/codelogin.vue
+++ b/src/page/login/codelogin.vue
@@ -63,8 +63,8 @@
<avue-input-tree style="width:580px !important" default-expand-all v-model="loginForm.deptid" placeholder="请选择部门" type="tree"
:dic="dic"></avue-input-tree>
<div style="margin-top: 16px">
- <el-radio v-model="loginForm.sex" label="0" border size="medium">男</el-radio>
- <el-radio v-model="loginForm.sex" label="1" border size="medium">女</el-radio>
+ <el-radio v-model="loginForm.sex" label="1" border size="medium">男</el-radio>
+ <el-radio v-model="loginForm.sex" label="2" border size="medium">女</el-radio>
</div>
<el-form-item class="z-login-submit-prv">
<el-button size="small"
diff --git a/src/views/supervisoryConsole/data.vue b/src/views/supervisoryConsole/data.vue
index 47a2d36..a33fb03 100644
--- a/src/views/supervisoryConsole/data.vue
+++ b/src/views/supervisoryConsole/data.vue
@@ -278,7 +278,7 @@
var that = this;
getList().then((res) => {
res.data.data.forEach((item) => {
- if (item.waringType == "紧急求救") {
+ if (item.waringType == "一键求助") {
that.tableData.push(item);
}
});
diff --git a/src/views/zc/zc.vue b/src/views/zc/zc.vue
index 27628a1..715bd4d 100644
--- a/src/views/zc/zc.vue
+++ b/src/views/zc/zc.vue
@@ -102,11 +102,11 @@
dicData: [
{
label: "男",
- value: "0"
+ value: "1"
},
{
label: "女",
- value: "1"
+ value: "2"
}
],
},
--
Gitblit v1.9.3