1.修改筛查条件，社区，医院，体检，修改为每次登陆后都弹窗

2.修改筛查填报场景需求
3.数据概览增加筛查概览
4.医联体修改为下拉，预备接口
5.随访默认同意

src/components/FormComponents/CustomForm/FormItemSelf.vue

@@ -214,12 +214,22 @@
                   :multiple-limit="item.limit"
                   @change="handleChange"
                 >
+                  <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()

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}`)
         }
       )

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
-        : "" :''
+            ? 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"),
         },
       ],

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 {

src/store/modules/table.js

 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 = {}

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) {