From 3a552a300de8d89174b9fc529d3bd4cba9514c5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 12 Jul 2022 11:27:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/routes_xm.js                       |  2 +-
 src/views/xm/core/xmMenu/XmMenuMng.vue        |  4 +-
 src/views/xm/core/xmProduct/XmProductInfo.vue |  1 +
 src/views/xm/core/xmProduct/XmProductMng.vue  |  9 ++--
 .../xm/core/xmQuestion/XmQuestionMngMy.vue    |  2 +-
 .../xm/core/xmQuestion/XmQuestionMngRoute.vue | 44 +++++++++++++++++++
 6 files changed, 54 insertions(+), 8 deletions(-)
 create mode 100644 src/views/xm/core/xmQuestion/XmQuestionMngRoute.vue

diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js
index 6ebec4ec..7d399c1a 100644
--- a/src/router/routes_xm.js
+++ b/src/router/routes_xm.js
@@ -51,7 +51,7 @@ export default {
       children: [
 
         { path: 'xmQuestion/XmQuestionAdd', component: _import('xm/core/xmQuestion/XmQuestionAdd'), name: 'XmQuestionAdd', meta: { title: '新建缺陷' }},
-        { path: 'xmQuestion/XmQuestionMng', component: _import('xm/core/xmQuestion/XmQuestionMng'), name: 'XmQuestionMng', meta: { title: '缺陷管理' }},
+        { path: 'xmQuestion/XmQuestionMng', component: _import('xm/core/xmQuestion/XmQuestionMngRoute'), name: 'XmQuestionMng', meta: { title: '缺陷管理' }},
         { path: 'xmQuestion/XmQuestionMngMy', component: _import('xm/core/xmQuestion/XmQuestionMngMy'), name: 'XmQuestionMngMy', meta: { title: '我的缺陷' }},
         { path: 'xmTestCase/XmTestCaseMng', component: _import('xm/core/xmTestCase/XmTestCaseMng'), name: 'XmTestCaseMng', meta: { title: '测试设计' }},
         //{ path: 'xmTestCaseExec/XmTestCaseExecMng', component: _import('xm/core/xmTestCaseExec/XmTestCaseExecMng'), name: 'XmTestCaseExecMng', meta: { title: '测试执行' }},
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 67de43b7..b08ddc5b 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<el-row>
+		<el-row class="padding-left padding-right" :class="{'padding-top':paddingTop!==false}">
 			<el-col :span="24">
 					<el-row>
 						<xm-product-select ref="xmProductSelect1" style="display:inline;" v-if="!xmProduct && !xmIteration"   :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClearSelect"></xm-product-select>
@@ -433,7 +433,7 @@
 	import { mapGetters } from 'vuex'
 
 	export default {
-		props:['selProject','xmIteration','xmProduct','disabledMng','parentMenu'],
+		props:['selProject','xmIteration','xmProduct','disabledMng','parentMenu','paddingTop'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
diff --git a/src/views/xm/core/xmProduct/XmProductInfo.vue b/src/views/xm/core/xmProduct/XmProductInfo.vue
index f24592c8..f41dffe6 100644
--- a/src/views/xm/core/xmProduct/XmProductInfo.vue
+++ b/src/views/xm/core/xmProduct/XmProductInfo.vue
@@ -406,6 +406,7 @@
           <xm-question
             v-if="infotype == '缺陷'"
             :xm-product="xmProduct"
+            :padding-top="false"
             ref="xmQuestion"
           ></xm-question>
           <xm-group-mng
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 79c72632..418d7cc8 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -1,10 +1,10 @@
 <template>
-	<section class="page-container">
+	<section>
 		<el-row>
 		<el-col :span="6" v-if="templateVisible"> 
 			<xm-product-tpl-mng @copy="searchXmProducts" ref="xmProductTplMngRef" show-type="simple"></xm-product-tpl-mng>
 		</el-col> 
-		<el-col :span="templateVisible?18:24" class="padding-top padding-left border padding-right">
+		<el-col :span="templateVisible?18:24" class="padding-left border padding-right">
 			<el-row >
 				<el-row>
 					<el-select   v-model="filters.queryScope"    placeholder="产品查询范围">
@@ -119,7 +119,7 @@
 					</el-popover>
 					</span>
 				</el-row>
-				<el-row  class="page-main "  v-show="showType">
+				<el-row v-show="showType">
 					<!--列表 XmProject xm_project-->
 					<el-row v-loading="load.list">
 						<el-col  v-cloak v-for="(p,i) in xmProducts" :key="i" :xl="4" :lg="6" :md="8" :sm="12">
@@ -234,9 +234,10 @@
 							</template>
 						</el-table-column>
 					</el-table>
-					</el-row>
 					<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>
 
+					</el-row>
+					
 							<!--编辑 XmProduct 产品表界面-->
 					<el-drawer title="编辑产品" :visible.sync="editFormVisible"  size="60%"   append-to-body   :close-on-click-modal="false">
 						<xm-product-edit :xm-product="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-product-edit>
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMngMy.vue b/src/views/xm/core/xmQuestion/XmQuestionMngMy.vue
index d0211d1f..32bd76bd 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMngMy.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMngMy.vue
@@ -1,5 +1,5 @@
 <template>
-	<xm-question-mng :query-scene="'my'"></xm-question-mng>
+	<xm-question-mng :query-scene="'my'" class="padding-top"></xm-question-mng>
 </template>
 
 <script>
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMngRoute.vue b/src/views/xm/core/xmQuestion/XmQuestionMngRoute.vue
new file mode 100644
index 00000000..32bd76bd
--- /dev/null
+++ b/src/views/xm/core/xmQuestion/XmQuestionMngRoute.vue
@@ -0,0 +1,44 @@
+<template>
+	<xm-question-mng :query-scene="'my'" class="padding-top"></xm-question-mng>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+
+	import config from '@/common/config';//全局公共库
+	 
+	import  XmQuestionMng from './XmQuestionMng';//修改界面
+	import { mapGetters } from 'vuex' 
+
+	export default {
+		computed: {
+			...mapGetters([
+				'userInfo','roles'
+			]),
+		}, 
+		 
+		data() {
+			 
+			return {
+				 
+
+			}
+
+		},//end data
+		methods: {
+			 
+
+		},//end methods
+		components: {
+			 XmQuestionMng
+		},
+		mounted() {
+			 
+		}
+	}
+
+</script>
+
+<style lang="scss" scoped>
+ 
+</style>