Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

This commit is contained in:
duandongmei
2018-10-25 16:01:55 +08:00
3 changed files with 6 additions and 6 deletions

View File

@@ -5,7 +5,7 @@
<title><spring:message code="${cfgName}"></spring:message></title>
<script type="text/javascript">
$(function() {
var fileType=["txt","doc","img","docx","pptx","xlsx","xls","ppt","mp4","flv","asf","wmv","avi","mpeg","mov","dat","m4v","m4p","m4b","webm","ogv","wav","mp3"];//使用是什么格式的后缀
var fileType=["txt","doc","img","docx","pptx","xlsx","xls","ppt","mp4","flv","asf","wmv","avi","mpeg","mov","dat","m4v","m4p","\n","m4b","webm","ogv","wav","mp3"];//使用是什么格式的后缀
$("#fileNoteInfo").attr("title","<spring:message code='select_file'/>: "+fileType);
$("#uploadSrc,#fileInfo").on('click', function() {
$("#file").trigger("click");
@@ -253,7 +253,7 @@
value="${_cfg.rawLen }" />
</div>
&nbsp;<span id="fileNoteInfo" title="<spring:message code="select_file"/>"
class="fileNoteInfo" data-icon="&#xe08b;" style="cursor:default"> <spring:message code="info"/></span>
class="fileNoteInfo" data-icon="&#xe08b;" style="cursor:default"></span>
<div for="fileInfo"></div>
<div id="fileErrorNote"></div>
</div>