From dbadefa27c75fed7e81cdd0809d3aeec4da98fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Wed, 6 Nov 2024 15:11:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=97=E6=A0=B7=E6=8E=92?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NavigationBar/peopleCentre.vue | 44 ++++++++++---------
 .../NavigationBar/warningCentre.vue           | 28 ++++++++++--
 src/views/components/xiaoqu/house.vue         | 16 ++++---
 src/views/login.vue                           | 12 ++---
 4 files changed, 64 insertions(+), 36 deletions(-)

diff --git a/src/components/NavigationBar/peopleCentre.vue b/src/components/NavigationBar/peopleCentre.vue
index a13b654..547b362 100644
--- a/src/components/NavigationBar/peopleCentre.vue
+++ b/src/components/NavigationBar/peopleCentre.vue
@@ -252,36 +252,40 @@
               >查看详情</el-link
             >
           </div>
+          <div class="no-left">实际工作单位</div>
+          <div>{{ infoData.workunit || "/" }}</div>
+
+          <div>未更新天数</div>
+          <div>{{ infoData.daycount || "/" }} 天</div>
+          <div class="no-left">数据更新人员</div>
+          <div>{{ infoData.updateBy || "/" }}</div>
+          <div>数据更新时间</div>
+          <div>{{ infoData.updateTime || "/" }}</div>
+
           <div class="no-left">参保单位</div>
-          <div>{{ infoData.qymc || "/" }}</div>
-          <div>社保联系电话</div>
-          <div>{{ infoData.lxdh || "/" }}</div>
-          <div class="no-left">社保联系地址</div>
-          <div>{{ infoData.lxdzDzmc || "/" }}</div>
-          <div>民族</div>
+          <div>{{ infoData.qymc || "/" }} 天</div>
+          <div>参保类型</div>
           <div>
             <dict-tag
-              :options="dict.type.sys_nationality"
-              :value="infoData.mzcgf || '/'"
+              :options="dict.type.sys_sb_type"
+              :value="infoData.eacaabbff || '/'"
             />
           </div>
-          <div class="no-left">参保类型</div>
+          <div class="no-left">民族</div>
           <div>
             <dict-tag
-              :options="dict.type.sys_sb_type"
-              :value="infoData.eacaabbff || '/'"
+              :options="dict.type.sys_nationality"
+              :value="infoData.mzcgf || '/'"
             />
           </div>
-          <div>实际工作单位</div>
-          <div>{{ infoData.workunit || "/" }}</div>
-          <div class="no-left">数据更新人员</div>
-          <div>{{ infoData.updateBy || "/" }}</div>
-          <div>数据更新时间</div>
-          <div>{{ infoData.updateTime || "/" }}</div>
-          <div class="no-left">未更新天数</div>
-          <div>{{ infoData.daycount || "/" }} 天</div>
+
+          <div>社保联系电话</div>
+          <div style="width: 80%">{{ infoData.lxdh || "/" }}</div>
+
+          <div>社保联系地址</div>
+          <div style="width: 80%">{{ infoData.lxdzDzmc || "/" }}</div>
           <div>备注</div>
-          <div style="flex: 1">{{ infoData.remark || "/" }}</div>
+          <div style="width: 80%">{{ infoData.remark || "/" }}</div>
         </div>
       </div>
     </el-dialog>
diff --git a/src/components/NavigationBar/warningCentre.vue b/src/components/NavigationBar/warningCentre.vue
index f69cee7..e063cdd 100644
--- a/src/components/NavigationBar/warningCentre.vue
+++ b/src/components/NavigationBar/warningCentre.vue
@@ -264,8 +264,30 @@
           <div>{{ infoData.updateTime || "/" }}</div>
           <div>未更新天数</div>
           <div>{{ infoData.daycount || "/" }} 天</div>
-          <div class="no-left">备注</div>
-          <div style="flex: 1">{{ infoData.remark || "/" }}</div>
+          <div class="no-left">参保单位</div>
+          <div>{{ infoData.qymc || "/" }} 天</div>
+          <div>参保类型</div>
+          <div>
+            <dict-tag
+              :options="dict.type.sys_sb_type"
+              :value="infoData.eacaabbff || '/'"
+            />
+          </div>
+          <div class="no-left">民族</div>
+          <div>
+            <dict-tag
+              :options="dict.type.sys_nationality"
+              :value="infoData.mzcgf || '/'"
+            />
+          </div>
+
+          <div>社保联系电话</div>
+          <div style="width: 80%">{{ infoData.lxdh || "/" }}</div>
+
+          <div>社保联系地址</div>
+          <div style="width: 80%">{{ infoData.lxdzDzmc || "/" }}</div>
+          <div>备注</div>
+          <div style="width: 80%">{{ infoData.remark || "/" }}</div>
         </div>
       </div>
     </el-dialog>
@@ -281,7 +303,7 @@ import ColorCell from "@/components/ColorCell";
 import { exportyujing } from "@/api/home/index.js"; //预警
 import { handleColor } from "@/utils/myFuntion.js";
 export default {
-  dicts: ["b_color_type"],
+  dicts: ["b_color_type", "sys_nationality", "sys_sb_type"],
   components: { ColorCell },
   computed: {
     ...mapGetters(["leftColor", "rightTopColor", "queryParamsXiaoqu", "dept"]),
diff --git a/src/views/components/xiaoqu/house.vue b/src/views/components/xiaoqu/house.vue
index 55c7b35..7a808ea 100644
--- a/src/views/components/xiaoqu/house.vue
+++ b/src/views/components/xiaoqu/house.vue
@@ -551,8 +551,13 @@
           <div class="border-top">{{ infoData.qymc || "/" }}</div>
           <div class="no-left border-top">社保联系电话</div>
           <div class="border-top">{{ infoData.lxdh || "/" }}</div>
-          <div>社保联系地址</div>
-          <div>{{ infoData.lxdzDzmc || "/" }}</div>
+          <div>参保类型</div>
+          <div>
+            <dict-tag
+              :options="dict.type.sys_sb_type"
+              :value="infoData.eacaabbff || '/'"
+            />
+          </div>
           <div class="no-left">民族</div>
           <div>
             <dict-tag
@@ -560,12 +565,9 @@
               :value="infoData.mzcgf || '/'"
             />
           </div>
-          <div>参保类型</div>
+          <div>社保联系地址</div>
           <div style="flex: 1">
-            <dict-tag
-              :options="dict.type.sys_sb_type"
-              :value="infoData.eacaabbff || '/'"
-            />
+            {{ infoData.lxdzDzmc || "/" }}
           </div>
         </div>
       </div>
diff --git a/src/views/login.vue b/src/views/login.vue
index 50bb9e4..628d33d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -81,13 +81,13 @@
       </el-form-item>
     </el-form>
     <!--  底部  -->
-    <div class="el-login-footer" v-show="show">
-      <!-- <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span> -->
+    <!-- <div class="el-login-footer" v-show="show">
+  
       <span
         >Copyright © 2022-{{ year }} 此系统对老版本系统进行优化 “简约版”
         后期维护此版本为准，老版本不在维护。</span
       >
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -108,8 +108,8 @@ export default {
       year: moment().year(),
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "Xingyu@2022",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: "",
@@ -140,7 +140,7 @@ export default {
     },
   },
   created() {
-    this.showFootnote();
+    // this.showFootnote();
     this.getCode();
     this.getCookie();
   },