From 7107b5a0dbc9d06ef57a6f40927f10e90b2fbf8a Mon Sep 17 00:00:00 2001
From: newPeter7 <aqdxeducation7@163.com>
Date: Fri, 2 Jun 2023 14:34:36 +0800
Subject: [PATCH] peter

---
 src/components/360View/dataInfo.vue      | 27 +++---------------------
 src/components/360View/index.vue         |  7 ++++--
 src/components/360View/special/index.vue | 10 ++++++++-
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/src/components/360View/dataInfo.vue b/src/components/360View/dataInfo.vue
index 8feb248..0445e02 100644
--- a/src/components/360View/dataInfo.vue
+++ b/src/components/360View/dataInfo.vue
@@ -37,23 +37,12 @@
           </template>
         </el-table-column>
         <el-table-column
+          :show-overflow-tooltip="true"
           align="center"
           label="OD"
         >
           <template slot-scope="scope">
             <div>
-<!--              <span v-if="scope.row.sort === 1">-->
-<!--                <span style="margin-right: 16px">结膜：充血</span>{{ scope.row.odValue }}-->
-<!--              </span>-->
-<!--              <span v-else-if="scope.row.sort === 2">-->
-<!--                <span style="margin-right: 16px">结膜：分泌物</span>{{ scope.row.odValue }}-->
-<!--              </span>-->
-<!--              <span v-else-if="scope.row.sort === 3">-->
-<!--                <span style="margin-right: 16px">视盘：视神经</span>{{ scope.row.odValue }}-->
-<!--              </span>-->
-<!--              <span v-else-if="scope.row.sort === 4">-->
-<!--                <span style="margin-right: 16px">视盘：CDR</span>{{ scope.row.odValue }}-->
-<!--              </span>-->
               <span v-if="scope.row.sort === 5">
                 <div v-if="scope.row.eyeType === 'OD'">
                   <p style="margin-right: 16px">球镜 DS：{{ scope.row.odSph }}</p>
@@ -79,23 +68,12 @@
           </template>
         </el-table-column>
         <el-table-column
+          :show-overflow-tooltip="true"
           align="center"
           label="OS"
         >
           <template slot-scope="scope">
             <div>
-<!--              <span v-if="scope.row.sort === 1">-->
-<!--                <span style="margin-right: 16px">结膜：充血</span>{{ scope.row.osValue }}-->
-<!--              </span>-->
-<!--              <span v-else-if="scope.row.sort === 2">-->
-<!--                <span style="margin-right: 16px">结膜：分泌物</span>{{ scope.row.osValue }}-->
-<!--              </span>-->
-<!--              <span v-else-if="scope.row.sort === 3">-->
-<!--                <span style="margin-right: 16px">视盘：视神经</span>{{ scope.row.osValue }}-->
-<!--              </span>-->
-<!--              <span v-else-if="scope.row.sort === 4">-->
-<!--                <span style="margin-right: 16px">视盘：CDR</span>{{ scope.row.osValue }}-->
-<!--              </span>-->
               <span v-if="scope.row.sort === 5">
                 <div v-if="scope.row.eyeType === 'OS'">
                   <p style="margin-right: 16px">球镜 DS：{{ scope.row.odSph }}</p>
@@ -121,6 +99,7 @@
           </template>
         </el-table-column>
         <el-table-column
+          :show-overflow-tooltip="true"
           align="center"
           label="OU"
           width="80"
diff --git a/src/components/360View/index.vue b/src/components/360View/index.vue
index f184e96..26c3a6c 100644
--- a/src/components/360View/index.vue
+++ b/src/components/360View/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <div style="flex: 1">
+    <div style="width: 100%">
       <div class="header">
         <img :src="require('@/assets/img/back-l.png')" alt="" style="margin-right: 8px;cursor: pointer" @click="backList">
         <img :src="require('@/assets/img/boy.png')" alt="">
@@ -516,6 +516,7 @@ export default {
 
   .contentBox{
     display: flex;
+    width: 100%;
     height: calc(100% - 100px);
   }
   .mr16{
@@ -626,7 +627,9 @@ export default {
     background-color: white;
   }
   .rightBox{
-    width: 100%;
+    //width: 100%;
+    flex: 1;
+    width:0;
     height: 100%;
     background-color: #F0F2F5;
   }
diff --git a/src/components/360View/special/index.vue b/src/components/360View/special/index.vue
index eecf766..265c46e 100644
--- a/src/components/360View/special/index.vue
+++ b/src/components/360View/special/index.vue
@@ -47,6 +47,7 @@
       <el-table
         v-loading="loadingFlag"
         class="tableBox"
+        border
         :data="extractData"
         style="width: 100%;margin-top: 16px"
         @selection-change="handleSelectionChange"
@@ -56,22 +57,28 @@
           width="55"
         />
         <el-table-column
+          :show-overflow-tooltip="true"
           prop="name"
           label="名称"
           width="90"
         />
         <el-table-column
+          :show-overflow-tooltip="true"
           prop="od"
           label="OD"
+          min-width="155"
         />
         <el-table-column
+          :show-overflow-tooltip="true"
           prop="os"
           label="OS"
+          min-width="155"
         />
         <el-table-column
+          :show-overflow-tooltip="true"
           prop="ou"
           label="OU"
-          width="80"
+          min-width="90"
         />
       </el-table>
     </div>
@@ -223,6 +230,7 @@ export default {
         item.id = item.name
         item.odValue = item.od
         item.osValue = item.os
+        item.ouValue = item.ou
       })
       eventBus.$emit('sendForData', data)
     }