From d15faa9698d5080003bbd7717c93f1c5cb07c005 Mon Sep 17 00:00:00 2001
From: wyuu <czlis@wuyy>
Date: Wed, 29 Oct 2025 09:41:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=9F=A5=E8=AF=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                          | 14 +++++++-------
 src/utils/request.js                 | 17 +++++++++++------
 src/views/checkCode/report/index.vue | 16 +++++++++-------
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2088584..efff5c3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="app-container" ref="appContainer">
-    <div class="app-content">
-      <router-view />
-    </div>
-  </div>
+  <!-- <div class="app-container" ref="appContainer">
+    <div class="app-content"> -->
+  <router-view />
+  <!-- </div>
+  </div> -->
 </template>
 
 <script setup>
@@ -15,8 +15,8 @@ const appContainer = ref(null);
 const appContent = ref(null);
 
 // 设计稿基准尺寸
-const baseWidth = 1920;
-const baseHeight = 1080;
+const baseWidth = 1620;
+const baseHeight = 680;
 
 // 计算缩放比例并应用
 const calcScale = () => {
diff --git a/src/utils/request.js b/src/utils/request.js
index f1901d6..311bc7a 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -75,7 +75,7 @@ service.interceptors.request.use(config => {
       const s_time = sessionObj.time; // 请求时间
       const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
       if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
-        // const message = '数据正在处理，请勿重复提交';
+        const message = '数据正在处理，请勿重复提交';
         // console.warn(`[${s_url}]: ` + message)
         return Promise.reject(new Error(message))
       } else {
@@ -253,11 +253,16 @@ service.interceptors.response.use(res => {
     } else if (message.includes("Request failed with status code")) {
       message = "系统接口" + message.substr(message.length - 3) + "异常";
     }
-    ElMessage({
-      message: message,
-      type: 'error',
-      duration: 5 * 1000
-    })
+    if (message.includes("数据正在处理，请勿重复提交")) {
+      return
+    } else {
+      ElMessage({
+        message: message,
+        type: 'error',
+        duration: 5 * 1000
+      })
+    }
+
     return Promise.reject(error)
   }
 )
diff --git a/src/views/checkCode/report/index.vue b/src/views/checkCode/report/index.vue
index bc88a0c..173521d 100644
--- a/src/views/checkCode/report/index.vue
+++ b/src/views/checkCode/report/index.vue
@@ -269,6 +269,8 @@ const columns = ref([
   { prop: 'ybh', label: '样本号', align: 'center', visible: true, width: 60 },
   { prop: 'yblxname', label: '样本类型', align: 'center', visible: true, },
   { prop: 'jymd', label: '检验目的', align: 'center', visible: true, width: 118 },
+  { prop: 'sqsj', label: '申请时间', align: 'center', visible: true, width: 150 },
+  { prop: 'sjysname', label: '送检医生', align: 'center', visible: true, width: 80 },
   { prop: 'brlyname', label: '病人类型', align: 'center', visible: true, width: 80 },
   { prop: 'yqmc', label: '仪器名称', align: 'center', visible: true, width: 150 },
   { prop: 'yljg', label: '医疗机构', align: 'center', visible: true, width: 150 },
@@ -416,12 +418,12 @@ const brlxFields = ref([
 const rightTableData = ref([])
 // 配置项
 const rightColumns = ref([
-  { prop: 'xmdh', label: '项目代号', align: 'center', visible: true, key: 0, },
-  { prop: 'xmmc', label: '项目名称', align: 'center', visible: true, key: 1 },
-  { prop: 'csjg', label: '检验结果', align: 'center', visible: true, key: 2 },
-  { prop: 'refs', label: '参考值', align: 'center', visible: true, key: 3 },
-  { prop: 'dw', label: '单位', align: 'center', visible: true, key: 4 },
-  { prop: 'jgbz', label: '结果标志', align: 'center', visible: true, key: 5, slot: 'jgbz' },
+  { prop: 'xmdh', label: '项目代号', align: 'center', visible: true, },
+  { prop: 'xmmc', label: '项目名称', align: 'center', visible: true, width: 150 },
+  { prop: 'csjg', label: '检验结果', align: 'center', visible: true, },
+  { prop: 'refs', label: '参考值', align: 'center', visible: true, },
+  { prop: 'dw', label: '单位', align: 'center', visible: true, },
+  { prop: 'jgbz', label: '结果标志', align: 'center', visible: true, slot: 'jgbz' },
 ])
 
 const rightCellStyleHd = ({ row, column, rowIndex, columnIndex }: {
@@ -545,7 +547,7 @@ const copyData = (type: string) => {
   rightTableData.value.forEach((v: any) => {
     if (type == 'All') {
       str = str + getCommonRow(v)
-      str = str + v.xmmc + v.csjg + v.dw + + ',';
+      // str = str + v.xmmc + v.csjg + v.dw + + ',';
     }
     if (type == 'N' && v.jgbz != 'M' && v.jgbz != '') {
       str = str + getCommonRow(v)