Merge branch 'test' of http://gitlab.fjmaimaimai.com/allied-creation/performance into test

@@ -39,7 +39,7 @@ type PerformanceTarget struct {
 
 
 func LoadPerformanceDimensions(rows [][]string) ([]*PerformanceDimension, error) {
 func LoadPerformanceDimensions(rows [][]string) ([]*PerformanceDimension, error) {
 	formRows := make([]*PerformanceApplicationForm, 0)
 	formRows := make([]*PerformanceApplicationForm, 0)
-	var dimensionName, moduleName, taskName, weightName, standardName, evaluator string
+	var dimensionName, moduleName, taskName, weightName, standardName, evaluator, indicatorType string
 	required := "是"
 	required := "是"
 	for key, item := range rows {
 	for key, item := range rows {
 		if key < 3 {
 		if key < 3 {
@@ -99,6 +99,12 @@ func LoadPerformanceDimensions(rows [][]string) ([]*PerformanceDimension, error)
 		}
 		}
 		form.Evaluator = evaluator
 		form.Evaluator = evaluator
 
 
+		// 指标类型
+		if len(item) > 11 && item[11] != "" {
+			indicatorType = strings.TrimSpace(item[11])
+		}
+		form.IndicatorType = indicatorType
+
 		formRows = append(formRows, form)
 		formRows = append(formRows, form)
 	}
 	}
 	dimensions := make([]*PerformanceDimension, 0)
 	dimensions := make([]*PerformanceDimension, 0)