Merge branch 'dev2.0' of http://192.168.3.207:8080/data_processing/data_validation into dev2.0

src/web/templates/project/project_list.html

@@ -94,7 +94,7 @@
                 <div class="form-group margin-bottom">
                   <label class="col-sm-3 control-label"><span style="color:red;">* </span>项目名称</label>
                   <div class="col-sm-5">
-                    <input type="text" class="form-control" id="project-name" placeholder="项目名称" required>
+                    <input type="text" class="form-control" id="project-name" placeholder="项目名称">
                   </div>
                 </div>
                 <div id="import-coll">
@@ -114,7 +114,7 @@
                   <div class="form-group">
                     <label class="col-sm-3 control-label"><span style="color:red;">* </span>数据导出ID</label>
                     <div class="col-sm-6">
-                      <input type="text" class="form-control" id="data-id" placeholder="数据导出ID" required>
+                      <input type="text" class="form-control" id="data-id" placeholder="数据导出ID">
                     </div>
                   </div>
                 </div>
@@ -124,7 +124,7 @@
                   <div class="form-group">
                     <label class="col-sm-3 control-label"><span style="color:red;">* </span>公司名称</label>
                     <div class="col-sm-6">
-                      <input type="text" class="form-control" id="company-name" placeholder="公司名称" required>
+                      <input type="text" class="form-control" id="company-name" placeholder="公司名称">
                     </div>
                   </div>
                   <div class="form-group">
@@ -156,7 +156,7 @@
                 <div class="form-group">
                   <label class="col-sm-3 control-label"><span style="color:red;">* </span>数据表名</label>
                   <div class="col-sm-6">
-                    <input type="text" class="form-control" id="coll-save-name" placeholder="数据表名" required>
+                    <input type="text" class="form-control" id="coll-save-name" placeholder="数据表名">
                   </div>
                 </div>
               </div>
@@ -251,7 +251,7 @@
       "ajax": {
         "url": "/front/project",
         "type": "post",
-        "data": {}
+        "data": {"status": "-1"}
       },
       "language": {
         "url": "/dist/js/dataTables.chinese.lang"
@@ -346,10 +346,10 @@
   }
 
   function importData() {
-    projectmap["s_name"] = $('#project-name').val()
-    projectmap["s_sourceinfo"] = $('#coll-save-name').val()
-    projectmap["s_type"] = stype
     if (stype === "coll") {
+      projectmap["s_name"] = $('#project-name').val()
+      projectmap["s_sourceinfo"] = $('#coll-save-name').val()
+      projectmap["s_type"] = stype
       projectmap["s_historyid"] = $('#data-id').val()
       $.ajax({
         url: "/front/project/save",
@@ -357,6 +357,7 @@
         data: projectmap,
         success: function (r) {
           if (r.rep) {
+            $("#modal-create-project").modal('hide')
             ttable.api().ajax.reload();
           } else {
             showTip("项目创建成功");
@@ -365,9 +366,16 @@
       })
     }else if (stype === "excel") {
       let formData = new FormData();
-      let file = $('#uploadfile').files[0]
+      formData.append("s_name", $('#project-name').val())
+      formData.append("s_sourceinfo", $('#coll-save-name').val())
+      formData.append("s_historyid", $('#data-id').val())
+      formData.append("s_entname", $('#company-name').val())
+      formData.append("s_departname", $('#dpart-name').val())
+      formData.append("s_rulename", $('#rule-name').val())
+      formData.append("s_type", stype)
+      let file = $('#uploadfile')[0].files[0]
       if (file) {
-        formData.append("file", file)
+        formData.append("xlsx", file)
         $.ajax({
           url: "/front/project/save",
           type: 'POST',
@@ -377,7 +385,7 @@
           contentType: false,
           success: function (r) {
             if (r.rep) {
-              $("#modal-edit-project").modal('hide')
+              $("#modal-create-project").modal('hide')
               ttable.api().ajax.reload();
             } else {
               showTip("状态修改失败");