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

src/icons/svg/测试.svg

@@ -0,0 +1,3 @@
+
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M996.291765 1.505882H86.919529C38.972235 1.505882 0 39.333647 0 85.835294V939.670588c0 46.561882 38.972235 84.329412 86.979765 84.329412H996.291765c48.007529 0 87.04-37.767529 87.04-84.329412V85.835294c0-46.501647-39.152941-84.329412-87.04-84.329412zM86.919529 62.343529H996.291765c13.372235 0 24.214588 10.541176 24.214588 23.491765v116.073412H62.765176V85.835294c0-12.950588 10.842353-23.491765 24.214589-23.491765zM996.291765 963.041882H86.979765a23.853176 23.853176 0 0 1-24.214589-23.491764V252.687059h957.741177v686.923294c0 12.950588-10.902588 23.491765-24.274824 23.491765z" fill="#565656" p-id="1096"></path><path d="M897.024 784.986353H668.009412c-17.950118 0-32.406588 13.010824-32.406588 29.153882s14.456471 29.153882 32.406588 29.153883h229.014588c18.010353 0 32.406588-13.010824 32.406588-29.153883s-14.456471-29.153882-32.406588-29.153882z m-599.943529-288.225882a34.876235 34.876235 0 0 0-45.778824-1.505883 27.105882 27.105882 0 0 0-1.566118 41.200941l140.830118 136.252236-139.625412 120.410353a27.045647 27.045647 0 0 0-0.963764 41.200941c6.384941 5.963294 14.878118 8.975059 23.371294 8.975059a33.852235 33.852235 0 0 0 22.407529-8.131765l162.635294-140.227765a27.166118 27.166118 0 0 0 1.325177-40.96l-162.635294-157.214117z" fill="#409EFF" p-id="1097"></path></svg>
+		

src/router/index.js

@@ -179,44 +179,6 @@ export const constantRoutes = [{
               import('@/views/projectManage/bugList/details/index.vue'),
     meta: { title: '缺陷详情' }
   },
-  {
-    path: '/Platform/useCasePage',
-    name: '测试',
-    component: () =>
-          import('@/views/Platform/useCase/test'),
-    meta: { title: '测试' },
-    children: [{
-      path: 'useCasePage',
-      name: '测试用例',
-      component: () =>
-              import('@/views/Platform/useCasePage'),
-      meta: { title: '测试用例' }
-    },
-    {
-      path: 'createUse',
-      name: '用例新增',
-      hidden: true,
-      component: () =>
-              import('@/views/Platform/useCase/createUse'),
-      meta: { title: '用例新增' }
-    },
-    {
-      path: 'queryUse',
-      name: '用例查看',
-      hidden: true,
-      component: () =>
-              import('@/views/Platform/useCase/queryUse'),
-      meta: { title: '用例查看' }
-    },
-    {
-      path: 'testPage',
-      name: '测试计划',
-      component: () =>
-              import('@/views/Platform/testPage.vue'),
-      meta: { title: '测试计划' }
-    }
-    ]
-  },
   {
     path: '/Platform/presentation',
     name: '报告',
@@ -298,7 +260,44 @@ export const constantRoutes = [{
     ]
   }]
 },
-
+{
+  path: '/Platform/useCasePage',
+  component: Layout,
+  name: '测试',
+  redirect: '/Platform/useCase/test',
+  meta: { title: '测试', icon: '测试' },
+  children: [{
+    path: 'useCasePage',
+    name: '测试用例',
+    component: () =>
+            import('@/views/Platform/useCasePage'),
+    meta: { title: '测试用例' }
+  },
+  {
+    path: 'createUse',
+    name: '用例新增',
+    hidden: true,
+    component: () =>
+            import('@/views/Platform/useCase/createUse'),
+    meta: { title: '用例新增' }
+  },
+  {
+    path: 'queryUse',
+    name: '用例查看',
+    hidden: true,
+    component: () =>
+            import('@/views/Platform/useCase/queryUse'),
+    meta: { title: '用例查看' }
+  },
+  {
+    path: 'testPage',
+    name: '测试计划',
+    component: () =>
+            import('@/views/Platform/testPage.vue'),
+    meta: { title: '测试计划' }
+  }
+  ]
+},
 {
   path: '/env-platform',
   component: Layout,

src/views/Platform/presentation/Acceptance.vue

@@ -1,186 +1,184 @@
 <template>
   <!-- 准出报告，新增服务端报告 -->
   <div class="eleStyle">
-    <div style="height:100%;width:94%; background:#ffffff; margin: 3%; border-radius: 4px; overflow: hidden;">
-      <el-form ref="ClientData" :inline="true" :model="ClientData" :rules="serviceDataRules" style="margin:2% 3%;">
-        <div style="display: flex;white-space: nowrap;">
-          <el-form-item label="标题" style="flex: 1;" prop="reportName">
-            <el-input v-model="ClientData.reportName" style="width:45vw;" placeholder="报告标题(xxx项目准出报告)" />
-          </el-form-item>
-          <el-form-item label="by" prop="ownner" style="flex: 1;text-align:right;">
-            <el-input v-model="ClientData.ownner" style="width: 24vw;" placeholder="who" />
-          </el-form-item>
-        </div>
-        <div class="backStyle" style="margin-bottom: 2% ;">一. 项目概述</div>
-        <div style="display: flex; white-space: nowrap;">
-          <el-form-item label="* 测试结果" style="flex: 1;" prop="status">
-            <el-button :type="tagBtn" style="margin: 0 2vw;" class="tag" @click="changeStatus(1)"> 通过 </el-button>
-            <el-button :type="tagBtn1" class="tag" @click="changeStatus(2)"> 不通过 </el-button>
-          </el-form-item>
-          <el-form-item label="准入结果" prop="smokeTestResult" style="flex: 2;text-align:right;"><el-input v-model="ClientData.smokeTestResult" style="width: 50vw;" placeholder="准入次数/通过次数/失败次数" /></el-form-item>
-        </div>
-        <div style="display: flex; white-space: nowrap;">
-          <el-form-item label="* 准出延期" style="flex: 1;" prop="taskLateStatus">
-            <el-button :type="tagChange" style="margin: 0 2vw;" class="tag" @click="lateStatusChange(1)"> 否 </el-button>
-            <el-button :type="tagChange1" class="tag" @click="lateStatusChange(2)"> 是 </el-button>
-          </el-form-item>
-          <el-form-item v-if="showDelay" label="延期原因" prop="taskLateReason" style="flex: 2;text-align:right;"><el-input v-model="ClientData.taskLateReason" style="width: 50vw;" /></el-form-item>
-        </div>
-
-        <div style="display: flex;white-space: nowrap;">
-          <el-form-item label="* 涉及安全项" style="flex: 1;">
-            <el-button :type="getInfoBtn" style="margin: 0 1vw" class="tag" @click="showStatusData(2)"> 是 </el-button>
-            <el-button :type="getInfoBtn1" style="margin-left: 1.7vw;" class="tag" @click="showStatusData(1)"> 否 </el-button>
-          </el-form-item>
-          <el-form-item v-if="showData" label="完成结果" prop="safeInfo" style="flex: 2;text-align:right;"><el-input v-model="ClientData.safeInfo" style="width: 50vw;" /></el-form-item>
-        </div>
-
-        <el-form-item label="SDL链接 : " style="white-space: nowrap;"><el-link href="http://wiki.intra.xiaojukeji.com/pages/viewpage.action?pageId=237016271" type="primary" target="_blank"> 普惠SDL准入标准</el-link></el-form-item>
-
-        <div style="display: flex; white-space: nowrap;">
-          <el-form-item label="开发人员" style="flex: 1;" prop="developer"><el-input v-model="ClientData.developer" style="width:30vw;" /></el-form-item>
-          <el-form-item label="开发周期" style="flex: 1;text-align:right;" prop="devTimeEnd">
-            <el-date-picker v-model="ClientData.devTimeEnd" type="date" placeholder="请选择开始日期" style=" width: 15vw;" />
-            <el-date-picker v-model="ClientData.devTimeStart" type="date" placeholder="请选择开始日期" style="margin-left:1.3vw; width: 16vw;" />
-          </el-form-item>
-        </div>
-
-        <div style="display: flex; white-space: nowrap;">
-          <el-form-item label="测试人员" style="flex: 1;" prop="tester"><el-input v-model="ClientData.tester" style="width: 30vw;" /></el-form-item>
-          <el-form-item label="测试周期" style="flex: 1;text-align:right;" prop="testTimeEnd">
-            <el-date-picker v-model="ClientData.testTimeEnd" type="date" placeholder="请选择开始日期" style=" width: 15vw;" />
-            <el-date-picker v-model="ClientData.testTimeStart" type="date" placeholder="请选择开始日期" style="margin-left: 1.3vw; width: 16vw;" />
-          </el-form-item>
+    <el-form ref="ClientData" :inline="true" :model="ClientData" :rules="serviceDataRules" style="margin: 0% 14%;">
+      <div style="display: flex;white-space: nowrap;">
+        <el-form-item label="标题" style="flex: 1;" prop="reportName">
+          <el-input v-model="ClientData.reportName" size="small" style="width:15vw;" placeholder="报告标题(xxx项目准出报告)" />
+        </el-form-item>
+        <el-form-item label="by" prop="ownner" style="flex: 1;text-align:right;">
+          <el-input v-model="ClientData.ownner" size="small" placeholder="who" />
+        </el-form-item>
+      </div>
+      <div class="backStyle" style="margin-bottom: 2% ;">一. 项目概述</div>
+      <div style="display: flex; white-space: nowrap;">
+        <el-form-item label="* 测试结果" style="flex: 1;" prop="status">
+          <el-button :type="tagBtn" size="small" style="margin: 0 2vw;" class="tag" @click="changeStatus(1)"> 通过 </el-button>
+          <el-button :type="tagBtn1" size="small" class="tag" @click="changeStatus(2)"> 不通过 </el-button>
+        </el-form-item>
+        <el-form-item label="准入结果" prop="smokeTestResult" style="flex: 2;text-align:right;"><el-input v-model="ClientData.smokeTestResult" style="width: 25vw;" size="small" placeholder="准入次数/通过次数/失败次数" /></el-form-item>
+      </div>
+      <div style="display: flex; white-space: nowrap;">
+        <el-form-item label="* 准出延期" style="flex: 1;" prop="taskLateStatus">
+          <el-button :type="tagChange" size="small" style="margin: 0 2vw;" class="tag" @click="lateStatusChange(1)"> 否 </el-button>
+          <el-button :type="tagChange1" size="small" class="tag" @click="lateStatusChange(2)"> 是 </el-button>
+        </el-form-item>
+        <el-form-item v-if="showDelay" label="延期原因" prop="taskLateReason" style="flex: 2;text-align:right;"><el-input v-model="ClientData.taskLateReason" size="small" style="width: 25vw;" /></el-form-item>
+      </div>
+
+      <div style="display: flex;white-space: nowrap;">
+        <el-form-item label="* 涉及安全项" style="flex: 1;">
+          <el-button :type="getInfoBtn" size="small" style="margin: 0 1vw" class="tag" @click="showStatusData(2)"> 是 </el-button>
+          <el-button :type="getInfoBtn1" size="small" style="margin-left: 1.7vw;" class="tag" @click="showStatusData(1)"> 否 </el-button>
+        </el-form-item>
+        <el-form-item v-if="showData" label="完成结果" prop="safeInfo" style="flex: 2;text-align:right;"><el-input v-model="ClientData.safeInfo" size="small" style="width: 25vw;" /></el-form-item>
+      </div>
+
+      <el-form-item label="SDL链接 : " style="white-space: nowrap;"><el-link href="http://wiki.intra.xiaojukeji.com/pages/viewpage.action?pageId=237016271" type="primary" target="_blank"> 普惠SDL准入标准</el-link></el-form-item>
+
+      <div style="display: flex; white-space: nowrap;">
+        <el-form-item label="开发人员" style="flex: 1;" prop="developer"><el-input v-model="ClientData.developer" size="small" style="width:15vw;" /></el-form-item>
+        <el-form-item label="开发周期" style="flex: 1;text-align:right;" prop="devTimeEnd">
+          <el-date-picker v-model="ClientData.devTimeEnd" size="small" type="date" placeholder="请选择开始日期" style=" width: 12.5vw;" />
+          <el-date-picker v-model="ClientData.devTimeStart" size="small" type="date" placeholder="请选择开始日期" style="margin-left:1.3vw; width: 12.5vw;" />
+        </el-form-item>
+      </div>
+
+      <div style="display: flex; white-space: nowrap;">
+        <el-form-item label="测试人员" style="flex: 1;" prop="tester"><el-input v-model="ClientData.tester" style="width: 15vw;" /></el-form-item>
+        <el-form-item label="测试周期" style="flex: 1;text-align:right;" prop="testTimeEnd">
+          <el-date-picker v-model="ClientData.testTimeEnd" size="small" type="date" placeholder="请选择开始日期" style=" width: 12.5vw;" />
+          <el-date-picker v-model="ClientData.testTimeStart" size="small" type="date" placeholder="请选择开始日期" style="margin-left: 1.3vw; width: 12.5vw;" />
+        </el-form-item>
+      </div>
+
+      <div class="backStyle" style="margin-bottom:2%;">二. 项目背景</div>
+      <div id="editorElem" class="toolbar" />
+      <div id="editorElem1" class="text" />
+
+      <div class="backStyle">三. 模块信息</div>
+      <div class="titStyle">1、模块信息</div>
+
+      <div id="editorElems" class="toolbar" />
+      <div id="editorElems1" class="text" />
+
+      <div class="titStyle">2、本期功能</div>
+
+      <div id="editorFrom" class="toolbar" />
+      <div id="editorFrom1" class="text" />
+
+      <div class="titStyle">3、风险点</div>
+
+      <div id="editorF" class="toolbar" />
+      <div id="editorF1" class="text" />
+
+      <div class="titStyle">4、缺陷分析</div>
+
+      <el-table :data="tableData" border>
+        <el-table-column prop="totalBug" label="bug总数" min-width="200" align="center" edit="false">
+          <template slot-scope="scope">
+            <el-input v-if="scope.row.totalBug.edit" ref="totalBug" v-model="scope.row.totalBug.value" style="width: 100%" @blur="scope.row.totalBug.edit = false" />
+            <span v-else>{{ scope.row.totalBug.value }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="fixBug" min-width="200" align="center" label="已解决bug数">
+          <template slot-scope="scope">
+            <el-input v-if="scope.row.fixBug.edit" ref="fixBug" v-model="scope.row.fixBug.value" style="width: 100%" @blur="scope.row.fixBug.edit = false" />
+            <span v-else>{{ scope.row.fixBug.value }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="remainBug" min-width="200" align="center" label="遗留bug数">
+          <template slot-scope="scope">
+            <el-input v-if="scope.row.remainBug.edit" ref="remainBug" v-model="scope.row.remainBug.value" style="width: 100%" @blur="scope.row.remainBug.edit = false" />
+            <span v-else>{{ scope.row.remainBug.value }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="rateOfReopen" min-width="200" align="center" label="reopen率">
+          <template slot-scope="scope">
+            <el-input v-if="scope.row.rateOfReopen.edit" ref="rateOfReopen" v-model="scope.row.rateOfReopen.value" style="width: 100%" @blur="scope.row.rateOfReopen.edit = false" />
+            <span v-else>{{ scope.row.rateOfReopen.value }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="invalidBug" min-width="200" align="center" label="无效bug数">
+          <template slot-scope="scope">
+            <el-input v-if="scope.row.invalidBug.edit" ref="invalidBug" v-model="scope.row.invalidBug.value" style="width: 100%" @blur="scope.row.invalidBug.edit = false" />
+            <span v-else>{{ scope.row.invalidBug.value }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row>
+        <el-col :span="24"><div class="titStyle">5、遗留问题</div><el-input v-model="ClientData.bugInfo" type="textarea" placeholder="请填写内容" /></el-col>
+      </el-row>
+
+      <div class="backStyle">四. 测试项</div>
+
+      <div class="titStyle" style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
+        <el-form-item style="flex:1; ">1、功能测试</el-form-item>
+        <div style="flex: 1; text-align: right;">
+          <el-tag :type="fctResultChange" size="small" effect="dark" class="tag" @click="fctResultradio(3)"> 未执行 </el-tag>
+          <el-tag :type="fctResultChange1" size="small" style="margin: 0 5%;" effect="dark" class="tag" @click="fctResultradio(1)"> 测试通过 </el-tag>
+          <el-tag :type="fctResultChange2" size="small" effect="dark" class="tag" @click="fctResultradio(2)"> 测试未通过 </el-tag>
         </div>
+      </div>
 
-        <div class="backStyle" style="margin-bottom:2%;">二. 项目背景</div>
-        <div id="editorElem" class="toolbar" />
-        <div id="editorElem1" class="text" />
-
-        <div class="backStyle">三. 模块信息</div>
-        <div class="titStyle">1、模块信息</div>
-
-        <div id="editorElems" class="toolbar" />
-        <div id="editorElems1" class="text" />
-
-        <div class="titStyle">2、本期功能</div>
-
-        <div id="editorFrom" class="toolbar" />
-        <div id="editorFrom1" class="text" />
-
-        <div class="titStyle">3、风险点</div>
-
-        <div id="editorF" class="toolbar" />
-        <div id="editorF1" class="text" />
-
-        <div class="titStyle">4、缺陷分析</div>
-
-        <el-table :data="tableData" border>
-          <el-table-column prop="totalBug" label="bug总数" min-width="200" align="center" edit="false">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.totalBug.edit" ref="totalBug" v-model="scope.row.totalBug.value" style="width: 100%" @blur="scope.row.totalBug.edit = false" />
-              <span v-else>{{ scope.row.totalBug.value }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="fixBug" min-width="200" align="center" label="已解决bug数">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.fixBug.edit" ref="fixBug" v-model="scope.row.fixBug.value" style="width: 100%" @blur="scope.row.fixBug.edit = false" />
-              <span v-else>{{ scope.row.fixBug.value }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="remainBug" min-width="200" align="center" label="遗留bug数">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.remainBug.edit" ref="remainBug" v-model="scope.row.remainBug.value" style="width: 100%" @blur="scope.row.remainBug.edit = false" />
-              <span v-else>{{ scope.row.remainBug.value }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="rateOfReopen" min-width="200" align="center" label="reopen率">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.rateOfReopen.edit" ref="rateOfReopen" v-model="scope.row.rateOfReopen.value" style="width: 100%" @blur="scope.row.rateOfReopen.edit = false" />
-              <span v-else>{{ scope.row.rateOfReopen.value }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="invalidBug" min-width="200" align="center" label="无效bug数">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.invalidBug.edit" ref="invalidBug" v-model="scope.row.invalidBug.value" style="width: 100%" @blur="scope.row.invalidBug.edit = false" />
-              <span v-else>{{ scope.row.invalidBug.value }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row>
-          <el-col :span="24"><div class="titStyle">5、遗留问题</div><el-input v-model="ClientData.bugInfo" type="textarea" placeholder="请填写内容" /></el-col>
-        </el-row>
-
-        <div class="backStyle">四. 测试项</div>
-
-        <div class="titStyle" style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
-          <el-form-item style="flex:1; ">1、功能测试</el-form-item>
-          <div style="flex: 1; text-align: right;">
-            <el-tag :type="fctResultChange" effect="dark" class="tag" @click="fctResultradio(3)"> 未执行 </el-tag>
-            <el-tag :type="fctResultChange1" style="margin: 0 5%;" effect="dark" class="tag" @click="fctResultradio(1)"> 测试通过 </el-tag>
-            <el-tag :type="fctResultChange2" effect="dark" class="tag" @click="fctResultradio(2)"> 测试未通过 </el-tag>
-          </div>
-        </div>
-
-        <div id="editorEl" class="toolbar" />
-        <div id="editorEl1" class="text" />
+      <div id="editorEl" class="toolbar" />
+      <div id="editorEl1" class="text" />
 
-        <div class="titStyle" style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
-          <el-form-item style="flex:1; ">2、可靠性测试</el-form-item>
-          <div style="flex: 1; text-align: right;">
-            <el-tag :type="rqtResultChange" effect="dark" class="tag" @click="rqtResultradio(3)"> 未执行 </el-tag>
-            <el-tag :type="rqtResultChange1" style="margin: 0 5%;" effect="dark" class="tag" @click="rqtResultradio(1)"> 测试通过 </el-tag>
-            <el-tag :type="rqtResultChange2" effect="dark" class="tag" @click="rqtResultradio(2)"> 测试未通过 </el-tag>
-          </div>
+      <div class="titStyle" style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
+        <el-form-item style="flex:1; ">2、可靠性测试</el-form-item>
+        <div style="flex: 1; text-align: right;">
+          <el-tag :type="rqtResultChange" size="small" effect="dark" class="tag" @click="rqtResultradio(3)"> 未执行 </el-tag>
+          <el-tag :type="rqtResultChange1" size="small" style="margin: 0 5%;" effect="dark" class="tag" @click="rqtResultradio(1)"> 测试通过 </el-tag>
+          <el-tag :type="rqtResultChange2" size="small" effect="dark" class="tag" @click="rqtResultradio(2)"> 测试未通过 </el-tag>
         </div>
+      </div>
 
-        <div id="editorEle" class="toolbar" />
-        <div id="editorEle1" class="text" />
+      <div id="editorEle" class="toolbar" />
+      <div id="editorEle1" class="text" />
 
-        <div class="titStyle" style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
-          <el-form-item style="flex:1; ">3、稳定性测试</el-form-item>
-          <div style="flex: 1; text-align: right;">
-            <el-tag :type="pftResultChange" effect="dark" class="tag" @click="pftResultradio(3)"> 未执行 </el-tag>
-            <el-tag :type="pftResultChange1" style="margin: 0 5%;" effect="dark" class="tag" @click="pftResultradio(1)"> 测试通过 </el-tag>
-            <el-tag :type="pftResultChange2" effect="dark" class="tag" @click="pftResultradio(2)"> 测试未通过 </el-tag>
-          </div>
+      <div class="titStyle" style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
+        <el-form-item style="flex:1; ">3、稳定性测试</el-form-item>
+        <div style="flex: 1; text-align: right;">
+          <el-tag :type="pftResultChange" size="small" effect="dark" class="tag" @click="pftResultradio(3)"> 未执行 </el-tag>
+          <el-tag :type="pftResultChange1" size="small" style="margin: 0 5%;" effect="dark" class="tag" @click="pftResultradio(1)"> 测试通过 </el-tag>
+          <el-tag :type="pftResultChange2" size="small" effect="dark" class="tag" @click="pftResultradio(2)"> 测试未通过 </el-tag>
         </div>
+      </div>
 
-        <div id="editorSix" class="toolbar" />
-        <div id="editorSix1" class="text" />
+      <div id="editorSix" class="toolbar" />
+      <div id="editorSix1" class="text" />
 
-        <div class="titStyle" style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
-          <el-form-item style="flex:1; ">4、安全性测试</el-form-item>
-          <div style="flex: 1; text-align: right;">
-            <el-tag :type="safeResultChange" effect="dark" class="tag" @click="safeResultradio(3)"> 未执行 </el-tag>
-            <el-tag :type="safeResultChange1" style="margin: 0 5%;" effect="dark" class="tag" @click="safeResultradio(1)"> 测试通过 </el-tag>
-            <el-tag :type="safeResultChange2" effect="dark" class="tag" @click="safeResultradio(2)"> 测试未通过 </el-tag>
-          </div>
+      <div class="titStyle" style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
+        <el-form-item style="flex:1; ">4、安全性测试</el-form-item>
+        <div style="flex: 1; text-align: right;">
+          <el-tag :type="safeResultChange" size="small" effect="dark" class="tag" @click="safeResultradio(3)"> 未执行 </el-tag>
+          <el-tag :type="safeResultChange1" size="small" style="margin: 0 5%;" effect="dark" class="tag" @click="safeResultradio(1)"> 测试通过 </el-tag>
+          <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" />
+      <div id="editorEight" class="toolbar" />
+      <div id="editorEight1" class="text" />
 
-        <div class="titStyle" style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
-          <el-form-item style="flex:1; ">5、线上监控</el-form-item>
-          <div style="flex: 1; text-align: right;">
-            <el-tag :type="moniterResultChange" effect="dark" class="tag" @click="moniterResultradio(3)"> 未执行 </el-tag>
-            <el-tag :type="moniterResultChange1" style="margin: 0 5%;" effect="dark" class="tag" @click="moniterResultradio(1)"> 测试通过 </el-tag>
-            <el-tag :type="moniterResultChange2" effect="dark" class="tag" @click="moniterResultradio(2)"> 测试未通过 </el-tag>
-          </div>
+      <div class="titStyle" style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
+        <el-form-item style="flex:1; ">5、线上监控</el-form-item>
+        <div style="flex: 1; text-align: right;">
+          <el-tag :type="moniterResultChange" size="small" effect="dark" class="tag" @click="moniterResultradio(3)"> 未执行 </el-tag>
+          <el-tag :type="moniterResultChange1" size="small" style="margin: 0 5%;" effect="dark" class="tag" @click="moniterResultradio(1)"> 测试通过 </el-tag>
+          <el-tag :type="moniterResultChange2" size="small" effect="dark" class="tag" @click="moniterResultradio(2)"> 测试未通过 </el-tag>
         </div>
-
-        <div id="editorNine" class="toolbar" />
-        <div id="editorNine1" class="text" />
-
-        <dir align="right" style="display: flex; margin: 5vw 0 0 50vw;">
-          <div style="flex: 1;"><el-button v-show="preview" @click="clickPreview(ClientData)"> 预 览 </el-button></div>
-          <div v-show="showButton" style="flex: 1;"><el-button type="primary" @click="getCreateData(ClientData, tableData)"> 保 存 </el-button></div>
-          <div v-show="showButton1" style="flex: 1;"><el-button type="primary" @click="getQueryData(ClientData, tableData)"> 更 新 </el-button></div>
-          <div style="flex: 1;"><el-button @click="open()"> 取 消 </el-button></div>
-        </dir>
-      </el-form>
-    </div>
+      </div>
+
+      <div id="editorNine" class="toolbar" />
+      <div id="editorNine1" class="text" />
+
+      <dir align="right" style="display: flex; margin: 5vw 0 0 50vw;">
+        <div style="flex: 1;"><el-button v-show="preview" @click="clickPreview(ClientData)"> 预 览 </el-button></div>
+        <div v-show="showButton" style="flex: 1;"><el-button type="primary" @click="getCreateData(ClientData, tableData)"> 保 存 </el-button></div>
+        <div v-show="showButton1" style="flex: 1;"><el-button type="primary" @click="getQueryData(ClientData, tableData)"> 更 新 </el-button></div>
+        <div style="flex: 1;"><el-button @click="open()"> 取 消 </el-button></div>
+      </dir>
+    </el-form>
   </div>
 </template>
 
@@ -778,7 +776,6 @@ export default {
   .eleStyle {
     width: 100%;
     height:100%;
-    background:#F2F3F6;
     display: inline-block;
   }
   .titStyle {

src/views/Platform/presentation/ClientAcceptance.vue

@@ -1,140 +1,132 @@
 <template>
   <!-- 准出报告，新增客户端报告 -->
   <div class="eleStyle">
-    <div style="height:100%;width:94%; background:#ffffff; margin: 3%; border-radius: 8px; overflow: hidden;">
-      <el-form ref="ClientData" :inline="true" :model="ClientData" :rules="serviceDataRules" style="margin:2% 3%;">
-        <div style="display:flex; white-space: nowrap;">
-          <el-form-item label="标题" class="backStyle" style="flex:1;" prop="reportName">
-            <el-input v-model="ClientData.reportName" style="width:45vw;" placeholder="报告标题(xxx项目准出报告)" />
-          </el-form-item>
-          <el-form-item label="by" prop="ownner" class="backStyle" style="flex:1; text-align: right;">
-            <el-input v-model="ClientData.ownner" style="width:24vw;" placeholder="who" />
-          </el-form-item>
+    <el-form ref="ClientData" :inline="true" :model="ClientData" :rules="serviceDataRules" style="margin:0% 14%;">
+      <div style="display:flex; white-space: nowrap;">
+        <el-form-item label="标题" class="backStyle" style="flex:1;" prop="reportName">
+          <el-input v-model="ClientData.reportName" size="small" style="width:15vw;" placeholder="报告标题(xxx项目准出报告)" />
+        </el-form-item>
+        <el-form-item label="by" prop="ownner" class="backStyle" style="flex:1; text-align: right;">
+          <el-input v-model="ClientData.ownner" size="small" placeholder="who" />
+        </el-form-item>
+      </div>
+      <div style="margin-bottom: 1%;" class="backStyle">一. 项目概述</div>
+
+      <div style="display: flex; white-space: nowrap;">
+        <el-form-item label="* 测试结果" style="flex: 1;" prop="status">
+          <el-tag :type="tagBtn" effect="dark" size="small" style="margin: 0 2vw;" class="tag" @click="changeStatus(1)"> 通过 </el-tag>
+          <el-tag :type="tagBtn1" effect="dark" size="small" class="tag" @click="changeStatus(2)"> 不通过 </el-tag>
+        </el-form-item>
+        <el-form-item label="准入结果" prop="smokeTestResult" style="flex: 2;text-align:right;"><el-input v-model="ClientData.smokeTestResult" style="width: 25vw;" size="small" placeholder="准入次数/通过次数/失败次数" /></el-form-item>
+      </div>
+      <div style="display: flex; white-space: nowrap;">
+        <el-form-item label="* 准出延期" style="flex: 1;" prop="taskLateStatus">
+          <el-tag :type="tagChange" effect="dark" size="small" style="margin: 0 2vw;" class="tag" @click="lateStatusChange(1)"> 否 </el-tag>
+          <el-tag :type="tagChange1" effect="dark" size="small" class="tag" @click="lateStatusChange(2)"> 是 </el-tag>
+        </el-form-item>
+        <el-form-item v-if="showDelay" label="延期原因" prop="taskLateReason" style="flex: 2;text-align:right;"><el-input v-model="ClientData.taskLateReason" size="small" style="width: 25vw;" /></el-form-item>
+      </div>
+      <div style="display: flex; white-space: nowrap;">
+        <el-form-item label="开发人员" style="flex: 1;" prop="developer"><el-input v-model="ClientData.developer" size="small" style="width:15vw;" /></el-form-item>
+        <el-form-item label="开发周期" style="flex: 1;text-align:right;" prop="devTimeEnd">
+          <el-date-picker v-model="ClientData.devTimeEnd" type="date" size="small" placeholder="请选择开始日期" style=" width: 12.5vw;" />
+          <el-date-picker v-model="ClientData.devTimeStart" type="date" size="small" placeholder="请选择开始日期" style="margin-left:1.3vw; width: 12.5vw;" />
+        </el-form-item>
+      </div>
+
+      <div style="display: flex; white-space: nowrap;">
+        <el-form-item label="测试人员" style="flex: 1;" prop="tester"><el-input v-model="ClientData.tester" size="small" style="width: 15vw;" /></el-form-item>
+        <el-form-item label="测试周期" style="flex: 1;text-align:right;" prop="testTimeEnd">
+          <el-date-picker v-model="ClientData.testTimeEnd" type="date" placeholder="请选择开始日期" size="small" style="width: 12.5vw;" />
+          <el-date-picker v-model="ClientData.testTimeStart" type="date" placeholder="请选择开始日期" size="small" style="margin-left: 1.3vw; width: 12.5vw;" />
+        </el-form-item>
+      </div>
+
+      <div style="margin-bottom: 1%;" class="backStyle">二. 项目背景</div>
+
+      <div id="editorElem" class="toolbar" />
+      <div id="editorElem1" class="text" />
+
+      <div style="margin: 1% 0;" class="backStyle">三. 测试项</div>
+
+      <div style="display:flex; margin:1% 0 -1% 0; white-space: nowrap;">
+        <el-form-item style="flex:1;">1.功能测试</el-form-item>
+        <div style="flex: 1; text-align: right;">
+          <el-tag :type="pftChange" size="small" effect="dark" class="tag" @click="changePftResult(3)"> 未执行 </el-tag>
+          <el-tag :type="pftChange1" size="small" style="margin: 0 5%;" effect="dark" class="tag" @click="changePftResult(1)"> 测试通过 </el-tag>
+          <el-tag :type="pftChange2" size="small" effect="dark" class="tag" @click="changePftResult(2)"> 测试未通过 </el-tag>
         </div>
-        <div style="margin-bottom: 1%;" class="backStyle">一. 项目概述</div>
-
-        <div style="display: flex; white-space: nowrap;">
-          <el-form-item label="* 测试结果" style="flex: 1;" prop="status">
-            <el-tag :type="tagBtn" effect="dark" style="margin: 0 2vw;" class="tag" @click="changeStatus(1)"> 通过 </el-tag>
-            <el-tag :type="tagBtn1" effect="dark" class="tag" @click="changeStatus(2)"> 不通过 </el-tag>
-          </el-form-item>
-          <el-form-item label="准入结果" prop="smokeTestResult" style="flex: 2;text-align:right;"><el-input v-model="ClientData.smokeTestResult" style="width: 50vw;" placeholder="准入次数/通过次数/失败次数" /></el-form-item>
-        </div>
-        <div style="display: flex; white-space: nowrap;">
-          <el-form-item label="* 准出延期" style="flex: 1;" prop="taskLateStatus">
-            <el-tag :type="tagChange" effect="dark" style="margin: 0 2vw;" class="tag" @click="lateStatusChange(1)"> 否 </el-tag>
-            <el-tag :type="tagChange1" effect="dark" class="tag" @click="lateStatusChange(2)"> 是 </el-tag>
-          </el-form-item>
-          <el-form-item v-if="showDelay" label="延期原因" prop="taskLateReason" style="flex: 2;text-align:right;"><el-input v-model="ClientData.taskLateReason" style="width: 50vw;" /></el-form-item>
-        </div>
-        <div style="display: flex; white-space: nowrap;">
-          <el-form-item label="开发人员" style="flex: 1;" prop="developer"><el-input v-model="ClientData.developer" style="width:30vw;" /></el-form-item>
-          <el-form-item label="开发周期" style="flex: 1;text-align:right;" prop="devTimeEnd">
-            <el-date-picker v-model="ClientData.devTimeEnd" type="date" placeholder="请选择开始日期" style=" width: 15vw;" />
-            <el-date-picker v-model="ClientData.devTimeStart" type="date" placeholder="请选择开始日期" style="margin-left:1.3vw; width: 16vw;" />
-          </el-form-item>
-        </div>
-
-        <div style="display: flex; white-space: nowrap;">
-          <el-form-item label="测试人员" style="flex: 1;" prop="tester"><el-input v-model="ClientData.tester" style="width: 30vw;" /></el-form-item>
-          <el-form-item label="测试周期" style="flex: 1;text-align:right;" prop="testTimeEnd">
-            <el-date-picker v-model="ClientData.testTimeEnd" type="date" placeholder="请选择开始日期" style=" width: 15vw;" />
-            <el-date-picker v-model="ClientData.testTimeStart" type="date" placeholder="请选择开始日期" style="margin-left: 1.3vw; width: 16vw;" />
-          </el-form-item>
-        </div>
-
-        <div style="margin-bottom: 1%;" class="backStyle">二. 项目背景</div>
+      </div>
 
-        <div id="editorElem" class="toolbar" />
-        <div id="editorElem1" class="text" />
+      <div id="editorElems" class="toolbar" />
+      <div id="editorElems1" class="text" />
 
-        <div style="margin: 1% 0;" class="backStyle">三. 测试项</div>
-
-        <div style="display:flex; margin:1% 0 -1% 0; white-space: nowrap;">
-          <el-form-item style="flex:1;">1.功能测试</el-form-item>
-          <div style="flex: 1; text-align: right;">
-            <el-tag :type="pftChange" effect="dark" class="tag" @click="changePftResult(3)"> 未执行 </el-tag>
-            <el-tag :type="pftChange1" style="margin: 0 5%;" effect="dark" class="tag" @click="changePftResult(1)"> 测试通过 </el-tag>
-            <el-tag :type="pftChange2" effect="dark" class="tag" @click="changePftResult(2)"> 测试未通过 </el-tag>
-          </div>
-        </div>
-
-        <div id="editorElems" class="toolbar" />
-        <div id="editorElems1" class="text" />
-
-        <div style="display:flex; margin:2% 0 -1% 0;  white-space: nowrap;">
-          <el-form-item style="flex:1;">2.兼容测试</el-form-item>
-          <div style="flex: 1; text-align: right;">
-            <el-tag :type="sctChange" effect="dark" class="tag" @click="changeSctResult(3)"> 未执行 </el-tag>
-            <el-tag :type="sctChange1" style="margin: 0 5%;" effect="dark" class="tag" @click="changeSctResult(1)"> 测试通过 </el-tag>
-            <el-tag :type="sctChange2" effect="dark" class="tag" @click="changeSctResult(2)"> 测试未通过 </el-tag>
-          </div>
+      <div style="display:flex; margin:2% 0 -1% 0;  white-space: nowrap;">
+        <el-form-item style="flex:1;">2.兼容测试</el-form-item>
+        <div style="flex: 1; text-align: right;">
+          <el-tag :type="sctChange" size="small" effect="dark" class="tag" @click="changeSctResult(3)"> 未执行 </el-tag>
+          <el-tag :type="sctChange1" size="small" style="margin: 0 5%;" effect="dark" class="tag" @click="changeSctResult(1)"> 测试通过 </el-tag>
+          <el-tag :type="sctChange2" size="small" effect="dark" class="tag" @click="changeSctResult(2)"> 测试未通过 </el-tag>
         </div>
+      </div>
 
-        <div id="editorFrom" class="toolbar" />
-        <div id="editorFrom1" class="text" />
-
-        <div style="margin: 2% 0 0% 0;" class="backStyle">四. 产品验收</div>
+      <div id="editorFrom" class="toolbar" />
+      <div id="editorFrom1" class="text" />
 
-        <div style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
-          <el-form-item style="flex:1; ">验收结果</el-form-item>
-          <div style="flex: 1; text-align: right;">
-            <el-tag :type="acceptanceResultChange" effect="dark" class="tag" @click="changeAcceptanceResult(3)"> 未执行 </el-tag>
-            <el-tag :type="acceptanceResultChange1" style="margin: 0 5%;" effect="dark" class="tag" @click="changeAcceptanceResult(1)"> 测试通过 </el-tag>
-            <el-tag :type="acceptanceResultChange2" effect="dark" class="tag" @click="changeAcceptanceResult(2)"> 测试未通过 </el-tag>
-          </div>
-        </div>
+      <div style="margin: 2% 0 0% 0;" class="backStyle">四. 产品验收</div>
 
-        <div id="editorFro" class="toolbar" />
-        <div id="editorFro1" class="text" />
-
-        <div style="margin: 2% 0 2% 0;" class="backStyle">五. bug指标</div>
-
-        <el-table :data="tableData" border>
-          <el-table-column prop="totalBug" label="bug总数" min-width="200" align="center" edit="false">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.totalBug.edit" ref="totalBug" v-model="scope.row.totalBug.value" style="width: 100%" @blur="scope.row.totalBug.edit = false" />
-              <span v-else>{{ scope.row.totalBug.value }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="fixBug" min-width="200" align="center" label="已解决bug数">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.fixBug.edit" ref="fixBug" v-model="scope.row.fixBug.value" style="width: 100%" @blur="scope.row.fixBug.edit = false" />
-              <span v-else>{{ scope.row.fixBug.value }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="remainBug" min-width="200" align="center" label="遗留bug数">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.remainBug.edit" ref="remainBug" v-model="scope.row.remainBug.value" style="width: 100%" @blur="scope.row.remainBug.edit = false" />
-              <span v-else>{{ scope.row.remainBug.value }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="rateOfFix" min-width="200" align="center" label="bug解决率">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.rateOfFix.edit" ref="rateOfFix" v-model="scope.row.rateOfFix.value" style="width: 100%" @blur="scope.row.rateOfFix.edit = false" />
-              <span v-else>{{ scope.row.rateOfFix.value }}</span>
-            </template>
-          </el-table-column>
-          <!-- <el-table-column prop="memo" min-width="200" align="center" label="备注">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.memo.edit" ref="rateOfFix" v-model="scope.row.memo.value" style="width: 100%" @blur="scope.row.memo.edit = false" />
-              <span v-else>{{ scope.row.memo.value }}</span>
-            </template>
-          </el-table-column> -->
-        </el-table>
-
-        <el-row>
-          <el-col :span="24" style="margin:1% 0;">遗留问题<el-input v-model="ClientData.bugInfo" type="textarea" placeholder="请填写内容" style="margin-top:1%;" /></el-col>
-        </el-row>
-
-        <div align="right" style="display: flex; margin: 5vw 0 3vw 50vw;">
-          <div style="flex: 1;"><el-button v-show="preview" @click="clickPreview(ClientData)"> 预 览 </el-button></div>
-          <div v-show="showButton" style="flex: 1;"><el-button type="primary" @click="getCreateData(ClientData, tableData)"> 保 存 </el-button></div>
-          <div v-show="showButton1" style="flex: 1;"><el-button type="primary" @click="getQueryData(ClientData, tableData)"> 更 新 </el-button></div>
-          <div style="flex: 1;"><el-button @click="open()"> 取 消 </el-button></div>
+      <div style="display:flex; margin:1% 0 -1% 0;  white-space: nowrap;">
+        <el-form-item style="flex:1; ">验收结果</el-form-item>
+        <div style="flex: 1; text-align: right;">
+          <el-tag :type="acceptanceResultChange" size="small" effect="dark" class="tag" @click="changeAcceptanceResult(3)"> 未执行 </el-tag>
+          <el-tag :type="acceptanceResultChange1" size="small" style="margin: 0 5%;" effect="dark" class="tag" @click="changeAcceptanceResult(1)"> 测试通过 </el-tag>
+          <el-tag :type="acceptanceResultChange2" size="small" effect="dark" class="tag" @click="changeAcceptanceResult(2)"> 测试未通过 </el-tag>
         </div>
-      </el-form>
-    </div>
+      </div>
+
+      <div id="editorFro" class="toolbar" />
+      <div id="editorFro1" class="text" />
+
+      <div style="margin: 2% 0 2% 0;" class="backStyle">五. bug指标</div>
+
+      <el-table :data="tableData" border>
+        <el-table-column prop="totalBug" label="bug总数" min-width="200" align="center" edit="false">
+          <template slot-scope="scope">
+            <el-input v-if="scope.row.totalBug.edit" ref="totalBug" v-model="scope.row.totalBug.value" style="width: 100%" @blur="scope.row.totalBug.edit = false" />
+            <span v-else>{{ scope.row.totalBug.value }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="fixBug" min-width="200" align="center" label="已解决bug数">
+          <template slot-scope="scope">
+            <el-input v-if="scope.row.fixBug.edit" ref="fixBug" v-model="scope.row.fixBug.value" style="width: 100%" @blur="scope.row.fixBug.edit = false" />
+            <span v-else>{{ scope.row.fixBug.value }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="remainBug" min-width="200" align="center" label="遗留bug数">
+          <template slot-scope="scope">
+            <el-input v-if="scope.row.remainBug.edit" ref="remainBug" v-model="scope.row.remainBug.value" style="width: 100%" @blur="scope.row.remainBug.edit = false" />
+            <span v-else>{{ scope.row.remainBug.value }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="rateOfFix" min-width="200" align="center" label="bug解决率">
+          <template slot-scope="scope">
+            <el-input v-if="scope.row.rateOfFix.edit" ref="rateOfFix" v-model="scope.row.rateOfFix.value" style="width: 100%" @blur="scope.row.rateOfFix.edit = false" />
+            <span v-else>{{ scope.row.rateOfFix.value }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-row>
+        <el-col :span="24" style="margin:1% 0;">遗留问题<el-input v-model="ClientData.bugInfo" type="textarea" size="small" placeholder="请填写内容" style="margin-top:1%;" /></el-col>
+      </el-row>
+
+      <div align="center" style="display: flex; margin: 2vw 0 2vw 30vw;">
+        <div style="flex: 1;"><el-button v-show="preview" @click="clickPreview(ClientData)"> 预 览 </el-button></div>
+        <div v-show="showButton" style="flex: 1;"><el-button type="primary" @click="getCreateData(ClientData, tableData)"> 保 存 </el-button></div>
+        <div v-show="showButton1" style="flex: 1;"><el-button type="primary" @click="getQueryData(ClientData, tableData)"> 更 新 </el-button></div>
+        <div style="flex: 1;"><el-button @click="open()"> 取 消 </el-button></div>
+      </div>
+    </el-form>
   </div>
 </template>
 
@@ -572,7 +564,6 @@ export default {
   .eleStyle {
     width: 100%;
     height:100%;
-    background:#F2F3F6;
     display: inline-block;
   }
   .toolbar {

src/views/Platform/presentation/DailyNewsAdded.vue

@@ -1,47 +1,44 @@
 <template>
   <!-- 日报报告，新增报告 -->
   <div class="eleStyle">
-    <div style="height:100%;width:94%; background:#ffffff; margin: 3%; border-radius: 8px; overflow: hidden;">
-      <el-form ref="fromCreateData" :inline="true" :model="fromCreateData" :rules="serviceDataRules" style="margin:2% 3%;">
-        <div style="display: flex;white-space: nowrap;">
-          <el-form-item label="标题" style="flex: 1;" prop="reportName">
-            <el-input v-model="fromCreateData.reportName" style="width:40vw;" placeholder="报告标题(xxx项目日报报告)" />
-          </el-form-item>
-          <el-form-item label="by" prop="ownner" style="flex: 1; text-align:right;">
-            <el-input v-model="fromCreateData.ownner" style="width: 24vw;" placeholder="who" />
-          </el-form-item>
-        </div>
+    <el-form ref="fromCreateData" :inline="true" :model="fromCreateData" :rules="serviceDataRules" style="margin:2% 12%;">
+      <div style="display: flex;white-space: nowrap;">
+        <el-form-item label="标题" style="flex: 1;" prop="reportName">
+          <el-input v-model="fromCreateData.reportName" size="small" style="width:15vw;" placeholder="报告标题(xxx项目日报报告)" />
+        </el-form-item>
+        <el-form-item label="by" prop="ownner" style="flex: 1; text-align:right;">
+          <el-input v-model="fromCreateData.ownner" size="small" placeholder="who" />
+        </el-form-item>
+      </div>
 
-        <!-- 富文本 -->
-        <div id="editor" name="editor" style="width:50px;" />
+      <!-- 富文本 -->
+      <div id="editor" name="editor" style="width:50px;" />
 
-        <div class="backStyle">三. bug情况</div>
+      <div class="backStyle">三. bug情况</div>
 
-        <div style="border: 1px,solid #ccc;">
-          <div style="color: #606266">1、bug统计</div>
-          <div style="display:flex;">
-            <div id="lineShow" style="flex:2; width: 800px;height:400px;" />
-            <div style="flex:1; width: 400px;height:400px;" />
-            <div id="barShow" style="flex:2; width: 800px;height:400px;" />
-          </div>
-          <div style="color: #606266; margin: 1% 0;">2、bug说明</div>
-          <el-row>
-            <el-col :span="24"><el-input v-model="fromCreateData.bugExplain" type="textarea" /></el-col>
-          </el-row>
+      <div style="border: 1px,solid #ccc;">
+        <div style="color: #606266">1、bug统计</div>
+        <div style="display:flex;">
+          <div id="lineShow" style="flex:2; width: 800px;height:400px;" />
+          <div style="flex:1; width: 400px;height:400px;" />
+          <div id="barShow" style="flex:2; width: 800px;height:400px;" />
         </div>
-        <dir align="right" style="display: flex; margin: 5vw 0 0 50vw;">
-          <div style="flex: 1;"><el-button v-show="preview" @click="clickPreview(fromCreateData)"> 预 览 </el-button></div>
-          <div v-show="showButton" style="flex: 1;"><el-button type="primary" @click="getCreateData(fromCreateData)"> 保 存 </el-button></div>
-          <div v-show="showButton1" style="flex: 1;"><el-button type="primary" @click="getQueryData(fromCreateData)"> 更 新 </el-button></div>
-          <div style="flex: 1;"><el-button @click="open(fromCreateData)"> 取 消 </el-button></div>
-        </dir>
-      </el-form>
-    </div>
+        <div style="color: #606266; margin: 1% 0;">2、bug说明</div>
+        <el-row>
+          <el-col :span="24"><el-input v-model="fromCreateData.bugExplain" size="small" type="textarea" /></el-col>
+        </el-row>
+      </div>
+      <dir align="centers" style="display: flex; margin: 5vw 0 0 30vw;">
+        <div style="flex: 1;"><el-button v-show="preview" @click="clickPreview(fromCreateData)"> 预 览 </el-button></div>
+        <div v-show="showButton" style="flex: 1;"><el-button type="primary" @click="getCreateData(fromCreateData)"> 保 存 </el-button></div>
+        <div v-show="showButton1" style="flex: 1;"><el-button type="primary" @click="getQueryData(fromCreateData)"> 更 新 </el-button></div>
+        <div style="flex: 1;"><el-button @click="open(fromCreateData)"> 取 消 </el-button></div>
+      </dir>
+    </el-form>
   </div>
 </template>
 
 <script>
-// import E from 'wangeditor'
 import echarts from 'echarts'
 import Jodit from 'jodit'
 import { dailyReportCreate, dailyReportUpdate, bugDailyList, dailyReport } from '@/api/testPresentetion'
@@ -266,7 +263,6 @@ export default {
   .eleStyle {
     width: 100%;
     height:100%;
-    background:#F2F3F6;
     display: inline-block;
   }
   .backStyle {

src/views/Platform/presentation/PresentReport.vue

@@ -194,7 +194,7 @@ export default {
           if (this.dataChange.configInfo !== '') {
             this.configInBtn = 'success'
             this.configInBtn1 = 'info'
-            this.configIn = 1
+            this.confidgIn = 1
             this.showApollo = true
           } else {
             this.configInBtn = 'info'
@@ -231,10 +231,6 @@ export default {
         }
       })
     },
-    guoOut() {
-      this.showOne = true
-      this.showtow = false
-    },
     getCreateData(ele) {
       this.$refs['dataChange'].validate((valid) => {
         if (valid) {

src/views/Platform/presentation/ResultPageyL.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="eleStyle">
-    <div style="height:100%;width:98%; background:#ffffff; margin: 1%; border-radius: 4px; overflow: hidden;">
+    <div style="height:100%;width:98%; margin: 1%; overflow: hidden;">
       <!-- 准出预览 -->
       <div v-if="towShow">
-        <div style="padding: 2% 9%;">
+        <div style="padding: 2% 14%;">
           <div style="display: flex; white-space: nowrap; font-family:SimSuncss">
             <span style="flex:1;font-weight: bold;font-size: 24px;color: #3a8ee6">{{ ClientDatayl.reportName }}</span>
             <span style="flex:2;margin: 0.5% 0 0 20px;font-size: 17px;">by {{ ClientDatayl.ownner }}
@@ -640,7 +640,6 @@ export default {
   .eleStyle {
     width: 100%;
     height:100%;
-    background:#F2F3F6;
     display: inline-block;
     font-size: 14px;
     color: #606266;

src/views/Platform/presentation/Templates/ClientReport.vue

@@ -0,0 +1,153 @@
+<template>
+  <el-dialog :visible.sync="dialogDaliy" width="80%" height="100%" top="4vh" :close-on-click-modal="false">
+    <div class="flex_start titFont">
+      <div class="titIcon" />
+      <span style="margin-left: 1%; width: 100px;">准出报告</span>
+    </div>
+    <div style="margin: 4% 0%; font-size: 16pt; color: #333B4A;">
+      <el-steps :active="active" align-center finish-status="success">
+        <el-step style="font-size: 16pt; color: #333B4A;" title="选择模版" />
+        <el-step title="填写报告" />
+        <el-step style="font-size: 16pt; color: #333B4A;" title="发送报告" />
+      </el-steps>
+    </div>
+    <div v-show="showOne" style="margin: 0 4% 2%;">
+      <div style="margin: 0% 14%;  height: 440px;" class="Layout">
+        <div style="margin-right:2%;">
+          <el-radio v-model="radio" class="_radio" label="1">客户端模版</el-radio>
+          <el-image :src="src" />
+        </div>
+        <div style="margin-left:2%;">
+          <el-radio v-model="radio" class="_radio" label="2">服务端模版</el-radio>
+          <el-image :src="src" />
+        </div>
+      </div>
+      <div align="center">
+        <el-button size="small" type="primary" @click="NextStep()">下一步</el-button>
+      </div>
+    </div>
+    <el-dialog :visible.sync="dialogDaliy1" width="80%" height="100%" top="4vh" append-to-body :close-on-click-modal="false" :before-close="handleClose1">
+      <div class="flex_start titFont">
+        <div class="titIcon" />
+        <span style="margin-left: 1%; width: 100px;">准出报告</span>
+      </div>
+      <div style="margin: 2% 0%; font-size: 16pt; color: #333B4A;">
+        <el-steps :active="active1" align-center finish-status="success">
+          <el-step style="font-size: 16pt; color: #333B4A;" title="选择模版" />
+          <el-step title="填写报告" />
+          <el-step style="font-size: 16pt; color: #333B4A;" title="发送报告" />
+        </el-steps>
+      </div>
+      <div class="descr" style=" margin-bottom: 2%; height: 480px; overflow:scroll; overflow-x: hidden">
+        <ClientAcceptance v-if="ClientAcceptance1" ref="ClientAcceptance" />
+        <Acceptance v-if="Acceptance1" />
+      </div>
+      <div align="center">
+        <el-button size="small" type="primary" @click="handleClose1()">上一步</el-button>
+        <el-button size="small" type="primary" @click="created_out()">保存，下一步</el-button>
+      </div>
+      <el-dialog :visible.sync="dialogDaliy2" width="80%" height="100%" top="4vh" append-to-body :close-on-click-modal="false" :before-close="handleClose2">
+        <div class="flex_start titFont">
+          <div class="titIcon" />
+          <span style="margin-left: 1%; width: 100px;">准出报告</span>
+        </div>
+        <div style="margin: 2% 0%; font-size: 16pt; color: #333B4A;">
+          <el-steps :active="active2" align-center finish-status="success">
+            <el-step style="font-size: 16pt; color: #333B4A;" title="选择模版" />
+            <el-step title="填写报告" />
+            <el-step style="font-size: 16pt; color: #333B4A;" title="发送报告" />
+          </el-steps>
+        </div>
+        <div style="margin: 0% 12%;font-size:18px; font-family:PingFangSC-Medium,PingFang SC; font-weight:500; color:rgba(51,59,74,1); line-height:29px;">
+          邮件列表
+        </div>
+        <div class="Layout" style="margin: 2% 12%;">
+          <div class="Layout"><div class="div1">收件人</div><el-input v-model="value" size="small" clearable filterable placeholder="请输入" /></div>
+          <div class="Layout"><div class="div1">抄送</div><el-input v-model="value" size="small" clearable filterable placeholder="请输入" /></div>
+        </div>
+        <div style="margin: 0 12%; font-size:18px; font-family:PingFangSC-Medium,PingFang SC; font-weight:500; color:rgba(51,59,74,1); line-height:29px;">
+          报告预览
+        </div>
+        <div class="descr" style=" margin-bottom: 2%; height: 350px; overflow:scroll; overflow-x: hidden">
+          <ResultPageyL />
+        </div>
+        <div align="center">
+          <el-button size="small" type="primary" @click="gou_out()">上一步</el-button>
+          <el-button size="small" type="primary">发送</el-button>
+        </div>
+      </el-dialog>
+    </el-dialog>
+  </el-dialog>
+</template>
+
+<script>
+import ClientAcceptance from '@/views/Platform/presentation/ClientAcceptance.vue'
+import Acceptance from '@/views/Platform/presentation/Acceptance.vue'
+import ResultPageyL from '@/views/Platform/presentation/ResultPageyL.vue'
+
+export default {
+  components: {
+    ClientAcceptance,
+    Acceptance,
+    ResultPageyL
+  },
+  data() {
+    return {
+      dialogDaliy: false,
+      dialogDaliy1: false,
+      dialogDaliy2: false,
+      Acceptance1: false,
+      ClientAcceptance1: false,
+      Client: false,
+      showOne: true,
+      radio: '3',
+      value: '',
+      active: 1,
+      active1: 2,
+      active2: 3,
+      src: 'https://fuss10.elemecdn.com/3/28/bbf893f792f03a54408b3b7a7ebf0jpeg.jpeg'
+    }
+  },
+  methods: {
+    init() {
+      this.dialogDaliy = true
+    },
+    handleClose1() {
+      this.dialogDaliy1 = false
+    },
+    created_out() {
+      this.dialogDaliy2 = true
+    },
+    gou_out() {
+      this.dialogDaliy2 = false
+    },
+    NextStep() {
+      switch (Number(this.radio)) {
+        case 1:
+          this.dialogDaliy1 = true
+          this.ClientAcceptance1 = true
+          this.Acceptance1 = false
+          // this.$nextTick(() => {
+          //   this.$refs.Present.init()
+          // })
+          break
+        case 2:
+          this.dialogDaliy1 = true
+          this.ClientAcceptance1 = false
+          this.Acceptance1 = true
+          // this.$nextTick(() => {
+          //   this.$refs.Present.init()
+          // })
+          break
+        case 3:
+          this.$message({ message: '请选择要创建的‘模版’', type: 'error', duration: 1000, offset: 150 })
+          break
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>

src/views/Platform/presentation/Templates/DailyReport.vue

@@ -0,0 +1,140 @@
+<template>
+  <el-dialog :visible.sync="dialogDaliy" width="80%" height="100%" top="4vh" :close-on-click-modal="false">
+    <div class="flex_start titFont">
+      <div class="titIcon" />
+      <span style="margin-left: 1%; width: 100px;">测试报告</span>
+    </div>
+    <div style="margin: 4% 0%; font-size: 16pt; color: #333B4A;">
+      <el-steps :active="active" align-center finish-status="success">
+        <el-step style="font-size: 16pt; color: #333B4A;" title="选择模版" />
+        <el-step title="填写报告" />
+        <el-step style="font-size: 16pt; color: #333B4A;" title="发送报告" />
+      </el-steps>
+    </div>
+    <div v-show="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" />
+      </div>
+      <div align="center" style="margin-top: 2%;">
+        <el-button size="small" type="primary" @click="NextStep()">下一步</el-button>
+      </div>
+    </div>
+    <el-dialog :visible.sync="dialogDaliy1" width="80%" height="100%" top="4vh" append-to-body :close-on-click-modal="false" :before-close="handleClose1">
+      <div class="flex_start titFont">
+        <div class="titIcon" />
+        <span style="margin-left: 1%; width: 100px;">测试报告</span>
+      </div>
+      <div style="margin: 4% 0%; font-size: 16pt; color: #333B4A;">
+        <el-steps :active="active1" align-center finish-status="success">
+          <el-step style="font-size: 16pt; color: #333B4A;" title="选择模版" />
+          <el-step title="填写报告" />
+          <el-step style="font-size: 16pt; color: #333B4A;" title="发送报告" />
+        </el-steps>
+      </div>
+      <div class="descr" style=" margin-bottom: 2%; height: 400px; overflow:scroll; overflow-x: hidden">
+        <DailyReport />
+      </div>
+      <div align="center">
+        <el-button size="small" type="primary" @click="handleClose1()">上一步</el-button>
+        <el-button size="small" type="primary" @click="created_out()">保存，下一步</el-button>
+      </div>
+      <el-dialog :visible.sync="dialogDaliy2" width="80%" height="100%" top="4vh" append-to-body :close-on-click-modal="false" :before-close="handleClose2">
+        <div class="flex_start titFont">
+          <div class="titIcon" />
+          <span style="margin-left: 1%; width: 100px;">测试报告</span>
+        </div>
+        <div style="margin: 2% 0%; font-size: 16pt; color: #333B4A;">
+          <el-steps :active="active2" align-center finish-status="success">
+            <el-step style="font-size: 16pt; color: #333B4A;" title="选择模版" />
+            <el-step title="填写报告" />
+            <el-step style="font-size: 16pt; color: #333B4A;" title="发送报告" />
+          </el-steps>
+        </div>
+        <div style="margin: 0% 12%;font-size:18px; font-family:PingFangSC-Medium,PingFang SC; font-weight:500; color:rgba(51,59,74,1); line-height:29px;">
+          邮件列表
+        </div>
+        <div class="Layout" style="margin: 2% 12%;">
+          <div class="Layout"><div class="div1">收件人</div><el-input v-model="value" size="small" clearable filterable placeholder="请输入" /></div>
+          <div class="Layout"><div class="div1">抄送</div><el-input v-model="value" size="small" clearable filterable placeholder="请输入" /></div>
+        </div>
+        <div style="margin: 0 12%; font-size:18px; font-family:PingFangSC-Medium,PingFang SC; font-weight:500; color:rgba(51,59,74,1); line-height:29px;">
+          报告预览
+        </div>
+        <div class="descr" style=" margin-bottom: 2%; height: 350px; overflow:scroll; overflow-x: hidden">
+          <testPresenyL />
+        </div>
+        <div align="center">
+          <el-button size="small" type="primary" @click="gou_out()">上一步</el-button>
+          <el-button size="small" type="primary">发送</el-button>
+        </div>
+      </el-dialog>
+    </el-dialog>
+  </el-dialog>
+</template>
+
+<script>
+import DailyReport from '@/views/Platform/presentation/DailyNewsAdded.vue'
+import testPresenyL from '@/views/Platform/presentation/testPresenyL.vue'
+export default {
+  components: {
+    DailyReport,
+    testPresenyL
+  },
+  data() {
+    return {
+      dialogDaliy: false,
+      dialogDaliy1: false,
+      dialogDaliy2: false,
+      showOne: true,
+      radio: '2',
+      active: 1,
+      active1: 2,
+      active2: 3,
+      src: 'https://fuss10.elemecdn.com/3/28/bbf893f792f03a54408b3b7a7ebf0jpeg.jpeg'
+    }
+  },
+  methods: {
+    init() {
+      this.dialogDaliy = true
+    },
+    handleClose1() {
+      this.dialogDaliy1 = false
+    },
+    created_out() {
+      this.dialogDaliy2 = true
+    },
+    gou_out() {
+      this.dialogDaliy2 = false
+    },
+    NextStep() {
+      switch (Number(this.radio)) {
+        case 1:
+          this.dialogDaliy1 = true
+          break
+        case 2:
+          this.$message({ message: '请选择要创建的‘模版’', type: 'error', duration: 1000, offset: 150 })
+          break
+      }
+    }
+  }
+}
+</script>
+
+<style>
+._radio {
+  margin: 3% 0;
+  color: #333B4A;
+  font-size: 16pt
+}
+.descr::-webkit-scrollbar{
+  width:0;
+}
+.div1 {
+  width: 100px;
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: rgba(51,51,51,1);
+  line-height: 19px;
+}
+</style>

src/views/Platform/presentation/Templates/TestReport.vue

@@ -5,7 +5,7 @@
       <span style="margin-left: 1%; width: 100px;">提测报告</span>
     </div>
     <div style="margin: 4% 0%; font-size: 16pt; color: #333B4A;">
-      <el-steps active="1" align-center finish-status="success">
+      <el-steps :active="active" align-center finish-status="success">
         <el-step style="font-size: 16pt; color: #333B4A;" title="选择模版" />
         <el-step title="填写报告" />
         <el-step style="font-size: 16pt; color: #333B4A;" title="发送报告" />
@@ -32,14 +32,15 @@
         <span style="margin-left: 1%; width: 100px;">提测报告</span>
       </div>
       <div style="margin: 4% 0%; font-size: 16pt; color: #333B4A;">
-        <el-steps active="2" align-center finish-status="success">
+        <el-steps :active="active1" align-center finish-status="success">
           <el-step style="font-size: 16pt; color: #333B4A;" title="选择模版" />
           <el-step title="填写报告" />
           <el-step style="font-size: 16pt; color: #333B4A;" title="发送报告" />
         </el-steps>
       </div>
-      <div style=" margin-bottom: 2%; height: 440px; overflow:scroll; overflow-x: hidden">
-        <Present ref="Present" />
+      <div class="descr" style=" margin-bottom: 2%; height: 440px; overflow:scroll; overflow-x: hidden">
+        <Present v-if="Present1" ref="Present" />
+        <presentation v-if="presentation1" ref="presentation" />
       </div>
       <div align="center">
         <el-button size="small" type="primary" @click="handleClose1()">上一步</el-button>
@@ -51,11 +52,28 @@
           <span style="margin-left: 1%; width: 100px;">提测报告</span>
         </div>
         <div style="margin: 4% 0%; font-size: 16pt; color: #333B4A;">
-          <el-steps active="3" align-center finish-status="success">
+          <el-steps :active="active2" align-center finish-status="success">
             <el-step style="font-size: 16pt; color: #333B4A;" title="选择模版" />
             <el-step title="填写报告" />
             <el-step style="font-size: 16pt; color: #333B4A;" title="发送报告" />
           </el-steps>
+          <div style="margin: 1% 12%;font-size:18px; font-family:PingFangSC-Medium,PingFang SC; font-weight:500; color:rgba(51,59,74,1); line-height:29px;">
+            邮件列表
+          </div>
+          <div class="Layout" style="margin: 2% 12%;">
+            <div class="Layout"><div class="div1">收件人</div> <el-input v-model="value" size="small" clearable filterable placeholder="请输入" /></div>
+            <div class="Layout"><div class="div1">抄送</div> <el-input v-model="value" size="small" clearable filterable placeholder="请输入" /></div>
+          </div>
+          <div style="margin: 0 12%; font-size:18px; font-family:PingFangSC-Medium,PingFang SC; font-weight:500; color:rgba(51,59,74,1); line-height:29px;">
+            报告预览
+          </div>
+          <div class="descr" style="margin-bottom: 2%; height: 320px; overflow:scroll; overflow-x: hidden">
+            <acceptthe ref="acceptthe" />
+          </div>
+        </div>
+        <div align="center">
+          <el-button size="small" type="primary" @click="gou_out()">上一步</el-button>
+          <el-button size="small" type="primary">发送</el-button>
         </div>
       </el-dialog>
     </el-dialog>
@@ -65,19 +83,26 @@
 <script>
 import '@/views/projectManage/publicCss/index.css'
 import Present from '@/views/Platform/presentation/PresentReport'
+import acceptthe from '@/views/Platform/presentation/acceptTheReport'
+import presentation from '@/views/Platform/presentation/presentationReport.vue'
 
 export default {
   components: {
-    Present
+    Present,
+    acceptthe,
+    presentation
   },
   data() {
     return {
+      value: '',
+      Present1: false,
+      presentation1: false,
       showOne: true,
-      // showtow: false,
       showClient: false,
       showClientYL: false,
       active: 1,
       active1: 2,
+      active2: 3,
       radio: '3',
       src: 'https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg',
       dialogVisible1: false
@@ -89,26 +114,42 @@ export default {
     },
     handleClose1() {
       this.showClient = false
+      this.dialogVisible1 = false
+    },
+    handleClose2() {
+      this.showClientYL = false
+      this.showClient = false
+      this.dialogVisible1 = false
+    },
+    gou_out() {
+      this.showClientYL = false
     },
     created_out() {
       this.showClientYL = true
+      // this.$nextTick(() => {
+      //   this.$refs.acceptthe.int()
+      // })
+      console.log(this.$refs)
     },
     NextStep() {
-      console.log(this.radio)
-      switch (this.radio) {
-        case '1':
+      switch (Number(this.radio)) {
+        case 1:
           this.showClient = true
-          this.$nextTick(() => {
-            this.$refs.Present.init()
-          })
+          this.Present1 = true
+          this.presentation1 = false
+          // this.$nextTick(() => {
+          //   this.$refs.Present.init()
+          // })
           break
-        case '2':
+        case 2:
           this.showClient = true
-          this.$nextTick(() => {
-            this.$refs.Present.init()
-          })
+          this.Present1 = false
+          this.presentation1 = true
+          // this.$nextTick(() => {
+          //   this.$refs.Present.init()
+          // })
           break
-        case '3':
+        case 3:
           this.$message({ message: '请选择要创建的‘模版’', type: 'error', duration: 1000, offset: 150 })
           break
       }
@@ -123,4 +164,24 @@ export default {
   color: #333B4A;
   font-size: 16pt
 }
+.flex_start {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+}
+.Layout {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.div1 {
+  width: 100px;
+  font-size: 14px;
+  font-family: MicrosoftYaHei;
+  color: rgba(51,51,51,1);
+  line-height: 19px;
+}
+.descr::-webkit-scrollbar{
+  width:0;
+}
 </style>

src/views/Platform/presentation/acceptTheReport.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 提测预览 -->
   <div class="eleStyle_one">
-    <div style="height:100%;width:94%; background:#ffffff; margin: 3%; border-radius: 4px; overflow: hidden;">
+    <div style="height:100%;width:94%; margin: 0 3%; overflow: hidden;">
       <div style="padding:2% 9%;">
         <div style="display: flex; white-space: nowrap; font-family:SimSuncss">
           <span style="flex:1;font-weight: bold;font-size: 24px;color: #3a8ee6">{{ fromCreateData.name }}</span>
@@ -328,7 +328,6 @@ export default {
   .eleStyle_one {
     width: 100%;
     height:100%;
-    background:#F2F3F6;
     display: inline-block;
     font-size: 14px;
     color: #606266;

src/views/Platform/presentation/presentationReport.vue

@@ -1,109 +1,104 @@
 <template>
   <!-- 提测报告，新增服务端报告 -->
   <div class="eleStyle">
-    <div style="height:100%;width:94%; background:#ffffff; margin: 3%; border-radius: 4px; overflow: hidden;">
-      <el-form ref="fromDev" :model="fromDev" :rules="serviceDataRules" style="margin: 2% 3%;">
-        <div class="double">
-          <el-form-item label="标题" prop="name">
-            <el-input v-model="fromDev.name" style="width:50vw;" placeholder="报告标题(端-版本-需求提测报告)" />
-          </el-form-item>
-          <el-form-item label="by" prop="submitter">
-            <el-input v-model="fromDev.submitter" style="width: 25vw;" placeholder="who" />
-          </el-form-item>
-        </div>
+    <el-form ref="fromDev" :model="fromDev" :rules="serviceDataRules" style="margin:2% 14%;">
+      <div class="double">
+        <el-form-item label="标题" prop="name">
+          <el-input v-model="fromDev.name" size="small" style="width:20vw;" placeholder="报告标题(端-版本-需求提测报告)" />
+        </el-form-item>
+        <el-form-item label="by" prop="submitter">
+          <el-input v-model="fromDev.submitter" size="small" placeholder="who" />
+        </el-form-item>
+      </div>
 
-        <div class="backStyle">一. 提测详情</div>
+      <div class="backStyle">一. 提测详情</div>
 
-        <div class="double" style="white-space: nowrap;">
-          <el-form-item label="* 是否延期">
-            <div style="margin-left: 15px;">
-              <el-button :type="lateStatusBtn" style="margin: 0 10px;" class="tag" @click="lateStatusChange(2)"> 是 </el-button>
-              <el-button :type="lateStatusBtn1" class="tag" @click="lateStatusChange(1)"> 否 </el-button>
-            </div>
-          </el-form-item>
-          <el-form-item v-if="showDelay" label="延期原因" prop="lateReason"><el-input v-model="fromDev.lateReason" style="width: 50vw;" /></el-form-item>
-        </div>
+      <div class="double" style="white-space: nowrap;">
+        <el-form-item label="* 是否延期" style="margin-left: 15px;">
+          <el-button :type="lateStatusBtn" size="small" style="margin: 0 10px;" class="tag" @click="lateStatusChange(2)"> 是 </el-button>
+          <el-button :type="lateStatusBtn1" size="small" class="tag" @click="lateStatusChange(1)"> 否 </el-button>
+        </el-form-item>
+        <el-form-item v-if="showDelay" label="延期原因" prop="lateReason"><el-input v-model="fromDev.lateReason" size="small" style="width: 25vw;" /></el-form-item>
+      </div>
 
-        <div class="double" style="white-space: nowrap;">
-          <el-form-item label="* 涉及安全项">
-            <el-button :type="getInfoBtn" style="margin: 0 10px;" class="tag" @click="showStatusData(2)"> 是 </el-button>
-            <el-button :type="getInfoBtn1" style="margin-left: 14px;" class="tag" @click="showStatusData(1)"> 否 </el-button>
-          </el-form-item>
-          <el-form-item v-if="showData" label="完成结果" prop="safeInfo"><el-input v-model="fromDev.safeInfo" style="width: 50vw;" /></el-form-item>
-        </div>
+      <div class="double" style="white-space: nowrap;">
+        <el-form-item label="* 涉及安全项">
+          <el-button :type="getInfoBtn" style="margin: 0 10px;" size="small" class="tag" @click="showStatusData(2)"> 是 </el-button>
+          <el-button :type="getInfoBtn1" style="margin-left: 14px;" size="small" class="tag" @click="showStatusData(1)"> 否 </el-button>
+        </el-form-item>
+        <el-form-item v-if="showData" label="完成结果" prop="safeInfo"><el-input v-model="fromDev.safeInfo" size="small" style="width: 25vw;" /></el-form-item>
+      </div>
 
-        <el-form-item label="SDL链接 : "><el-link href="http://wiki.intra.xiaojukeji.com/pages/viewpage.action?pageId=237016271" type="primary" target="_blank"> 普惠SDL准入标准</el-link></el-form-item>
+      <el-form-item label="SDL链接 : "><el-link href="http://wiki.intra.xiaojukeji.com/pages/viewpage.action?pageId=237016271" type="primary" target="_blank"> 普惠SDL准入标准</el-link></el-form-item>
 
-        <div class="double">
-          <el-form-item label="是否跟版" prop="isEdition"><el-input v-model="fromDev.isEdition" style="width:30vw;" placeholder="请填写" /></el-form-item>
-          <el-form-item label="开发时间" prop="devTimeStart">
-            <el-date-picker v-model="fromDev.devTimeStart" type="date" style="width:20vw; margin-right:2%;" placeholder="选择日期" />
-            <el-date-picker v-model="fromDev.devTimeEnd" type="date" style="width:20vw;" placeholder="选择日期" />
-          </el-form-item>
-        </div>
+      <div class="double">
+        <el-form-item label="是否跟版" prop="isEdition"><el-input v-model="fromDev.isEdition" size="small" style="width:15vw;" placeholder="请填写" /></el-form-item>
+        <el-form-item label="开发时间" prop="devTimeStart">
+          <el-date-picker v-model="fromDev.devTimeStart" type="date" size="small" style="width:12.5vw; margin-right:2%;" placeholder="选择日期" />
+          <el-date-picker v-model="fromDev.devTimeEnd" type="date" size="small" style="width:12.5vw;" placeholder="选择日期" />
+        </el-form-item>
+      </div>
 
-        <div class="double">
-          <el-form-item label=" 优 先 级" prop="priority">
-            <el-select v-model="fromDev.priority" style="width:30vw;" placeholder="请选择优先级">
-              <el-option v-for="item in priorityStrings" :key="item.value" :label="item.name" :value="item.name" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="计划提测时间" prop="planLaunchTime">
-            <el-date-picker v-model="fromDev.planLaunchTime" type="date" style="width:40vw;" placeholder="选择日期" />
-          </el-form-item>
-        </div>
+      <div class="double">
+        <el-form-item label=" 优 先 级" prop="priority">
+          <el-select v-model="fromDev.priority" size="small" style="width:15vw;" placeholder="请选择优先级">
+            <el-option v-for="item in priorityStrings" :key="item.value" :label="item.name" :value="item.name" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="计划提测时间" prop="planLaunchTime">
+          <el-date-picker v-model="fromDev.planLaunchTime" size="small" type="date" style="width:25vw;" placeholder="选择日期" />
+        </el-form-item>
+      </div>
 
-        <div class="double">
-          <el-form-item label=" prd地址 " prop="prdUrl"><el-input v-model="fromDev.prdUrl" style="width:30vw;" placeholder="请提供wiki链接" /></el-form-item>
-          <el-form-item label="实际提测时间" prop="launchTime">
-            <el-date-picker v-model="fromDev.launchTime" type="date" style="width:40vw;" placeholder="选择日期" />
-          </el-form-item>
-        </div>
-        <div class="double">
-          <el-col :span="24">
-            <el-form-item label="设计方案" prop="devUrl"><el-input v-model="fromDev.devUrl" style="width:85vw;" placeholder="请提供wiki链接，包含接口定义，数据库改动，依赖关系" /></el-form-item>
-          </el-col>
-        </div>
+      <div class="double">
+        <el-form-item label=" prd地址 " prop="prdUrl"><el-input v-model="fromDev.prdUrl" size="small" style="width:15vw;" placeholder="请提供wiki链接" /></el-form-item>
+        <el-form-item label="实际提测时间" prop="launchTime">
+          <el-date-picker v-model="fromDev.launchTime" type="date" size="small" style="width:25vw;" placeholder="选择日期" />
+        </el-form-item>
+      </div>
+      <div class="double">
+        <el-col :span="24">
+          <el-form-item label="设计方案" prop="devUrl"><el-input v-model="fromDev.devUrl" size="small" style="width:85vw;" placeholder="请提供wiki链接，包含接口定义，数据库改动，依赖关系" /></el-form-item>
+        </el-col>
+      </div>
 
-        <div class="double">
-          <el-col :span="24">
-            <el-form-item label="自测结果" prop="selfTestInfo"><el-input v-model="fromDev.selfTestInfo" style="width:85vw;" placeholder="请提供wiki链接（提测前QA需提供准人case）" /></el-form-item>
-          </el-col>
-        </div>
-        <div class="double">
-          <el-col :span="24">
-            <el-form-item label="测试建议" prop="testSuggest"><el-input v-model="fromDev.testSuggest" style="width:83.5vw;" type="textarea" :rows="5" placeholder="改动点影响分析：是否影响老功能，那些老功能需要回归接口是否影响上下游系统，有没有通知相关人性能，安全" /></el-form-item>
-          </el-col>
-        </div>
-        <el-form-item label="提测模块" style="margin: 2px 0;" />
-        <div id="DetailsOfProposal" class="toolbar" />
-        <div id="DetailsOfProposal1" class="text" />
+      <div class="double">
+        <el-col :span="24">
+          <el-form-item label="自测结果" prop="selfTestInfo"><el-input v-model="fromDev.selfTestInfo" size="small" style="width:85vw;" placeholder="请提供wiki链接（提测前QA需提供准人case）" /></el-form-item>
+        </el-col>
+      </div>
+      <div class="double">
+        <el-col :span="24">
+          <el-form-item label="测试建议" prop="testSuggest"><el-input v-model="fromDev.testSuggest" size="small" style="width:83.5vw;" type="textarea" :rows="5" placeholder="改动点影响分析：是否影响老功能，那些老功能需要回归接口是否影响上下游系统，有没有通知相关人性能，安全" /></el-form-item>
+        </el-col>
+      </div>
+      <el-form-item label="提测模块" style="margin: 2px 0;" />
+      <div id="DetailsOfProposal" class="toolbar" />
+      <div id="DetailsOfProposal1" class="text" />
 
-        <div class="backStyle">二. 联调详情</div>
+      <div class="backStyle">二. 联调详情</div>
 
-        <div id="editorContent" class="toolbar" />
-        <div id="editorContent1" class="text" />
+      <div id="editorContent" class="toolbar" />
+      <div id="editorContent1" class="text" />
 
-        <div class="backStyle">三. 其他</div>
-        <div class="double">
-          <el-col :span="24">
-            <el-form-item label="新增配置"><el-input v-model="fromDev.configInfo" style="width:85vw;" type="textarea" :rows="2" placeholder="全局变量、kdiamond配置、降级点、新增topic等，disconf配置，apollo配置说明用途" /></el-form-item>
-          </el-col>
-        </div>
-        <div class="double" align="right">
-          <el-col :span="24">
-            <el-form-item label="其他"><el-input v-model="fromDev.others" style="padding-left: 25px; text-align: right; width: 85vw;" type="textarea" :rows="5" placeholder="请输入其他内容…" /></el-form-item>
-          </el-col>
-        </div>
+      <div class="backStyle">三. 其他</div>
+      <div class="double">
+        <el-col :span="24">
+          <el-form-item label="新增配置"><el-input v-model="fromDev.configInfo" style="width:85vw;" size="small" type="textarea" :rows="2" placeholder="全局变量、kdiamond配置、降级点、新增topic等，disconf配置，apollo配置说明用途" /></el-form-item>
+        </el-col>
+      </div>
+      <div class="double" align="right">
+        <el-col :span="24">
+          <el-form-item label="其他"><el-input v-model="fromDev.others" style="padding-left: 25px; text-align: right; width: 85vw;" size="small" type="textarea" :rows="5" placeholder="请输入其他内容…" /></el-form-item>
+        </el-col>
+      </div>
 
-        <div class="double" align="right" style="margin: 5vw 0 3vw 60vw;">
-          <div><el-button @click="clickPreview(fromDev)"> 预 览 </el-button></div>
-          <div v-show="showButton"><el-button type="primary" @click="getCreateData(fromDev)"> 保 存 </el-button></div>
-          <div v-show="showButton1"><el-button type="primary" @click="getQueryData(fromDev)"> 更 新 </el-button></div>
-          <div><el-button @click="open(fromDev)"> 取 消 </el-button></div>
-        </div>
-      </el-form>
-    </div>
+      <div class="double" align="center" style="margin: 5vw 0 3vw;">
+        <div><el-button @click="clickPreview(fromDev)"> 预 览 </el-button></div>
+        <div v-show="showButton"><el-button type="primary" @click="getCreateData(fromDev)"> 保 存 </el-button></div>
+        <div v-show="showButton1"><el-button type="primary" @click="getQueryData(fromDev)"> 更 新 </el-button></div>
+      </div>
+    </el-form>
   </div>
 </template>
 
@@ -235,15 +230,6 @@ export default {
         }
       })
     },
-    open(ele) {
-      this.$confirm('是否放弃修改，离开页面？', '确认信息', {
-        distinguishCancelAndClose: true,
-        confirmButtonText: '继续修改',
-        cancelButtonText: '放弃修改'
-      })
-        .then(() => { this.$message({ type: 'info', message: '继续修改' }) })
-        .catch(action => { action === 'cancel' ? this.$router.push({ path: '/Platform/presentation/Assumptions' }) : '' })
-    },
     getCreateData(ele) {
       this.$refs['fromDev'].validate((valid) => {
         if (valid) {
@@ -311,7 +297,6 @@ export default {
 .eleStyle {
     width: 100%;
     height:100%;
-    background:#F2F3F6;
     display: inline-block;
   }
   .tag {

src/views/Platform/presentation/testPresenyL.vue

@@ -1,32 +1,30 @@
 <template>
   <!-- 日报预览 -->
   <div class="eleStyle">
-    <div style="height:100%;width:94%; background:#ffffff; margin: 3% 3% 8% 3%; border-radius: 4px; overflow: hidden;">
-      <el-form :model="fromCreat" style="margin:2% 9%">
-        <div>
-          <div style="display: flex; white-space: nowrap; font-family:SimSuncss">
-            <span style="flex:1;font-weight: bold;font-size: 24px;color: #3a8ee6">{{ fromCreat.reportName }}</span>
-            <span style="flex:2;margin: 0.5% 0 0 20px;font-size: 17px;">by {{ fromCreat.ownner }}
-              <el-button v-show="btn" type="primary" size="mini" style="margin:0 2% 0 5%;" @click="dialogTableVisible = true">发送报告</el-button>
-              <el-button v-show="btn" size="mini" @click="dialogTableVisible = true">下载测试报告</el-button>
-            </span>
-          </div>
-          <div style="font-size:15px;color:#606266;" class="rich" v-html="projectProgress" />
-          <div class="titleStyle">三. bug情况</div>
-          <div style="border: 1px,solid #ccc;font-size:14px;color:#606266;">
-            <div style="margin: 1%;">1、bug统计</div>
-            <div style="display:flex;">
-              <div id="lineShow" style="flex:2; width: 800px;height:400px;" />
-              <div style="flex:1; width: 400px;height:400px;" />
-              <div id="barShow" style="flex:2; width: 800px;height:400px;" />
-            </div>
-            <div style="margin: 1%;">2、bug说明</div>
-            {{ bugshow }}
+    <el-form :model="fromCreat" style="margin:0% 14%">
+      <div>
+        <div style="display: flex; white-space: nowrap; font-family:SimSuncss">
+          <span style="flex:1;font-weight: bold;font-size: 24px;color: #3a8ee6">{{ fromCreat.reportName }}</span>
+          <span style="flex:2;margin: 0.5% 0 0 20px;font-size: 17px;">by {{ fromCreat.ownner }}
+            <el-button v-show="btn" type="primary" size="mini" style="margin:0 2% 0 5%;" @click="dialogTableVisible = true">发送报告</el-button>
+            <el-button v-show="btn" size="mini" @click="dialogTableVisible = true">下载测试报告</el-button>
+          </span>
+        </div>
+        <div style="font-size:15px;color:#606266;" class="rich" v-html="projectProgress" />
+        <div class="titleStyle">三. bug情况</div>
+        <div style="border: 1px,solid #ccc;font-size:14px;color:#606266;">
+          <div style="margin: 1%;">1、bug统计</div>
+          <div style="display:flex;">
+            <div id="lineShow" style="flex:2; width: 800px;height:400px;" />
+            <div style="flex:1; width: 400px;height:400px;" />
+            <div id="barShow" style="flex:2; width: 800px;height:400px;" />
           </div>
+          <div style="margin: 1%;">2、bug说明</div>
+          {{ bugshow }}
         </div>
-        <el-button v-show="btn" style="float:right; margin:2% 50%;" @click="$router.go(-1)"> 返 回 </el-button>
-      </el-form>
-    </div>
+      </div>
+      <el-button v-show="btn" style="float:right; margin:2% 50%;" @click="$router.go(-1)"> 返 回 </el-button>
+    </el-form>
     <el-dialog title="邮件预览" width="70%" center :visible.sync="dialogTableVisible" @open="dasd()">
       <div align="center">
         <el-button type="primary" size="mini" @click="dialogFormVisible = true">确定发送</el-button>
@@ -202,7 +200,6 @@ export default {
   .eleStyle {
     width: 100%;
     height:100%;
-    background:#F2F3F6;
     display: inline-block;
   }
   .titleStyle {

src/views/ToConfigure/configure.vue

@@ -153,12 +153,12 @@
                 :row-class-name="tableRowhidden"
               >
                 <el-table-column v-if="false" prop="id" label="ID" width="180" />
-                <el-table-column prop="moduleName" label="模块名称" width="180">
+                <el-table-column prop="moduleName" label="模块名称" width="280">
                   <template slot="header">
                     模块名称<i class="el-icon-circle-plus" @click="handlerModule('add')" />
                   </template>
                 </el-table-column>
-                <el-table-column prop="creator" label="创建人" width="180" />
+                <el-table-column prop="creator" label="创建人" width="120" />
                 <el-table-column prop="createTime" label="创建时间" />
                 <el-table-column label="操作">
                   <template slot-scope="scope">

src/views/projectManage/taskList/taskViewDetails.vue

@@ -523,6 +523,8 @@
       <openDialog v-if="dialog_open" ref="task_createdUpdata" />
       <createdBug v-if="modalShow" ref="createdBug" />
       <TestReport v-if="dialogVisible1" ref="TestReport" />
+      <DailyReport v-if="dialogDaily" ref="DailyReport" />
+      <ClientReport v-if="dialogClient" ref="ClientReport" />
     </div>
     <el-drawer
       :visible.sync="drawerShow"
@@ -562,13 +564,17 @@ import { releaseScheduleList } from '@/api/teamBench'
 import Gantt from '@/views/gantta/gantta'
 import createdBug from '@/views/projectManage/bugList/file/createdBug' // bug缺陷
 import TestReport from '@/views/Platform/presentation/Templates/TestReport' // 提测
+import DailyReport from '@/views/Platform/presentation/Templates/DailyReport' // 日报
+import ClientReport from '@/views/Platform/presentation/Templates/ClientReport' // 准出
 export default {
   components: {
     openDialog,
     Gantt,
     createdBug,
     TestReport,
-    BugDetails
+    BugDetails,
+    DailyReport,
+    ClientReport
   },
   filters: {
     oneA(value) {
@@ -676,7 +682,9 @@ export default {
       CallBackStatus: '',
       CallBackId: '',
       bgStyle: '',
-      colorStyle: ''
+      colorStyle: '',
+      dialogDaily: false,
+      dialogClient: false
     }
   },
   computed: {
@@ -1282,25 +1290,33 @@ export default {
             // }
             break
           case 2:
-            this.$router.push({
-              path: '/Platform/presentation/DailyNewsAdded',
-              query: { task: ele, taskId: ele.id }
-            }) // 客户端日报
+            this.dialogDaily = true
+            this.$nextTick(() => {
+              this.$refs.DailyReport.init(1)
+            })
+            // this.$router.push({
+            //   path: '/Platform/presentation/DailyNewsAdded',
+            //   query: { task: ele, taskId: ele.id }
+            // }) // 客户端日报
             break
           case 3:
-            if (this.task_form.statusString === '测试中') {
-              this.$router.push({
-                path: '/Platform/presentation/ClientAcceptance',
-                query: { task: ele }
-              }) // 客户端准出
-            } else {
-              this.$message({
-                message: '该状态下不支持提测，请先将状态更改为【测试中】',
-                type: 'success',
-                duration: 1000,
-                offset: 150
-              })
-            }
+            this.dialogClient = true
+            this.$nextTick(() => {
+              this.$refs.ClientReport.init(1)
+            })
+            // if (this.task_form.statusString === '测试中') {
+            //   this.$router.push({
+            //     path: '/Platform/presentation/ClientAcceptance',
+            //     query: { task: ele }
+            //   }) // 客户端准出
+            // } else {
+            //   this.$message({
+            //     message: '该状态下不支持提测，请先将状态更改为【测试中】',
+            //     type: 'success',
+            //     duration: 1000,
+            //     offset: 150
+            //   })
+            // }
             break
           case 4:
             this.modalShow = true