日报

src/views/Platform/presentation/DailyNewsAdded.vue

@@ -44,16 +44,18 @@
             </div>
           </el-col> -->
         <!-- </el-row> -->
+
+        <!-- 富文本 -->
         <div id="editor" name="editor" style="width:50px;" />
 
-        <div class="backStyle">一. 进度和风险</div>
+        <!-- <div class="backStyle">一. 进度和风险</div>
         <div id="projectProgress" class="toolbar" />
         <div id="projectProgress1" class="text" style="text-align:left" />
 
         <div class="backStyle">二. 测试情况</div>
 
         <div id="TestProgress" class="toolbar" />
-        <div id="TestProgress1" class="text" style="text-align:left;" />
+        <div id="TestProgress1" class="text" style="text-align:left;" /> -->
 
         <div class="backStyle">三. bug情况</div>
 
@@ -151,23 +153,23 @@ export default {
   "showXPathInStatusbar": false
     })
     this.editor.value = '<br><h2>一. 进度和风险</h2><br><p>1,项目整体进度</p><br><br><p>2,项目风险与问题</p><br><table width="100%"><colgroup><col width="8%"><col width="8%"><col width="8%"><col width="8%"></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><br><h2>二. 测试情况</h2><br><p>1,测试进展</p><br><table width="100%"><colgroup><col width="8%"><col width="8%"><col width="8%"><col width="8%"><col width="8%"><col width="8%"><col width="8%"></colgroup><thead><tr><th>标题1</th><th>标题2</th><th>标题3</th><th>标题4</th><th>标题5</th><th>标题6</th><th>标题7</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><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><td><br></td><td><br></td><td><br></td></tr></tbody></table><br><p>2,测试说明</p><br><br>'
-    this.TestProgress = new E('#TestProgress', '#TestProgress1')
-    this.projectProgress = new E('#projectProgress', '#projectProgress1')
+    // this.TestProgress = new E('#TestProgress', '#TestProgress1')
+    // this.projectProgress = new E('#projectProgress', '#projectProgress1')
 
-    this.TestProgress.customConfig.zIndex = 110
-    this.projectProgress.customConfig.zIndex = 110
+    // this.TestProgress.customConfig.zIndex = 110
+    // this.projectProgress.customConfig.zIndex = 110
 
-    this.TestProgress.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
-    this.projectProgress.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
+    // this.TestProgress.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
+    // this.projectProgress.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table']
 
-    this.TestProgress.customConfig.onchange = (html) => { this.TestProgress = html }
-    this.projectProgress.customConfig.onchange = (html) => { this.projectProgress = html }
+    // this.TestProgress.customConfig.onchange = (html) => { this.TestProgress = html }
+    // this.projectProgress.customConfig.onchange = (html) => { this.projectProgress = html }
 
-    this.TestProgress.create()
-    this.projectProgress.create()
+    // this.TestProgress.create()
+    // this.projectProgress.create()
 
-    this.TestProgress.txt.html(`<p>1,测试进展</p><br><table width="100%"><colgroup><col width="8%"><col width="8%"><col width="8%"><col width="8%"><col width="8%"><col width="8%"><col width="8%"></colgroup><thead><tr><th>标题1</th><th>标题2</th><th>标题3</th><th>标题4</th><th>标题5</th><th>标题6</th><th>标题7</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><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><td><br></td><td><br></td><td><br></td></tr></tbody></table><br><p>2,测试说明</p><br><br>`)
-    this.projectProgress.txt.html(`<br><p>1,项目整体进度</p><br><br><p>2,项目风险与问题</p><br><table width="100%"><colgroup><col width="8%"><col width="8%"><col width="8%"><col width="8%"></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><br>`)
+    // this.TestProgress.txt.html(`<p>1,测试进展</p><br><table width="100%"><colgroup><col width="8%"><col width="8%"><col width="8%"><col width="8%"><col width="8%"><col width="8%"><col width="8%"></colgroup><thead><tr><th>标题1</th><th>标题2</th><th>标题3</th><th>标题4</th><th>标题5</th><th>标题6</th><th>标题7</th></tr></thead><tbody><tr><td><br></td><td><br></td><td><br></td><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><td><br></td><td><br></td><td><br></td></tr></tbody></table><br><p>2,测试说明</p><br><br>`)
+    // this.projectProgress.txt.html(`<br><p>1,项目整体进度</p><br><br><p>2,项目风险与问题</p><br><table width="100%"><colgroup><col width="8%"><col width="8%"><col width="8%"><col width="8%"></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><br>`)
     this.getRouterData1()
   },
   methods: {
@@ -235,8 +237,10 @@ export default {
       })
     },
     getRouterData1() {
-      this.TestProgress.txt.html(this.fromCreateData.testExplain)
-      this.projectProgress.txt.html(this.fromCreateData.problemRisks)
+      console.log(this.fromCreateData.problemRisks)
+      this.editor.value = this.fromCreateData.problemRisks
+      // this.TestProgress.txt.html(this.fromCreateData.testExplain)
+      // this.projectProgress.txt.html(this.fromCreateData.problemRisks)
     },
 
     // 返回
@@ -252,12 +256,13 @@ export default {
 
     // 新建bug提交
     getCreateData(ele) {
-       console.log(this.editor)
+       console.log(this.editor.editor.innerHTML)
       this.$refs['fromCreateData'].validate((valid) => {
         if (valid) {
           this.fromCreateData = ele
-          typeof (this.TestProgress) === 'string' ? this.fromCreateData.testExplain = this.TestProgress : ''
-          typeof (this.projectProgress) === 'string' ? this.fromCreateData.problemRisks = this.projectProgress : ''
+          // typeof (this.TestProgress) === 'string' ? this.fromCreateData.testExplain = this.TestProgress : ''
+          this.fromCreateData.testExplain = this.editor.editor.innerHTML
+          // typeof (this.projectProgress) === 'string' ? this.fromCreateData.problemRisks = this.projectProgress : ''
           // this.fromCreateData.taskId !== '' ? this.fromCreateData.taskId = this.idCode : this.fromCreateData.projectId = this.idCode
           if (this.$route.query.task) { // 任务页面
             this.fromCreateData.taskId = this.idCode
@@ -296,8 +301,8 @@ export default {
       this.fromCreateData = ele
       this.fromCreateData.taskId === 0 ? this.fromCreateData.taskId = '' : ''
       this.fromCreateData.projectId === 0 ? this.fromCreateData.projectId = '' : ''
-      typeof (this.TestProgress) === 'string' ? this.fromCreateData.testExplain = this.TestProgress : ''
-      typeof (this.projectProgress) === 'string' ? this.fromCreateData.problemRisks = this.projectProgress : ''
+      // typeof (this.TestProgress) === 'string' ? this.fromCreateData.testExplain = this.testExplain : ''
+      this.fromCreateData.problemRisks = this.editor.editor.innerHTML
       this.userData = { id: '', ename: this.userInformation, name: this.userNames }
       this.objData = { dailyTestReport: this.fromCreateData, user: this.userData }
       dailyReportUpdate(this.objData).then(res => {