潘钊 / bsth_control · Commits

Commit 31c8db92a97472fb267e3f809e69b753f602293d

Authored by 娄高锋
1 parent e3b86293
build: skipped

重名模板名称修改

Inline Side-by-side
Showing 4 changed files with 16 additions and 16 deletions
src/main/resources/static/pages/forms/calc/calcsingledata.html
  View file @31c8db9
@@ -249,9 +249,9 @@ @@ -249,9 +249,9 @@
249 var i = layer.load(2); 249 var i = layer.load(2);
250 $get("/calc_mix/singledatatj",{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,sfdc:sfdc},function(result){ 250 $get("/calc_mix/singledatatj",{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,sfdc:sfdc},function(result){
251 layer.close(i); 251 layer.close(i);
252 - var singledata = template('singledata',{list:result}); 252 + var calcsingledata = template('calcsingledata',{list:result});
253 // 把渲染好的模版html文本追加到表格中 253 // 把渲染好的模版html文本追加到表格中
254 - $('#forms tbody').html(singledata); 254 + $('#forms tbody').html(calcsingledata);
255 }); 255 });
256 }); 256 });
257 257
@@ -284,7 +284,7 @@ @@ -284,7 +284,7 @@
284 }); 284 });
285 285
286 </script> 286 </script>
287 -<script type="text/html" id="singledata"> 287 +<script type="text/html" id="calcsingledata">
288 {{each list as obj i}} 288 {{each list as obj i}}
289 <tr> 289 <tr>
290 <td>{{i+1}}</td> 290 <td>{{i+1}}</td>
src/main/resources/static/pages/mforms/singledatas/singledata_date.html
  View file @31c8db9
@@ -219,9 +219,9 @@ @@ -219,9 +219,9 @@
219 219
220 $get("/report/singledatatj",params,function(result){ 220 $get("/report/singledatatj",params,function(result){
221 layer.close(i); 221 layer.close(i);
222 - var singledata = template('singledata',{list:result}); 222 + var singledata_date = template('singledata_date',{list:result});
223 // 把渲染好的模版html文本追加到表格中 223 // 把渲染好的模版html文本追加到表格中
224 - $('#forms tbody').html(singledata); 224 + $('#forms tbody').html(singledata_date);
225 225
226 }); 226 });
227 227
@@ -264,7 +264,7 @@ @@ -264,7 +264,7 @@
264 }); 264 });
265 }); 265 });
266 </script> 266 </script>
267 -<script type="text/html" id="singledata"> 267 +<script type="text/html" id="singledata_date">
268 {{each list as obj i}} 268 {{each list as obj i}}
269 <tr> 269 <tr>
270 <td>{{i+1}}</td> 270 <td>{{i+1}}</td>
@@ -290,7 +290,7 @@ @@ -290,7 +290,7 @@
290 </tr> 290 </tr>
291 {{/if}} 291 {{/if}}
292 </script> 292 </script>
293 -<script type="text/html" id="singledata2"> 293 +<script type="text/html" id="singledata_date2">
294 {{each list as obj i}} 294 {{each list as obj i}}
295 <tr> 295 <tr>
296 <td>{{i+1}}</td> 296 <td>{{i+1}}</td>
src/main/resources/static/pages/mforms/singledatas/singledatanew.html
  View file @31c8db9
@@ -194,9 +194,9 @@ @@ -194,9 +194,9 @@
194 } 194 }
195 obj.updateDate = moment(obj.startDate).format("YYYY-MM-DD HH:mm:ss"); 195 obj.updateDate = moment(obj.startDate).format("YYYY-MM-DD HH:mm:ss");
196 }); 196 });
197 - var singledata = template('singledata',{list:result}); 197 + var singledatanew = template('singledatanew',{list:result});
198 // 把渲染好的模版html文本追加到表格中 198 // 把渲染好的模版html文本追加到表格中
199 - $('#forms tbody').html(singledata); 199 + $('#forms tbody').html(singledatanew);
200 200
201 }); 201 });
202 }); 202 });
@@ -214,7 +214,7 @@ @@ -214,7 +214,7 @@
214 }); 214 });
215 }); 215 });
216 </script> 216 </script>
217 -<script type="text/html" id="singledata"> 217 +<script type="text/html" id="singledatanew">
218 {{each list as obj i}} 218 {{each list as obj i}}
219 <tr> 219 <tr>
220 <td>{{i+1}}</td> 220 <td>{{i+1}}</td>
src/main/resources/static/pages/mforms/singledatas/singledatas.html
  View file @31c8db9
@@ -198,9 +198,9 @@ @@ -198,9 +198,9 @@
198 if(tjtype=='jsy'){ 198 if(tjtype=='jsy'){
199 $get("/mcy_forms/singledata",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){ 199 $get("/mcy_forms/singledata",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){
200 layer.close(i); 200 layer.close(i);
201 - var singledata = template('singledata',{list:result}); 201 + var singledatas = template('singledatas',{list:result});
202 // 把渲染好的模版html文本追加到表格中 202 // 把渲染好的模版html文本追加到表格中
203 - $('#forms tbody').html(singledata); 203 + $('#forms tbody').html(singledatas);
204 204
205 }); 205 });
206 }else{ 206 }else{
@@ -208,9 +208,9 @@ @@ -208,9 +208,9 @@
208 208
209 layer.close(i); 209 layer.close(i);
210 210
211 - var singledata = template('singledata2',{list:result}); 211 + var singledatas2 = template('singledatas2',{list:result});
212 // 把渲染好的模版html文本追加到表格中 212 // 把渲染好的模版html文本追加到表格中
213 - $('#forms tbody').html(singledata); 213 + $('#forms tbody').html(singledatas2);
214 214
215 }); 215 });
216 } 216 }
@@ -238,7 +238,7 @@ @@ -238,7 +238,7 @@
238 }); 238 });
239 }); 239 });
240 </script> 240 </script>
241 -<script type="text/html" id="singledata"> 241 +<script type="text/html" id="singledatas">
242 {{each list as obj i}} 242 {{each list as obj i}}
243 <tr> 243 <tr>
244 <td>{{i+1}}</td> 244 <td>{{i+1}}</td>
@@ -264,7 +264,7 @@ @@ -264,7 +264,7 @@
264 </tr> 264 </tr>
265 {{/if}} 265 {{/if}}
266 </script> 266 </script>
267 -<script type="text/html" id="singledata2"> 267 +<script type="text/html" id="singledatas2">
268 {{each list as obj i}} 268 {{each list as obj i}}
269 <tr> 269 <tr>
270 <td>{{i+1}}</td> 270 <td>{{i+1}}</td>