From 00df21985694f9ff91018b15b33a1df5aa297965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 6 Mar 2020 18:19:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/public/index.html                               | 2 +-
 public/react/scripts/build.js                                | 2 +-
 public/react/src/college/College.js                          | 4 ++--
 public/react/src/modules/tpm/TPMsettings/LearningSettings.js | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/react/public/index.html b/public/react/public/index.html
index ddf1ed4a9..59e66b0d4 100755
--- a/public/react/public/index.html
+++ b/public/react/public/index.html
@@ -108,7 +108,7 @@
     <!--
 =======
   <!--    <meta name="viewport" id="viewport" content="width=device-width, initial-scale=0.3, maximum-scale=0.3, user-scalable=no">-->
-  <meta name="viewport" id="viewport" content="width=device-width, initial-scale=0.3, maximum-scale=0.3">
+<!--  <meta name="viewport" id="viewport" content="width=device-width, initial-scale=0.3, maximum-scale=0.3">-->
 
   <meta name="theme-color" content="#000000">
   <!--<meta http-equiv="cache-control" content="no-cache,no-store, must-revalidate" />-->
diff --git a/public/react/scripts/build.js b/public/react/scripts/build.js
index f8cec6702..e1ba02ef3 100644
--- a/public/react/scripts/build.js
+++ b/public/react/scripts/build.js
@@ -221,12 +221,12 @@ function generateNewIndexJsp() {
     // <script type="text/javascript" src="/js/js_min_all.js"></script>
     var result = data
         .replace(jsMinAllRegex, code)
-        .replace(flvMinAllRegex,'')
         // .replace('/js/js_min_all.js', `${cdnHost}/react/build/js/js_min_all.js?v=${newVersion}`)
         // .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`)
 
         // ${cdnHost}  加了cdn后，这个文件里的字体文件加载会有跨域的报错   ../fonts/fontawesome-webfont.eot
         // TODO tpi 评测结果关闭也使用了fontawesome
+        .replace(flvMinAllRegex,``)
         .replace('/css/css_min_all.css', `${cdnHost}/react/build/css/css_min_all.css?v=${newVersion}`)
 			  .replace('/css/iconfont.css', `${cdnHost}/react/build/css/iconfont.css?v=${newVersion}`)
         .replace(/\/js\/create_kindeditor.js/g, `${cdnHost}/react/build/js/create_kindeditor.js?v=${newVersion}`)
diff --git a/public/react/src/college/College.js b/public/react/src/college/College.js
index d18e45d48..7ebfe6644 100644
--- a/public/react/src/college/College.js
+++ b/public/react/src/college/College.js
@@ -893,8 +893,8 @@ class College extends Component {
 						<p className="yslstatistic-base-item-label">
 							共建实训
 							</p>
-						<p className="yslstatistic-base-item-label">
-							实习报告
+							<p className="yslstatistic-base-item-label">
+								实训报告
 							</p>
 						<p className="yslstatistic-base-item-label">
 							学员实战时间
diff --git a/public/react/src/modules/tpm/TPMsettings/LearningSettings.js b/public/react/src/modules/tpm/TPMsettings/LearningSettings.js
index e1316623e..53f4b01b8 100644
--- a/public/react/src/modules/tpm/TPMsettings/LearningSettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/LearningSettings.js
@@ -331,7 +331,7 @@ export default class Shixuninformation extends Component {
               <Checkbox
                 checked={this.state.test_set_permission}
                 onChange={this.Checktest_set_permission}></Checkbox>
-              <label style={{top: '6px'}} className="color-grey-9 ml10">（选中则允许学员允许学员通过金币解锁查看隐藏测试集的内容）</label>
+              <label style={{top: '6px'}} className="color-grey-9 ml10">（选中则允许学员通过金币解锁查看隐藏测试集的内容）</label>
             </span>
           </div>