修改保留换行符bug

.env.development

@@ -6,7 +6,7 @@ ENV = 'development'
 
 # 开发环境
 #测试地址
-# VUE_APP_BASE_API = 'http://47.92.229.224:8080'
+VUE_APP_BASE_API = 'http://47.92.229.224:8080'
 #罗俊
 #VUE_APP_BASE_API = 'http://10.87.21.60:8080'
 #罗伟
@@ -17,7 +17,7 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'http://10.87.11.173:8080'
 # VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
-VUE_APP_BASE_API = 'http://10.87.23.62:8080'
+# VUE_APP_BASE_API = 'http://10.87.23.62:8080'
 # VUE_APP_BASE_API = 'http://localhost:8080'
 # 开发环境
 # VUE_APP_BASE_API = 'http://10.87.21.103:8080'

src/assets/styles/ruoyi.scss

@@ -372,6 +372,10 @@
    text-align: center !important;
    color: #1e1e1e;
  }
+ .text_nbsp{
+	text-align: justify !important;
+	white-space: pre-wrap !important;
+ }
  .el-descriptions-item__label.is-bordered-label {
    font-weight: bold;
    color: #515a6e;

src/views/core/drill/task/dialog.info.vue

@@ -31,21 +31,15 @@
             label="演练机构"
           >
             {{ formData.orgName }} </el-descriptions-item
-          ><el-descriptions-item
-            labelClassName="gx_info_label"
-            label="指挥人"
-          >
+          ><el-descriptions-item labelClassName="gx_info_label" label="指挥人">
             {{ formData.hostName }} </el-descriptions-item
-          ><el-descriptions-item
-            labelClassName="gx_info_label"
-            label="登记人"
-          >
-            {{ formData.recorderName}} </el-descriptions-item
+          ><el-descriptions-item labelClassName="gx_info_label" label="登记人">
+            {{ formData.recorderName }} </el-descriptions-item
           ><el-descriptions-item
             labelClassName="gx_info_label"
             label="演练项目"
           >
-            {{  formData.typeText }} </el-descriptions-item
+            {{ formData.typeText }} </el-descriptions-item
           ><el-descriptions-item
             labelClassName="gx_info_label"
             label="演练地点"
@@ -55,8 +49,8 @@
             labelClassName="gx_info_label"
             label="演练开始时间"
           >
-            {{ formData.drillStartTime }} </el-descriptions-item
-          >
+            {{ formData.drillStartTime }}
+          </el-descriptions-item>
           <el-descriptions-item
             labelClassName="gx_info_label"
             label="演练结束时间"
@@ -68,14 +62,17 @@
             span="2"
             label="预设案由"
           >
-             {{ formData.presetCase }}
+            <span class="text_nbsp"> {{ formData.presetCase }}</span>
           </el-descriptions-item>
           <el-descriptions-item
             labelClassName="gx_info_label"
             span="2"
             label="演练情况"
           >
+          <span class="text_nbsp">
+
             {{ formData.drillSituation }}
+          </span>
           </el-descriptions-item>
         </el-descriptions>
 
@@ -344,7 +341,4 @@ export default {
 };
 </script>
 
-<!-- <style lang="less">
-.edu-training-edit {
-}
-</style> -->
+<style lang="scss" scoped></style>