Merge branch 'main' of http://121.41.2.71:3000/ykx/jy-safe-app

manifest.json

@@ -2,8 +2,8 @@
     "name" : "矿山安全生产标准化系统",
     "appid" : "__UNI__DE7034E", //BBB1077
     "description" : "厦钨矿山安全app",
-    "versionName" : "1.0.005",
-    "versionCode" : 10005,
+    "versionName" : "1.0.006",
+    "versionCode" : 10006,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/apply/subPages/SE/6trainReportEdit.vue

@@ -92,6 +92,13 @@
 				// TODO: id 未获取
 				extendRule(json, 'ID', 1, this.model.ID)
 				getRequest(json, "/SE/TrainingEffectEvaluationSurvey/Get").then(res => {
+					if (res.Nav_ResultList && res.Nav_ResultList.length) {
+						res.Nav_ResultList.forEach(item => {
+							if (item.EVALUATION_RESULT === undefined || item.EVALUATION_RESULT === null) {
+								item.EVALUATION_RESULT = 0
+							}
+						})
+					}
 					this.model = res
 				})
 			},