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

src/front/remark.go

@@ -242,7 +242,8 @@ func setPaceMap(info map[string]interface{}) ([]map[string]interface{}, []string
 	if packages, ok := info["package"].(map[string]interface{}); ok && len(packages) > 0 {
 		for k, tmpackage := range packages { //遍历分包
 			if tmppack, ok := tmpackage.(map[string]interface{}); ok {
-				isNew, _ := tmppack["isnew"].(bool)
+				//isNew, _ := tmppack["isnew"].(bool)
+				isNew := false
 				status := "-1"
 				if tmppack["package_son"] != nil {
 					status = "1"
@@ -335,7 +336,8 @@ func setPurchasingMap(info map[string]interface{}) ([]interface{}, []map[string]
 	if tmpcls, ok := info["purchasinglist"].([]interface{}); ok {
 		for _, v := range tmpcls {
 			if pcl, ok := v.(map[string]interface{}); ok {
-				isNew, _ := pcl["isnew"].(bool)
+				//isNew, _ := pcl["isnew"].(bool)
+				isNew := false
 				status := "-1"
 				if pcl["purchasinglist_son"] != nil {
 					status = "1"
@@ -378,7 +380,8 @@ func setWorderMap(info map[string]interface{}) ([]interface{}, []map[string]inte
 	if tmpwds, ok := info["winnerorder"].([]interface{}); ok {
 		for _, v := range tmpwds {
 			if wd, ok := v.(map[string]interface{}); ok {
-				isNew, _ := wd["isnew"].(bool)
+				//isNew, _ := wd["isnew"].(bool)
+				isNew := false
 				status := "-1"
 				if wd["winnerorder_son"] != nil {
 					status = "1"

src/web/templates/project/remark_detail.html

@@ -401,6 +401,8 @@
 </body>
 
 <script>
+    let tid = {{ .T.tid }}
+    let did = {{ .T.did }}
     var allCheckFields = {{ .T.fields }}          //本次需标注的所有字段
     var moreInfo = {{ .T.moreInfo }}            // 更多关联信息
     var otherInfo = {{ .T.otherInfo }}          //公告关联信息
@@ -908,16 +910,16 @@
                         this.setStatus(uni, status, two, one)
                     },
                 openHref() {
-                        if (!issave) {
-                            alert("请先保存数据！")
+                    if (!issave) {
+                        alert("请先保存数据！")
+                    } else {
+                        if (nextid === "") {
+                            showMsg("数据已经全部标注完")
                         } else {
-                            if (nextid === "") {
-                                showMsg("数据已经全部标注完")
-                            } else {
-                                window.location.href = "/front/user/remark/detail?pid=" + {{ .T.pid }} + "&did=" + nextid + "&s_sourceinfo=" + {{ .T.s_sourceinfo }}
-                            }
+                            window.location.href = "/front/user/remark/detail?pid=" + {{ .T.pid }} + "&did=" + nextid + "&s_sourceinfo=" + {{ .T.s_sourceinfo }}
                         }
-                    },
+                    }
+                },
                 // 检查一级是否需要改变状态
                 checkOneStatus: function (config) {
                     var tempObj = {
@@ -1181,11 +1183,11 @@
                         }
                         if (n === "1" && v.status === "-1") {
                             v.status = n
-                        } else if (n === "-1") {
+                        } else if (n === -1) {
                             v.status = n
-                        } else if (n === "2") {
+                        } else if (n === 2) {
                             v.status = n
-                        } else if (n === "4") {
+                        } else if (n === 4) {
                             v.status = n
                         }
                     });