From 5400d8b310ce6fe6919594a096f3a87307a66e61 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 11 一月 2024 08:47:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/layout/index.vue | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/CanadaMes-ui/src/layout/index.vue b/CanadaMes-ui/src/layout/index.vue
index 3aafa96..244d977 100644
--- a/CanadaMes-ui/src/layout/index.vue
+++ b/CanadaMes-ui/src/layout/index.vue
@@ -103,19 +103,19 @@
</el-table>
</el-dialog>
<el-dialog :visible.sync="dialogFormCountDown" :title="$t('Approximately resettable time')" top="5vh">
- <div :style="'font-size: ' + PromptSize + 'px;text-align: center;'">
- <!-- {{ this.CountDowns }} -->
- {{ this.CountDowns }}
- </div>
- </el-dialog>
- <el-dialog :visible.sync="dialogFormVisible3">
+ <div :style="'font-size: ' + PromptSize + 'px;text-align: center;'">
+ <!-- {{ this.CountDowns }} -->
+ {{ this.CountDowns }}
+ </div>
+ </el-dialog>
+ <!-- <el-dialog :visible.sync="dialogFormVisible3">
<el-button :class="{ 'blue-button': receivedData === 1 }" @click="toggleButtonValue(1)">{{
$t('A01Abort/ResumeTasks') }}</el-button>
<el-button :class="{ 'blue-button': receivedData2 === 1 }" @click="toggleButtonValue(2)">{{
$t('A02Abort/ResumeTasks') }}</el-button>
- </el-dialog>
+ </el-dialog> -->
</el-container>
</template>
@@ -161,7 +161,7 @@
CountDowns: "0",
EmergencyStop: false,
PromptSize: 250,
- dialogFormCountDown:false
+ dialogFormCountDown: false
}
},
@@ -274,7 +274,6 @@
}
//澶嶄綅鍊掕鏃�
- console.log(obj.countdown);
if (obj.countdown != null) {
if ((obj.countdown[0] == true && this.CountDowns == 0) || this.EmergencyStop == true) {
this.CountDown();
@@ -292,13 +291,12 @@
-
if (obj.Abort) {
if (obj.Abort[0].length > 0) {
this.receivedData = obj.Abort[0][0];
this.receivedData2 = obj.Abort[0][1];
- this.dialogFormVisible3 = true;
+ // this.dialogFormVisible3 = true;
}
}
this.$forceUpdate();
@@ -328,7 +326,6 @@
this.PromptSize = 500;
this.CountDowns = count;
count--;
- this.dialogFormCountDown = true;
}
else {
this.PromptSize = 200;
@@ -339,10 +336,13 @@
}
}
}
+
},
1000
);
-
+ if (this.reset == false) {
+ this.dialogFormCountDown = true;
+ }
},
logout: function () {
removeToken()
--
Gitblit v1.8.0