From 963a2313f4f8959715293d38f69894078150d508 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 14 六月 2024 11:29:47 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/mdc/components/ShiftAlarm.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/mdc/components/ShiftAlarm.vue b/src/views/mdc/components/ShiftAlarm.vue
index 27a7b87..1864fb1 100644
--- a/src/views/mdc/components/ShiftAlarm.vue
+++ b/src/views/mdc/components/ShiftAlarm.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-18 21:52:18
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-21 18:49:27
+ * @LastEditTime: 2024-05-14 20:42:32
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/ShiftAlarm.vue
-->
<template>
@@ -9,8 +9,8 @@
<el-row>
<el-col>
<el-button-group>
- <el-button @click="btnListActive = item.id" :type="btnListActive == item.id ? 'primary' : ''"
- v-for="item in btnList" :key="item.id">{{
+ <el-button size="small" @click="btnListActive = item.id"
+ :type="btnListActive == item.id ? 'primary' : ''" v-for="item in btnList" :key="item.id">{{
item.title }}</el-button>
</el-button-group>
</el-col>
@@ -89,9 +89,10 @@
},
methods: {
init(params) {
+ this.btnListActive = ''
+ console.log('++++++')
this.params = {
...this.params,
- ...params,
workstationId: params.workstationId.toString()
}
this.getTime({
--
Gitblit v1.9.3