From 2159605a3b050816dc2b7c8a6554f06fa0f60338 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Tue, 23 Mar 2021 15:07:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/HealthyView/index.vue      |  33 +-
 .../components/PhysicalSignsDialog/index.vue  | 453 ++++++++----------
 2 files changed, 222 insertions(+), 264 deletions(-)

diff --git a/stdiet-ui/src/components/HealthyView/index.vue b/stdiet-ui/src/components/HealthyView/index.vue
index 674ffe218..2e96297fc 100644
--- a/stdiet-ui/src/components/HealthyView/index.vue
+++ b/stdiet-ui/src/components/HealthyView/index.vue
@@ -36,13 +36,15 @@
           />
           <div v-else>
             <span :style="{ color: '#8c8c8c' }">{{ con.title }}:</span>
-            <el-button
-              v-if="data[con.value]"
-              type="text"
-              size="mini"
-              @click="handleOnPreviewClick(data[con.value])"
-              >查看</el-button
-            >
+            <el-image
+              title="点击大图预览"
+              fit="contain"
+              style="width: auto; height: 80px"
+              :src="`${window.location.origin}${data[con.value]}`"
+              :preview-src-list="[
+                `${window.location.origin}${data[con.value]}`,
+              ]"
+            />
           </div>
         </div>
       </el-collapse-item>
@@ -63,17 +65,6 @@
         <el-button @click="onClosed">取 消</el-button>
       </div>
     </el-dialog>
-
-    <!-- 预览弹窗 -->
-    <el-dialog
-      :visible.sync="previewVisible"
-      title="体检报告"
-      class="preview_dialog_wrapper"
-    >
-      <div class="preview_content">
-        <img :src="previewUrl" alt="" class="preview_img" />
-      </div>
-    </el-dialog>
   </div>
 </template>
 <script>
@@ -125,8 +116,6 @@ export default {
 
     return {
       open: false,
-      previewVisible: false,
-      previewUrl: "",
       basicInfo,
       healthyInvestigate: [
         {
@@ -268,10 +257,6 @@ export default {
         }
       });
     },
-    handleOnPreviewClick(url) {
-      this.previewVisible = true;
-      this.previewUrl = `${window.location.origin}${url}`;
-    },
   },
 };
 </script>
diff --git a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
index 075bcbf80..25c913e10 100644
--- a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
+++ b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
@@ -1,258 +1,233 @@
 <template>
-  <div>
-    <el-dialog
-      :visible.sync="visible"
-      :title="title"
-      append-to-body
-      @closed="onClosed"
-      :width="dialogWidth"
-    >
-      <div style="display: flex; flex-direction: row">
-        <div v-if="showFlag" style="float: left; width: 900px">
-          <div
-            style="float: right; margin-top: -10px; margin-bottom: 10px"
-            v-show="dataList.length > 0"
+  <el-dialog
+    :visible.sync="visible"
+    :title="title"
+    append-to-body
+    @closed="onClosed"
+    :width="dialogWidth"
+  >
+    <div style="display: flex; flex-direction: row">
+      <div v-if="showFlag" style="float: left; width: 900px">
+        <div
+          style="float: right; margin-top: -10px; margin-bottom: 10px"
+          v-show="dataList.length > 0"
+        >
+          <!-- 只有新版健康评估信息才可修改，旧的体征数据不支持修改 -->
+          <el-button
+            type="info"
+            v-show="dataType == 0"
+            @click="generateReport()"
+            plain
+            >下载报告</el-button
           >
-            <!-- 只有新版健康评估信息才可修改，旧的体征数据不支持修改 -->
-            <el-button
-              type="info"
-              v-show="dataType == 0"
-              @click="generateReport()"
-              plain
-              >下载报告</el-button
+          <el-button
+            type="info"
+            v-show="dataType == 0"
+            @click="handleEditGuidanceClick()"
+            plain
+            >减脂指导</el-button
+          >
+          <el-button
+            v-hasPermi="['custom:healthy:edit']"
+            type="info"
+            v-show="dataType == 0"
+            @click="handleEditRemarkClick()"
+            plain
+            >修改备注</el-button
+          >
+          <el-button
+            v-hasPermi="['custom:healthy:edit']"
+            type="warning"
+            v-show="dataType == 0"
+            @click="handleEditHealthyClick()"
+            plain
+            >修改信息</el-button
+          >
+          <el-button
+            type="danger"
+            v-hasPermi="['custom:healthy:remove']"
+            @click="handleDelete()"
+            plain
+            >删除信息</el-button
+          >
+        </div>
+        <!-- 客户健康评估 -->
+        <div v-if="dataList.length > 0 && dataType == 0">
+          <!-- 基础信息 -->
+          <div
+            v-for="(item, index) in dataList.slice(0, 1)"
+            style="margin-bottom: 50px"
+            :key="index"
+          >
+            <div>
+              <p class="p_title_1" style="margin-top: 5px">
+                {{ titleArray[index] }}
+              </p>
+              <table-detail-message :data="item"></table-detail-message>
+            </div>
+            <!-- 备注 -->
+            <el-table
+              :data="remarkList"
+              :show-header="false"
+              border
+              :cell-style="remarkColumnStyle"
+              style="width: 100%"
             >
-            <el-button
-              type="info"
-              v-show="dataType == 0"
-              @click="handleEditGuidanceClick()"
-              plain
-              >减脂指导</el-button
-            >
-            <el-button
-              v-hasPermi="['custom:healthy:edit']"
-              type="info"
-              v-show="dataType == 0"
-              @click="handleEditRemarkClick()"
-              plain
-              >修改备注</el-button
-            >
-            <el-button
-              v-hasPermi="['custom:healthy:edit']"
-              type="warning"
-              v-show="dataType == 0"
-              @click="handleEditHealthyClick()"
-              plain
-              >修改信息</el-button
-            >
-            <el-button
-              type="danger"
-              v-hasPermi="['custom:healthy:remove']"
-              @click="handleDelete()"
-              plain
-              >删除信息</el-button
+              <el-table-column width="140" prop="remarkTitle">
+              </el-table-column>
+              <el-table-column prop="remarkValue">
+                <template slot-scope="scope">
+                  <auto-hide-message
+                    :data="scope.row.remarkValue"
+                    :maxLength="100"
+                /></template>
+              </el-table-column>
+            </el-table>
+            <!-- 指导 -->
+            <el-table
+              :data="guidanceList"
+              :show-header="false"
+              border
+              :cell-style="remarkColumnStyle"
+              style="width: 100%"
             >
+              <el-table-column width="140" prop="guidanceTitle">
+              </el-table-column>
+              <el-table-column prop="guidanceValue">
+                <template slot-scope="scope">
+                  <auto-hide-message
+                    :data="scope.row.guidanceValue"
+                    :maxLength="100"
+                /></template>
+              </el-table-column>
+            </el-table>
           </div>
-          <!-- 客户健康评估 -->
-          <div v-if="dataList.length > 0 && dataType == 0">
-            <!-- 基础信息 -->
+          <!-- 其他信息 -->
+          <div style="height: 390px; overflow: auto">
             <div
-              v-for="(item, index) in dataList.slice(0, 1)"
+              v-for="(item, index) in dataList.slice(1, 10)"
               style="margin-bottom: 50px"
               :key="index"
             >
               <div>
                 <p class="p_title_1" style="margin-top: 5px">
-                  {{ titleArray[index] }}
+                  {{ titleArray[index + 1] }}
                 </p>
-                <table-detail-message :data="item"></table-detail-message>
-              </div>
-              <!-- 备注 -->
-              <el-table
-                :data="remarkList"
-                :show-header="false"
-                border
-                :cell-style="remarkColumnStyle"
-                style="width: 100%"
-              >
-                <el-table-column width="140" prop="remarkTitle">
-                </el-table-column>
-                <el-table-column prop="remarkValue">
-                  <template slot-scope="scope">
-                    <auto-hide-message
-                      :data="scope.row.remarkValue"
-                      :maxLength="100"
-                  /></template>
-                </el-table-column>
-              </el-table>
-              <!-- 指导 -->
-              <el-table
-                :data="guidanceList"
-                :show-header="false"
-                border
-                :cell-style="remarkColumnStyle"
-                style="width: 100%"
-              >
-                <el-table-column width="140" prop="guidanceTitle">
-                </el-table-column>
-                <el-table-column prop="guidanceValue">
-                  <template slot-scope="scope">
-                    <auto-hide-message
-                      :data="scope.row.guidanceValue"
-                      :maxLength="100"
-                  /></template>
-                </el-table-column>
-              </el-table>
-            </div>
-            <!-- 其他信息 -->
-            <div style="height: 390px; overflow: auto">
-              <div
-                v-for="(item, index) in dataList.slice(1, 10)"
-                style="margin-bottom: 50px"
-                :key="index"
-              >
-                <div>
-                  <p class="p_title_1" style="margin-top: 5px">
-                    {{ titleArray[index + 1] }}
-                  </p>
-                  <table-detail-message
-                    :data="item"
-                    v-if="index != dataList.length - 2"
-                  ></table-detail-message>
-                  <el-table
-                    :show-header="false"
-                    v-if="index == dataList.length - 2"
-                    :data="item"
-                    border
-                    :cell-style="columnStyle"
-                    style="width: 100%"
-                  >
-                    <el-table-column width="140" prop="attr_name_one">
-                    </el-table-column>
-                    <el-table-column prop="value_one">
-                      <template slot-scope="scope">
-                        <!-- <auto-hide-message
-                          :data="
-                            scope.row.value_one == null
-                              ? ''
-                              : scope.row.value_one + ''
-                          "
-                          :maxLength="20"
-                        /> -->
-                        <el-button
-                          type="text"
-                          v-show="scope.row.value_one"
-                          @click="downloadFile(medicalReportPathArray[0])"
-                          >查看</el-button
-                        >
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                      width="140"
-                      prop="attr_name_two"
-                    ></el-table-column>
-                    <el-table-column prop="value_two">
-                      <template slot-scope="scope">
-                        <!-- <auto-hide-message
-                          :data="
-                            scope.row.value_two == null
-                              ? ''
-                              : scope.row.value_two + ''
-                          "
-                          :maxLength="20"
-                        /> -->
-                        <el-button
-                          type="text"
-                          v-show="scope.row.value_two"
-                          @click="downloadFile(medicalReportPathArray[1])"
-                          >查看</el-button
-                        >
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                      width="140"
-                      prop="attr_name_three"
-                    ></el-table-column>
-                    <el-table-column prop="value_three">
-                      <template slot-scope="scope">
-                        <!-- <auto-hide-message
-                          :data="
-                            scope.row.value_three == null
-                              ? ''
-                              : scope.row.value_three + ''
-                          "
-                          :maxLength="20"
-                        /> -->
-                        <el-button
-                          type="text"
-                          v-show="scope.row.value_three"
-                          @click="downloadFile(medicalReportPathArray[2])"
-                          >查看</el-button
-                        >
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </div>
-              </div>
-            </div>
-          </div>
-          <!-- 客户体征 -->
-          <div v-else>
-            <table-detail-message
-              v-show="dataList.length > 0"
-              :data="dataList"
-            ></table-detail-message>
-            <div
-              v-show="dataList.length == 0"
-              style="font-size: 20px; text-align: center"
-            >
-              <VueQr :text="copyValue" :logoSrc="logo" :size="256" />
-              <div style="text-align: center; margin-top: 20px">
-                <el-button
-                  icon="el-icon-share"
-                  size="small"
-                  title="点击复制链接"
-                  class="copyBtn"
-                  type="primary"
-                  :data-clipboard-text="copyValue"
-                  @click="handleCopy()"
-                  >健康评估表链接
-                </el-button>
+                <table-detail-message
+                  :data="item"
+                  v-if="index != dataList.length - 2"
+                ></table-detail-message>
+                <el-table
+                  :show-header="false"
+                  v-if="index == dataList.length - 2"
+                  :data="item"
+                  border
+                  :cell-style="columnStyle"
+                  style="width: 100%"
+                >
+                  <el-table-column width="140" prop="attr_name_one">
+                  </el-table-column>
+                  <el-table-column prop="value_one">
+                    <template slot-scope="scope">
+                      <el-image
+                        v-if="scope.row.value_one"
+                        title="点击大图预览"
+                        style="width: auto; height: 80px"
+                        fit="contain"
+                        :src="`${window.location.origin}${medicalReportPathArray[0]}`"
+                        :preview-src-list="[
+                          `${window.location.origin}${medicalReportPathArray[0]}`,
+                        ]"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    width="140"
+                    prop="attr_name_two"
+                  ></el-table-column>
+                  <el-table-column prop="value_two">
+                    <template slot-scope="scope">
+                      <el-image
+                        v-if="scope.row.value_two"
+                        title="点击大图预览"
+                        fit="contain"
+                        style="width: auto; height: 80px"
+                        :src="`${window.location.origin}${medicalReportPathArray[1]}`"
+                        :preview-src-list="[
+                          `${window.location.origin}${medicalReportPathArray[1]}`,
+                        ]"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    width="140"
+                    prop="attr_name_three"
+                  ></el-table-column>
+                  <el-table-column prop="value_three">
+                    <template slot-scope="scope">
+                      <el-image
+                        v-if="scope.row.value_two"
+                        title="点击大图预览"
+                        fit="contain"
+                        style="width: auto; height: 80px"
+                        :src="`${window.location.origin}${medicalReportPathArray[3]}`"
+                        :preview-src-list="[
+                          `${window.location.origin}${medicalReportPathArray[3]}`,
+                        ]"
+                      />
+                    </template>
+                  </el-table-column>
+                </el-table>
               </div>
             </div>
           </div>
         </div>
-        <div style="width: 200px" v-show="guidanceShow">
-          <!-- 编辑减脂指导 -->
-          <physicalSigns-guidance
-            ref="physicalSignsGuidanceDialog"
-            @close="editGuidanceShow(false)"
-            @refreshHealthyData="getCustomerHealthyByCusId()"
-          ></physicalSigns-guidance>
+        <!-- 客户体征 -->
+        <div v-else>
+          <table-detail-message
+            v-show="dataList.length > 0"
+            :data="dataList"
+          ></table-detail-message>
+          <div
+            v-show="dataList.length == 0"
+            style="font-size: 20px; text-align: center"
+          >
+            <VueQr :text="copyValue" :logoSrc="logo" :size="256" />
+            <div style="text-align: center; margin-top: 20px">
+              <el-button
+                icon="el-icon-share"
+                size="small"
+                title="点击复制链接"
+                class="copyBtn"
+                type="primary"
+                :data-clipboard-text="copyValue"
+                @click="handleCopy()"
+                >健康评估表链接
+              </el-button>
+            </div>
+          </div>
         </div>
       </div>
-      <!-- 编辑 -->
-      <physicalSigns-edit
-        ref="physicalSignsEditDialog"
-        @refreshHealthyData="getCustomerHealthyByCusId()"
-      ></physicalSigns-edit>
-      <!-- 编辑备注 -->
-      <physicalSigns-remark
-        ref="physicalSignsRemarkDialog"
-        @refreshHealthyData="getCustomerHealthyByCusId()"
-      ></physicalSigns-remark>
-    </el-dialog>
-
-    <!-- 预览弹窗 -->
-    <el-dialog
-      :visible.sync="previewVisible"
-      title="体检报告"
-      class="preview_dialog_wrapper"
-    >
-      <div class="preview_content">
-        <img :src="previewUrl" alt="" class="preview_img" />
+      <div style="width: 200px" v-show="guidanceShow">
+        <!-- 编辑减脂指导 -->
+        <physicalSigns-guidance
+          ref="physicalSignsGuidanceDialog"
+          @close="editGuidanceShow(false)"
+          @refreshHealthyData="getCustomerHealthyByCusId()"
+        ></physicalSigns-guidance>
       </div>
-    </el-dialog>
-  </div>
+    </div>
+    <!-- 编辑 -->
+    <physicalSigns-edit
+      ref="physicalSignsEditDialog"
+      @refreshHealthyData="getCustomerHealthyByCusId()"
+    ></physicalSigns-edit>
+    <!-- 编辑备注 -->
+    <physicalSigns-remark
+      ref="physicalSignsRemarkDialog"
+      @refreshHealthyData="getCustomerHealthyByCusId()"
+    ></physicalSigns-remark>
+  </el-dialog>
 </template>
 <script>
 import {
@@ -282,8 +257,6 @@ export default {
   data() {
     return {
       logo,
-      previewVisible: false,
-      previewUrl: "",
       visible: false,
       showFlag: false,
       title: "",
@@ -796,8 +769,8 @@ export default {
     },
     downloadFile(fileName) {
       // this.downloadResource(fileName);
-      this.previewVisible = true;
-      this.previewUrl = `${window.location.origin}${fileName}`;
+      // this.previewVisible = true;
+      // this.previewUrl = `${window.location.origin}${fileName}`;
     },
     generateReport() {
       let data = this.detailHealthy;