Merge branch 'http_mock' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_mock

src/views/Platform/presentation/Acceptance.vue

@@ -743,4 +743,7 @@ export default {
     align-items: center;
     justify-content: space-between;
   }
+  .eleStyle >>> .el-col {
+    white-space: pre-line;
+  }
 </style>

src/views/Platform/presentation/ClientAcceptance.vue

@@ -116,7 +116,7 @@
         </el-table-column>
       </el-table>
 
-      <el-row>
+      <el-row class="pre-line">
         <el-col :span="24" style="margin:1% 0;">遗留问题<el-input v-model="ClientData.bugInfo" type="textarea" size="small" placeholder="请填写内容" style="margin-top:1%;" /></el-col>
       </el-row>
     </el-form>
@@ -522,6 +522,9 @@ export default {
     align-items: center;
     justify-content: space-between;
   }
+  .pre-line >>> .el-col{
+    white-space: pre-line
+  }
 </style>
 <style lang="stylus" scoped>
   .double

src/views/Platform/presentation/ResultPageyL.vue

@@ -182,7 +182,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-row>
+        <el-row class="pre-line">
           <el-col :span="24"><div style="margin: 2% 0;">1、遗留问题</div>{{ ClientDatayl.bugInfo }}</el-col>
         </el-row>
 
@@ -385,6 +385,9 @@ export default {
     font-size: 19px;
     font-weight: bold;
   }
+  .pre-line >>> .el-col{
+    white-space: pre-line
+  }
   .rich>>> table tr td{border:1px solid #ccc;font-size: 15px; color: #606266}
   .rich>>> table th{border:1px solid #ccc; font-size: 15px; background: #F0F7FF; color: #606266}
   .rich>>> table {border:1px solid #ccc; border-collapse: collapse;line-height: 30px; text-align: center;font-size: 15px; color: #606266}

src/views/Platform/presentation/acceptTheReport.vue

@@ -81,8 +81,12 @@
       <div class="rich" v-html="joinTestOne" />
 
       <div class="titleStyle">三. 其他</div>
-      <div v-if="oneShow" class="marage">新增配置 : {{ fromCreateData.configInfo }}</div><br>
-      <div class="marage">其他 : {{ fromCreateData.others }}</div><br>
+      <el-form :model="fromCreateData">
+        <div class="noWrap">
+          <el-form-item v-if="oneShow" label="新增配置 :">{{ fromCreateData.configInfo }}</el-form-item><br>
+          <el-form-item label="其他 :">{{ fromCreateData.others }}</el-form-item><br>
+        </div>
+      </el-form>
     </div>
   </div>
 </template>
@@ -209,3 +213,11 @@ export default {
   text-align left
   font-weight 400 !important
 </style>
+<style scoped lang="scss">
+/deep/ .el-form-item__content{
+  white-space: pre-line
+}
+.marage {
+  white-space: pre-line
+}
+</style>

src/views/Platform/presentation/testPresenyL.vue

@@ -15,8 +15,8 @@
           <div style="flex:1; width: 200px;height:400px;" />
           <div id="barShow" style="flex:2; width: 400px;height:400px;" />
         </div>
-        <div style="margin: 1%;">2、bug说明</div>
-        {{ bugshow }}
+        <div style="margin: 1%;">2、bug说明：</div>
+        <div class="pre-line">{{ bugshow }}</div>
       </div>
     </el-form>
   </div>
@@ -113,6 +113,10 @@ export default {
   #app .hideSidebar .sidebar-container {
     display: none;
   }
+  .pre-line {
+    white-space: pre-line;
+    padding-left: 10px;
+  }
   .rich>>> table tr td{border:1px solid #ccc;font-size: 14px; color: #606266}
   .rich>>> table th{border:1px solid #ccc; font-size: 14px; background: #F0F7FF; color: #606266}
   .rich>>> table {border:1px solid #ccc; border-collapse: collapse;line-height: 30px; text-align: center;font-size: 14px; color: #606266}