From fd58fa59f17e6e521ca4bc0d89de083f88c4dc01 Mon Sep 17 00:00:00 2001
From: qqkj <qqkj@163.com>
Date: Sun, 7 Mar 2021 01:05:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmProject/XmProjectInfo.vue    |  1 -
 src/views/xm/core/xmProject/XmProjectMng.vue     | 16 +++++++++-------
 src/views/xm/core/xmQuestion/XmQuestionMng.vue   |  1 +
 src/views/xm/core/xmTask/XmTaskList.vue          |  1 +
 src/views/xm/core/xmTask/XmTaskListForMenu.vue   |  1 +
 .../xm/core/xmTask/XmTaskListForProduct.vue      |  1 +
 src/views/xm/core/xmTask/XmTaskMng.vue           |  1 +
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index 0b6faf6d..b1711396 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -307,7 +307,6 @@
 .app-container{
 	display: flex;
 	padding: 10px;
-	padding-left: 0;
 	background: #e8edf7;
 }
 .project-handle{
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 82daad7d..ff6cfd05 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -23,12 +23,13 @@
 					<el-menu-item index="7-2">选项2</el-menu-item>
 					<el-menu-item index="7-3">选项3</el-menu-item>
 				</el-submenu> -->
-				<el-checkbox  v-model="finishFlag">未结束</el-checkbox>
-				<el-tag v-if="filters.productId" closable @close="onProductClose">{{filters.productName}}</el-tag><el-button type="warning" @click.native="productSelectVisible=true">选产品</el-button>
-				
-				<div class="changebtn"> 
-					<el-button :loading="load.list" :class="{'changebtn-active':showType}" plain type="text" @click="showType=true" icon="el-icon-menu"></el-button>
-					<el-button :loading="load.list" :class="{'changebtn-active':!showType}" plain type="text" @click="showType=false" icon="el-icon-more"></el-button>
+				<div >
+					<el-checkbox  v-model="finishFlag">未结束</el-checkbox>
+					<el-tag v-if="filters.productId" closable @close="onProductClose">{{filters.productName}}</el-tag><el-button v-else type="text" plain  @click.native="productSelectVisible=true">选产品</el-button>
+					<div class="changebtn">
+					<el-button :loading="load.list" v-if="!showType" :class="{'changebtn-active':showType}" plain type="text" @click="showType=true" icon="el-icon-menu"></el-button>
+					<el-button :loading="load.list" v-else :class="{'changebtn-active':!showType}" plain type="text" @click="showType=false" icon="el-icon-more"></el-button>
+					</div>
 				</div>
 			</el-menu>
 		</el-row>
@@ -628,7 +629,7 @@
 }
 .changebtn{
 	float: right;
-	padding: 0 10px;
+	padding: 2px 10px;
 	display: flex;
 	align-items: center;
 	line-height: 0;
@@ -651,6 +652,7 @@
 .el-menu-demo{
 	border: 0 !important;
 	height: 50px;
+	padding-left: 10px;
 	background-color: #fafbfc;
 }
 .el-menu-demo>.el-menu-item,
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 17d1925d..a85dbee4 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -656,6 +656,7 @@
 }
 .xm-question>.el-menu-demo{
 	height: 50px;
+	padding-left: 10px;
 	background: #fafbfc;
 }
 .xm-question>.el-menu-demo>li{
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index ea630fbc..5474512f 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -420,6 +420,7 @@
 }
 .xm-task>.el-menu-demo{
 	height: 50px;
+	padding-left: 10px;
 	background: #fafbfc;
 }
 .xm-task>.el-menu-demo>li{
diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
index 984d53e0..f8dc2283 100644
--- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
@@ -389,6 +389,7 @@
 }
 .xm-task>.el-menu-demo{
 	height: 50px;
+	padding-left: 10px;
 	background: #fafbfc;
 }
 .xm-task>.el-menu-demo>li{
diff --git a/src/views/xm/core/xmTask/XmTaskListForProduct.vue b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
index 57d7f901..79b21a6f 100644
--- a/src/views/xm/core/xmTask/XmTaskListForProduct.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
@@ -443,6 +443,7 @@
 }
 .xm-task>.el-menu-demo{
 	height: 50px;
+	padding-left: 10px;
 	background: #fafbfc;
 }
 .xm-task>.el-menu-demo>li{
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 83300fbf..64cc7f1a 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -1787,6 +1787,7 @@
 }
 .xm-task>.el-menu-demo{
 	height: 50px;
+	padding-left: 10px;
 	background: #fafbfc;
 }
 .xm-task>.el-menu-demo>li{