合并分支 'thy' 到 'master'

config.js

@@ -4,8 +4,8 @@
 
 // 服务地址
 
+// const IP = 'http://192.168.1.248'; // 刘杰
 const IP = 'http://120.55.57.35'; // 刘杰
-// const IP = 'http://192.168.0.114'; // 刘杰
 
 // 请求目标服务器域名配置
 const DOMAIN_NAME = {

src/components/assessment/homeDetailcopy.vue

@@ -2721,7 +2721,7 @@ systemStructure.cdn.space != ''  "
                         </el-select>
                       </div>
                       <div class="copy-box-main-input more plan" style="margin-top:30px;">
-                        <span class="box-input-text plan">RPR时间（恢复还原点）：</span>
+                        <span class="box-input-text plan">RPO时间（恢复还原点）：</span>
                         <el-select v-model="rpo" placeholder="请选择">
                           <el-option label="与RTO时间的前60秒同步
 
@@ -4289,6 +4289,14 @@ export default {
               }
             }
           });
+          Object.keys(this.developLanguageSystem).forEach(key => {
+            if (res.data.developLanguageSystem[key] != -1) {
+              if (res.data.developLanguageSystem[key] == undefined) {
+              } else {
+                this.developLanguageSystem[key] = res.data.developLanguageSystem[key];
+              }
+            }
+          });
           Object.keys(this.systemStructure).forEach(key => {
             if (res.data.systemStructure[key] != -1) {
               if (res.data.systemStructure[key] == undefined) {