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

src/views/Platform/presentation/Acceptance.vue

@@ -53,24 +53,20 @@
       </div>
 
       <div class="backStyle" style="margin-bottom:2%;">二. 项目背景</div>
-      <div id="editorElem" class="toolbar" />
-      <div id="editorElem1" class="text" />
+      <normal-area id="clients-children-projectBackground" :value.sync="clienEdit.projectBackground" :height="200" />
 
       <div class="backStyle">三. 模块信息</div>
       <div class="titStyle" style="margin: 20px 0;">1、模块信息</div>
 
-      <div id="editorElems" class="toolbar" />
-      <div id="editorElems1" class="text" />
+      <normal-area id="clients-children-moduleInfo" :value.sync="clienEdit.moduleInfo" :height="200" />
 
       <div class="titStyle" style="margin: 20px 0;">2、本期功能</div>
 
-      <div id="editorFrom" class="toolbar" />
-      <div id="editorFrom1" class="text" />
+      <normal-area id="clients-children-functionInfo" :value.sync="clienEdit.functionInfo" :height="200" />
 
       <div class="titStyle" style="margin: 20px 0;">3、风险点</div>
 
-      <div id="editorF" class="toolbar" />
-      <div id="editorF1" class="text" />
+      <normal-area id="clients-children-onlineRisk" :value.sync="clienEdit.onlineRisk" :height="200" />
 
       <div class="titStyle" style="margin: 20px 0;">4、缺陷分析</div>
 
@@ -121,8 +117,7 @@
         </div>
       </div>
 
-      <div id="editorEl" class="toolbar" />
-      <div id="editorEl1" class="text" />
+      <normal-area id="clients-children-fctInfo" :value.sync="clienEdit.fctInfo" :height="200" />
 
       <div class="titStyle BJIsize">
         <el-form-item style="flex:1; ">2、可靠性测试</el-form-item>
@@ -133,8 +128,7 @@
         </div>
       </div>
 
-      <div id="editorEle" class="toolbar" />
-      <div id="editorEle1" class="text" />
+      <normal-area id="clients-children-rqtInfo" :value.sync="clienEdit.rqtInfo" :height="200" />
 
       <div class="titStyle BJIsize">
         <el-form-item style="flex:1; ">3、稳定性测试</el-form-item>
@@ -145,8 +139,7 @@
         </div>
       </div>
 
-      <div id="editorSix" class="toolbar" />
-      <div id="editorSix1" class="text" />
+      <normal-area id="clients-children-pftInfo" :value.sync="clienEdit.pftInfo" :height="200" />
 
       <div class="titStyle BJIsize">
         <el-form-item style="flex:1; ">4、安全性测试</el-form-item>
@@ -156,9 +149,7 @@
           <el-tag :type="safeResultChange2" size="small" effect="dark" class="tag" @click="safeResultradio(2)"> 测试未通过 </el-tag>
         </div>
       </div>
-
-      <div id="editorEight" class="toolbar" />
-      <div id="editorEight1" class="text" />
+      <normal-area id="clients-children-safeResultInfo" :value.sync="clienEdit.safeResultInfo" :height="200" />
 
       <div class="titStyle BJIsize">
         <el-form-item style="flex:1; ">5、线上监控</el-form-item>
@@ -168,17 +159,19 @@
           <el-tag :type="moniterResultChange2" size="small" effect="dark" class="tag" @click="moniterResultradio(2)"> 测试未通过 </el-tag>
         </div>
       </div>
-      <div id="editorNine" class="toolbar" />
-      <div id="editorNine1" class="text" />
+      <normal-area id="clients-children-moniterResultInfo" :value.sync="clienEdit.moniterResultInfo" :height="200" />
     </el-form>
   </div>
 </template>
 
 <script>
 import { projectTestReportUpdate, projectTestReportCreate, bugFinishList } from '@/api/ResultPage'
-import E from 'wangeditor'
+import normalArea from '@/components/input/normalArea'
 export default {
   name: 'Acceptance',
+  components: {
+    normalArea
+  },
   props: {
     clienData: {
       type: Object,
@@ -221,9 +214,7 @@ export default {
         taskLateReason: [{ required: true, message: '延期原因不能为空', trigger: 'change' }],
         smokeTestResult: [{ required: true, message: '准入结果不能为空', trigger: 'change' }],
         developer: [{ required: true, message: '开发人员不能为空', trigger: 'change' }],
-        // devTimeEnd: [{ required: true, message: '开发周期不能为空', trigger: 'change' }],
         tester: [{ required: true, message: '测试人员不能为空', trigger: 'change' }]
-        // testTimeEnd: [{ required: true, message: '测试周期不能为空', trigger: 'change' }]
       },
       showData: false,
       showDelay: false,
@@ -233,15 +224,17 @@ export default {
       value: '',
       status: '',
       ClientData: {},
-      editorElem: '',
-      editorElems: '',
-      editorFrom: '',
-      editorF: '',
-      editorEl: '',
-      editorEle: '',
-      editorSix: '',
-      editorEight: '',
-      editorNine: '',
+      clienEdit: {
+        projectBackground: '',
+        moduleInfo: `<p></p><table border="1" style="border: 1px solid #DEE2E7" width="100%"><colgroup><col width="20%"><col width="20%"></colgroup><thead><tr><th>提测模块</th><th>提测分支</th></tr></thead><tbody><tr><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td></tr></tbody></table>`,
+        functionInfo: '',
+        onlineRisk: '',
+        fctInfo: `<p></p><table border="1" style="border: 1px solid #DEE2E7" width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>子类</th><th>测试功能点</th><th>测试结果</th><th>备注</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table>`,
+        rqtInfo: `<p></p><table border="1" style="border: 1px solid #DEE2E7" width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>子类</th><th>描述</th><th>测试结果</th><th>备注</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table>`,
+        pftInfo: `<p></p><table border="1" style="border: 1px solid #DEE2E7" width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>子类</th><th>描述</th><th>测试结果</th><th>备注</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table>`,
+        safeResultInfo: `<p></p><table border="1" style="border: 1px solid #DEE2E7"  width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>子类</th><th>描述</th><th>测试结果</th><th>备注</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table>`,
+        moniterResultInfo: `<p></p><table border="1" style="border: 1px solid #DEE2E7" width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>子类</th><th>描述</th><th>测试结果</th><th>备注</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table>`
+      },
       tableData: [],
       fctResult: '',
       rqtResult: '',
@@ -255,87 +248,21 @@ export default {
   created() {
     this.getRouterData()
   },
-  mounted() {
-    this.editorElem = new E('#editorElem', '#editorElem1')
-    this.editorElems = new E('#editorElems', '#editorElems1')
-    this.editorFrom = new E('#editorFrom', '#editorFrom1')
-    this.editorF = new E('#editorF', '#editorF1')
-    this.editorEl = new E('#editorEl', '#editorEl1')
-    this.editorEle = new E('#editorEle', '#editorEle1')
-    this.editorSix = new E('#editorSix', '#editorSix1')
-    this.editorEight = new E('#editorEight', '#editorEight1')
-    this.editorNine = new E('#editorNine', '#editorNine1')
-
-    this.editorElem.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
-    this.editorElems.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
-    this.editorFrom.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
-    this.editorF.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
-    this.editorEl.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
-    this.editorEle.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
-    this.editorSix.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
-    this.editorEight.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
-    this.editorNine.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
-
-    this.editorElem.customConfig.zIndex = 110
-    this.editorElems.customConfig.zIndex = 110
-    this.editorFrom.customConfig.zIndex = 110
-    this.editorF.customConfig.zIndex = 110
-    this.editorEl.customConfig.zIndex = 110
-    this.editorEle.customConfig.zIndex = 110
-    this.editorSix.customConfig.zIndex = 110
-    this.editorEight.customConfig.zIndex = 110
-    this.editorNine.customConfig.zIndex = 110
-
-    this.editorElem.customConfig.onchange = (html) => { this.editorElem = html }
-    this.editorElem.create()
-
-    this.editorElems.customConfig.onchange = (html) => { this.editorElems = html }
-    this.editorElems.create()
-
-    this.editorFrom.customConfig.onchange = (html) => { this.editorFrom = html }
-    this.editorFrom.create()
-
-    this.editorF.customConfig.onchange = (html) => { this.editorF = html }
-    this.editorF.create()
-
-    this.editorEl.customConfig.onchange = (html) => { this.editorEl = html }
-    this.editorEl.create()
-
-    this.editorEle.customConfig.onchange = (html) => { this.editorEle = html }
-    this.editorEle.create()
-
-    this.editorSix.customConfig.onchange = (html) => { this.editorSix = html }
-    this.editorSix.create()
-
-    this.editorEight.customConfig.onchange = (html) => { this.editorEight = html }
-    this.editorEight.create()
-
-    this.editorNine.customConfig.onchange = (html) => { this.editorNine = html }
-    this.editorNine.create()
-
-    this.editorElem.txt.html(``)
-    this.editorElems.txt.html(`<p></p><table style="border-radius:4px;" width="100%"><colgroup><col width="20%"><col width="20%"></colgroup><thead><tr><th>提测模块</th><th>提测分支</th></tr></thead><tbody><tr><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td></tr></tbody></table><p></p>`)
-    this.editorEl.txt.html(`<p></p><table style="border-radius:4px;" width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>子类</th><th>测试功能点</th><th>测试结果</th><th>备注</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table><p></p>`)
-    this.editorEle.txt.html(`<p></p><table style="border-radius:4px;" width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>子类</th><th>描述</th><th>测试结果</th><th>备注</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table><p></p>`)
-    this.editorSix.txt.html(`<p></p><table style="border-radius:4px;" width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>子类</th><th>描述</th><th>测试结果</th><th>备注</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table><p></p>`)
-    this.editorEight.txt.html(`<p></p><table style="border-radius:4px;" width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>子类</th><th>描述</th><th>测试结果</th><th>备注</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table><p></p>`)
-    this.editorNine.txt.html(`<p></p><table style="border-radius:4px;" width="100%"><colgroup><col width="20%"><col width="20%"><col width="20%"><col width="20%"></colgroup><thead><tr><th>子类</th><th>描述</th><th>测试结果</th><th>备注</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td><td><br></td></tr></tbody></table><p></p>`)
-  },
   methods: {
     getRouterData() {
       this.getBugData(this.clienData)
       console.log(this.clienData, '准出服务端')
       this.ClientData = this.clienData
       this.$nextTick(() => {
-        this.ClientData.projectBackground !== null ? this.editorElem.txt.html(this.ClientData.projectBackground) : ''
-        this.ClientData.moduleInfo !== null ? this.editorElems.txt.html(this.ClientData.moduleInfo) : ''
-        this.ClientData.functionInfo !== null ? this.editorFrom.txt.html(this.ClientData.functionInfo) : ''
-        this.ClientData.onlineRisk !== null ? this.editorF.txt.html(this.ClientData.onlineRisk) : ''
-        this.ClientData.rqtInfo !== null ? this.editorEle.txt.html(this.ClientData.rqtInfo) : ''
-        this.ClientData.fctInfo !== null ? this.editorEl.txt.html(this.ClientData.fctInfo) : ''
-        this.ClientData.pftInfo !== null ? this.editorSix.txt.html(this.ClientData.pftInfo) : ''
-        this.ClientData.safeResultInfo !== null ? this.editorEight.txt.html(this.ClientData.safeResultInfo) : ''
-        this.ClientData.moniterResultInfo !== null ? this.editorNine.txt.html(this.ClientData.moniterResultInfo) : ''
+        this.clienEdit.projectBackground = this.ClientData.projectBackground || this.clienEdit.projectBackground
+        this.clienEdit.moduleInfo = this.ClientData.moduleInfo || this.clienEdit.moduleInfo
+        this.clienEdit.functionInfo = this.ClientData.functionInfo || this.clienEdit.functionInfo
+        this.clienEdit.onlineRisk = this.ClientData.onlineRisk || this.clienEdit.onlineRisk
+        this.clienEdit.fctInfo = this.ClientData.fctInfo || this.clienEdit.fctInfo
+        this.clienEdit.rqtInfo = this.ClientData.rqtInfo || this.clienEdit.rqtInfo
+        this.clienEdit.pftInfo = this.ClientData.pftInfo || this.clienEdit.pftInfo
+        this.clienEdit.safeResultInfo = this.ClientData.safeResultInfo || this.clienEdit.safeResultInfo
+        this.clienEdit.moniterResultInfo = this.ClientData.moniterResultInfo || this.clienEdit.moniterResultInfo
       })
       if (this.ClientData.status === 1) {
         this.tagBtn = 'success'
@@ -480,15 +407,15 @@ export default {
       this.$refs['ClientData'].validate((valid) => {
         if (valid) {
           this.ClientData = ele
-          typeof (this.editorElem) === 'string' ? this.ClientData.projectBackground = this.editorElem : ''
-          typeof (this.editorElems) === 'string' ? this.ClientData.moduleInfo = this.editorElems : ''
-          typeof (this.editorFrom) === 'string' ? this.ClientData.functionInfo = this.editorFrom : ''
-          typeof (this.editorF) === 'string' ? this.ClientData.onlineRisk = this.editorF : ''
-          typeof (this.editorEle) === 'string' ? this.ClientData.rqtInfo = this.editorEle : ''
-          typeof (this.editorEl) === 'string' ? this.ClientData.fctInfo = this.editorEl : ''
-          typeof (this.editorSix) === 'string' ? this.ClientData.pftInfo = this.editorSix : ''
-          typeof (this.editorEight) === 'string' ? this.ClientData.safeResultInfo = this.editorEight : ''
-          typeof (this.editorNine) === 'string' ? this.ClientData.moniterResultInfo = this.editorNine : ''
+          this.ClientData.projectBackground = this.clienEdit.projectBackground
+          this.ClientData.moduleInfo = this.clienEdit.moduleInfo
+          this.ClientData.functionInfo = this.clienEdit.functionInfo
+          this.ClientData.onlineRisk = this.clienEdit.onlineRisk
+          this.ClientData.fctInfo = this.clienEdit.fctInfo
+          this.ClientData.rqtInfo = this.clienEdit.rqtInfo
+          this.ClientData.pftInfo = this.clienEdit.pftInfo
+          this.ClientData.safeResultInfo = this.clienEdit.safeResultInfo
+          this.ClientData.moniterResultInfo = this.clienEdit.moniterResultInfo
           this.ClientData.fctResult = this.fctResult
           this.ClientData.rqtResult = this.rqtResult
           this.ClientData.pftResult = this.pftResult
@@ -525,15 +452,15 @@ export default {
       this.$refs['ClientData'].validate((valid) => {
         if (valid) {
           this.ClientData = ele
-          typeof (this.editorElem) === 'string' ? this.ClientData.projectBackground = this.editorElem : ''
-          typeof (this.editorElems) === 'string' ? this.ClientData.moduleInfo = this.editorElems : ''
-          typeof (this.editorFrom) === 'string' ? this.ClientData.functionInfo = this.editorFrom : ''
-          typeof (this.editorF) === 'string' ? this.ClientData.onlineRisk = this.editorF : ''
-          typeof (this.editorEle) === 'string' ? this.ClientData.rqtInfo = this.editorEle : ''
-          typeof (this.editorEl) === 'string' ? this.ClientData.fctInfo = this.editorEl : ''
-          typeof (this.editorSix) === 'string' ? this.ClientData.pftInfo = this.editorSix : ''
-          typeof (this.editorEight) === 'string' ? this.ClientData.safeResultInfo = this.editorEight : ''
-          typeof (this.editorNine) === 'string' ? this.ClientData.moniterResultInfo = this.editorNine : ''
+          this.ClientData.projectBackground = this.clienEdit.projectBackground
+          this.ClientData.moduleInfo = this.clienEdit.moduleInfo
+          this.ClientData.functionInfo = this.clienEdit.functionInfo
+          this.ClientData.onlineRisk = this.clienEdit.onlineRisk
+          this.ClientData.fctInfo = this.clienEdit.fctInfo
+          this.ClientData.rqtInfo = this.clienEdit.rqtInfo
+          this.ClientData.pftInfo = this.clienEdit.pftInfo
+          this.ClientData.safeResultInfo = this.clienEdit.safeResultInfo
+          this.ClientData.moniterResultInfo = this.clienEdit.moniterResultInfo
           this.$route.query.id ? this.ClientData.taskId = this.$route.query.id : ''
           this.ClientData.bizId = Number(localStorage.getItem('bizId'))
           this.ClientData.taskIds = this.Tsk

src/views/Platform/presentation/ClientAcceptance.vue

@@ -182,9 +182,7 @@ export default {
   watch: {
     clienData: {
       handler(newV, old) {
-        console.log(newV, '结果')
         if (newV.id) {
-          alert(1)
           this.getRouterData()
         }
         this.bugNum = { type: 2, taskIds: newV.taskIds }
@@ -193,9 +191,6 @@ export default {
       immediate: true
     }
   },
-  created() {
-    this.getRouterData()
-  },
   methods: {
     getRouterData() {
       this.ClientData = this.clienData

src/views/Platform/presentation/PresentReport.vue

@@ -91,8 +91,7 @@
 
       <div class="backStyle">二. 联调详情</div>
 
-      <div id="DetailsOfProposal" class="toolbar" />
-      <div id="DetailsOfProposal1" class="text" />
+      <normal-area id="presen-children-joinTest" :value.sync="clienEdit.joinTest" :height="200" />
 
       <div class="backStyle">三. 其他</div>
 
@@ -107,10 +106,13 @@
 
 <script>
 import { launchTestUpdate, launchTestCreate } from '@/api/InterfaceReport'
-import E from 'wangeditor'
+import normalArea from '@/components/input/normalArea'
 
 export default {
   name: 'PresentReport',
+  components: {
+    normalArea
+  },
   props: {
     clienData: {
       type: Object,
@@ -159,7 +161,9 @@ export default {
       dataChange: {
         cr: 0
       },
-      DetailsOfProposal: '',
+      clienEdit: {
+        joinTest: `<p></p><table border="1" style="border: 1px solid #DEE2E7" width="100%"><colgroup><col width="30%"><col width="30%"><col width="30%"></colgroup><thead><tr><th>端类型</th><th>联调RD</th><th>联调结果</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td></tr></tbody></table>`
+      },
       lateStatus: '',
       bizIdCode: '',
       projectIdCode: '',
@@ -179,12 +183,6 @@ export default {
         this.getRouterData()
       })
     })
-    this.DetailsOfProposal = new E('#DetailsOfProposal', '#DetailsOfProposal1')
-    this.DetailsOfProposal.customConfig.zIndex = 110
-    this.DetailsOfProposal.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
-    this.DetailsOfProposal.customConfig.onchange = (html) => { this.DetailsOfProposal = html }
-    this.DetailsOfProposal.create()
-    this.DetailsOfProposal.txt.html(`<p></p><table width="100%"><colgroup><col width="30%"><col width="30%"><col width="30%"></colgroup><thead><tr><th>端类型</th><th>联调RD</th><th>联调结果</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td></tr></tbody></table><p></p>`)
   },
   methods: {
     getRouterData() {
@@ -240,7 +238,7 @@ export default {
           this.showCodeReview = false
         }
         this.$nextTick(() => {
-          this.DetailsOfProposal.txt.html(this.dataChange.joinTest)
+          this.clienEdit.joinTest = this.dataChange.joinTest || this.clienEdit.joinTest
         })
       }
       if (!this.clienData[0] === undefined) {
@@ -253,7 +251,7 @@ export default {
           this.dataChange = ele
           this.dataChange.lateStatus = this.lateStatus
           this.dataChange.id === undefined ? this.dataChange.id = this.clien : ''
-          typeof (this.DetailsOfProposal) === 'string' ? this.dataChange.joinTest = this.DetailsOfProposal : ''
+          this.ClientData.joinTest = this.clienEdit.joinTest
           this.userData = { ename: this.userInformation, name: this.userNames }
           this.objData = { launchTestInfo: this.dataChange, user: this.userData }
           launchTestUpdate(this.objData).then(res => {
@@ -283,7 +281,7 @@ export default {
           this.dataChange = ele
           this.dataChange.configInfo ? '' : this.dataChange.configInfo = ''
           this.dataChange.dependentComponents ? '' : this.dataChange.dependentComponents = ''
-          typeof (this.DetailsOfProposal) === 'string' ? this.dataChange.joinTest = this.DetailsOfProposal : ''
+          this.dataChange.joinTest = this.clienEdit.joinTest
           this.dataChange.bizId = Number(localStorage.getItem('bizId'))
           this.dataChange.taskIds = this.ids
           this.dataChange.type = 1
@@ -386,15 +384,6 @@ export default {
      text-align: center;
      cursor:pointer
   }
-  .toolbar {
-    border: 1px solid #DEE2E7;
-  }
-  .text {
-    font-size: 15px;
-    color: #606266;
-    border: 1px solid #DEE2E7;
-    height: auto;
-  }
   .CodeReview {
     /deep/ .el-form-item__label {
       width: 106px;

src/views/Platform/presentation/presentationReport.vue

@@ -81,13 +81,12 @@
         </el-col>
       </div>
       <el-form-item label="提测模块" style="margin: 2px 0;" />
-      <div id="DetailsOfProposal" class="toolbar" />
-      <div id="DetailsOfProposal1" class="text" />
+
+      <normal-area id="presens-children-moduleInfo" :value.sync="clienEdit.moduleInfo" :height="200" />
 
       <div class="backStyle">二. 联调详情</div>
 
-      <div id="editorContent" class="toolbar" />
-      <div id="editorContent1" class="text" />
+      <normal-area id="presens-children-joinTest" :value.sync="clienEdit.joinTest" :height="200" />
 
       <div class="backStyle">三. 其他</div>
       <div class="double">
@@ -108,10 +107,13 @@
 const _ = require('lodash')
 import moment from 'moment'
 import { launchTestUpdate, launchTestCreate } from '@/api/InterfaceReport'
-import E from 'wangeditor'
+import normalArea from '@/components/input/normalArea'
 
 export default {
   name: 'PresentationReport',
+  components: {
+    normalArea
+  },
   props: {
     clienData: {
       type: Object,
@@ -155,36 +157,19 @@ export default {
       lateStatus: 1,
       getInfo: '',
       fromDev: {},
+      clienEdit: {
+        moduleInfo: `<p></p><table border="1" style="border: 1px solid #DEE2E7" width="100%"><colgroup><col width="30%"><col width="30%"><col width="30%"></colgroup><thead><tr><th>提测模块</th><th>提测分支</th><th>对应RD</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td></tr></tbody></table>`,
+        joinTest: `<p></p><table border="1" style="border: 1px solid #DEE2E7" width="100%"><colgroup><col width="30%"><col width="30%"><col width="30%"></colgroup><thead><tr><th>联调模块</th><th>联调RD</th><th>联调结果</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td></tr></tbody></table>`
+      },
       ids: [],
-      editorContent: '',
       showData: false,
       showCodeReview: false,
-      DetailsOfProposal: '',
       projectIdCode: ''
     }
   },
   created() {
     this.getRouterData()
   },
-  mounted() {
-    this.editorContent = new E('#editorContent', '#editorContent1')
-    this.DetailsOfProposal = new E('#DetailsOfProposal', '#DetailsOfProposal1')
-
-    this.editorContent.customConfig.zIndex = 110
-    this.DetailsOfProposal.customConfig.zIndex = 110
-
-    this.editorContent.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
-    this.DetailsOfProposal.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
-
-    this.editorContent.customConfig.onchange = (html) => { this.editorContent = html }
-    this.DetailsOfProposal.customConfig.onchange = (html) => { this.DetailsOfProposal = html }
-
-    this.editorContent.create()
-    this.DetailsOfProposal.create()
-
-    this.editorContent.txt.html(`<p></p><table width="100%"><colgroup><col width="30%"><col width="30%"><col width="30%"></colgroup><thead><tr><th>联调模块</th><th>联调RD</th><th>联调结果</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td></tr></tbody></table><p></p>`)
-    this.DetailsOfProposal.txt.html(`<p></p><table width="100%"><colgroup><col width="30%"><col width="30%"><col width="30%"></colgroup><thead><tr><th>提测模块</th><th>提测分支</th><th>对应RD</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td><td><br></td></tr></tbody></table><p></p>`)
-  },
   methods: {
     getRouterData() {
       console.log(this.clienData, '提测服务端')
@@ -226,8 +211,8 @@ export default {
           this.$set(this.fromDev, 'crBy', '')
         }
         this.$nextTick(() => {
-          this.fromDev.joinTest !== null ? this.editorContent.txt.html(this.fromDev.joinTest) : ''
-          this.fromDev.moduleInfo !== null ? this.DetailsOfProposal.txt.html(this.fromDev.moduleInfo) : ''
+          this.clienEdit.moduleInfo = this.fromDev.moduleInfo || this.clienEdit.moduleInfo
+          this.clienEdit.joinTest = this.fromDev.joinTest || this.clienEdit.joinTest
         })
       }
     },
@@ -235,8 +220,8 @@ export default {
       this.$refs['fromDev'].validate((valid) => {
         if (valid) {
           const params = _.cloneDeep(this.fromDev)
-          typeof (this.editorContent) === 'string' ? params.joinTest = this.editorContent : ''
-          typeof (this.DetailsOfProposal) === 'string' ? params.moduleInfo = this.DetailsOfProposal : ''
+          params.moduleInfo = this.clienEdit.moduleInfo
+          params.joinTest = this.clienEdit.joinTest
           params.lateStatus = this.lateStatus
           params.devTimeStart = moment(params.devTimeStart).format('YYYY.MM.DD')
           params.devTimeEnd = moment(params.devTimeEnd).format('YYYY.MM.DD')
@@ -270,7 +255,8 @@ export default {
         if (valid) {
           this.fromDev = ele
           typeof (this.editorContent) === 'string' ? this.fromDev.joinTest = this.editorContent : ''
-          typeof (this.DetailsOfProposal) === 'string' ? this.fromDev.moduleInfo = this.DetailsOfProposal : ''
+          this.fromDev.moduleInfo = this.clienEdit.moduleInfo
+          this.fromDev.joinTest = this.clienEdit.joinTest
           this.fromDev.lateReason = ele.lateReason
           this.fromDev.lateStatus = this.lateStatus
           this.fromDev.bizId = Number(localStorage.getItem('bizId'))
@@ -352,15 +338,6 @@ export default {
     border-radius: 4px;
     margin: 1% 0;
   }
-  .toolbar {
-    border: 2px solid #DEE2E7;
-  }
-  .text {
-   font-size: 15px;
-   color: #606266;
-   border: 2px solid #DEE2E7;
-   height: auto;
-  }
   .CodeReview {
     /deep/ .el-form-item__label {
       width: 106px;