From 324184d9dd1ec27594fd39610fdbd7be520e3516 Mon Sep 17 00:00:00 2001
From: miaojiale <1123971748@qq.com>
Date: Tue, 31 Jan 2023 17:31:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=AD=9B=E6=9F=A5=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E7=A4=BE=E5=8C=BA=EF=BC=8C=E5=8C=BB=E9=99=A2?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=93=E6=A3=80=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E7=99=BB=E9=99=86=E5=90=8E=E9=83=BD=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=202.=E4=BF=AE=E6=94=B9=E7=AD=9B=E6=9F=A5=E5=A1=AB?=
 =?UTF-8?q?=E6=8A=A5=E5=9C=BA=E6=99=AF=E9=9C=80=E6=B1=82=203.=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A6=82=E8=A7=88=E5=A2=9E=E5=8A=A0=E7=AD=9B=E6=9F=A5?=
 =?UTF-8?q?=E6=A6=82=E8=A7=88=204.=E5=8C=BB=E8=81=94=E4=BD=93=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89=EF=BC=8C=E9=A2=84=E5=A4=87?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=205.=E9=9A=8F=E8=AE=BF=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=90=8C=E6=84=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomForm/FormItemSelf.vue               | 28 +++++++++++---
 src/layouts/components/Avatar/index.vue       |  1 +
 src/layouts/components/NavBar/index.vue       | 37 +++++++++++++++----
 src/layouts/index.vue                         | 19 +++++++++-
 src/store/modules/table.js                    |  8 +++-
 src/views/dataoverview/index.vue              |  4 +-
 6 files changed, 78 insertions(+), 19 deletions(-)

diff --git a/src/components/FormComponents/CustomForm/FormItemSelf.vue b/src/components/FormComponents/CustomForm/FormItemSelf.vue
index 65b2043..71b8cf4 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"
                 >
-                  <el-option
-                    v-for="(opt, optIndex) in item.dicData"
-                    :key="optIndex"
-                    :label="opt.label"
-                    :value="opt.value"
-                  ></el-option>
+                  <template v-if="item.prop == 'union_id'">
+                    <el-option
+                      v-for="(opt, optIndex) in unionList"
+                      :key="optIndex"
+                      :label="opt.label"
+                      :value="opt.value"
+                    ></el-option>
+                  </template>
+                  <template v-else>
+                    <el-option
+                      v-for="(opt, optIndex) in item.dicData"
+                      :key="optIndex"
+                      :label="opt.label"
+                      :value="opt.value"
+                    ></el-option>
+                  </template>
                 </el-select>
               </template>
               <!-- 级联 -->
@@ -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 e7ec045..f0a35bc 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 eaa8301..4b30ca6 100644
--- a/src/layouts/components/NavBar/index.vue
+++ b/src/layouts/components/NavBar/index.vue
@@ -8,16 +8,27 @@
       <error-log></error-log>
       <!-- <avatar></avatar> -->
       <div class="fontSelect">
-        <div v-for="(item, index) in fontList" :key="index" class="font" @click="changeFont(index)">
+        <div
+          v-for="(item, index) in fontList"
+          :key="index"
+          class="font"
+          @click="changeFont(index)"
+        >
           <div class="label">{{ item.label }}</div>
         </div>
       </div>
-      <div v-show="curSelectedIndex != -1" class="community" @click="openModalFlag">
+      <div
+        v-show="curSelectedIndex != -1"
+        class="community"
+        @click="openModalFlag"
+      >
         <img src="~@/assets/img/DataCenter/shift.png" alt />
         {{
-        curSelectedIndex != -1
-        ? screeningList[curSelectedIndex - 1] ? screeningList[curSelectedIndex - 1].title
-        : "" :''
+          curSelectedIndex != -1
+            ? screeningList[curSelectedIndex - 1]
+              ? screeningList[curSelectedIndex - 1].title
+              : ""
+            : ""
         }}
       </div>
 
@@ -25,8 +36,17 @@
         <img src="~@/assets/img/DataCenter/user.png" alt />
         <avatar></avatar>
       </div>
-      <el-popover placement="top-start" width="200" trigger="click" popper-class="message-pop">
-        <div v-for="(item, index) in messageList" :key="index" class="message-box mb-24">
+      <el-popover
+        placement="top-start"
+        width="200"
+        trigger="click"
+        popper-class="message-pop"
+      >
+        <div
+          v-for="(item, index) in messageList"
+          :key="index"
+          class="message-box mb-24"
+        >
           <div class="top-box mb-12">
             <span class="blue-dot mt-5 mr-8"></span>
             <span class="top-text">{{ item.date }}</span>
@@ -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 81af5d9..4b7783a 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -77,6 +77,9 @@
               </div>
               <div class="itemTitle">{{ item.title }}</div>
             </div>
+            <div class="desc">
+              {{ item.desc }}
+            </div>
             <div class="ItemIamge">
               <img :src="item.src" alt />
             </div>
@@ -84,7 +87,7 @@
         </ul>
         <div class="submit">
           <el-button type="primary" class="btn" @click="setSelectedIndex"
-            >保存</el-button
+            >确定</el-button
           >
         </div>
       </div>
@@ -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 6a63cce..e49519f 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 b27024e..ef41627 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) {
-- 
2.22.0