diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
index c3431ea5..685d9bbd 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
@@ -142,11 +142,21 @@
 			<el-drawer v-if="selProject" :title="selProject==null?'操作日志':selProject.name+'团队操作日志'" center   :visible.sync="xmRecordVisible"  size="50%"  :close-on-click-modal="false" append-to-body>
 				<xm-record :obj-type="'group'" :visible="xmRecordVisible" :project-id="selProject.id"    :simple="1"></xm-record>
 			</el-drawer>
-			<el-drawer  title="小组进度数据查看" center   :visible.sync="xmProjectGroupStateVisible"  size="80%"  :close-on-click-modal="false" append-to-body>
-				<xm-project-group-state-mng  :sel-project="selProject" :xm-product="xmProduct" :xm-project-group="editForm" :visible="xmProjectGroupStateVisible" ></xm-project-group-state-mng>
+			<el-drawer v-else-if="xmProduct&&!selProject" :title="xmProject==null?'操作日志':xmProject.productName+'团队操作日志'" center   :visible.sync="xmRecordVisible"  size="50%"  :close-on-click-modal="false" append-to-body>
+				<xm-record :obj-type="'group'" :visible="xmRecordVisible" :product-id="xmProject.id"    :simple="1"></xm-record>
 			</el-drawer>
 			
-			<el-drawer   center  :title="(editForm==null?editForm.groupName:'')+'小组成员管理'" :visible.sync="groupUserVisible"  size="80%"  :close-on-click-modal="false" append-to-body>
+			<el-drawer v-if="currNodeType=='group'&&editForm.groupName" :title="editForm.groupName+'小组进度数据查看'" center   :visible.sync="xmProjectGroupStateVisible"  size="80%"  :close-on-click-modal="false" append-to-body>
+				<xm-project-group-state-mng :xm-project-group="editForm"  :visible="xmProjectGroupStateVisible" ></xm-project-group-state-mng>
+			</el-drawer>
+			<el-drawer v-else-if="selProject" :title="selProject.name+'小组进度数据查看'" center   :visible.sync="xmProjectGroupStateVisible"  size="80%"  :close-on-click-modal="false" append-to-body>
+				<xm-project-group-state-mng  :sel-project="selProject"  :visible="xmProjectGroupStateVisible" ></xm-project-group-state-mng>
+			</el-drawer>
+			<el-drawer v-else-if="!selProject && xmProduct" :title="xmProduct.name+'小组进度数据查看'" center   :visible.sync="xmProjectGroupStateVisible"  size="80%"  :close-on-click-modal="false" append-to-body>
+				<xm-project-group-state-mng   :xm-product="xmProduct"   :visible="xmProjectGroupStateVisible" ></xm-project-group-state-mng>
+			</el-drawer>
+			
+			<el-drawer  v-if="currNodeType=='group'&&editForm.groupName" center  :title="(editForm==null?editForm.groupName:'')+'小组成员管理'" :visible.sync="groupUserVisible"  size="80%"  :close-on-click-modal="false" append-to-body>
 				<xm-project-group-user-mng  :xm-project-group="editForm" :visible="groupUserVisible" ></xm-project-group-user-mng>
 			</el-drawer>
 	    </el-row>
diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
index fce7cb7b..d900e808 100644
--- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
+++ b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
@@ -64,7 +64,7 @@ import XmProjectGroupStateOverview from './XmProjectGroupStateOverview.vue';
 		      'userInfo','roles'
 		    ])
 		},
-		props:['selProject','visible'],
+		props:['selProject','visible','xmProduct','xmProjectGroup'],
 		watch:{
 			visible(visible){
 				if(visible==true){
@@ -160,6 +160,14 @@ import XmProjectGroupStateOverview from './XmProjectGroupStateOverview.vue';
 				if(this.selProject){
 					params.projectId=this.selProject.id
 				}
+				
+				if(this.xmProduct){
+					params.productId=this.xmProduct.id
+				}
+				
+				if(this.xmProjectGroup){
+					params.groupId=this.xmProjectGroup.id
+				}
 				this.load.list = true;
 				listXmProjectGroupState(params).then((res) => {
 					var tips=res.data.tips;