From 22bd207587899810e9afb4c1a53f0d5dae1e2ece Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期五, 05 十二月 2025 16:28:42 +0800
Subject: [PATCH] 测试完成
---
src/views/index.vue | 1
vue.config.js | 4
src/views/followvisit/HistoricalFollow/index.vue | 3
src/views/followvisit/record/detailpage/index.vue | 113 ++++++++++++++++++++-----------------
src/utils/sipService.js | 4 +
src/views/followvisit/record/TracingInfo/index.vue | 2
src/components/SortCheckbox/index.vue | 1
7 files changed, 69 insertions(+), 59 deletions(-)
diff --git a/src/components/SortCheckbox/index.vue b/src/components/SortCheckbox/index.vue
index a33c5b4..45107e3 100644
--- a/src/components/SortCheckbox/index.vue
+++ b/src/components/SortCheckbox/index.vue
@@ -106,7 +106,6 @@
}
if (newVal.length > 0 && typeof newVal[0] === "object") {
- console.log(this.selectedOrder, "111");
// 1. 浼犲叆鐨勬槸瀵硅薄鏁扮粍 [{ sort, preachform, compensateTime }]
this.checkedValues = newVal.map((item) => item.preachform);
this.selectedOrder = newVal.map((item) => ({
diff --git a/src/utils/sipService.js b/src/utils/sipService.js
index a8ce592..8f81f71 100644
--- a/src/utils/sipService.js
+++ b/src/utils/sipService.js
@@ -1,4 +1,5 @@
import JsSIP from "jssip";
+import { Notification, MessageBox, Message, Loading } from "element-ui";
class SipService {
constructor() {
@@ -77,7 +78,7 @@
const remaining = minDelay - timeSinceRegistration;
return {
canCall: false,
- reason: `娉ㄥ唽鎴愬姛锛岃绛夊緟 ${Math.ceil(remaining / 1000)} 绉掑悗鍐嶅懠鍙玚,
+ reason: `娉ㄥ唽鎴愬姛锛岃祫婧愬姞杞戒腑璇风瓑寰� ${Math.ceil(remaining / 1000)} 绉掑悗鍐嶅懠鍙玚,
};
}
@@ -86,6 +87,7 @@
makeCall(targetNumber) {
const { canCall, reason } = this.canMakeCall();
if (!canCall) {
+ Message.error(reason);
return Promise.reject(new Error(reason));
}
return new Promise((resolve, reject) => {
diff --git a/src/views/followvisit/HistoricalFollow/index.vue b/src/views/followvisit/HistoricalFollow/index.vue
index 1bf4a5d..764a25a 100644
--- a/src/views/followvisit/HistoricalFollow/index.vue
+++ b/src/views/followvisit/HistoricalFollow/index.vue
@@ -1,4 +1,5 @@
<template>
+ <!-- 鍘嗗彶闅忚璁板綍 -->
<div class="app-container">
<div class="leftvlue" style="margin-bottom: 20px"></div>
<el-row :gutter="20">
@@ -1145,7 +1146,7 @@
this.topqueryParams.pageSize = null;
this.download(
// "smartor/serviceSubtask/export",
- "smartor/serviceSubtask/patItemExport",
+ "smartor/serviceSubtask/getSubtaskByDiagnameExport",
{
...this.topqueryParams,
},
diff --git a/src/views/followvisit/record/TracingInfo/index.vue b/src/views/followvisit/record/TracingInfo/index.vue
index 014a4be..a2e6e5e 100644
--- a/src/views/followvisit/record/TracingInfo/index.vue
+++ b/src/views/followvisit/record/TracingInfo/index.vue
@@ -1392,8 +1392,6 @@
methods: {
// 鑾峰彇涓婚鏍峰紡绫�
getTopicClass(item) {
- console.log(item.isabnormal,'111');
-
// 鏍规嵁鐘舵�佸�艰繑鍥炲搴旂殑鏍峰紡绫�
if (item.isabnormal == 1) {
return "scriptTopic-isabnormal"; // 寮傚父 - 绾㈣壊
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 886d0b5..629bad8 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -695,7 +695,10 @@
</div>
<!-- SIP娉ㄥ唽鐘舵�佹彁绀� -->
- <div v-if="isSipRegistering&&orgname == '涓芥按甯備腑鍖婚櫌'" class="sip-registering">
+ <div
+ v-if="isSipRegistering && orgname == '涓芥按甯備腑鍖婚櫌'"
+ class="sip-registering"
+ >
<el-alert
title="鍛煎彨搴ф満鍒濆鍖栦腑锛岃绋嶅��..."
type="info"
@@ -1157,6 +1160,7 @@
callType: "", // 鐢ㄤ簬鍖哄垎鏄摢涓數璇�
isSipRegistering: true, // SIP娉ㄥ唽鐘舵��
// 宸叉湁鏁版嵁...
+ customCallStatus: "", // 鐢ㄤ簬瀛樺偍鑷畾涔夌姸鎬佹枃鏈�
callStatus: "idle", // idle, calling, connected, ended, failed
isEndingCall: false,
CaldialogVisible: false,
@@ -1376,6 +1380,7 @@
label: "涓�骞村悗",
},
],
+ statusTimer: null,
userform: {},
smsDialogVisible: false, // 鎺у埗鐭俊瀵硅瘽妗嗘樉绀�
smsContent: "", // 瀛樺偍鐭俊鍐呭
@@ -1392,9 +1397,18 @@
patid: null,
};
},
-
+ // 鍦ㄧ粍浠朵腑娣诲姞閿�姣佸墠鐨勬竻鐞�
+ beforeUnmount() {
+ if (this.statusTimer) {
+ clearTimeout(this.statusTimer);
+ this.statusTimer = null;
+ }
+ },
computed: {
callStatusText() {
+ if (this.customCallStatus) {
+ return this.customCallStatus;
+ }
const statusMap = {
idle: "鍑嗗鍛煎彨",
calling: `姝ｅ湪鍛煎彨 ${this.currentPhoneNumber}...`,
@@ -1428,16 +1442,26 @@
this.getTaskservelist();
},
-mounted() {
+ mounted() {
// 鐩戝惉瀛愮粍浠剁殑sipStatus灞炴�у彉鍖�
if (this.$refs.callButton) {
this.$watch(
() => this.$refs.callButton.sipStatus,
(newStatus) => {
- if (newStatus === '宸叉敞鍐�') {
+ if (this.statusTimer) {
+ clearTimeout(this.statusTimer);
+ this.statusTimer = null;
+ }
+ if (newStatus === "宸叉敞鍐�") {
+ this.statusTimer = setTimeout(() => {
+ this.isSipRegistering = false;
+ this.customCallStatus = ""; // 娉ㄥ唽鎴愬姛鍚庢竻绌鸿嚜瀹氫箟鎻愮ず
+ console.log("SIP娉ㄥ唽鎴愬姛锛岀姸鎬佸凡鏇存柊");
+ }, 2000);
this.isSipRegistering = false;
- } else if (newStatus === '娉ㄥ唽澶辫触' || newStatus === '鏈繛鎺�') {
+ } else if (newStatus === "娉ㄥ唽澶辫触" || newStatus === "鏈繛鎺�") {
this.isSipRegistering = true;
+ this.customCallStatus = "鍛煎彨涓柇锛岃祫婧愰噸鏂板姞杞戒腑璇风◢绛�3s閲嶆柊銆�";
}
},
{ immediate: true } // 绔嬪嵆鎵ц涓�娆′互鑾峰彇鍒濆鍊�
@@ -1582,8 +1606,6 @@
},
// 妫�鏌ラ殢璁挎棩鏈熸槸鍚︽湁鏁�
checkFollowupDate(date) {
- console.log(date);
-
if (!date) {
this.form.date1 = "";
this.$refs.zcform.clearValidate(["date1"]);
@@ -1710,7 +1732,10 @@
}
});
this.Editsingletasksonyic(6);
-
+ if (this.visitCount != 1) {
+ this.Torouter();
+ return;
+ }
this.$modal
.confirm(
'浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮ｈ�咃細"' +
@@ -1732,33 +1757,36 @@
this.dialogFormVisible = true;
})
.catch(() => {
- if (this.form.serviceType == 13) {
- if (this.visitCount != 1) {
- this.$router.push({
- path: "/logisticsservice/zbAgain",
- });
- } else {
- this.$router.push({
- path: "/logisticsservice/record",
- });
- }
- } else if (this.form.serviceType == 2) {
- if (this.visitCount != 1) {
- this.$router.push({
- path: "/logisticsservice/again",
- });
- } else {
- this.$router.push({
- path: "/followvisit/discharge",
- });
- }
- }
+ this.Torouter();
});
})
.catch((error) => {
// 濡傛灉鏈変换浣曚竴涓紓姝ユ搷浣滃け璐ワ紝浼氳繘鍏ヨ繖閲�
console.error("鍙戠敓閿欒锛�", error);
});
+ },
+ Torouter() {
+ if (this.form.serviceType == 13) {
+ if (this.visitCount != 1) {
+ this.$router.push({
+ path: "/logisticsservice/zbAgain",
+ });
+ } else {
+ this.$router.push({
+ path: "/logisticsservice/record",
+ });
+ }
+ } else if (this.form.serviceType == 2) {
+ if (this.visitCount != 1) {
+ this.$router.push({
+ path: "/logisticsservice/again",
+ });
+ } else {
+ this.$router.push({
+ path: "/followvisit/discharge",
+ });
+ }
+ }
},
// 鐢佃瘽============================
// 楠岃瘉鐢佃瘽鍙风爜鏍煎紡骞惰繑鍥為敊璇俊鎭�
@@ -1889,7 +1917,10 @@
param2: this.patid,
subId: this.id,
};
-
+ if (this.visitCount != 1) {
+ this.Torouter();
+ return;
+ }
addPersonVoices(obj).then((res) => {
if (res.code == 200) {
this.$modal.msgSuccess("鏈嶅姟淇濆瓨鎴愬姛");
@@ -1914,27 +1945,7 @@
this.dialogFormVisible = true;
})
.catch(() => {
- if (this.form.serviceType == 13) {
- if (this.visitCount != 1) {
- this.$router.push({
- path: "/logisticsservice/zbAgain",
- });
- } else {
- this.$router.push({
- path: "/logisticsservice/record",
- });
- }
- } else if (form.serviceType == 2) {
- if (this.visitCount != 1) {
- this.$router.push({
- path: "/followvisit/again",
- });
- } else {
- this.$router.push({
- path: "/followvisit/discharge",
- });
- }
- }
+ this.Torouter();
});
}
});
diff --git a/src/views/index.vue b/src/views/index.vue
index ac2876e..927419c 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -873,7 +873,6 @@
},
// 椤甸潰鍙樺寲璋冩暣澶у皬
handleResize() {
- console.log(111);
// 璋冩暣 ECharts 鍥捐〃澶у皬
if (this.myChart2) {
this.myChart2.resize();
diff --git a/vue.config.js b/vue.config.js
index f87d75f..b9ae4c7 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,8 +36,8 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `https://www.health-y.cn/lssf`,
- // target: `http://192.168.100.10:8096`,
- target: `http://192.168.100.10:8094`,//鐪佺珛鍚屽痉
+ target: `http://192.168.100.10:8096`,
+ // target: `http://192.168.100.10:8094`,//鐪佺珛鍚屽痉
// target: `http://192.168.100.10:8095`,//鏂板崕
// target:`http://localhost:8095`,
// target:`http://35z1t16164.qicp.vip`,
--
Gitblit v1.9.3