From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html
index a4cc68a..4583f15 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html
@@ -80,12 +80,12 @@
font-size: 14px;
}
</style>
-<input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row" style="margin-left: 2%;">
<div class="col-sm-3">
<input id="activityId" value="${activityId}" type="hidden">
- <input hidden id="language" value="${language}">
+
<div class="ibox float-e-margins">
<div class="ibox-title">
<h3>活动时间：<input type="text" id="startTime" name="zc7" class="form-control" style="max-width:250px !important;display: initial !important;" onchange="receiveRecordDetail()"/></h3>
@@ -167,7 +167,7 @@
<div class="row" style="margin-left: 2%;">
<div class="col-sm-3">
<input id="activityId" value="${activityId}" type="hidden">
- <input hidden id="language" value="${language}">
+
<div class="ibox float-e-margins">
<div class="ibox-title">
<h3>Activity time：<input type="text" id="startTime" name="zc7" class="form-control" style="max-width:250px !important;display: initial !important;" onchange="receiveRecordDetail()"/></h3>
@@ -249,7 +249,7 @@
<div class="row" style="margin-left: 2%;">
<div class="col-sm-3">
<input id="activityId" value="${activityId}" type="hidden">
- <input hidden id="language" value="${language}">
+
<div class="ibox float-e-margins">
<div class="ibox-title">
<h3>Waktu aktivitas：<input type="text" id="startTime" name="zc7" class="form-control" style="max-width:250px !important;display: initial !important;" onchange="receiveRecordDetail()"/></h3>
--
Gitblit v1.7.1