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

src/front/remark.go

@@ -901,9 +901,9 @@ func (f *Front) CheckSave() {
 			"b_isgiveuser":  true,
 			"s_userid":      userId,
 		}
-		//for field, val := range tagSet { //更新质检字段
-		//	setResult["v_taginfo."+field] = val
-		//}
+		for field, val := range checkSet { //更新质检字段
+			setResult["v_taginfo."+field] = val
+		}
 		setResult["v_checkinfo"] = checkSet
 		for field, val := range baseSet { //更新基本字段
 			setResult["v_baseinfo."+field] = val

src/web/templates/com/header.html

@@ -75,7 +75,7 @@
 				<div class="form-group">
 				    <label class="col-sm-2 control-label">姓名:</label>
 				    <div class="col-sm-10">
-						<input id="t_name" type="text" value={{(session "user").s_name}} class="form-control" disabled>
+						<input id="t_name" type="text" class="form-control" disabled>
 				    </div>
 				</div>
 				<div class="form-group">
@@ -115,6 +115,7 @@
 <style>.btn-center{ margin:0 auto; height:100px;text-align:center; }</style>
 <!-- /.modal -->
 <script>
+	$('#t_name').val({{(session "user").s_name}})
 function t_save(){
 	pwd=$("#t_pwd").val()
 	showConfirm("确定修改？", function() {

src/web/templates/project/project_list.html

@@ -108,7 +108,7 @@
                                     <div class="form-group">
                                         <label class="col-sm-3 control-label"><span
                                                 style="color:red;">* </span>数据导出ID</label>
-                                        <div class="col-sm-6">
+                                        <div class="col-sm-5">
                                             <input type="text" class="form-control" id="data-id" placeholder="数据导出ID">
                                         </div>
                                     </div>
@@ -120,26 +120,26 @@
                                     <div class="form-group">
                                         <label class="col-sm-3 control-label"><span style="color:red;">* </span>公司名称</label>
                                         <ul class="dropdown-menu"> </ul>
-                                        <div class="col-sm-6">
+                                        <div class="col-sm-5">
                                             <input type="text" class="form-control" id="company-name" autocomplete="off"
                                                    data-provide="typeahead" placeholder="公司名称">
                                         </div>
                                     </div>
                                     <div class="form-group">
                                         <label class="col-sm-3 control-label">部门名称</label>
-                                        <div class="col-sm-6">
+                                        <div class="col-sm-5">
                                             <input type="text" class="form-control" id="dpart-name" placeholder="部门名称">
                                         </div>
                                     </div>
                                     <div class="form-group">
                                         <label class="col-sm-3 control-label">规则名称</label>
-                                        <div class="col-sm-6">
+                                        <div class="col-sm-5">
                                             <input type="text" class="form-control" id="rule-name" placeholder="规则名称">
                                         </div>
                                     </div>
                                     <div class="form-group">
                                         <label class="col-sm-3 control-label">选择文件</label>
-                                        <div class="col-sm-6">
+                                        <div class="col-sm-5">
                                             <input type="file" name="file" id="uploadfile">
                                         </div>
                                     </div>
@@ -148,13 +148,13 @@
                                        style="color: #00c4ff;margin-right: 6px"></i>数据存储</h5>
                                 <div class="form-group">
                                     <label class="col-sm-3 control-label"><span style="color:red;">* </span>数据库名</label>
-                                    <div class="col-sm-6">
+                                    <div class="col-sm-5">
                                         <input type="text" class="form-control" value="jyqykhfw" readonly>
                                     </div>
                                 </div>
                                 <div class="form-group">
                                     <label class="col-sm-3 control-label"><span style="color:red;">* </span>数据表名</label>
-                                    <div class="col-sm-6">
+                                    <div class="col-sm-5">
                                         <input type="text" class="form-control" id="coll-save-name" placeholder="数据表名">
                                     </div>
                                 </div>
@@ -245,6 +245,7 @@
     let stype = "coll";
     let fields = {{ .T.fields }}
     let projectmap = {}
+    let existName = false
 
     //展示loading框
     showLoading = function (){
@@ -381,11 +382,12 @@
     });
 
     function createPro() {
+        existName = false
+        document.getElementById("model-form-project").reset();
        $("#modal-create-project").modal('show')
     }
 
     function cancelModel() {
-        document.getElementById("model-form-project").reset();
         $("#modal-create-project").modal('hide')
         $("#modal-edit-project").modal('hide')
     }
@@ -397,6 +399,10 @@
             alert("项目名称为必填项")
             return
         }
+        if (existName) {
+            alert("项目名称已经存在")
+            return
+        }
         if (coll === "") {
             alert("数据表名为必填项")
             return;
@@ -532,7 +538,7 @@
 
     function clearPro(val) {
         let tmp = ttable.fnGetData()[val]
-        if (tmp["v_fields"] === undefined) {
+        if (tmp["v_fields"] === undefined || Object.keys(tmp["v_fields"]).length === 0) {
             showTip("请设置标注字段")
         }else {
             showLoading()
@@ -541,8 +547,8 @@
                 type: 'POST',
                 data: {"pid": tmp["_id"]},
                 success: function (r) {
+                    hideLoading()
                     if (r.success) {
-                        hideLoading()
                         window.location.href="/front/project/task/list?pid=" + tmp["_id"]
                     } else {
                         showTip(r.msg);
@@ -591,6 +597,9 @@
                 success: function (r) {
                     if (r.exists) {
                         alert("项目名称已经存在")
+                        existName = true
+                    }else {
+                        existName = false
                     }
                 }
             })

src/web/templates/project/task_detail.html

@@ -229,7 +229,6 @@
             data: {"grouptaskid": grouptaskid, "s_status": "-1", "s_login": "-1"},
             success: function (r) {
                 if (r.data.length > 0) {
-                    console.log(r.data)
                     ttable.fnClearTable();
                     ttable.fnAddData(r.data);
                 }
@@ -333,6 +332,10 @@
                 var selectId = $(this).find("select option:checked").val()
                 var inputVal = $(this).find("input").val()
                 valNum += parseInt(inputVal)
+                if (selectId === undefined) {
+                    showTip("未选择分发用户")
+                    return
+                }
                 if (inputVal === ""|| valNum > num) {
                     showTip("分发数量有问题")
                     return
@@ -368,7 +371,6 @@
                     // 没有整除
                     let quo =  Math.floor(dataNum/userNum)      // 商数
                     let rem = dataNum%userNum                   // 余数
-                    console.log("quo---", quo, "rem---", rem)
                     for (let i = 0; i < userNum; i++) {
                         let tmp = {}
                         tmp["s_userid"] = userList[i]["_id"]
@@ -388,14 +390,12 @@
             }
         }
         if (arr.length > 0) {
-            console.log(arr)
             $.ajax({
                 url: "/front/user/task/save",
                 type: "POST",
                 data: {"grouptaskid": grouptaskid, "usernums": JSON.stringify(arr)},
                 success: function (r) {
                     if (r.success) {
-                        console.log(r.data)
                         location.reload()
                     }else {
                         showTip(r.msg)