xg

src/front/project.go

@@ -143,7 +143,7 @@ func (f *Front) ProjectSave() {
 		v_fields := map[string]interface{}{}
 		if err := json.Unmarshal([]byte(fields), &v_fields); err != nil {
 			qu.Debug("V_Filelds Unmarshal Failed：", err)
-			f.ServeJson(map[string]interface{}{"success": false})
+			f.ServeJson(map[string]interface{}{"success": false, "msg": err})
 			return
 		}
 		set = map[string]interface{}{
@@ -165,7 +165,7 @@ func (f *Front) ProjectSave() {
 		if !success { //保存项目失败
 			msg = "新建项目失败\n" + msg
 		} else {
-			msg = "新建项目成功\n" + msg
+			msg = "保存项目成功"
 		}
 	}
 	qu.Debug("Create Project：", success, "importnum：", importDataNum, "successnum：", successNum, "failnum：", int64(importDataNum)-successNum)
@@ -288,7 +288,7 @@ func (f *Front) ProjectTaskSave() {
 	username := qu.ObjToString(user["s_name"]) //当前登录用户
 	projectid := f.GetString("s_projectid")    //项目标识
 	project, _ := util.Mgo.FindById(util.PROJECTCOLLNAME, projectid, nil)
-	projectname := qu.ObjToString((*project)["s_projectname"])       //项目名称
+	projectname := qu.ObjToString((*project)["s_name"])              //项目名称
 	sourceinfo := qu.ObjToString((*project)["s_sourceinfo"])         //源数据表
 	sourcetaskinfo := qu.ObjToString((*project)["s_sourcetaskinfo"]) //任务日志表
 	group := f.GetString("s_group")

src/front/quality.go

@@ -38,6 +38,10 @@ func QuaFieldScore(field_tag []string, coll_name string) bool {
 		u.Mgo.UpSertBulk(coll_name, updateFieldScore...)
 	}
 	log.Printf("处理耗时：%d秒~数量：%d个\n", int(time.Now().Unix())-start, total)
+
+	if total <= 0 {
+		return false
+	}
 	return true
 }
 

src/front/user.go

@@ -326,7 +326,7 @@ func (f *Front) GroupList() {
 	}
 }
 
-//用户任务分发
+// UserTaskSave 用户任务分发
 func (f *Front) UserTaskSave() {
 	defer qu.Catch()
 	user := f.GetSession("user").(map[string]interface{})

src/util/config.go

@@ -36,11 +36,11 @@ var (
 
 
 var (
-	Qy_Es                  					*elastic.Elastic //企业es
-	Mgo_QY									*mongodb.MongodbSim
-	Qy_Lock 								sync.Mutex         	   //锁
+	Qy_Es                  					*elastic.Elastic 		//企业es
+	Mgo_QY									*mongodb.MongodbSim		//企业mgo
+	Qy_Lock 								sync.Mutex         	   	//锁-多线程备用
 	Ext_Type,Ext_From						map[string]interface{}	//抽取来源，方式分
-	Buyer_Score,S_Winner_Score				map[string]interface{}
+	Buyer_Score,S_Winner_Score				map[string]interface{}	//字段规则分
 	Budget_Score,Bidamount_Score			map[string]interface{}
 	Projectname_Score,Projectcode_Score		map[string]interface{}
 )
@@ -128,6 +128,7 @@ func InitConfig() {
 
 //质量相关初始化配置
 func initQuaConfig()  {
+	//线上-需替换-172.17.145.163:27083,172.17.4.187:27082，
 	qyxyconf := Quaconfig["qy_mongodb"].(map[string]interface{})
 	Mgo_QY = &mongodb.MongodbSim{
 		MongodbAddr: qyxyconf["qy_addrName"].(string),
@@ -138,7 +139,7 @@ func initQuaConfig()  {
 	}
 	Mgo_QY.InitPool()
 
-	//查询企业库-可使用es - 也可以mongo
+	//查询企业库-可使用es - 也可以mongo  http://172.17.145.170:9800
 	//Qy_Es = &elastic.Elastic{
 	//	S_esurl: qu.ObjToString(Quaconfig["qyxy_es"]),
 	//	I_size:  10,

src/web/qua_res/qua_config.json

@@ -1,11 +1,11 @@
 {
-  "qyxy_es":"http://127.0.0.1:12003",
+  "qyxy_es":"http://172.17.145.170:9800",
   "qy_mongodb": {
-    "qy_addrName": "127.0.0.1:27017",
+    "qy_addrName": "192.168.3.207:27092",
     "qy_dbName": "mixdata",
     "qy_username": "",
     "qy_password": "",
-    "qy_pool": 10
+    "qy_pool": 5
   },
   "ext_from": {
     "title": 98,

src/web/templates/project/project_clear.html

@@ -99,7 +99,7 @@
                                 <table id="dataTable" class="table table-bordered table-hover">
                                     <thead>
                                     <tr>
-                                        <th></th>
+                                        <th>序号</th>
                                         <th>项目名称</th>
                                         <th>用户组名称</th>
                                         <th>负责人</th>
@@ -138,7 +138,7 @@
                             <div class="modal-body modal-task">
                                 <div class="form-group margin-bottom" style="margin-left: 15px">
                                     <label class="control-label form-inline h4">待分发数据总量(条)：
-                                        <span>0</span>
+                                        <span id="modal-num">0</span>
                                     </label>
                                 </div>
                                 <hr>
@@ -153,7 +153,7 @@
                                         <label class="control-label form-inline" style="margin-left: 20px">数据量(条)：
                                             <input type="number" class="form-control" required></label>
                                     </div>
-                                    <div class="form-group itemDiv" style="margin-left: 10px;">
+                                    <div class="form-group clone-template" style="margin-left: 10px;">
                                         <select class="selectpicker" id="group-select"></select>
                                         <label class="control-label form-inline" style="margin-left: 20px">数据量(条)：
                                             <input type="number" class="form-control by-use" required></label>
@@ -206,21 +206,40 @@
                 });
             },
             "columns": [
-                {"data": "", width: "1%"},
-                {"data": "s_entname", width: "5%"},
-                {"data": "s_departname", width: "4%"},
-                {"data": "s_rulename", width: "4%"},
-                {"data": "s_name", width: "4%"},
+                {"data": null, width: "1%"},
+                {"data": "s_projectname", width: "5%"},
+                {"data": "s_groupname", width: "4%"},
                 {"data": "s_personname", width: "4%"},
-                {"data": "i_importnum", width: "4%"},
+                {"data": "i_givenum", width: "4%"},
                 {"data": "s_status", width: "4%"},
+                {"data": "s_progress", width: "4%"},
+                {
+                    "data": "_id", width: "4%", render: function (val, a, row) {
+                        let str = ""
+                        if (row['i_createtime'] === undefined) {
+                            str = "未开始"
+                        }else if (row['i_createtime'] && row['i_completetime'] === undefined) {
+                            let dt = new Date()
+                            dt.setTime(parseInt(row['i_createtime']) * 1000);
+                            str = dt.format("yyyy-MM-dd") + " - 未结束"
+                        }else {
+                            let dt = new Date()
+                            let ds = new Date()
+                            dt.setTime(parseInt(row['i_createtime']) * 1000);
+                            ds.setTime(parseInt(row["i_completetime"]) * 1000)
+                            str = dt.format("yyyy-MM-dd") + " - " + ds.format("yyyy-MM-dd")
+                        }
+                        return str
+                    }
+                },
                 {
                     "data": "_id", width: "11%", render: function (val, a, row, pos) {
                         tmp = '<div>' +
-                            '<a class="btn btn-sm btn-primary" onclick="editPro(\'' + pos.row + '\')">编辑</a>&nbsp;&nbsp;' +
-                            '<a class="btn btn-sm btn-warning" href="/front/project/clear?pid=' + val + '">清洗</a>&nbsp;&nbsp;' +
-                            '<a class="btn btn-sm btn-info" onclick="del(\'' + val + '\')">判重</a>&nbsp;&nbsp;' +
-                            '<a class="btn btn-sm btn-default" href="">完成</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-primary" href="/front/user/task/save?tid=' + val + '">查看</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-warning" onclick="retrieveTask(' + row + ')">收回</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-info">质检</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-info" onclick="repulseTask(' + row + ')">打回</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-default" onclick="closeTask(\'' + val + '\',\'' + row.s_status + '\')">关闭</a>&nbsp;&nbsp;' +
                             '</div>';
                         return tmp
                     }
@@ -234,6 +253,7 @@
             data: {"pid": projectid},
             success: function (r) {
                 if (r.data.length > 0) {
+                    console.log(r.data)
                     ttable.fnClearTable();
                     ttable.fnAddData(r.data);
                 }
@@ -270,7 +290,15 @@
     }
 
     function dispatchTak(val) {
+        console.log(val)
         stype = val
+        if (stype === "all") {
+            $('#modal-num').val({{.T.allGiveDataNum}})
+        }else if (stype === "notag") {
+            $('#modal-num').val({{.T.okNotGiveDataNum}})
+        }else {
+            $('#modal-num').val({{.T.IsNotOkNotGiveDataNum}})
+        }
         $('#modal-create-task').modal('show')
         for (var i in groupList) {
             var opt = document.createElement('option');
@@ -279,7 +307,7 @@
             $('#group-select')[0].appendChild(opt)
         }
         $("#group-select").selectpicker("refresh");
-        console.log(val)
+
     }
 
     function cancelModel() {
@@ -289,7 +317,7 @@
     }
 
     function addTaskSelect() {
-        let tNode = $('#itemDiv').clone().addClass('clone-template').addClass('used').show()
+        let tNode = $('#itemDiv').clone().addClass('clone-template').show()
         let st = $(tNode).find('select')
         $(st).addClass('selectpicker')
         for (var i in groupList) {
@@ -303,20 +331,24 @@
     }
 
     function saveTask() {
-        console.log(stype)
-        $('#TaskDiv select').each(function () {
-            let ms = $(this).find("option:checked").val()
-            console.log(ms)
-        })
-
-        $('#TaskDiv input').each(function () {
-            let ms = $(this).val()
-            console.log(ms)
-        })
-
         let arr = []
-        arr.push({"s_groupid": "61a47d76c908d368871f5033", "s_groupname": "ceshi", "s_personname": "111", "i_givenum": 30})
-        console.log(JSON.stringify(arr))
+        $('.clone-template').each(function () {
+            var selectId = $(this).find("select option:checked").val()
+            var inputVal = $(this).find("input").val()
+            console.log(selectId, inputVal)
+            let tmp = {}
+            for (let v in groupList) {
+                console.log(v)
+                if (groupList[v]["_id"] === selectId) {
+                    tmp["s_groupid"] = selectId
+                    tmp["s_groupname"] = groupList[v]["s_name"]
+                    tmp["s_personname"] = groupList[v]["s_personname"]
+                    tmp["i_givenum"] = inputVal
+                    break
+                }
+            }
+            arr.push(tmp)
+        })
         $.ajax({
             url: "/front/project/task/save",
             type: 'POST',
@@ -331,4 +363,52 @@
         })
     }
 
+    // 收回
+    function retrieveTask(row) {
+        $.ajax({
+            url: "/front/project/task/retrieve",
+            type: 'POST',
+            data: {"s_status": row.s_status, "id": row._id, "s_groupid": row.s_groupid, "s_sourceinfo": row.s_sourceinfo,
+                "s_sourcetaskinfo": row.s_sourcetaskinfo},
+            success: function (r) {
+                if (r.success) {
+                    ttable.api().ajax.reload()
+                } else {
+                    showTip(r.msg);
+                }
+            }
+        })
+    }
+
+    // 打回
+    function repulseTask(row) {
+        $.ajax({
+            url: "/front/project/task/repulse",
+            type: 'POST',
+            data: {"s_status": row.s_status, "id": row._id, "s_groupid": row.s_groupid, "s_sourceinfo": row.s_sourceinfo,
+                "s_sourcetaskinfo": row.s_sourcetaskinfo},
+            success: function (r) {
+                if (r.success) {
+                    ttable.api().ajax.reload()
+                } else {
+                    showTip(r.msg);
+                }
+            }
+        })
+    }
+
+    function closeTask(val, status) {
+        $.ajax({
+            url: "/front/project/task/close",
+            type: 'POST',
+            data: {"s_status": status, "id": val},
+            success: function (r) {
+                if (r.success) {
+                    ttable.api().ajax.reload()
+                } else {
+                    showTip(r.msg);
+                }
+            }
+        })
+    }
 </script>

src/web/templates/project/project_list.html

@@ -37,7 +37,7 @@
                         <table id="dataTable" class="table table-bordered table-hover">
                             <thead>
                             <tr>
-                                <th></th>
+                                <th>序号</th>
                                 <th>公司名称</th>
                                 <th>部门名称</th>
                                 <th>规则名称</th>
@@ -60,7 +60,6 @@
     </section>
 </div>
 
-
 <div class="modal fade" id="modal-create-project" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog" style="width: 30%">
         <div class="modal-content">
@@ -174,7 +173,6 @@
     </div><!-- /.modal -->
 </div>
 
-
 <div class="modal fade" id="modal-edit-project" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog" style="width: 30%">
         <div class="modal-content">
@@ -233,7 +231,6 @@
     </div><!-- /.modal -->
 </div>
 
-
 {{include "com/footer.html"}}
 <script>
     menuActive("project");
@@ -273,16 +270,34 @@
                 });
             },
             "columns": [
-                {"data": "", width: "1%"},
+                {"data": null, width: "2%"},
                 {"data": "s_entname", width: "5%"},
                 {"data": "s_departname", width: "4%"},
                 {"data": "s_rulename", width: "4%"},
                 {"data": "s_name", width: "4%"},
-                {"data": "s_personname", width: "4%"},
+                {"data": "s_personname", width: "4%", "defaultContent": ""},
                 {"data": "i_importnum", width: "4%"},
                 {"data": "s_status", width: "4%"},
-                {"data": "", width: "4%"},
-                {"data": "", width: "4%"},
+                {"data": null, width: "4%"},
+                {
+                    "data": "_id", width: "4%", render: function (val, a, row) {
+                        let str = ""
+                        if (row['i_createtime'] === undefined) {
+                            str = "未开始"
+                        }else if (row['i_createtime'] && row['i_completetime'] === undefined) {
+                            let dt = new Date()
+                            dt.setTime(parseInt(row['i_createtime']) * 1000);
+                            str = dt.format("yyyy-MM-dd") + " - 未结束"
+                        }else {
+                            let dt = new Date()
+                            let ds = new Date()
+                            dt.setTime(parseInt(row['i_createtime']) * 1000);
+                            ds.setTime(parseInt(row["i_completetime"]) * 1000)
+                            str = dt.format("yyyy-MM-dd") + " - " + ds.format("yyyy-MM-dd")
+                        }
+                        return str
+                    }
+                },
                 {
                     "data": "_id", width: "11%", render: function (val, a, row, pos) {
                         tmp = '<div>' +
@@ -352,30 +367,43 @@
     }
 
     function importData() {
+        let sname = $('#project-name').val()
+        let dataid = $('#data-id').val()
+        let coll = $('#coll-save-name').val()
+        if (sname === "") {
+            alert("项目名称为必填项")
+        }
+        if (dataid === "") {
+            alert("数据导出ID为必填项")
+        }
+        if (coll === "") {
+            alert("数据导出ID为必填项")
+        }
         if (stype === "coll") {
-            projectmap["s_name"] = $('#project-name').val()
-            projectmap["s_sourceinfo"] = $('#coll-save-name').val()
+            projectmap["s_name"] = sname
+            projectmap["s_historyid"] = dataid
+            projectmap["s_sourceinfo"] = coll
+            if (projectmap["s_sourceinfo"] === "") {
+                alert("数据表名为必填项")
+            }
             projectmap["s_type"] = stype
-            projectmap["s_historyid"] = $('#data-id').val()
             $.ajax({
                 url: "/front/project/save",
                 type: 'POST',
                 data: projectmap,
                 success: function (r) {
                     if (r.success) {
-
                         $("#modal-create-project").modal('hide')
                         ttable.api().ajax.reload();
                     } else {
-
+                        showTip(r.msg)
                     }
                 }
             })
         } else if (stype === "excel") {
             let formData = new FormData();
-            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_name", sname)
+            formData.append("s_sourceinfo", coll)
             formData.append("s_entname", $('#company-name').val())
             formData.append("s_departname", $('#dpart-name').val())
             formData.append("s_rulename", $('#rule-name').val())
@@ -407,7 +435,6 @@
 
     function editPro(index) {
         projectmap = ttable.fnGetData()[index]
-        console.log(projectmap)
         $('#modal-edit-project').modal('show')
         $('#company-edit-name').val(projectmap["s_entname"])
         $('#rule-edit-name').val(projectmap["s_rulename"])
@@ -416,10 +443,11 @@
 
     function saveData() {
         stype = "edit"
+        let s1 = JSON.stringify(projectmap)
         let tmp = projectmap
-        tmp["s_entname"] = $('#company-edit-name').val()
-        tmp["s_rulename"] = $('#rule-edit-name').val()
         tmp["s_departname"] = $('#dpart-edit-name').val()
+        tmp["s_rulename"] = $('#rule-edit-name').val()
+        tmp["s_personname"] = $('#edit-person').val()
 
         let fieldArr = $('#markFieldSelect').val();
         let m = {}
@@ -430,22 +458,24 @@
                 }
             }
         }
-        tmp["v_field"] = m
-        if (tmp !== projectmap) {
+        tmp["v_fields"] = JSON.stringify(m)
+        if (s1 === JSON.stringify(tmp)) {
+            showTip("未做修改");
+        } else {
             $.ajax({
-                url: "/front/project/task/save",
+                url: "/front/project/save",
                 type: 'POST',
-                data: projectmap,
+                data: {"s_type": stype, "s_departname": tmp["s_departname"], "s_personname": tmp["s_personname"],
+                    "s_rulename": tmp["s_rulename"], "v_fields": tmp["v_fields"], "s_name": tmp["s_name"]},
                 success: function (r) {
-                    if (r.rep) {
+                    if (r.success) {
+                        cancelModel()
                         ttable.api().ajax.reload();
                     } else {
-                        showTip("保存失败");
+                        showTip(r.msg);
                     }
                 }
             })
-        } else {
-            showTip("未做修改");
         }
     }
 

src/web/templates/project/task_group_list.html

@@ -18,15 +18,15 @@
             <div class="col-xs-12">
                 <div class="box">
                     <div class="box-body">
-                        <hr>
+
                         <div class="form-horizontal">
                             <div class="box-body margin">
                                 <table id="dataTable" class="table table-bordered table-hover">
                                     <thead>
                                     <tr>
                                         <th></th>
-                                        <th>用户账号</th>
                                         <th>项目名称</th>
+                                        <th>负责人</th>
                                         <th>数据量</th>
                                         <th>任务状态</th>
                                         <th>完成进度</th>
@@ -83,19 +83,32 @@
             },
             "columns": [
                 {"data": "", width: "1%"},
-                {"data": "s_personname", width: "5%"},
-                {"data": "s_projectname", width: "4%"},
+                {"data": "s_projectname", width: "5%"},
+                {"data": "s_personname", width: "4%"},
                 {"data": "i_givenum", width: "4%"},
-                {"data": "", width: "4%"},
-                {"data": "", width: "4%"},
-                {"data": "", width: "4%"},
-                {"data": "", width: "4%"},
+                {"data": "s_status", width: "4%"},
+                {"data": "s_progress", width: "4%"},
+                {"data": "i_createtime", width: "4%", render: function (val) {
+                        var dt = new Date()
+                        dt.setTime(parseInt(val) * 1000);
+                        return dt.format("yyyy-MM-dd")
+                    }},
+                {"data": "i_completetime", width: "4%", render: function (val) {
+                        if (val === undefined) {
+                            return "未完成"
+                        }else {
+                            var dt = new Date()
+                            dt.setTime(parseInt(val) * 1000);
+                            return dt.format("yyyy-MM-dd")
+                        }
+                    }},
                 {
                     "data": "_id", width: "11%", render: function (val, a, row, pos) {
                         tmp = '<div>' +
-                            '<a class="btn btn-sm btn-primary" onclick="editPro(\'' + pos.row + '\')">收回</a>&nbsp;&nbsp;' +
-                            '<a class="btn btn-sm btn-warning" href="/front/project/clear?pid=' + val + '">质检</a>&nbsp;&nbsp;' +
-                            '<a class="btn btn-sm btn-info" onclick="del(\'' + val + '\')">关闭</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-primary" href="/front/user/task/save?tid=' + val + '">查看</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-warning">分发</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-info">质检</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-info">交付</a>&nbsp;&nbsp;' +
                             '</div>';
                         return tmp
                     }
@@ -103,143 +116,6 @@
             ]
         });
 
-        $('input[type=radio][name=stype]').change(function () {
-            if (this.value === 'coll') {
-                stype = "coll"
-                $("#import-coll").attr("style", "display:block;")
-                $("#import-excel").attr("style", "display:none;")
-            } else if (this.value === 'excel') {
-                stype = "excel"
-                $("#import-coll").attr("style", "display:none;")
-                $("#import-excel").attr("style", "display:block;")
-            }
-        });
     });
 
-
-    function del(id) {
-        showConfirm("确定删除该用户组？", function () {
-            $.ajax({
-                url: "",
-                type: 'POST',
-                data: {"id": id},
-                success: function (r) {
-                    if (r.rep) {
-                        ttable.ajax.reload();
-                    } else {
-                        showTip("状态修改失败");
-                    }
-                }
-            })
-        })
-    }
-
-    function createPro() {
-       $("#modal-create-project").modal('show')
-    }
-
-    function cancelModel() {
-        document.getElementById("model-form-project").reset();
-        $("#modal-create-project").modal('hide')
-        $("#modal-edit-project").modal('hide')
-    }
-
-    function importData() {
-        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",
-                type: 'POST',
-                data: projectmap,
-                success: function (r) {
-                    if (r.success) {
-
-                        $("#modal-create-project").modal('hide')
-                        ttable.api().ajax.reload();
-                    } else {
-
-                    }
-                }
-            })
-        } else if (stype === "excel") {
-            let formData = new FormData();
-            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("xlsx", file)
-                $.ajax({
-                    url: "/front/project/save",
-                    type: 'POST',
-                    data: formData,
-                    cache: false,
-                    processData: false,
-                    contentType: false,
-                    success: function (r) {
-                        if (r.rep) {
-                            $("#modal-create-project").modal('hide')
-                            ttable.api().ajax.reload();
-                        } else {
-                            showTip("状态修改失败");
-                        }
-                    }
-                })
-            } else {
-                showTip("请选择上传文件");
-            }
-        }
-    }
-
-    function editPro(index) {
-        projectmap = ttable.fnGetData()[index]
-        console.log(projectmap)
-        $('#modal-edit-project').modal('show')
-        $('#company-edit-name').val(projectmap["s_entname"])
-        $('#rule-edit-name').val(projectmap["s_rulename"])
-        $('#dpart-edit-name').val(projectmap["s_departname"])
-    }
-
-    function saveData() {
-        stype = "edit"
-        let tmp = projectmap
-        tmp["s_entname"] = $('#company-edit-name').val()
-        tmp["s_rulename"] = $('#rule-edit-name').val()
-        tmp["s_departname"] = $('#dpart-edit-name').val()
-
-        let fieldArr = $('#markFieldSelect').val();
-        let m = {}
-        if (fieldArr.length > 0) {
-            for (const i in fields) {
-                if (fieldArr.indexOf(fields[i]["s_code"]) > -1) {
-                    m[fields[i]["s_code"]] = fields[i]["s_name"]
-                }
-            }
-        }
-        tmp["v_field"] = m
-        if (tmp !== projectmap) {
-            $.ajax({
-                url: "/front/project/save",
-                type: 'POST',
-                data: projectmap,
-                success: function (r) {
-                    if (r.rep) {
-                        ttable.api().ajax.reload();
-                    } else {
-                        showTip("保存失败");
-                    }
-                }
-            })
-        } else {
-            showTip("未做修改");
-        }
-    }
-
 </script>

src/web/templates/project/task_list.html

@@ -314,25 +314,6 @@
             ]
         });
 
-        $('input[type=radio][name=stype]').change(function () {
-            if (this.value === 'coll') {
-                stype = "coll"
-                $("#import-coll").attr("style", "display:block;")
-                $("#import-excel").attr("style", "display:none;")
-            } else if (this.value === 'excel') {
-                stype = "excel"
-                $("#import-coll").attr("style", "display:none;")
-                $("#import-excel").attr("style", "display:block;")
-            }
-        });
-
-        for (var i in fields) {
-            var opt = document.createElement('option');
-            opt.innerText = fields[i]["s_name"];
-            opt.value = fields[i]["s_code"];
-            $('#markFieldSelect')[0].appendChild(opt)
-        }
-        $("#markFieldSelect").selectpicker("refresh");
     });
 
 

src/web/templates/project/task_user_list.html

@@ -49,7 +49,7 @@
 
 {{include "com/footer.html"}}
 <script>
-    menuActive("user/task/list");
+    menuActive("/front/user/task/list");
 
     $(function () {
         ttable = $('#dataTable').dataTable({