Browse Source

日报优化完毕

qinzhipeng_v 5 years ago
parent
commit
cda36f407e

+ 2 - 69
src/views/Platform/presentation/DailyNewsAdded.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 日报报告,新增报告 -->
+  <!-- 新增日报报告 -->
   <div class="eleStyle">
     <el-form ref="fromCreateData" :inline="true" :model="fromCreateData" :rules="serviceDataRules" style="margin:0% 12%;">
       <div style="display: flex;white-space: nowrap;">
@@ -10,12 +10,9 @@
           <el-input v-model="fromCreateData.ownner" size="small" placeholder="who" />
         </el-form-item>
       </div>
-
       <!-- 富文本 -->
       <div id="editor" name="editor" style="width:50px;" />
-
       <div class="backStyle">三. bug情况</div>
-
       <div style="border: 1px,solid #ccc;">
         <div style="color: #606266">1、bug统计</div>
         <div style="display:flex;">
@@ -53,9 +50,6 @@ export default {
         reportName: [{ required: true, message: '报告标题不能为空', trigger: 'change' }],
         ownner: [{ required: true, message: 'by不能为空', trigger: 'change' }]
       },
-      showbut1: false,
-      showbut: '',
-      bugshow: '',
       fromCreateData: {
         id: '',
         bizId: '',
@@ -69,20 +63,13 @@ export default {
         bugExplain: '', //  bug说明
         problemRisks: ''// 进度和风险
       },
-      TestProgress: '',
-      projectProgress: '',
       userData: '',
       objData: '',
       dateList: [],
       numList: [],
       bugName: [],
       statusMap: [],
-      statusList: [],
-      statusMap1: [],
-      pro: '',
-      idCode: '', // 项目 任务的id
-      bizIdCode: '', // 业务线
-      taskId: ''
+      statusList: []
     }
   },
   created() {
@@ -101,14 +88,12 @@ 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.getRouterData()
   },
   methods: {
     getRouterData() {
       var url = location.href // 获取url中"?"符后的字串
       var arr = url.split('=')
       this.fromCreateData = this.message
-      console.log(this.message, 'xxxxxx')
       bugDailyList({ taskIds: [Number(arr[1])] }).then(res => {
         this.dateList = res.data.dateList
         this.statusMap = res.data.statusMap
@@ -202,56 +187,4 @@ export default {
     border-radius: 4px;
     margin: 1% 0;
   }
-  .btn {
-    margin: 0 90px 0 0;
-    border: none;
-  }
-  .toolbar {
-    border: 1px solid #DEE2E7;
-  }
-  .text {
-    border: 1px solid #DEE2E7;
-    height: auto;
-    font-size: 15px;
-    color: #606266
-  }
-  .time_line_box{
-    position: relative;
-    height: auto;
-    }
-    .time_line{
-    position: absolute;
-    height: 2px;
-    background: #ccc;
-    }
-    .order_item{
-    position: absolute;
-    bottom: 0;
-    z-index: 2;
-    text-align: center;
-    font-size: 13px;
-    padding-bottom: 35px;
-    color: #409EFF;
-    }
-    .order_item:after{
-    content: '';
-    position: absolute;
-    left: 50%;
-    right: auto;
-    transform: translateX(-50%);
-    bottom: -10px;
-    height: 20px;
-    width: 30px;
-    border-radius: 50%;
-    border: 2px solid #ccc;
-    background-color: #ccc;
-    }
-    .filling_line{
-    position: absolute;
-    z-index: 1;
-    left: 0;
-    top: 0;
-    height: 100%;
-    width: 100%;
-    }
 </style>

+ 7 - 12
src/views/Platform/presentation/Templates/DailyReport.vue

@@ -11,7 +11,7 @@
         <el-step style="font-size: 16pt; color: #333B4A;" title="发送报告" />
       </el-steps>
     </div>
-    <div v-show="showOne" style="margin: 0 4%;">
+    <div v-if="showOne" style="margin: 0 4%;">
       <el-radio v-model="radio" style="margin: 0% 25%;" class="_radio" label="1">测试日报模版</el-radio>
       <div align="center" style="margin: 0% 25%; height: 400px;" class="Layout">
         <el-image :src="src" />
@@ -20,7 +20,7 @@
         <el-button size="small" type="primary" @click="NextStep()">下一步</el-button>
       </div>
     </div>
-    <div v-show="showTow">
+    <div v-if="showTow">
       <div class="descr" style=" margin-bottom: 2%; height: 400px; overflow:scroll; overflow-x: hidden">
         <DailyReport ref="DailyReport" :message="dailyNewData" @daily="daily" />
       </div>
@@ -78,11 +78,6 @@ export default {
       src: 'https://fuss10.elemecdn.com/3/28/bbf893f792f03a54408b3b7a7ebf0jpeg.jpeg'
     }
   },
-  mounted() {
-    window.pageYOffset = 0
-    document.documentElement.scrollTop = 0
-    document.body.scrollTop = 0
-  },
   methods: {
     init(index, newData) {
       this.dialogDaliy = true
@@ -95,7 +90,6 @@ export default {
           break
         case 2:
           this.dailyNewData = newData
-          console.log(this.dailyNewData, 'sxxxxxx')
           this.newIndex = 2
           this.showOne = false
           this.showTow = true
@@ -103,17 +97,19 @@ export default {
           this.active = 2
           break
         case 3:
-          this.preview = newData
-          console.log(this.preview, 'xsssss')
           this.showOne = false
           this.showTow = false
           this.showThree = true
-          this.active = 2
+          this.preview = newData
+          this.active = 3
           break
       }
     },
     handleClose() {
       this.dialogDaliy = false
+      this.showThree = false
+      this.showOne = false
+      this.showTow = false
       this.radio = '2'
     },
     handleClose1() {
@@ -131,7 +127,6 @@ export default {
       this.newIndex = 1
     },
     daily(e) {
-      console.log(e, 'daily')
       this.preview = e
       this.showOne = false
       this.showTow = false

+ 0 - 2
src/views/Platform/presentation/testPresenyL.vue

@@ -60,8 +60,6 @@ export default {
   },
   methods: {
     idGet() {
-      // dailyReport({ id: this.$route.query.id }).then((res) => {
-      // console.log(this.message, 'dss')
       this.fromCreat = this.message
       this.name = this.fromCreat.reportName
       this.gntCreateEnd = this.fromCreat.gmtCreate

+ 2 - 2
src/views/online-quality/BlockServer/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="background-color: rgb(242, 243, 246);min-height: calc(100vh - 80px);padding: 1% 0px;">
     <div class="stylus-content">
-      <el-tabs v-model="activeName"  @tab-click="handleClick">
+      <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="阻断服务" name="first">
           <block-server />
         </el-tab-pane>
@@ -9,7 +9,7 @@
           <block-result v-if="blockResultShow" />
         </el-tab-pane>
       </el-tabs>
-      </div>
+    </div>
   </div>
 
 </template>