Authored by zhengyouwei

update

@@ -177,19 +177,19 @@ @@ -177,19 +177,19 @@
177 </div> 177 </div>
178 </div> 178 </div>
179 <div class="form-group"> 179 <div class="form-group">
180 - <label class="col-sm-2 control-label"> <span style="color:red">*</span>休息开始</label> 180 + <label class="col-sm-2 control-label"> <span style="color:red">*</span>开始时间</label>
181 181
182 <div class="col-sm-8"> 182 <div class="col-sm-8">
183 <input type="text" class="form-control" id="relaxStartTime" name="relaxStartTime" 183 <input type="text" class="form-control" id="relaxStartTime" name="relaxStartTime"
184 - placeholder="休息开始 H" size="40"/> 184 + placeholder="开始 H" size="40"/>
185 </div> 185 </div>
186 </div> 186 </div>
187 <div class="form-group"> 187 <div class="form-group">
188 - <label class="col-sm-2 control-label"> <span style="color:red">*</span>休息结束</label> 188 + <label class="col-sm-2 control-label"> <span style="color:red">*</span>结束时间</label>
189 189
190 <div class="col-sm-8"> 190 <div class="col-sm-8">
191 <input type="text" class="form-control" id="relaxEndTime" name="relaxEndTime" 191 <input type="text" class="form-control" id="relaxEndTime" name="relaxEndTime"
192 - placeholder="休息结束 H" size="40"/> 192 + placeholder="结束 H" size="40"/>
193 </div> 193 </div>
194 </div> 194 </div>
195 <div class="form-group"> 195 <div class="form-group">
@@ -26,7 +26,6 @@ @@ -26,7 +26,6 @@
26 <div id="content"> 26 <div id="content">
27 <div style="height: 100%"> 27 <div style="height: 100%">
28 <iframe src="http://om.yoho.cn/" id="iframepage" frameborder="0" scrolling="yes" width="100%" height="800px"></iframe> 28 <iframe src="http://om.yoho.cn/" id="iframepage" frameborder="0" scrolling="yes" width="100%" height="800px"></iframe>
29 - </iframe>  
30 </div> 29 </div>
31 30
32 </div> 31 </div>