Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/sg/project/addItemForm.js

@@ -69,14 +69,18 @@
         });
     }
     $(document).ready(function() {
-    // 选择文件触发事件
+        // 选择文件触发事件
         $("#btnxz").click(function(){
             $("#myfile").trigger("click");
         })
 
         $("#myfile").bind("change",function(){
             var solr_file= $("#myfile").val();
+            var index = solr_file.lastIndexOf("\\");
+            var index1 = solr_file.lastIndexOf(".xls");
+            var name = solr_file.substring(index+1,index1);
             $("#view_input").val(solr_file);
+            $("#mydiv1").text(name);
         })
     })
 </script>

src/main/webapp/webpage/modules/sg/projecttem/addItem.js

@@ -61,7 +61,11 @@ $(document).ready(function() {
     //获取现在的文件的名称展示在input框当中
     $("#myfile").bind("change",function(){
         var solr_file= $("#myfile").val();
+        var index = solr_file.lastIndexOf("\\");
+        var index1 = solr_file.lastIndexOf(".xls");
+        var name = solr_file.substring(index+1,index1);
         $("#view_input").val(solr_file);
+        $("#mydiv1").text(name);
     })
 })