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

src/components/input/textArea.vue

@@ -5,7 +5,6 @@
       v-loading="loading"
       element-loading-text="数据上传中，请稍后"
       element-loading-spinner="el-icon-loading"
-      element-loading-background="rgba(0, 0, 0, 0.8)"
     >
       <div v-show="isEmpty && !edit" class="text-edit">
         {{ emptyText }}

src/views/projectManage/bugList/details/index.vue

@@ -1498,8 +1498,7 @@ border-color: #DCDFE6;
 }
 
 .bug_date {
-  width:46px;
-  height:16px;
+  padding: 0 3px;
   background:rgba(245,108,108,0.1);
   border:1px solid rgba(245,108,108,1);
   opacity:1;

src/views/projectManage/taskList/childrenTask/childDetail.vue

@@ -91,7 +91,7 @@
             <div class="title-left-name">描述</div>
           </div>
           <div>
-            <text-area :id="'pro-desc'" :value.sync="formData.remark" :empty-text="'点击'" :input-button="'添加描述'" @change="changeArea" />
+            <text-area :id="'pro-desc'" :value.sync="formData.remark" :empty-text="'点击'" :input-button="'添加描述'" @change="changeArea('remark')" />
           </div>
         </section>
         <!-- 子任务 -->

src/views/projectManage/taskList/childrenTask/createChildren.vue

@@ -8,7 +8,6 @@
     width="65%"
     element-loading-text="数据上传中，请稍后"
     element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
     @confirm="confirmForm()"
     @cancel="cancel()"
   >

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -1,6 +1,11 @@
 <template>
   <!-- 新建报告模版 -->
-  <div class="report-container">
+  <div
+    v-loading="loading"
+    class="report-container"
+    element-loading-text="数据上传中，请稍后"
+    element-loading-spinner="el-icon-loading"
+  >
     <el-form ref="fromCreateData" :model="from">
       <el-form-item v-if="releaseType" label="模版名称" prop="moduleName" :rules="[{ required: true, message: '模版名称不能为空', trigger: 'change'}]"><br>
         <el-input v-model="from.moduleName" size="small" style="width:100%;" placeholder="请输入模版名称（不可与现有模版重名）" />
@@ -82,6 +87,7 @@ import normalArea from '@/components/input/normalArea' // 富文本
 import 'tinymce/plugins/table'// 插入表格插件
 import iconDisplay from '@/views/reportManagement/ReleaseReport/components/iconDisplay.vue'
 import { settingAddReportModule, settingUpdateReportModule, settingGetReportModuleById, reportreleaseInitReportRelease, reportreleaseCreate, reportreleaseUpdate, reportreleaseGetReportById } from '@/api/reportTemplate' // 模版添删改查
+import { getContainImgHTMLNode } from '@/utils/handleTinymce' // 富文本本图片转换
 
 export default {
   components: {
@@ -102,7 +108,8 @@ export default {
       from: {}, // from-date
       fromData: {},
       modelID: '',
-      releaseType: false // 新建模版还是新建准出报告
+      releaseType: false, // 新建模版还是新建准出报告
+      loading: false // loading状态
     }
   },
   watch: {
@@ -200,8 +207,15 @@ export default {
 
     // 创建准出报告
     reportreleaseCreate(val) {
-      this.$refs.fromCreateData.validate((valid) => {
+      this.$refs.fromCreateData.validate(async(valid) => {
         if (valid) {
+          this.loading = true
+          try {
+            this.fromData.content = await getContainImgHTMLNode(this.fromData.content)
+          } catch (error) {
+            this.loading = false
+            throw error
+          }
           if (val) {
             const data = {}
             data.id = this.reportId
@@ -290,11 +304,18 @@ export default {
 
     // 新建模版
     getCreateData(e) {
-      this.$refs.fromCreateData.validate((valid) => {
+      this.$refs.fromCreateData.validate(async(valid) => {
         if (valid) {
           const data = {}
           data.bizId = localStorage.getItem('bizId')
-          data.content = this.fromData.content
+          this.loading = true
+          try {
+            data.content = await getContainImgHTMLNode(this.fromData.content)
+          } catch (error) {
+            this.loading = false
+            throw error
+          }
+          this.loading = false
           data.moduleName = this.from.moduleName
           data.type = 4 // 准出报告 4
           if (e === '新建模版') {

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -115,6 +115,7 @@ import normalArea from '@/components/input/normalArea' // 富文本
 import 'tinymce/plugins/table'// 插入表格插件
 import { configShowTaskEnum } from '@/api/taskIndex'
 import { settingAddReportModule, settingUpdateReportModule, settingGetReportModuleById, reportdelivertestInitReportRelease, reportdelivertestCreate, reportdelivertestGetRequiresByTaskIds, reportdelivertestUpdate, reportdelivertestGetReportById } from '@/api/reportTemplate' // 模版添删改查
+import { getContainImgHTMLNode } from '@/utils/handleTinymce' // 富文本本图片转换
 
 export default {
   components: {
@@ -135,7 +136,8 @@ export default {
         reportName: ''
       },
       appClient: [], // 跟版客户端
-      releaseType: true // 新建模版还是新建准出报告
+      releaseType: true, // 新建模版还是新建准出报告
+      loading: false // loading状态
     }
   },
   watch: {
@@ -235,8 +237,16 @@ export default {
 
     // 创建提测报告
     reportreleaseCreate(val) {
-      this.$refs.fromCreateData.validate((valid) => {
+      this.$refs.fromCreateData.validate(async(valid) => {
         if (valid) {
+          this.loading = true
+          try {
+            this.fromCreateData.content = await getContainImgHTMLNode(this.fromCreateData.content)
+          } catch (error) {
+            this.loading = false
+            throw error
+          }
+          this.loading = false
           if (val) {
             const data = {}
             data.id = this.from.id

src/views/reportManagement/daily/newReportTemplate.vue

@@ -4,7 +4,6 @@
     v-loading="loading"
     element-loading-text="数据上传中，请稍后"
     element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
   >
     <el-form ref="fromCreateData" :model="fromCreateData" :rules="serviceDataRules">
       <el-form-item label="模版名称" prop="moduleName" label-width="80px">