From 68dd704226348324d908cac2cc9d7e4c08d546ff Mon Sep 17 00:00:00 2001
From: duanxiaohai <1812246227@qq.com>
Date: Thu, 17 Oct 2024 16:09:02 +0800
Subject: [PATCH] gx

---
 src/utils/request.js            |  2 +-
 src/view/dialog/dialogRW.vue    | 14 +++++++---
 src/view/dialog/dialogSf.vue    | 47 ++++++++++++++++++++++-----------
 src/view/table_gk/gk_infant.vue | 18 ++++++-------
 4 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index bb32fc8..111c7ed 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,7 +3,7 @@ import { ElMessage } from "element-plus";
 import tools from "@/utils/tools";
 import router from "../router";
 
-// axios.defaults.baseURL = 'https://jzzf.longyou.gov.cn:998/'
+axios.defaults.baseURL = 'https://jzzf.longyou.gov.cn:998/'
 axios.defaults.timeout = 120000;
 
 // HTTP request 拦截器
diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue
index f1f6fae..408db45 100644
--- a/src/view/dialog/dialogRW.vue
+++ b/src/view/dialog/dialogRW.vue
@@ -116,7 +116,9 @@
               </template>
             </el-table>
           </div>
-          <div class="lampMessage">注：工作日早上8:30自动推送浙政钉</div>
+          <div class="lampMessage">
+            注：每周或每月第一个工作日自动推送浙政钉通知
+          </div>
         </div>
       </div>
     </el-dialog>
@@ -277,6 +279,12 @@ watch(
         }
         return name;
       }
+      function maskYwfzr(ywfzr) {
+        // 使用正则匹配每个名字并进行替换
+        return ywfzr.replace(
+          /：([^,]+)/g,(match, name) => `：${maskName(name.trim())}`
+        );
+      }
       if (props.tableData.data.wxs.length > 0) {
         props.tableData.data.wxs.forEach((item, index) => {
           let obj = {
@@ -284,7 +292,7 @@ watch(
             bzlx: item.bzlx,
             qtbm: item.qtbm,
             zrks: item.zrks,
-            ywfzr: maskName(item.ywfzr),
+            ywfzr: maskYwfzr(item.ywfzr),
             fgldsj: item.fgldsj.replace(/^(\d{3})\d{4}(\d{4})$/, "$1****$2"),
           };
           data.tableData.push(obj);
@@ -298,7 +306,7 @@ watch(
             bzlx: item.bzlx,
             qtbm: item.qtbm,
             zrks: item.zrks,
-            ywfzr: maskName(item.ywfzr),
+            ywfzr: maskYwfzr(item.ywfzr),
             // fgldsj: item.fgldsj,
             fgldsj: item.fgldsj.replace(/^(\d{3})\d{4}(\d{4})$/, "$1****$2"),
           };
diff --git a/src/view/dialog/dialogSf.vue b/src/view/dialog/dialogSf.vue
index 9750664..7424dfb 100644
--- a/src/view/dialog/dialogSf.vue
+++ b/src/view/dialog/dialogSf.vue
@@ -54,24 +54,27 @@
           </div>
           <div class="item" style="margin-top: 20px">
             <div class="item_title">详情描述</div>
-            <div class="item_content">
+            <div class="item_content item_contents">
               <div class="item_content_item">
                 <div class="item_content_item_title">输入：</div>
-                <div class="item_content_item_content">
-                  {{ data.content.srsj }}
-                </div>
+                <div
+                  class="item_content_item_content"
+                  v-html="formatContent(data.content.srsj)"
+                ></div>
               </div>
               <div class="item_content_item">
                 <div class="item_content_item_title">对比逻辑：</div>
-                <div class="item_content_item_content">
-                  {{ data.content.bdlj }}
-                </div>
+                <div
+                  class="item_content_item_content"
+                  v-html="formatContent(data.content.bdlj)"
+                ></div>
               </div>
               <div class="item_content_item">
                 <div class="item_content_item_title">输出：</div>
-                <div class="item_content_item_content">
-                  {{ data.content.scjg }}
-                </div>
+                <div
+                  class="item_content_item_content"
+                  v-html="formatContent(data.content.scjg)"
+                ></div>
               </div>
             </div>
           </div>
@@ -80,7 +83,7 @@
     </el-dialog>
   </div>
 </template>
-  <script setup>
+<script setup>
 import {
   onMounted,
   reactive,
@@ -129,7 +132,10 @@ const data = reactive({
   title: "",
   content: {},
 });
-
+const formatContent = (content) => {
+  // 将换行符 \n 替换为 <br> 标签
+  return content.replace(/\n/g, "<br>");
+};
 // 监听
 watch(
   () => props.dialogShow,
@@ -158,7 +164,7 @@ const handle = (current) => {
   emit("handle", current);
 };
 </script>
-  <style lang="scss" scoped>
+<style lang="scss" scoped>
 :deep(.el-dialog) {
   --el-dialog-bg-color: none;
   --el-dialog-width: 50% !important;
@@ -251,8 +257,8 @@ const handle = (current) => {
   width: 100%;
   .item_title {
     font-family: PingFangSC, PingFang SC;
-    font-weight: 500;
-    font-size: 16px;
+    font-weight: 600;
+    font-size: 18px;
     color: #ffffff;
     line-height: 22px;
     letter-spacing: 3px;
@@ -270,12 +276,16 @@ const handle = (current) => {
     letter-spacing: 3px;
     color: #ffffff;
     line-height: 22px;
+    height: 144px;
+    overflow-y: auto;
     .item_content_item {
       width: 100%;
       display: flex;
       margin-bottom: 20px;
       box-sizing: border-box;
       .item_content_item_title {
+        font-weight: 600;
+        font-size: 17px;
         width: 100px;
         margin-right: 10px;
       }
@@ -287,6 +297,11 @@ const handle = (current) => {
       margin-bottom: 0px;
     }
   }
+  .item_contents {
+    height: 360px;
+  }
+  ::-webkit-scrollbar {
+    display: none; /* Chrome Safari */
+  }
 }
 </style>
-  
\ No newline at end of file
diff --git a/src/view/table_gk/gk_infant.vue b/src/view/table_gk/gk_infant.vue
index ed556a4..084873f 100644
--- a/src/view/table_gk/gk_infant.vue
+++ b/src/view/table_gk/gk_infant.vue
@@ -139,10 +139,10 @@ const data = reactive({
     jtysqyl: "49.37",
   }, //健康档案
   jsbgl: [], //精神病管理
-  fyglrs: {}, //系统管理
-  jktj: {}, //65岁健康体检
-  jkhd: [], //健康活动
-  lxbx: {}, //手工零星报销
+  // fyglrs: {}, //系统管理
+  // jktj: {}, //65岁健康体检
+  // jkhd: [], //健康活动
+  // lxbx: {}, //手工零星报销
 });
 const showEchart = ref(false);
 
@@ -152,12 +152,12 @@ const getData = async () => {
       data.medicalInsurance = res.data.medicalInsurance;
       data.lmb = res.data.lmb;
       data.mz = res.data.mz;
-      // data.jkda = res.data.jkda;
+      data.jkda = res.data.jkda;
       data.jsbgl = res.data.jsbgl;
-      data.fyglrs = res.data.fyglrs;
-      data.jktj = res.data.jktj;
-      data.jkhd = res.data.jkhd;
-      data.lxbx = res.data.lxbx;
+      // data.fyglrs = res.data.fyglrs;
+      // data.jktj = res.data.jktj;
+      // data.jkhd = res.data.jkhd;
+      // data.lxbx = res.data.lxbx;
       showEchart.value = true;
     }
   });