chengjie 6 月之前
父节点
当前提交
4fcef3ab1f
共有 2 个文件被更改,包括 6 次插入5 次删除
  1. 3 5
      src/api/mps/mpsScoreController.js
  2. 3 0
      src/config/index.js

+ 3 - 5
src/api/mps/mpsScoreController.js

@@ -191,8 +191,6 @@ export async function GetMPSScore(ctx) {
191 191
         list=[];
192 192
 
193 193
     if (!list || list.length==0) {
194
-        if (param.ScoreType == "1-15志愿")
195
-            param.ScoreType = "1-15志愿";
196 194
 
197 195
         var sql0 = "SELECT f.ID,x.DistrictID as 'DistrictName',x.District as 'DistrictNameArea',f.DistrictID,f.ScoreType,f.SchoolOfGraduation,f.SchoolFullNameJunior,f.SchoolTarget,x.SchoolFullName,x.SchoolShortName,x.SchoolType2ShortID,x.SchoolType2Short,x.Accommodation,x.PublicOrPrivate,f.SchoolTargetRemark," +
198 196
             "f.PlanNum,f.ScoreTotal,f.Score1,f.Score2,f.Score3,f.Score4,f.SchoolTargetRemark2,f.PlanNumDifferenceValue,f.ScoreTotalDifferenceValue,x.PublicOrPrivate FROM MPS_Score f inner join MPS_School x on f.SchoolTarget=x.ID ";
@@ -314,9 +312,9 @@ export async function GetMPSScore(ctx) {
314 312
                     item.Height = 121;
315 313
                 else if (param.ScoreType == "1-15志愿") {
316 314
                     if (item.SchoolTargetRemark && item.SchoolTargetRemark.indexOf("(") >= 0) {
317
-                        item.SchoolShortName += "\n" + item.SchoolTargetRemark;
318
-                        item.SchoolShortName = item.SchoolShortName.replace("(", "·");
319
-                        item.SchoolShortName = item.SchoolShortName.replace(")", "");
315
+                        // item.SchoolShortName += "\n" + item.SchoolTargetRemark;
316
+                        // item.SchoolShortName = item.SchoolShortName.replace("(", "·");
317
+                        // item.SchoolShortName = item.SchoolShortName.replace(")", "");
320 318
                         item.Height = 159;
321 319
                     }
322 320
                     else {

+ 3 - 0
src/config/index.js

@@ -130,6 +130,9 @@ const commonConfig = {
130 130
     ]
131 131
 };
132 132
 
133
+if (!process.env.NODE_ENV)
134
+    process.env.NODE_ENV='development';
135
+
133 136
 const env = process.env.NODE_ENV || 'development';
134 137
 const envConfig = env === 'production' ? prodConfig : devConfig;
135 138