fanxw 2 年之前
父节点
当前提交
2866b90345

+ 4 - 4
src/main/resources/static/app/business/device/views/deviceStorage-edit.html

@@ -204,17 +204,17 @@
204 204
                                             </section>
205 205
                                             <section class="col col-3">
206 206
                                                 <label class="input">
207
-                                                    <label class="label">检定单位:<span style="color: red;">*</span></label>
207
+                                                    <label class="label">检定单位:</label>
208 208
                                                     <input type="text" ng-model="dSbxxsjy.jddw" name="jddw"
209
-                                                           placeholder="检定单位" ng-disabled="isNotEdit" required />
209
+                                                           placeholder="检定单位" ng-disabled="isNotEdit" />
210 210
                                                 </label>
211 211
                                             </section>
212 212
                                             <section class="col col-3">
213
-                                                <label class="label">检定时间:<span style="color: red;">*</span></label>
213
+                                                <label class="label">检定时间:</label>
214 214
                                                 <label class="input">
215 215
                                                     <input type="text" ng-model="dSbxxsjy.jdsj" name="jdsj" id="jdsj"
216 216
                                                            onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
217
-                                                           ng-disabled="isNotEdit" required />
217
+                                                           ng-disabled="isNotEdit" />
218 218
                                                 </label>
219 219
                                             </section>
220 220
                                         </div>

+ 2 - 2
src/main/resources/static/app/intelligent/statisticalReport/views/summaryReport-list.html

@@ -114,7 +114,7 @@
114 114
 	                                                    <span style="color: red;">-100</span></acronym>
115 115
 	                                                </div>
116 116
 	                                                <div ng-if="summaryReport.maxtemp!=250">
117
-	                                                    <acronym title="粮温高限报警为: {{warningValueList[summaryReport.storehouse].high}}℃"><span style="color: red;">{{ summaryReport.maxTemp }}</span></acronym>
117
+	                                                    <acronym title="粮温高限报警为: {{warningValueList[summaryReport.storehouse].high}}℃"><span style="color: red;">{{ summaryReport.maxtemp }}</span></acronym>
118 118
 	                                                </div>
119 119
 	                                            </div>
120 120
 	                                            <div ng-if="summaryReport.maxtemp < warningValueList[summaryReport.storehouse].high">
@@ -133,7 +133,7 @@
133 133
                                             <div ng-if="summaryReport.mintemp!=250">
134 134
 	                                            <!--低温报警-->
135 135
 	                                            <div ng-if="summaryReport.mintemp <= warningValueList[summaryReport.storehouse].low">
136
-	                                                <acronym title="粮温低限报警为: {{warningValueList[summaryReport.storehouse].low}}℃"><span style="color: red;">{{ summaryReport.minTemp }}</span></acronym>
136
+	                                                <acronym title="粮温低限报警为: {{warningValueList[summaryReport.storehouse].low}}℃"><span style="color: red;">{{ summaryReport.mintemp }}</span></acronym>
137 137
 	                                            </div>
138 138
 	                                            <div ng-if="summaryReport.mintemp > warningValueList[summaryReport.storehouse].low">
139 139
 	                                                <span>{{ summaryReport.mintemp }}</span>