diff --git a/src/components/FormComponents/CustomForm/FormItemSelf.vue b/src/components/FormComponents/CustomForm/FormItemSelf.vue
index 65b204318c925508efdd0eb43559057ed2490ea3..71b8cf47bc0084966ef1fe8dce3497abbfccac0e 100644
--- a/src/components/FormComponents/CustomForm/FormItemSelf.vue
+++ b/src/components/FormComponents/CustomForm/FormItemSelf.vue
@@ -214,12 +214,22 @@
:multiple-limit="item.limit"
@change="handleChange"
>
-
+
+
+
+
+
+
@@ -440,6 +450,7 @@ export default {
age: "",
pickerOptions,
rangeOptions,
+ unionList: [],
showChildren: false, // 用来控制不同表单
}
},
@@ -471,6 +482,9 @@ export default {
this.timerangeReset()
this.numberReset()
this.checkboxReset()
+ if (this.item.prop == "union_id") {
+ this.unionList = [{ label: "嗡嗡嗡", value: 1 }]
+ }
},
mounted() {
this.showFormItem()
@@ -611,6 +625,7 @@ export default {
}
val && this.$set(this.form, ruleTarget, val)
},
+ // 根据生日设置年龄回显
getAge() {
if (this.form.birthday) {
var birthday = new Date(this.form.birthday.replace(/-/g, "/"))
@@ -810,6 +825,7 @@ export default {
handleBlur() {
this.handleAlgorithm()
},
+ // 每个表单值改变的方法
handleChange(val) {
this.checkboxRepel(val)
this.handleAlgorithm()
diff --git a/src/layouts/components/Avatar/index.vue b/src/layouts/components/Avatar/index.vue
index e7ec045f93e5421b944fab09b1ad1061a3ae1059..f0a35bcb2013f7dc0dc0a1447595b6594eaca86a 100644
--- a/src/layouts/components/Avatar/index.vue
+++ b/src/layouts/components/Avatar/index.vue
@@ -53,6 +53,7 @@ export default {
async () => {
const fullPath = this.$route.fullPath
await this.$store.dispatch("user/logout")
+ this.$store.commit("table/removeSelectedIndex")
this.$router.push(`/home?redirect=${fullPath}`)
}
)
diff --git a/src/layouts/components/NavBar/index.vue b/src/layouts/components/NavBar/index.vue
index eaa8301b7117655ce8d06375272da9ed3a256c51..4b30ca6fb9bea0fb5ea0203ff50f3442c4316920 100644
--- a/src/layouts/components/NavBar/index.vue
+++ b/src/layouts/components/NavBar/index.vue
@@ -8,16 +8,27 @@
-
-
-
-
+
+
{{ item.date }}
@@ -80,14 +100,17 @@ export default {
screeningList: [
{
title: "社区筛查",
+
src: require("@/assets/img/DataCenter/shequ.png"),
},
{
title: "医院筛查",
+
src: require("@/assets/img/DataCenter/yiyuan.png"),
},
{
title: "体检筛查",
+
src: require("@/assets/img/DataCenter/tijian.png"),
},
],
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 81af5d964305416a99e7f222afb4a89cb0b2d5f2..4b7783ae39c275164a51eb7148da81b723f9c02e 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -77,6 +77,9 @@
{{ item.title }}
+
+ {{ item.desc }}
+
@@ -84,7 +87,7 @@
保存确定
@@ -123,16 +126,19 @@ export default {
{
title: "社区筛查",
value: "1",
+ desc: "在社区对该地区居民进行招募与筛查",
src: require("@/assets/img/DataCenter/shequ.png"),
},
{
title: "医院筛查",
value: "2",
+ desc: "无消化道症状的门诊人群",
src: require("@/assets/img/DataCenter/yiyuan.png"),
},
{
title: "体检筛查",
value: "3",
+ desc: "参加单位或个人体检的人群",
src: require("@/assets/img/DataCenter/tijian.png"),
},
],
@@ -156,7 +162,7 @@ export default {
},
},
created() {
- this.selectedIndex = localStorage.getItem("selectedIndex") || ""
+ this.selectedIndex = sessionStorage.getItem("selectedIndex") || ""
this.curSelectedIndex = String(this.selectedIndex) ? this.selectedIndex : ""
},
mounted() {
@@ -335,6 +341,9 @@ export default {
box-shadow: none;
}
}
+::v-deep .homeDialog {
+ min-width: 1036px;
+}
::v-deep .homeDialog .el-dialog__header {
display: none;
}
@@ -355,6 +364,12 @@ export default {
li {
cursor: pointer;
}
+ .desc {
+ font-size: 14px;
+ font-family: AlibabaPuHuiTiR;
+ color: #666666;
+ text-indent: 38px;
+ }
.screeningItem {
display: flex;
.circle {
diff --git a/src/store/modules/table.js b/src/store/modules/table.js
index 6a63cce71f7407174893a71abbfd50668e0cdee3..e49519f52fef3e3e513b044b8db71f9b41cb6eda 100644
--- a/src/store/modules/table.js
+++ b/src/store/modules/table.js
@@ -1,6 +1,6 @@
const state = {
fontSize: localStorage.getItem("fontSize") || 1,
- selectedIndex: localStorage.getItem("selectedIndex") || "",
+ selectedIndex: sessionStorage.getItem("selectedIndex") || "",
}
const getters = {
fontSize: (state) => state.fontSize,
@@ -12,7 +12,11 @@ const mutations = {
},
setSelectedIndex(state, selectedIndex) {
state.selectedIndex = selectedIndex
- localStorage.setItem("selectedIndex", selectedIndex)
+ sessionStorage.setItem("selectedIndex", selectedIndex)
+ },
+ removeSelectedIndex() {
+ state.selectedIndex = ""
+ sessionStorage.removeItem("selectedIndex")
},
}
const actions = {}
diff --git a/src/views/dataoverview/index.vue b/src/views/dataoverview/index.vue
index b27024e9f9f8cbcf74ef606c10c5851aa0285cf6..ef416272d234f8fd2c298b8e458a6e6cb632f19a 100644
--- a/src/views/dataoverview/index.vue
+++ b/src/views/dataoverview/index.vue
@@ -40,7 +40,7 @@ export default {
return {
listLoading: false,
selectedIndex: sessionStorage.getItem("homeSelectedIndex") - 0 || 0,
- headList: ["社区筛查", "医院筛查", "体检筛查"],
+ headList: ["筛查概览", "社区筛查", "医院筛查", "体检筛查"],
columns: [
{
label: "医联体",
@@ -109,7 +109,7 @@ export default {
},
getPatientPage() {
this.listLoading = true
- let data = { patientFrom: this.selectedIndex - 0 + 1 }
+ let data = { patientFrom: this.selectedIndex }
getPatientPage(data).then((res) => {
this.listLoading = false
if (res.code === 1) {