From b7eedb41516a6ab02526e64177331a9669f4d3cb Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 15:54:23 +0800
Subject: [PATCH] 修改冲突
---
src/view/timer.vue | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/view/timer.vue b/src/view/timer.vue
index a037a4b..89650b5 100644
--- a/src/view/timer.vue
+++ b/src/view/timer.vue
@@ -1,14 +1,21 @@
+<!--
+ * @Author: licp lichunping@guanfang.com.cn
+ * @Date: 2024-08-20 09:31:20
+ * @LastEditors: licp lichunping@guanfang.com.cn
+ * @LastEditTime: 2024-12-19 09:57:53
+ * @FilePath: \tx-lims-before\src\view\timer.vue
+ * @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
<template>
<div>
<el-dialog
title="鎻愮ず"
:visible.sync="dialogVisible"
- width="30%"
- :before-close="handleClose">
- <span>杩欐槸涓�娈典俊鎭�</span>
- <span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="dialogVisible = false">纭� 瀹�</el-button>
- </span>
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ :show-close="false"
+ width="30%">
+ <div style="display: flex;align-items: center;"><i class="el-icon-warning" style="color: red;font-size: 40px;margin-right: 20px;"></i><span>浠ｇ爜姝ｅ湪閮ㄧ讲锛岃30鍒嗛挓鍚庨噸鏂拌繘鍏ョ郴缁燂紒</span></div>
</el-dialog>
</div>
</template>
@@ -47,11 +54,13 @@
performTask() {
// 鍦ㄨ繖閲屾墽琛屼綘鎯宠鐨勫畾鏃朵换鍔�
console.log("浠诲姟鎵ц浜嗭紒");
+ this.dialogVisible = true;
// 杩欓噷鍙互瑙﹀彂涓�涓� Vuex 鍔ㄤ綔銆佸彂璧蜂竴涓� HTTP 璇锋眰锛屾垨鑰呭叾浠栨搷浣�
},
promptToClose() {
// 鎻愮ず鐢ㄦ埛鍏抽棴
- alert("璇疯寰楀湪20鍒嗛挓鍚庡叧闂换鍔★紒");
+ // alert("璇疯寰楀湪20鍒嗛挓鍚庡叧闂换鍔★紒");
+ this.dialogVisible = true;
}
},
beforeDestroy() {
--
Gitblit v1.9.3