|
|
@@ -11,39 +11,6 @@
|
|
|
<el-input v-model="fromCreateData.ownner" style="width: 24vw;" placeholder="who" />
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
- <!-- <el-radio-group v-model="showbut">
|
|
|
- <el-radio label="1" @change="deleteProject(1)">开启项目节点</el-radio>
|
|
|
- <el-radio label="2" @change="deleteProject(2)">关闭项目节点</el-radio>
|
|
|
- </el-radio-group>
|
|
|
- <el-row>
|
|
|
- <el-col :span="24">
|
|
|
- <div style="border: 1px solid #DEE2E7; margin-top: 15px;" align="left">
|
|
|
- <el-button class="btn" icon="el-icon-plus" @click="createDateNode">新增时间节点</el-button>
|
|
|
- <el-button class="btn" icon="el-icon-delete">删除节点</el-button>
|
|
|
- </div>
|
|
|
- <div style="border: 1px solid #DEE2E7; padding: 100px 0;" class="time_line_box">
|
|
|
- <div class="time_line" style="width:100%;">
|
|
|
- <ol>
|
|
|
- <li style="list-style-type:none;">
|
|
|
- <a class="order_item" style="left:5%;">一号节点</a>
|
|
|
- </li>
|
|
|
- <li style="list-style-type:none;">
|
|
|
- <a class="order_item" style="left:25%;">二号节点</a>
|
|
|
- </li>
|
|
|
- <li style="list-style-type:none;">
|
|
|
- <a class="order_item" style="left:45%;">三号节点</a>
|
|
|
- </li>
|
|
|
- <li style="list-style-type:none;">
|
|
|
- <a class="order_item" style="left:65%;">四号节点</a>
|
|
|
- </li>
|
|
|
- <li style="list-style-type:none;">
|
|
|
- <a class="order_item" style="left:85%;">五号节点</a>
|
|
|
- </li>
|
|
|
- </ol>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </el-col> -->
|
|
|
- <!-- </el-row> -->
|
|
|
|
|
|
<!-- 富文本 -->
|
|
|
<div id="editor" name="editor" style="width:50px;" />
|
|
|
@@ -81,9 +48,9 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
-<script src="//cdnjs.cloudflare.com/ajax/libs/jodit/3.1.92/jodit.min.js"></script>
|
|
|
+
|
|
|
<script>
|
|
|
-import E from 'wangeditor'
|
|
|
+// import E from 'wangeditor'
|
|
|
import echarts from 'echarts'
|
|
|
import Jodit from 'jodit'
|
|
|
import { dailyReportCreate, dailyReportUpdate, bugDailyList } from '@/api/testPresentetion'
|
|
|
@@ -137,15 +104,15 @@ export default {
|
|
|
},
|
|
|
mounted() {
|
|
|
this.editor = new Jodit('#editor', {
|
|
|
- "uploader": {
|
|
|
- "insertImageAsBase64URI": true
|
|
|
- },
|
|
|
- "spellcheck": false,
|
|
|
- "language": "Auto",
|
|
|
- "toolbarSticky": false,
|
|
|
- "showCharsCounter": false,
|
|
|
- "showWordsCounter": false,
|
|
|
- "showXPathInStatusbar": false
|
|
|
+ 'uploader': {
|
|
|
+ 'insertImageAsBase64URI': true
|
|
|
+ },
|
|
|
+ 'spellcheck': false,
|
|
|
+ 'language': 'Auto',
|
|
|
+ 'toolbarSticky': false,
|
|
|
+ 'showCharsCounter': false,
|
|
|
+ 'showWordsCounter': false,
|
|
|
+ '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')
|
|
|
@@ -232,10 +199,7 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
getRouterData1() {
|
|
|
- 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)
|
|
|
+ this.editor.value = this.fromCreateData.testExplain
|
|
|
},
|
|
|
|
|
|
// 返回
|
|
|
@@ -251,7 +215,6 @@ export default {
|
|
|
|
|
|
// 新建bug提交
|
|
|
getCreateData(ele) {
|
|
|
- console.log(this.editor.editor.innerHTML)
|
|
|
this.$refs['fromCreateData'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
this.fromCreateData = ele
|
|
|
@@ -297,7 +260,7 @@ export default {
|
|
|
this.fromCreateData.taskId === 0 ? this.fromCreateData.taskId = '' : ''
|
|
|
this.fromCreateData.projectId === 0 ? this.fromCreateData.projectId = '' : ''
|
|
|
// typeof (this.TestProgress) === 'string' ? this.fromCreateData.testExplain = this.testExplain : ''
|
|
|
- this.fromCreateData.problemRisks = this.editor.editor.innerHTML
|
|
|
+ this.fromCreateData.testExplain = 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 => {
|
qinzhipeng_v