From 97ddbdb0827051db8fb25e42b964185fa6a9a3b5 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期三, 30 七月 2025 18:03:46 +0800
Subject: [PATCH] 心电检查
---
src/views/doctor/checkAll/index.vue | 35 +++++++++--------
public/yuanqu.ini | 2
src/views/picture/picture/index.vue | 55 ++++++++++++++++++++++-----
src/views/hosp/project/index.vue | 24 ++++++++++++
4 files changed, 87 insertions(+), 29 deletions(-)
diff --git a/public/yuanqu.ini b/public/yuanqu.ini
index 877b8aa..851fa96 100644
--- a/public/yuanqu.ini
+++ b/public/yuanqu.ini
@@ -1,7 +1,7 @@
[development]
8094=pbkwyy
81=jdczgzyy
-82=ssyjyy
+82=bjxjyy
8095=jdczgzyy
8096=sqyy
8097=wbzxyy
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 9474445..4af72f0 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -2581,7 +2581,6 @@
yichangjieguo() {
this.loading = true;
- this.isLoading = true; // 纭繚鏁翠綋鍔犺浇妗嗗紑鍚�
this.status1 = 0;
this.yichangList = [];
@@ -2595,7 +2594,6 @@
if (!data || data.length === 0) {
this.$message.warning("鏆傛棤寮傚父鎶ュ憡");
this.loading = false;
- this.isLoading = false; // 鍏抽棴鏁翠綋鍔犺浇妗�
resolve(); // 杩斿洖 Promise锛屼絾涓嶇户缁悗缁�昏緫
return;
}
@@ -2617,17 +2615,12 @@
resolve(); // 鎴愬姛瀹屾垚
})
.catch((error) => {
- this.isLoading = false;
this.loading = false;
console.error("鑾峰彇寮傚父缁撴灉澶辫触:", error);
this.$message.error("鑾峰彇寮傚父缁撴灉澶辫触");
reject(error); // 杩斿洖閿欒
})
.finally(() => {
- // 鍙湪娌℃湁鎻愬墠杩斿洖鐨勬儏鍐典笅鍏抽棴鍔犺浇妗�
- if (this.isLoading) {
- this.isLoading = false;
- }
if (this.loading) {
this.loading = false;
}
@@ -3183,6 +3176,7 @@
handleClick(row) {
this.qingkong();
+ this.isLoading = true; // 寮�濮嬫暣浣撳姞杞�
this.$refs.Pre.open = false;
this.tableAll = row;
let dict = "dict_tjtype";
@@ -3206,7 +3200,14 @@
if (this.status.status === "1") {
// 鍏堣皟鐢ㄥ紓甯哥粨鏋滐紝绛夊緟鍏跺畬鎴愬悗鍐嶇户缁悗缁�昏緫
this.yichangjieguo().then(() => {
- // 鏃犺寮傚父缁撴灉鏄惁鏈夋暟鎹紝閮界户缁悗缁�昏緫
+ // 濡傛灉寮傚父缁撴灉涓虹┖锛岀珛鍗冲叧闂姞杞芥骞舵墦寮�鎶藉眽
+ if (!this.yichangList || this.yichangList.length === 0) {
+ this.isLoading = false;
+ this.drawer = true;
+ return;
+ }
+
+ // 寮傚父缁撴灉鏈夋暟鎹紝缁х画鍚庣画閫昏緫
getInfo().then((response) => {
this.userId = response.user.userId;
if (this.userId) {
@@ -3217,10 +3218,6 @@
};
getModifiedState(data).then((res) => {
this.MsgId = res.msg;
- // 鍙湁褰撳紓甯哥粨鏋滄湁鏁版嵁鏃舵墠寮�鍚姞杞芥
- if (this.yichangList && this.yichangList.length > 0) {
- this.isLoading = true;
- }
this.drawer = true;
getupdateCheckType(this.tjNumber).then((response) => {
this.isLoading = false; // 鍏抽棴鍔犺浇妗�
@@ -3267,7 +3264,14 @@
.then(() => {
// 鍏堣皟鐢ㄥ紓甯哥粨鏋滐紝绛夊緟鍏跺畬鎴愬悗鍐嶇户缁悗缁�昏緫
this.yichangjieguo().then(() => {
- // 鏃犺寮傚父缁撴灉鏄惁鏈夋暟鎹紝閮界户缁悗缁�昏緫
+ // 濡傛灉寮傚父缁撴灉涓虹┖锛岀珛鍗冲叧闂姞杞芥骞舵墦寮�鎶藉眽
+ if (!this.yichangList || this.yichangList.length === 0) {
+ this.isLoading = false;
+ this.drawer = true;
+ return;
+ }
+
+ // 寮傚父缁撴灉鏈夋暟鎹紝缁х画鍚庣画閫昏緫
getInfo().then((response) => {
this.userId = response.user.userId;
if (this.userId) {
@@ -3278,10 +3282,6 @@
};
getforceIn(data).then((res) => {
this.MsgId = res.msg;
- // 鍙湁褰撳紓甯哥粨鏋滄湁鏁版嵁鏃舵墠寮�鍚姞杞芥
- if (this.yichangList && this.yichangList.length > 0) {
- this.isLoading = true;
- }
this.drawer = true;
getupdateCheckType(this.tjNumber).then((response) => {
this.isLoading = false; // 鍏抽棴鍔犺浇妗�
@@ -3316,6 +3316,7 @@
});
})
.catch(() => {
+ this.isLoading = false; // 鍙栨秷鏃朵篃瑕佸叧闂姞杞芥
this.$message({
type: "info",
message: "宸插彇娑堣繘鍏�",
diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index bceaf93..e51de15 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -1840,6 +1840,9 @@
// 绛夊緟鍙充晶琛ㄦ牸鍒锋柊
await this.getList();
+
+ // 绔嬪嵆鍒锋柊褰撳墠椤圭洰鏁版嵁锛岀‘淇濇暟鎹槸鏈�鏂扮殑
+ await this.refreshCurrentProjectData();
this.pageLoading = false; // 鉁� 缁熶竴鍔犺浇鐘舵�佹帶鍒�
},
@@ -1852,6 +1855,23 @@
});
}
}, */
+ // 鍒锋柊褰撳墠閫変腑椤圭洰鐨勬暟鎹�
+ async refreshCurrentProjectData() {
+ if (this.id) {
+ try {
+ const response = await getInfoByProId(this.id);
+ this.xiugaiList = response.data;
+ console.log("鍒锋柊椤圭洰鏁版嵁鎴愬姛:", this.xiugaiList);
+ return response.data;
+ } catch (error) {
+ console.error("鍒锋柊椤圭洰鏁版嵁澶辫触:", error);
+ this.$message.error("鍒锋柊椤圭洰鏁版嵁澶辫触");
+ this.xiugaiList = null; // 鍒锋柊澶辫触鏃堕噸缃负 null
+ return null;
+ }
+ }
+ return null;
+ },
submit() {
this.ChangeList.forEach((item) => {
this.form.proPrice = item.ckdj;
@@ -1861,6 +1881,10 @@
this.sfxmId = parseInt(item.id);
});
this.dialogTableVisible = false;
+ this.getDeptList();
+ this.getDeptTree().then(() => {
+ this.precomputePinyin();
+ });
},
handleDelete(row) {
const proIds = row.proId || this.ids;
diff --git a/src/views/picture/picture/index.vue b/src/views/picture/picture/index.vue
index ab88565..47d7ab1 100644
--- a/src/views/picture/picture/index.vue
+++ b/src/views/picture/picture/index.vue
@@ -779,18 +779,24 @@
this.changtjNumber(val.tjNumber);
},
changtjNumber(val) {
- console.log(8989);
let tjNumber = val;
this.loading = true;
getYxJcXx(tjNumber).then((res) => {
- this.tableList = res.data.map((item) => {
- // 濡傛灉 imageUrl 瀛樺湪涓旀槸绾� Base64 瀛楃涓诧紝娣诲姞 data:image 鍓嶇紑
- if (item.imageUrl && !item.imageUrl.startsWith("data:image")) {
- // 鍋囪鍥剧墖绫诲瀷涓� png锛屽鏋滄帴鍙ｆ彁渚涚被鍨嬶紝鍙互鏇挎崲涓哄姩鎬佸��
- item.imageUrl = `data:image/png;base64,${item.imageUrl}`;
- }
- return item;
- });
+ // 妫�鏌� res.data 鏄惁瀛樺湪涓斾负鏁扮粍
+ if (res && res.data && Array.isArray(res.data)) {
+ this.tableList = res.data.map((item) => {
+ // 濡傛灉 imageUrl 瀛樺湪涓旀槸绾� Base64 瀛楃涓诧紝娣诲姞 data:image 鍓嶇紑
+ if (item.imageUrl && !item.imageUrl.startsWith("data:image")) {
+ // 鍋囪鍥剧墖绫诲瀷涓� png锛屽鏋滄帴鍙ｆ彁渚涚被鍨嬶紝鍙互鏇挎崲涓哄姩鎬佸��
+ item.imageUrl = `data:image/png;base64,${item.imageUrl}`;
+ }
+ return item;
+ });
+ } else {
+ // 濡傛灉 res.data 涓嶅瓨鍦ㄦ垨涓嶆槸鏁扮粍锛岃缃负绌烘暟缁�
+ this.tableList = [];
+ // console.warn('API response data is not an array:', res);
+ }
this.loading = false;
this.$nextTick(() => {
const headerCheckbox = this.$refs.mu.$el.querySelector(
@@ -813,6 +819,10 @@
this.handleChange([firstRow]);
}
});
+ }).catch((error) => {
+ console.error('鑾峰彇褰卞儚妫�鏌ヤ俊鎭け璐�:', error);
+ this.tableList = [];
+ this.loading = false;
});
},
qijian(row) {
@@ -919,15 +929,38 @@
this.form.proResult = yxbx;
},
submiepilog() {
+ if (!this.tableList || this.tableList.length === 0) {
+ this.$message.warning("琛ㄦ牸涓病鏈夋暟鎹�");
+ return;
+ }
+
+ // 妫�鏌� tableList 琛ㄦ牸涓槸鍚︽湁閫変腑鐨勯」鐩�
+ const selectedRows = this.$refs.mu.selection;
+ if (!selectedRows || selectedRows.length === 0) {
+ this.$message.warning("璇峰厛閫夋嫨琛ㄦ牸涓殑椤圭洰");
+ return;
+ }
this.$refs.aaa.open = true;
let proId = "1633660948860522585";
this.$refs.aaa.getList(proId);
},
submito() {
- if (!this.selectedRow || !this.selectedRow.proId) {
- this.$message.error("璇烽�夋嫨鎻愪氦椤圭洰");
+ if (!this.tableList || this.tableList.length === 0) {
+ this.$message.warning("琛ㄦ牸涓病鏈夋暟鎹�");
return;
}
+
+ // 妫�鏌� tableList 琛ㄦ牸涓槸鍚︽湁閫変腑鐨勯」鐩�
+ const selectedRows = this.$refs.mu.selection;
+ if (!selectedRows || selectedRows.length === 0) {
+ this.$message.warning("璇峰厛閫夋嫨琛ㄦ牸涓殑椤圭洰");
+ return;
+ }
+
+ /* if (!this.selectedRow || !this.selectedRow.proId) {
+ this.$message.error("璇烽�夋嫨鎻愪氦椤圭洰");
+ return;
+ } */
if (!this.form.proResult && !this.form.conclusion) {
this.$message.warning("璇烽�夋嫨妫�鏌ユ墍瑙佹垨妫�鏌ョ粨璁�!");
} else {
--
Gitblit v1.8.0