Browse Source

线上bug

qinzhipeng_v 5 years ago
parent
commit
b579dd1672

+ 25 - 2
src/views/Platform/presentation/Templates/TestReport.vue

@@ -12,7 +12,7 @@
       </el-steps>
       </el-steps>
     </div>
     </div>
     <div v-if="showOne" style="margin: 0 4% 2%;">
     <div v-if="showOne" style="margin: 0 4% 2%;">
-      <div style="margin: 0% 14%;  height: 440px;" class="Layout">
+      <div style="margin: 0% 14%;  height: 435px;" class="Layout">
         <div style="margin-right:2%;">
         <div style="margin-right:2%;">
           <el-radio v-model="radio" class="_radio" label="1">客户端模版</el-radio><br>
           <el-radio v-model="radio" class="_radio" label="1">客户端模版</el-radio><br>
           <el-image style="display: inline-block; width: 80%;" :src="src1" />
           <el-image style="display: inline-block; width: 80%;" :src="src1" />
@@ -48,7 +48,7 @@
         <div style="margin: 0 2%; font-size:18px; font-family:PingFangSC-Medium,PingFang SC; font-weight:500; color:rgba(51,59,74,1); line-height:29px;">
         <div style="margin: 0 2%; font-size:18px; font-family:PingFangSC-Medium,PingFang SC; font-weight:500; color:rgba(51,59,74,1); line-height:29px;">
           报告预览
           报告预览
         </div>
         </div>
-        <div class="descr" style=" margin-bottom: 2%; height:350px; overflow:scroll; overflow-x: hidden">
+        <div class="descr" style=" margin-bottom: 2%; height:310px; overflow:scroll; overflow-x: hidden">
           <acceptthe id="resumeId" ref="acceptthe" :message="preview" />
           <acceptthe id="resumeId" ref="acceptthe" :message="preview" />
         </div>
         </div>
       </div>
       </div>
@@ -243,6 +243,29 @@ export default {
 }
 }
 </script>
 </script>
 
 
+<style>
+/* 全局dialog上下左右剧中 */
+.el-dialog{
+  display: flex;
+  flex-direction: column;
+  margin:0 !important;
+  position:absolute;
+  top:50%;
+  left:50%;
+  transform:translate(-50%,-50%);
+  max-height:calc(100% - 30px);
+  max-width:calc(100% - 30px);
+}
+.el-dialog .el-dialog__body{
+  flex:1;
+  overflow: auto;
+}
+.descr{
+  display: flex;
+  justify-content: center;
+}
+</style>
+
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 ._radio {
 ._radio {
   margin: 3% 0;
   margin: 3% 0;

+ 1 - 1
src/views/Platform/presentation/acceptTheReport.vue

@@ -183,7 +183,7 @@ export default {
     padding: 2%;
     padding: 2%;
   }
   }
   .marage {
   .marage {
-    padding: 2%;
+    padding: 2% 0;
   }
   }
   .eleStyle_one {
   .eleStyle_one {
     width: 100%;
     width: 100%;

+ 3 - 0
src/views/projectManage/taskList/taskIndex.vue

@@ -148,6 +148,9 @@
         <el-table-column label="归属需求" min-width="150" align="center" show-overflow-tooltip>
         <el-table-column label="归属需求" min-width="150" align="center" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.requireName }}</template>
           <template slot-scope="scope">{{ scope.row.requireName }}</template>
         </el-table-column>
         </el-table-column>
+        <el-table-column label="状态" min-width="150" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">{{ scope.row.statusString }}</template>
+        </el-table-column>
         <el-table-column label="是否免测" min-width="80" align="center">
         <el-table-column label="是否免测" min-width="80" align="center">
           <template slot-scope="scope">{{ scope.row.noTestString }}</template>
           <template slot-scope="scope">{{ scope.row.noTestString }}</template>
         </el-table-column>
         </el-table-column>