CanadaMes.git - Gitblit

			@@ -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()