Compare commits
3 Commits
27bf89fa3e
...
develop_mh
| Author | SHA1 | Date | |
|---|---|---|---|
| a117d417f4 | |||
| 32842d4b6e | |||
| 703a279ffa |
@@ -89,7 +89,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.select-style {
|
.select-style {
|
||||||
@apply block w-full px-2 py-1.5 border border-default-slate/50 rounded-xs text-base-background
|
@apply block w-full px-2 py-1.5 border border-default-slate/50 rounded-xs text-base-background appearance-none
|
||||||
}
|
}
|
||||||
|
|
||||||
.select-style option {
|
.select-style option {
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
<ul class="divide-y divide-base-border whitespace-nowrap h-full relative">
|
<ul class="divide-y divide-base-border whitespace-nowrap h-full relative">
|
||||||
<% if @schedule.present? %>
|
<% if @schedule.present? %>
|
||||||
<% @schedule.each do |s| %>
|
<% @schedule.each do |s| %>
|
||||||
<li class="flex justify-between items-stretch px-4 py-2 space-x-4 h-full relative">
|
<li class="flex justify-between items-center px-4 py-2 space-x-4 h-full relative">
|
||||||
<div class="flex items-center space-x-4 basis-3/5 h-full">
|
<div class="flex items-center space-x-4 basis-3/5 h-full">
|
||||||
<!-- 시간 -->
|
<!-- 시간 -->
|
||||||
<div class="flex flex-col lg:flex-row h-full items-center space-x-0 space-y-2 lg:space-x-4 lg:space-y-0">
|
<div class="flex flex-col lg:flex-row h-full items-center space-x-0 space-y-2 lg:space-x-4 lg:space-y-0">
|
||||||
@@ -18,11 +18,11 @@
|
|||||||
<div class="text-xl flex items-center space-x-1 w-full h-full">
|
<div class="text-xl flex items-center space-x-1 w-full h-full">
|
||||||
<%= select_tag "schedule[#{s.id}][hour]",
|
<%= select_tag "schedule[#{s.id}][hour]",
|
||||||
options_for_select((0..23).map { |h| [h.to_s.rjust(2, '0'), h] }, s.hour),
|
options_for_select((0..23).map { |h| [h.to_s.rjust(2, '0'), h] }, s.hour),
|
||||||
class: "select-style text-white min-w-[60px] h-full" %>
|
class: "select-style text-white min-w-[60px]" %>
|
||||||
<div>:</div>
|
<div>:</div>
|
||||||
<%= number_field_tag "schedule[#{s.id}][minute]",
|
<%= number_field_tag "schedule[#{s.id}][minute]",
|
||||||
s.minute, min: 0, max: 59, step: 1, inputmode: "decimal",
|
s.minute, min: 0, max: 59, step: 1, inputmode: "decimal",
|
||||||
class: "input-style min-w-[60px] h-full" %>
|
class: "input-style min-w-[60px]" %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -30,7 +30,7 @@
|
|||||||
<div class="flex flex-col lg:flex-row h-full items-center space-x-0 space-y-2 lg:space-x-4 lg:space-y-0">
|
<div class="flex flex-col lg:flex-row h-full items-center space-x-0 space-y-2 lg:space-x-4 lg:space-y-0">
|
||||||
<div class="text-white text-left w-full lg:w-auto">온도 (°C)</div>
|
<div class="text-white text-left w-full lg:w-auto">온도 (°C)</div>
|
||||||
<div class="text-xl flex items-center">
|
<div class="text-xl flex items-center">
|
||||||
<%= number_field_tag "schedule[#{s.id}][temperature]", s.temperature, min: -99, max: 99, step: "0.1", inputmode: "decimal", class: "input-style min-w-[68px] h-full" %>
|
<%= number_field_tag "schedule[#{s.id}][temperature]", s.temperature, min: -99, max: 99, step: "0.1", inputmode: "decimal", class: "input-style min-w-[68px]" %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
18
modbus.rb
18
modbus.rb
@@ -22,13 +22,13 @@ begin
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
rescue
|
rescue
|
||||||
# error_message = "[#{Time.now}] #{mode} 실행 실패 (station_id: #{controller_id}, value: #{value})"
|
error_message = "[#{Time.now}] #{mode} 실행 실패 (station_id: #{controller_id}, value: #{value})"
|
||||||
# res = Sms.send_one(
|
res = Sms.send_one(
|
||||||
# {
|
{
|
||||||
# to: '01062619801',
|
to: '01062619801',
|
||||||
# from: '01062619801',
|
from: '01062619801',
|
||||||
# text: error_message
|
text: error_message
|
||||||
# }
|
}
|
||||||
# )
|
)
|
||||||
# puts res
|
puts res
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user