优化月报设置

src/views/monthlyReport/childrenPage/setReport/components/general.vue

@@ -189,7 +189,6 @@ export default {
 .reportSetting {
   .report-left-margin {
     color: #333333;
-    margin-left: 30px;
   }
   >>>label {
       font-weight: 400;
@@ -202,8 +201,6 @@ export default {
   font-size: 14px;
   color: #666666;
   font-weight: 400;
-  height: calc(100vh - 368px);
-  overflow-y: auto;
   .report-fromTitle {
     font-weight: 500;
     line-height: 32px;

src/views/monthlyReport/childrenPage/setReport/components/nodeTreeSet.vue

@@ -4,7 +4,7 @@
       <el-input v-model="filterText" class="node-input" suffix-icon="el-icon-search" placeholder="输入关键字进行过滤" @blur="expandAll = true, getOdinTree(filterText)" />
       <el-button class="teamDeleteText" type="text" @click="() => append('add')">添加根节点</el-button>
     </div>
-    <el-tree v-if="tree" ref="tree" v-loading="loading" class="filter-tree tree-height" :data="treeNodeData" :props="defaultProps" :default-expand-all="expandAll" :expand-on-click-node="false" :filter-node-method="filterNode">
+    <el-tree v-if="tree" ref="tree" v-loading="loading" class="filter-tree" :data="treeNodeData" :props="defaultProps" :default-expand-all="expandAll" :expand-on-click-node="false" :filter-node-method="filterNode">
       <span slot-scope="{ node, data }" class="custom-tree-node">
         <span>
           {{ node.label }}
@@ -199,11 +199,6 @@ export default {
       }
     }
 
-    .tree-height {
-      overflow-y: auto;
-      height: calc(100vh - 257px);
-    }
-
     .teamDeleteText {
       text-align: center;
       font-weight: 400;

src/views/monthlyReport/components/monthlyEards.vue

@@ -11,13 +11,13 @@
     <section class="report-content-data">
       <div style="color: #FAAD14;">
         待反馈：{{ data.feedback || '无' }}；
-        改进项：{{ data.improveNum }}；
+        改进项：{{ data.improveNum }}，
         已完成：{{ data.finishNum }}
       </div>
-      <div style="margin: 10px 0;">
+      <div>
         本月新增线上问题{{ data.problem.key }}个，
-        归属于：<span>{{ data.problem.team ? data.problem.team.join('，') : '' }}</span>团队；
-        责任人：<span>{{ data.problem.charge.join('，') }}</span>
+        归属于：<span>{{ data.problem.team.join('，') || '无 ' }}</span>团队，
+        责任人：<span>{{ data.problem.charge.join('，') || '无' }}</span>
       </div>
       <div>
         本月提测打回{{ data.returnBackData.key }}个：<span>{{ data.returnBackData.projectName.join('，') }}</span>
@@ -31,7 +31,7 @@
       <div v-for="(item, index) in data.lastMonthImprovment.improve" :key="index">
           <span>{{ item.name }}</span>
           负责人：<span>{{ item.charge || '无' }}</span>
-          进展：<span>{{ item.process }}%</span>
+          进展：<span>{{ item.process ? item.process + '%' : '无' }}</span>
       </div>
     </section>
   </el-card>

src/views/monthlyReport/index.vue

@@ -3,7 +3,7 @@
     <!--  header  -->
     <headerCom title="请选择">
       <template slot="input">
-        <el-select v-model="reportValue" size="small" placeholder="请选择">
+        <el-select v-model="reportValue" size="small" style="width: 30%;" placeholder="请选择">
           <el-option v-for="item in reportData.reportList" :key="item.id" :label="item.reportName" :value="item.id" @click.native="getReportStatus(item)">
             <span style="float: left">{{ item.reportName }}</span>
             <span style="float: right; color: #8492a6; font-size: 13px; padding-left: 20px;">{{ item.statueStr }}</span>
@@ -29,7 +29,7 @@
         <span v-if="tagData.analysisList"> 本月质量月报<b>{{ tagData.analysisList }}</b>有您负责的重点问题需要分析反馈，请点击<b>{{ tagData.analysisList }}</b>的"查看更多"按钮进入填写！</span>
         <span v-if="tagData.confirmeList || tagData.toBeConfirmList "> 已确认业务线<b>{{ tagData.confirmeList || '无' }}</b> ，未确认业务线<b>{{ tagData.toBeConfirmList || '无' }}</b>。 </span>
       </div>
-      <el-row :gutter="12" style="height: calc(100vh - 182px); overflow-y: auto;">
+      <el-row :gutter="12">
         <el-col v-for="(i, k) in tagData.subReportList" :key="k" :span="innerWidth">
           <monthlyEards :datas="i" />
         </el-col>

src/views/monthlyReport/style.less

@@ -6,7 +6,7 @@
 
 .content-wrapper {
   background: #ffffff;
-  min-height: calc(100vh - 93px);
+  min-height: calc(100vh - 80px);
   box-shadow: 0 0 11px #eef0f5;
   border-radius: 6px;
   width: 100%;