wenbobowen 4 years ago
parent
commit
61d47db8e5

+ 1 - 0
src/styles/PublicStyle/index.less

@@ -28,6 +28,7 @@
   background: #FFF;
   border-top-left-radius:4px;
   border-top-right-radius:4px;
+  padding: 0.3% 1% 1% 1%;
 }
 
 .public_footer { // 缺陷,迭代,项目,任务,需求布局footer

+ 32 - 14
src/views/Platform/testPage.vue

@@ -1,11 +1,11 @@
 <template>
   <!-- 测试计划管理 -->
-  <div id="init-window" style="position:relative; min-height:95vh; font-size:14px background:#F2F3F6;">
+  <div id="init-window" style="position:relative; min-height:100vh; font-size:14px background:#F2F3F6;">
     <router-view />
     <div style="position: absolute;width: 100%;">
-      <div style="background:#F2F3F6;">
-        <el-container>
-          <el-aside width="17%" style=" background: #FFF;margin: 1% 0 1% 1%; border-radius:4px;">
+      <div style="background:#F2F3F6; margin-right: 10px">
+        <el-container style="min-height:100vh;">
+          <el-aside width="17%" style=" background: #FFF; margin: 0 10px 0px 10px; border-radius:4px;min-width: 180px">
             <div class="nav_Input" style="min-height:90vh;">
               <br>
               <el-tree :data="data1" style="overflow-x:auto; min-width:100%;display:inline-block !important" :default-expanded-keys="key_arr" :expand-on-click-node="true" node-key="id" @node-click="clickFun">
@@ -26,21 +26,21 @@
             </div>
           </el-aside>
           <el-container>
-            <el-header style="background:#ffffff; height: auto; width: 98%; margin: 1%; font-size: 13px; border-radius: 4px;">
+            <el-header style="background:#ffffff; height: auto; width: 100%; margin: 0 0px 10px 0px; font-size: 13px; border-radius: 4px;">
               <el-row>
                 <el-col :span="24" style="white-space:nowrap; display: flex; justify-content: left; align-items: center;">
                   序列号
-                  <el-input v-model="test_plan.id" clearable placeholder="请填写" style="width: 20%; margin: 3% 2%" />
+                  <el-input v-model="test_plan.id" size="small" clearable placeholder="请填写" style="width: 20%; margin: 3% 2%" />
                   测试计划状态
-                  <el-select v-model="test_plan.region" clearable placeholder="请选择" style="width: 20%; margin: 3% 2%">
+                  <el-select v-model="test_plan.region" size="small" clearable placeholder="请选择" style="width: 20%; margin: 3% 2%">
                     <el-option v-for="item in projectTypeStrings" :key="item.code" :label="item.msg" :value="item.code" />
                   </el-select>
-                  <el-button type="primary" @click="queryCaseData(test_plan)">查询</el-button>
-                  <el-button type="primary" style="margin: 3% 2%" @click="createGetShow">新增</el-button>
+                  <el-button type="primary" size="small" @click="queryCaseData(test_plan)">查询</el-button>
+                  <el-button type="primary" size="small" style="margin: 3% 2%" @click="createGetShow">新增</el-button>
                 </el-col>
               </el-row>
             </el-header>
-            <div style="background:#ffffff; width: 98%; margin: 0 1% 1% 1%; font-size: 14px; border-radius: 4px;">
+            <div style="background:#ffffff; width: 100%; margin: 0 0px 10px 0px; font-size: 14px; border-radius: 4px;">
               <el-row :gutter="20" style="margin: 3%;text-align:center">
                 <el-col :span="6" style="border-right: 1px solid #D8D8D8; color:#07BCA4;"><img :src="clicked_1" style="margin-right: 6%;width:5%;">通过 {{ num.Count1 }} 个, 占比 {{ num.Rate1 }} %</el-col>
                 <el-col :span="6" style="border-right: 1px solid #D8D8D8; color:#F56C6C;"><img :src="clicked_2" style="margin-right: 6%;width:5%;">失败 {{ num.Count2 }} 个, 占比 {{ num.Rate2 }} %</el-col>
@@ -48,7 +48,7 @@
                 <el-col :span="6" style=" color:#73C5FA;"><img :src="clicked_4" style="margin-right: 6%;width:5%;">未执行{{ num.Count4 }}个,占比{{ num.Rate4 }}%</el-col>
               </el-row>
             </div>
-            <el-main style="background:#ffffff; width:98%;margin:0% 1% 1% 1%; font-size:14px;border-radius:4px;">
+            <el-main style="background:#ffffff; width:100%; margin: 0; font-size:14px;border-radius:4px;">
               <!-- 主页table -->
               <el-table :data="gridData" :header-cell-style="{ background: '#F0F2F4', color: '#333B4A' }" border fit tooltip-effect="dark" size="mini" style="width: 100%">
                 <el-table-column label="序列号" min-width="100" align="center"><template slot-scope="scope">{{ scope.row.ids }}</template></el-table-column>
@@ -77,9 +77,17 @@
               </el-table>
 
               <div align="center"> <!--分页-->
-                <el-pagination :current-page="curIndex" :page-size="pageSize" background layout="total, prev, pager, next" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+                <el-pagination
+                  align="right"
+                  :current-page="curIndex"
+                  :page-size="pageSize"
+                  background
+                  layout="total, sizes, prev, pager, next, jumper"
+                  :total="total"
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                />
               </div>
-
             </el-main>
           </el-container>
         </el-container>
@@ -146,7 +154,17 @@
                 <template slot-scope="scope">{{ scope.row.modifier }}</template>
               </el-table-column>
             </el-table>
-            <el-pagination :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, prev, pager, next" :total="total_one" background @size-change="handleSizeChange1" @current-change="handleCurrentChange1" />
+            <el-pagination
+              align="right"
+              :current-page="curIndex"
+              :page-sizes="[5, 10, 20]"
+              :page-size="pageSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total_one"
+              background
+              @size-change="handleSizeChange1"
+              @current-change="handleCurrentChange1"
+            />
           </div>
 
           <div slot="footer" class="dialog-footer">

+ 1 - 1
src/views/projectManage/iteration/index.vue

@@ -6,7 +6,7 @@
         <el-button size="mini" type="primary" @click="showIteration = true">新建迭代</el-button>
       </div>
       <el-divider style="color: #EEF0F5; margin: 10px 0 ;" />
-      <div class="Layout_flex_start" style="padding: 5px 0 5px 15px">
+      <div class="Layout_flex_start" style="padding: 5px 0 0px 15px">
         <div class="Layout_space_between">
           <div class="searchName">迭代名称</div>
           <el-input v-model="filterItems.name" clearable size="small" placeholder="请输入迭代名称" @change="iteratioFilter(1)" />

+ 2 - 4
src/views/projectManage/version/list/index.vue

@@ -6,9 +6,7 @@
           <span style="font-size: 22px;letter-spacing: 1px;font-weight: 600;color: #333B4A;padding-left: 15px">版本</span>
           <i class="el-icon-date calendar" @click="link_calendar" />
         </div>
-        <div style="position: relative;">
-          <el-divider />
-        </div>
+        <div style="height: 1px; width: 100%; background-color: #DCDFE6; color: #EEF0F5; margin: 10px 0;" />
         <el-row style="padding: 5px 0 0 15px">
           <el-col :span="20">
             <span class="queryName">客户端</span>
@@ -41,7 +39,7 @@
           <time-line :steps="timeLineSteps" />
         </div>
       </el-main>
-      <div class="layout_main version_list_layout_main" style="padding: 15px">
+      <div class="layout_main version_list_layout_main" style="padding: 0.3% 1% 1% 1%;">
         <el-tabs v-model="activeName" class="version-nav-tag" @tab-click="handleClick">
           <el-tab-pane label="需求" name="first">
             <el-row>

+ 4 - 4
src/views/reportManagement/testPresentation.vue

@@ -7,12 +7,12 @@
       <div class="Layout_space_between Qz_report_query">
         <div class="Layout_space_between">
           <span style="width: 100px;">{{ title }}</span>
-          <el-input v-if="history" v-model="state" size="medium" filterable placeholder="报告名称搜索" style="width:100%;" @change="history ? getList(state) : gethistoryData(state)" />
+          <el-input v-if="history" v-model="state" size="small" filterable placeholder="报告名称搜索" style="width:100%;" @change="history ? getList(state) : gethistoryData(state)" />
         </div>
         <div class="Layout_space_between">
-          <el-button v-if="!history" type="primary" size="medium" @click="returnNewest">返回最新</el-button>
+          <el-button v-if="!history" type="primary" size="small" @click="returnNewest">返回最新</el-button>
           <!-- <el-button v-if="history" type="text" @click="gethistoryData">查看老数据</el-button> -->
-          <el-button v-if="history" type="primary" size="medium" @click="getQueryData">新建{{ title }}</el-button>
+          <el-button v-if="history" type="primary" size="small" @click="getQueryData">新建{{ title }}</el-button>
         </div>
       </div>
     </el-header>
@@ -620,7 +620,7 @@ export default {
     background:#ffffff;
     margin: 0 10px 10px;
     border-radius: 4px;
-    padding-bottom: 10px;
+    padding-bottom: 15px;
     .Qz_report_tabs {
       padding-top: 10px;
     }