From 9ced232db5127d30105bb9f70e519f1b4f07f3b5 Mon Sep 17 00:00:00 2001
From: duanxiaohai <1812246227@qq.com>
Date: Mon, 11 Nov 2024 16:05:10 +0800
Subject: [PATCH] gx

---
 src/view/dialog/dialogPush.vue |  2 +-
 src/view/sy_details.vue        | 64 +++++++++++++++++++++++-----------
 2 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/src/view/dialog/dialogPush.vue b/src/view/dialog/dialogPush.vue
index bac156f..06658a6 100644
--- a/src/view/dialog/dialogPush.vue
+++ b/src/view/dialog/dialogPush.vue
@@ -160,7 +160,7 @@ watch(
     // }
   //   return item;
   // });
-    console.log(555, props.tableData);
+    // console.log(555, props.tableData);
   }
 );
 
diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue
index b964f4f..f7710b0 100644
--- a/src/view/sy_details.vue
+++ b/src/view/sy_details.vue
@@ -1,5 +1,10 @@
 <template>
-  <div class="module" v-loading="isLoading">
+  <div
+    class="module"
+    v-loading.fullscreen.lock="isLoading"
+    element-loading-text="Loading..."
+    element-loading-background="rgba(122, 122, 122, 0.5)"
+  >
     <div class="displayFlex left_bg">
       <div class="bt_title">
         <div class="yd_title">
@@ -30,6 +35,7 @@
               v-if="item.type == 'slot'"
               :label="item.label"
               :prop="item.property"
+              :show-overflow-tooltip="item.tooltip"
               :width="item.width || ''"
             >
               <template #default="scope">
@@ -45,6 +51,7 @@
               :label="item.label"
               :width="item.width || ''"
               :prop="item.property"
+              :show-overflow-tooltip="item.tooltip"
             />
           </template>
         </el-table>
@@ -155,6 +162,7 @@
               v-if="item.type == 'slot'"
               :label="item.label"
               :prop="item.property"
+              :show-overflow-tooltip="item.tooltip"
               :width="item.width || ''"
               :align="item.align || 'left'"
             >
@@ -219,6 +227,7 @@
               :label="item.label"
               :width="item.width || ''"
               :prop="item.property"
+              :show-overflow-tooltip="item.tooltip"
             />
           </template>
         </el-table>
@@ -314,6 +323,7 @@ const data = reactive({
     {
       label: "地址",
       property: "dz",
+      tooltip: true,
     },
     {
       label: "年龄",
@@ -364,10 +374,11 @@ const data = reactive({
       align: "center",
       type: "slot",
     },
-    {
-      label: "地址",
-      property: "dz",
-    },
+    // {
+    //   label: "地址",
+    //   property: "dz",
+    //   tooltip: true,
+    // },
     {
       label: "年龄",
       property: "nl",
@@ -466,10 +477,11 @@ const lampScreen = (val) => {
         align: "center",
         type: "slot",
       },
-      {
-        label: "地址",
-        property: "dz",
-      },
+      // {
+      //   label: "地址",
+      //   property: "dz",
+      //   tooltip: true,
+      // },
       {
         label: "年龄",
         property: "nl",
@@ -501,10 +513,11 @@ const lampScreen = (val) => {
         align: "center",
         type: "slot",
       },
-      {
-        label: "地址",
-        property: "dz",
-      },
+      // {
+      //   label: "地址",
+      //   property: "dz",
+      //   tooltip: true,
+      // },
       {
         label: "年龄",
         property: "nl",
@@ -756,6 +769,11 @@ let loadingCount = 0; // 计数器，用于跟踪未完成请求的数量
 function startLoading() {
   loadingCount++;
   isLoading.value = true; // 有请求时，设置为 true
+  // const isLoading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(0, 0, 0, 0.7)',
+  // })
 }
 // 结束加载状态
 function stopLoading() {
@@ -977,6 +995,7 @@ onMounted(() => {
         {
           label: "地址",
           property: "dz",
+          tooltip: true,
         },
       ];
       data.column_2 = [
@@ -995,10 +1014,11 @@ onMounted(() => {
           label: "统一社会信用代码",
           property: "dxbm",
         },
-        {
-          label: "地址",
-          property: "dz",
-        },
+        // {
+        //   label: "地址",
+        //   property: "dz",
+        //   tooltip: true,
+        // },
       ];
     }
     if (data.name == "药品安全监管") {
@@ -1016,6 +1036,7 @@ onMounted(() => {
         {
           label: "地址",
           property: "dz",
+          tooltip: true,
         },
       ];
       data.column_2 = [
@@ -1034,10 +1055,11 @@ onMounted(() => {
           label: "许可证编号",
           property: "dxbm",
         },
-        {
-          label: "地址",
-          property: "dz",
-        },
+        // {
+        //   label: "地址",
+        //   property: "dz",
+        //   tooltip: true,
+        // },
       ];
     }
     listAssignment();