Merge branch 'master' into zhp

src/i18n/zh-CN.js

@@ -427,7 +427,10 @@ t.supplier.description = '说明'
 t.supplier.evaluationPeriod	= '评估时间段'		
 t.supplier.evaluationType = '评估类型'
 t.supplier.reminder	= '提醒人'	
-t.supplier.title = '标题'
+t.supplier.title	= '标题'
+t.supplier.projectType = '评估项类型'
+t.supplier.weight = '权重'
+t.supplier.projectName = '评估项目'
 t.supplier.projectTypeName	= '类别'
 t.supplier.requirement = '要求'
 t.supplier.statisticalValue = '是否统计值'
@@ -438,16 +441,6 @@ t.supplier.estimatedNextStartTime = '预计下次启动时间'
 t.supplier.offline = '下限'
 t.supplier.online = '上限'
 
-
-
-	
-
-
-
-
-
-
-
 t.gage = {}
 t.gage.name = '名称'
 t.gage.code = '编号'