Merge remote-tracking branch 'origin/dev' into dev

2020-04-09 19:27:55 +08:00 · 2020-04-09 19:27:55 +08:00 · 42b93d04b8
parent 1beb5523a6 7f4a0e98d2
commit 42b93d04b8
9 changed files with 108 additions and 144 deletions
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@ -1,39 +1,43 @@
 <template>
-  <div class="case_container">
-    <el-container>
-      <el-aside width="250px">
+  <div class="container">
+    <div class="main-content">
+      <el-container>
+        <el-aside width="250px">

-        <select-menu
-          :data="projects"
-          :current-data="currentProject"
-          :title="$t('test_track.project')"
-          @dataChange="changeProject">
-        </select-menu>
+          <select-menu
+            :data="projects"
+            :current-data="currentProject"
+            :title="$t('test_track.project')"
+            @dataChange="changeProject">
+          </select-menu>

-        <node-tree class="node_tree"
-                   :current-project="currentProject"
-                   @nodeSelectEvent="refreshTable"
-                   @refresh="refreshTable"
-                   ref="nodeTree">
-        </node-tree>
-      </el-aside>
+          <node-tree class="node-tree"
+                     :current-project="currentProject"
+                     @nodeSelectEvent="refreshTable"
+                     @refresh="refreshTable"
+                     ref="nodeTree">
+          </node-tree>

-      <el-main class="main-content">
+        </el-aside>

-        <test-case-list
-          :current-project="currentProject"
-          @openTestCaseEditDialog="openTestCaseEditDialog"
-          @testCaseEdit="openTestCaseEditDialog"
-          ref="testCaseList">
-        </test-case-list>
-      </el-main>
+        <el-main class="main-content">

-    </el-container>
+          <test-case-list
+            :current-project="currentProject"
+            @openTestCaseEditDialog="openTestCaseEditDialog"
+            @testCaseEdit="openTestCaseEditDialog"
+            ref="testCaseList">
+          </test-case-list>
+        </el-main>

-    <test-case-edit
-      @refresh="refreshTable"
-      ref="testCaseEditDialog"></test-case-edit>
+      </el-container>

+      <test-case-edit
+        @refresh="refreshTable"
+        ref="testCaseEditDialog">
+      </test-case-edit>
+
+    </div>
  </div>
 </template>

@ -177,7 +181,7 @@
        });
      },
      getProjectById(id) {
-        if (id && id != 'all'){
+        if (id && id != 'all') {
          this.$get('/project/get/' + id, response => {
            let project = response.data;
            this.setCurrentProject(project);
@ -200,7 +204,8 @@
 </script>

 <style scoped>
-  .case_container {
+
+  .main-content {
    width: 100%;
    height: 100%;
    background: white;
@ -208,19 +213,12 @@
    box-sizing: border-box;
  }

-  .main-content {
-    margin: 0 auto;
-    width: 100%;
-    max-width: 1200px;
-  }
-
-  .node_tree {
+  .node-tree {
    margin: 5%;
  }

-  .project_menu {
-    margin-left: 20px;
-    height: 50px;
+  .container {
+    padding: 0px;
  }

 </style>
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@ -32,19 +32,16 @@
        <el-table-column
          prop="name"
          :label="$t('commons.name')"
-          width="120"
          show-overflow-tooltip>
        </el-table-column>
        <el-table-column
          prop="priority"
          :label="$t('test_track.priority')"
-          width="120"
          show-overflow-tooltip>
        </el-table-column>
        <el-table-column
          prop="type"
          :label="$t('test_track.type')"
-          width="120"
          show-overflow-tooltip>
          <template v-slot:default="scope">
            <span v-if="scope.row.type == 'functional'">{{$t('test_track.functional_test')}}</span>
@ -55,7 +52,6 @@
        <el-table-column
          prop="method"
          :label="$t('test_track.method')"
-          width="120"
          show-overflow-tooltip>
          <template v-slot:default="scope">
            <span v-if="scope.row.method == 'manual'">{{$t('test_track.manual')}}</span>
@ -65,25 +61,21 @@
        <el-table-column
          prop="nodePath"
          :label="$t('test_track.module')"
-          width="160"
          show-overflow-tooltip>
        </el-table-column>
        <el-table-column
-          width="160"
          :label="$t('commons.create_time')">
          <template v-slot:default="scope">
            <span>{{ scope.row.createTime | timestampFormatDate }}</span>
          </template>
        </el-table-column>
        <el-table-column
-          width="160"
          :label="$t('commons.update_time')">
          <template v-slot:default="scope">
            <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
          </template>
        </el-table-column>
        <el-table-column
-          width="100"
          :label="$t('commons.operating')">
          <template v-slot:default="scope">
            <el-button @click="handleEdit(scope.row)" type="primary" icon="el-icon-edit" size="mini" circle/>
--- a/frontend/src/business/components/track/head/TrackHeaderMenus.vue
+++ b/frontend/src/business/components/track/head/TrackHeaderMenus.vue
@ -38,6 +38,7 @@
          </el-submenu>
        </el-menu>
      </el-col>
+      <el-col :span="16"/>
    </el-row>
  </div>

@ -121,6 +122,7 @@

  #menu-bar {
    border-bottom: 1px solid #E6E6E6;
+    background-color: #FFF;
  }

  .blank_item {
--- a/frontend/src/business/components/track/home/TrackHome.vue
+++ b/frontend/src/business/components/track/home/TrackHome.vue
@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="main-content">
    <h1>测试跟踪首页</h1>
  </div>

--- a/frontend/src/business/components/track/plan/TestPlan.vue
+++ b/frontend/src/business/components/track/plan/TestPlan.vue
@ -1,16 +1,15 @@
 <template>
-
-  <div>
-    <test-plan-list
-      @openTestPlanEditDialog="openTestPlanEditDialog"
-      @testPlanEdit="openTestPlanEditDialog"
-      ref="testPlanList"></test-plan-list>
-    <test-plan-edit
-      ref="testPlanEditDialog"
-      @refresh="refreshTestPlanList"></test-plan-edit>
+  <div class="container">
+    <div class="main-content">
+      <test-plan-list
+        @openTestPlanEditDialog="openTestPlanEditDialog"
+        @testPlanEdit="openTestPlanEditDialog"
+        ref="testPlanList"></test-plan-list>
+      <test-plan-edit
+        ref="testPlanEditDialog"
+        @refresh="refreshTestPlanList"></test-plan-edit>
+    </div>
  </div>
-
-
 </template>

 <script>
--- a/frontend/src/business/components/track/plan/TestPlanView.vue
+++ b/frontend/src/business/components/track/plan/TestPlanView.vue
@ -1,44 +1,45 @@
 <template>
+  <div class="container">
+    <div class="main-content">
+      <el-container>
+        <el-aside class="aside-container" width="250px">
+          <select-menu
+            :data="testPlans"
+            :current-data="currentPlan"
+            :title="$t('test_track.plan')"
+            @dataChange="changePlan">
+          </select-menu>

-  <div class="plan_container">
-    <el-container>
-      <el-aside class="aside-container" width="250px">
-        <select-menu
-          :data="testPlans"
-          :current-data="currentPlan"
-          :title="$t('test_track.plan')"
-          @dataChange="changePlan">
-        </select-menu>
+          <plan-node-tree
+            class="node-tree"
+            :plan-id="planId"
+            @nodeSelectEvent="getPlanCases"
+            ref="tree">
+          </plan-node-tree>

-        <plan-node-tree
-          class="node_tree"
-          :plan-id="planId"
-          @nodeSelectEvent="getPlanCases"
-          ref="tree">
-        </plan-node-tree>
+        </el-aside>

-      </el-aside>
+        <el-main>
+          <test-plan-test-case-list
+            @openTestCaseRelevanceDialog="openTestCaseRelevanceDialog"
+            @editTestPlanTestCase="editTestPlanTestCase"
+            @refresh="refresh"
+            :plan-id="planId"
+            ref="testCasePlanList"></test-plan-test-case-list>
+        </el-main>
+      </el-container>

-      <el-main>
-        <test-plan-test-case-list
-          @openTestCaseRelevanceDialog="openTestCaseRelevanceDialog"
-          @editTestPlanTestCase="editTestPlanTestCase"
-          @refresh="refresh"
-          :plan-id="planId"
-          ref="testCasePlanList"></test-plan-test-case-list>
-      </el-main>
-    </el-container>
+      <test-case-relevance
+        @refresh="refresh"
+        :plan-id="planId"
+        ref="testCaseRelevance"></test-case-relevance>

-    <test-case-relevance
-      @refresh="refresh"
-      :plan-id="planId"
-      ref="testCaseRelevance"></test-case-relevance>
-
-    <test-plan-test-case-edit
-      ref="testPlanTestCaseEdit"
-      @refresh="refresh">
-    </test-plan-test-case-edit>
+      <test-plan-test-case-edit
+        ref="testPlanTestCaseEdit"
+        @refresh="refresh">
+      </test-plan-test-case-edit>

+    </div>
  </div>

 </template>
@ -120,16 +121,21 @@

 <style scoped>

-  .plan_container {
+  .main-content {
+    padding: 0px;
    background: white;
    height: 600px;
  }

+  .container {
+    padding: 0px;
+  }
+
  .aside-container {
    margin-left: 15px;
  }

-  .node_tree {
+  .node-tree {
    margin: 3%;
  }

--- a/frontend/src/business/components/track/plan/components/PlanNodeTree.vue
+++ b/frontend/src/business/components/track/plan/components/PlanNodeTree.vue
@ -20,6 +20,7 @@
        </span>
      </template>
    </el-tree>
+
  </div>

 </template>
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@ -1,6 +1,6 @@
 <template>

-  <div class="testplan-container">
+  <div class="container">
    <el-main class="main-content">
      <el-card v-loading="result.loading">
        <template v-slot:header>
@ -30,24 +30,20 @@

        <el-table
          :data="tableData"
-          class="test-content"
          @row-click="intoPlan">
          <el-table-column
            prop="name"
            :label="$t('commons.name')"
-            width="130"
            show-overflow-tooltip>
          </el-table-column>
          <el-table-column
            prop="principal"
            :label="$t('test_track.plan_principal')"
-            width="130"
            show-overflow-tooltip>
          </el-table-column>
          <el-table-column
            prop="status"
            :label="$t('test_track.plan_status')"
-            width="130"
            show-overflow-tooltip>
            <template v-slot:default="scope">
              <span v-if="scope.row.status == 'Prepare'">{{$t('test_track.plan_status_prepare')}}</span>
@ -58,7 +54,6 @@
          <el-table-column
            prop="stage"
            :label="$t('test_track.plan_stage')"
-            width="130"
            show-overflow-tooltip>
            <template v-slot:default="scope">
              <span v-if="scope.row.stage == 'smoke'">{{$t('test_track.smoke_test')}}</span>
@ -71,25 +66,21 @@
          <el-table-column
            prop="projectName"
            :label="$t('test_track.plan_project')"
-            width="160"
            show-overflow-tooltip>
          </el-table-column>
          <el-table-column
-            width="160"
            :label="$t('commons.create_time')">
            <template v-slot:default="scope">
              <span>{{ scope.row.createTime | timestampFormatDate }}</span>
            </template>
          </el-table-column>
          <el-table-column
-            width="160"
            :label="$t('commons.update_time')">
            <template v-slot:default="scope">
              <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
            </template>
          </el-table-column>
          <el-table-column
-            width="160"
            :label="$t('commons.operating')">
            <template v-slot:default="scope">
              <el-button @click="handleEdit(scope.row)"
@ -206,23 +197,6 @@

 <style scoped>

-  .testplan-container {
-    padding: 15px;
-    width: 100%;
-    height: 100%;
-    box-sizing: border-box;
-  }
-
-  .main-content {
-    margin: 0 auto;
-    width: 100%;
-    max-width: 1200px;
-  }
-
-  .test-content {
-    width: 100%;
-  }
-
  .table-page {
    padding-top: 20px;
    margin-right: -9px;
--- a/frontend/src/business/components/track/plan/components/TestPlanTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanTestCaseList.vue
@ -27,24 +27,20 @@
      </template>

      <el-table
-        :data="tableData"
-        class="test-content">
+        :data="tableData">
+
        <el-table-column
          prop="name"
-          :label="$t('commons.name')"
-          width="120"
-          show-overflow-tooltip>
+          :label="$t('commons.name')">
        </el-table-column>
        <el-table-column
          prop="priority"
-          :label="$t('test_track.priority')"
-          width="120"
-          show-overflow-tooltip>
+          :label="$t('test_track.priority')">
        </el-table-column>
+
        <el-table-column
          prop="type"
          :label="$t('test_track.type')"
-          width="120"
          show-overflow-tooltip>
          <template v-slot:default="scope">
            <span v-if="scope.row.type == 'functional'">{{$t('test_track.functional_test')}}</span>
@ -52,10 +48,10 @@
            <span v-if="scope.row.type == 'api'">{{$t('commons.api')}}</span>
          </template>
        </el-table-column>
+
        <el-table-column
          prop="method"
          :label="$t('test_track.method')"
-          width="120"
          show-overflow-tooltip>
          <template v-slot:default="scope">
            <span v-if="scope.row.method == 'manual'">{{$t('test_track.manual')}}</span>
@ -65,15 +61,13 @@


        <el-table-column
-          width="160"
          prop="executor"
          :label="$t('test_track.executor')">
        </el-table-column>
+
        <el-table-column
          prop="status"
-          :label="$t('test_track.execute_result')"
-          width="160"
-          show-overflow-tooltip>
+          :label="$t('test_track.execute_result')">
          <template v-slot:default="scope">
            <el-tag v-if="scope.row.status == 'Prepare'"
                    e ffect="info"
@ -98,14 +92,12 @@
        </el-table-column>

        <el-table-column
-          width="160"
          :label="$t('commons.update_time')">
          <template v-slot:default="scope">
            <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
          </template>
        </el-table-column>
        <el-table-column
-          width="100"
          :label="$t('commons.operating')">
          <template v-slot:default="scope">
            <el-button @click="handleEdit(scope.row)" type="primary" icon="el-icon-edit" size="mini" circle/>
@ -239,10 +231,10 @@
  }


-  .main-content {
-    margin: 0 auto;
-    width: 100%;
-    max-width: 1200px;
-  }
+  /*.main-content {*/
+    /*margin: 0 auto;*/
+    /*width: 100%;*/
+    /*max-width: 1200px;*/
+  /*}*/

 </style>