diff --git a/h5/pages/user/fenzhen/fenzhen.vue b/h5/pages/user/fenzhen/fenzhen.vue
index cec4fdc..d523a28 100644
--- a/h5/pages/user/fenzhen/fenzhen.vue
+++ b/h5/pages/user/fenzhen/fenzhen.vue
@@ -40,7 +40,8 @@
fenzhen_list.value = response.data;
console.log(window.location.href)
setTimeout(() => {
- if (!!window.location.href.includes('/pages/user/fenzhen/fenzhen')) {
+ if (!!window.location.href.includes('/pages/user/fenzhen/fenzhen') &&
+ !window.location.href.includes('192.168.31.84:5173')) {
getFenzhenList(false)
}
}, 1000 * 10)
@@ -59,12 +60,6 @@
}
};
- const toRouter = (clinic) => {
- uni.navigateTo({
- url: "/pages/user/fenzhen/xindiantu?id=" + $props.id + '&clinic=' + clinic,
- });
- };
-
const timeShow = (time) => {
let time_array = time.split(":");
return `${time_array[0]}:${time_array[1]}`;
@@ -95,6 +90,44 @@
})
}
+ const toRouter = (clinic) => {
+ uni.navigateTo({
+ url: "/pages/user/fenzhen/xindiantu?id=" + $props.id + '&clinic=' + clinic,
+ });
+ };
+ const fenzhen_active = ref(-1)
+ const fenzhen_info = ref(false)
+ const infoShowClick = (clinic) => {
+ if (clinic !== fenzhen_active.value) {
+ fenzhen_info.value = false
+ getFenzhenInfo(clinic)
+ } else {
+ fenzhen_active.value = -1
+ }
+ }
+ const qijian = (item) => {
+ uni.navigateTo({
+ url: `/pages/user/fenzhen/qijian?id=${$props.id}&xmid=${item.id}&tj_number=${fenzhen_list.value.info.tj_number}`,
+ });
+ };
+
+ const getFenzhenInfo = async (clinic) => {
+ fenzhen_active.value = clinic
+ uni.showLoading();
+ const response = await $api("FenzhenInfo", {
+ id: $props.id,
+ clinic: clinic,
+ });
+ uni.hideLoading();
+ $response(response, () => {
+ fenzhen_info.value = response.data;
+ });
+ };
+
+ const useTimeShow = (time) => {
+ return Math.ceil(Number(time))
+ }
+
onShow(() => {
if (!!config_ref.value) {
mountedAction();
@@ -151,14 +184,32 @@
- 开始体检时间
+ 开始时间
{{
timeShow(fenzhen_list.info.start_time)
}}
- — 预计结束时间
+
+
+ 预计结束
{{
- timeShow(fenzhen_list.info.end_time)
- }}
+ timeShow(fenzhen_list.info.yuji_end_time)
+ }}
+ — 预计用时
+ {{
+ useTimeShow(fenzhen_list.info.yuji_use_time)
+ }}
+ 分钟
+
+
+ 结束时间
+ {{
+ timeShow(fenzhen_list.info.end_time)
+ }}
+ — 实际用时
+ {{
+ useTimeShow(fenzhen_list.info.use_time)
+ }}
+ 分钟
@@ -171,28 +222,50 @@
自助导检
-
-
- {{
- i.time
- }}
-
-
-
-
-
-
-
-
-
- {{ k + 1 }}.{{ i.name }}
- {{ i.desc }}
+
+
+
+ {{
+ i.time
+ }}
+
+
+
+
+
-
-
- {{ i.tip }}
- 查看详情>>
+
+
+
+ {{ k + 1 }}.{{ i.name }}
+ {{ i.desc }}
+
+
+
+ {{ i.tip }}
+ 查看详情>>
+
+
+
+
+
+
+ {{ item.name }}
+
+ 弃检
+
+
+
+ {{ item.name }}
+
+ 完成
+ {{ item.time }}
+
+
+
+
@@ -207,6 +280,10 @@