项目试图整体改版

src/router/routes_arc.js

@@ -18,7 +18,7 @@ export default {
 	      children: [
 	    	{ path: 'aqQuestion/AqQuestionMng',   name: 'AqQuestionMng', meta: { title: '咨询信息管理' ,openTab:true,outUrl:'${curlDomain}/arc/'+process.env.VERSION+'/#/mdp/arc/aq/aqQuestion/AqQuestionMng',menu:false} },
 	    	{ path: 'aqQuestion/AqQuestionAdd',   name: 'AqQuestionAdd', meta: { title: '发起咨询' ,openTab:true,outUrl:'${curlDomain}/arc/'+process.env.VERSION+'/#/mdp/arc/aq/aqQuestion/AqQuestionAdd',menu:false} }, 
-	      	{ path: 'aqFaq/AqFaqMng',  name: 'AqFaqMng', meta: { title: '常见问题管理' ,openTab:true,outUrl:'${curlDomain}/arc/'+process.env.VERSION+'/#/mdp/arc/aq/aqFaq/AqFaqMng',menu:false}},
+	      	{ path: 'aqFaq/AqFaqMng',  name: 'AqFaqMng', meta: { title: '常见缺陷管理' ,openTab:true,outUrl:'${curlDomain}/arc/'+process.env.VERSION+'/#/mdp/arc/aq/aqFaq/AqFaqMng',menu:false}},
 	      	
 	      ]
 		}, 

src/router/routes_xm.js

@@ -17,7 +17,7 @@ export default {
       children: [
         
         { path: 'xmProject/XmProjectAdd', component: _import('xm/core/xmProject/XmProjectAdd'), name: 'xmProjectAdd', meta: { title: '项目立项' }},
-        { path: 'xmProject/XmProjectAllMng', component: _import('xm/core/xmProject/XmProjectAllMng'), name: 'xmProjectAllMng', meta: { title: '项目管理' }},
+        { path: 'xmProject/XmProjectAllMng', component: _import('xm/core/xmProject/XmProjectAllMng'), name: 'xmProjectAllMng', meta: { title: '项目总览' }},
         { path: 'xmProject/XmProjectMng', component: _import('xm/core/xmProject/XmProjectMng'), name: 'xmProjectMng', meta: { title: '项目(我的)' }},
         { path: 'xmProjectState/XmCockpit',   name: 'XmCockpit', meta: { title: '领导驾驶舱' ,openTab:true,outUrl:'${curlDomain}/xm/'+process.env.VERSION+'/#/datav/xm/branch/branchDatavFullScreen'}},
         { path: 'xmProjectState/XmProjectStateMng', component: _import('xm/core/xmProjectState/XmProjectStateMng'), name: 'XmProjectStateMng', meta: { title: '项目统计' }},
@@ -29,6 +29,17 @@ export default {
 
       ]
     },
+    {
+      path: '/xm/core/xmProject/XmProjectInfoRoute',
+      component: _import('xm/core/xmProject/XmProjectInfoRoute'),
+      name: 'XmProjectInfoRoute',
+      iconCls: 'fa el-icon-menu',
+      meta: {
+        title: '项目管理',
+        icon: 'project', 
+        hidden:true
+      }, 
+    },
     {
       path: '/xm/core',
       component: Layout,
@@ -41,8 +52,8 @@ export default {
       // leaf: true,//只有一个节点
       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/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: '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: '测试执行' }}, 
 

src/views/xm/core/xmAttachment/XmAttachmentAdd.vue

@@ -6,8 +6,8 @@
 				<el-form-item label="主键" prop="id">
 					<el-input v-model="addForm.id" placeholder="主键" ></el-input>
 				</el-form-item> 
-				<el-form-item label="附件来源类型，0任务，1问题，2文档" prop="originType">
-					<el-input v-model="addForm.originType" placeholder="附件来源类型，0任务，1问题，2文档" ></el-input>
+				<el-form-item label="附件来源类型，0任务，1缺陷，2文档" prop="originType">
+					<el-input v-model="addForm.originType" placeholder="附件来源类型，0任务，1缺陷，2文档" ></el-input>
 				</el-form-item> 
 				<el-form-item label="来源id" prop="originId">
 					<el-input v-model="addForm.originId" placeholder="来源id" ></el-input>

src/views/xm/core/xmAttachment/XmAttachmentEdit.vue

@@ -6,8 +6,8 @@
 				<el-form-item label="主键" prop="id">
 					<el-input v-model="editForm.id" placeholder="主键"></el-input>
 				</el-form-item> 
-				<el-form-item label="附件来源类型，0任务，1问题，2文档" prop="originType">
-					<el-input v-model="editForm.originType" placeholder="附件来源类型，0任务，1问题，2文档"></el-input>
+				<el-form-item label="附件来源类型，0任务，1缺陷，2文档" prop="originType">
+					<el-input v-model="editForm.originType" placeholder="附件来源类型，0任务，1缺陷，2文档"></el-input>
 				</el-form-item> 
 				<el-form-item label="来源id" prop="originId">
 					<el-input v-model="editForm.originId" placeholder="来源id"></el-input>

src/views/xm/core/xmAttachment/XmAttachmentMng.vue

@@ -12,7 +12,7 @@
 				<el-table-column sortable type="selection" width="40"></el-table-column>
 				<el-table-column sortable type="index" width="40"></el-table-column>
 				<el-table-column prop="id" label="主键" min-width="80" ></el-table-column>
-				<el-table-column prop="originType" label="附件来源类型，0任务，1问题，2文档" min-width="80" ></el-table-column>
+				<el-table-column prop="originType" label="附件来源类型，0任务，1缺陷，2文档" min-width="80" ></el-table-column>
 				<el-table-column prop="originId" label="来源id" min-width="80" ></el-table-column>
 				<el-table-column prop="name" label="附件名字" min-width="80" ></el-table-column>
 				<el-table-column prop="addr" label="附件地址" min-width="80" ></el-table-column>

src/views/xm/core/xmProject/XmProjectInfo.vue

@@ -4,17 +4,17 @@
 			<div class="project-info" v-loading.lock="load.list || load.edit">
 				<div class="info-type">
 					<el-radio-group v-model="infotype" size="medium"> 
+						<el-radio-button label="项目概览"></el-radio-button> 
+						<el-radio-button label="用户故事"></el-radio-button>
 						<el-radio-button label="任务"></el-radio-button>
+						<el-radio-button label="缺陷"></el-radio-button>
 						<el-radio-button label="阶段计划"></el-radio-button>
 						<el-radio-button label="团队"></el-radio-button>
 						<el-radio-button class="hidden-sm-and-down" label="风险"></el-radio-button>
-						<el-radio-button label="问题"></el-radio-button>
 						<el-radio-button label="测试计划"></el-radio-button> 
 						<el-radio-button label="文档"></el-radio-button>
-						<el-radio-button label="用户故事"></el-radio-button>
 						<el-radio-button label="故事监控"></el-radio-button>
 						<el-radio-button label="项目监控"></el-radio-button> 
-						<el-radio-button label="详情"></el-radio-button>
 						<el-radio-button class="hidden-sm-and-down" label="考核"></el-radio-button>
 						<el-radio-button class="hidden-md-and-down" label="日志"></el-radio-button>
 						<el-radio-button class="hidden-md-and-down" label="费用"></el-radio-button>
@@ -50,13 +50,13 @@
 					<xm-project-phase-mng v-if="infotype=='阶段计划'" ref="xmProjectPhaseMng" :sel-project="selProject" ></xm-project-phase-mng>
 					<xm-group-mng v-if="infotype=='团队'" :sel-project="selProject"></xm-group-mng>  
 					<xm-question v-if="infotype=='风险'" :qtype="'risk'" :sel-project='selProject' ref="xmRisk"></xm-question>
-					<xm-question v-if="infotype=='问题'" :qtype="'bug'" :sel-project='selProject' ref="xmQuestion"></xm-question>
+					<xm-question v-if="infotype=='缺陷'" :qtype="'bug'" :sel-project='selProject' ref="xmQuestion"></xm-question>
 					<xm-test-case-exec-mng v-if="infotype=='测试计划'" :visible="infotype=='测试计划'"  :sel-project='selProject' ref="xmQuestion"></xm-test-case-exec-mng> 
 					<xm-file-mng v-if="infotype=='文档'" :sel-project="selProject"></xm-file-mng> 
 					<xm-menu-mng v-if="infotype=='用户故事'" :sel-project="selProject"></xm-menu-mng> 
 					<xm-menu-with-plan v-if="infotype=='故事监控'" ref="xmMenuWithPlan" :sel-project="selProject"></xm-menu-with-plan> 
 					<xm-project-state-mng v-if="infotype=='项目监控'" :sel-project="selProject"></xm-project-state-mng> 
-					<xm-detail v-if="infotype=='详情'" :sel-project="selProject" @submit="afterEditSubmit"></xm-detail>
+					<xm-detail v-if="infotype=='项目概览'" :sel-project="selProject" @submit="afterEditSubmit"></xm-detail>
 					<xm-project-kpi v-if="infotype=='考核'"  :sel-project="selProject"></xm-project-kpi>
 					<xm-record v-if="infotype=='日志'" :visible="infotype=='日志'" :sel-project="selProject"></xm-record>
 					<xm-cost v-if="infotype=='费用'" :sel-project="selProject"></xm-cost>
@@ -325,7 +325,6 @@
 <style scoped>
 .app-container{
 	display: flex; 
-	margin-top: -28px;
 	margin-left: 1px;
 	margin-right:1px;
 	padding: 2px;

src/views/xm/core/xmProject/XmProjectInfoRoute.vue

@@ -0,0 +1,61 @@
+<template>
+	<section>
+		 <xm-project-info v-if="selProject" :sel-project="selProject" :visible="showInfo"></xm-project-info>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	 
+	import { mapGetters } from 'vuex'; 
+	import XmProjectInfo from './XmProjectInfo'
+
+	export default {  
+		computed: {
+		    ...mapGetters([
+		      'userInfo','roles'
+				]), 
+		}, 
+		watch:{
+			 
+		},
+		data() {
+			return { 
+				 selProject:null,
+				 showInfo:false,
+			}
+		},//end data
+		methods: { 
+			 
+			 
+			
+		},//end methods
+		components: {  
+			XmProjectInfo,
+			//在下面添加其它组件
+		},
+		activated(){
+			if(this.$route.params && this.$route.params.id){
+				  this.selProject=this.$route.params
+				  this.showInfo=true;
+				  localStorage.setItem('xm-project-info-route',JSON.stringify(this.selProject));
+			}else{
+				this.selProject=JSON.parse(localStorage.getItem("xm-project-info-route"))
+				this.showInfo=true;
+			}
+		},
+		mounted() {  
+			  if(this.$route.params && this.$route.params.id){
+				  this.selProject=this.$route.params
+				  this.showInfo=true;
+				  localStorage.setItem('xm-project-info-route',JSON.stringify(this.selProject));
+			  }else{
+				this.selProject=JSON.parse(localStorage.getItem("xm-project-info-route"))
+				this.showInfo=true;
+			}
+		}
+	}
+</script>
+
+<style scoped> 
+</style>

src/views/xm/core/xmProject/XmProjectMng.vue

@@ -80,7 +80,7 @@
 						<div class="project-info">
 							<div class="info-item">
 								<span class="item-total">{{p.totalBugCnt==null?0:p.totalBugCnt}}</span>
-								<span class="item-type">问题</span>
+								<span class="item-type">缺陷</span>
 							</div>
 							<div class="info-item">
 								<span class="item-total">{{p.totalFileCnt==null?0:p.totalFileCnt}}</span>
@@ -116,7 +116,7 @@
 				<el-table-column prop="totalTaskCnt" label="任务数" min-width="80" ></el-table-column>
 				<el-table-column prop="totalCompleteTaskCnt" label="任务完成" min-width="80" ></el-table-column>
 				<el-table-column prop="totalFileCnt" label="文档" min-width="80" ></el-table-column>
-				<el-table-column prop="totalBugCnt" label="问题" min-width="80" ></el-table-column>
+				<el-table-column prop="totalBugCnt" label="缺陷" min-width="80" ></el-table-column>
 				<el-table-column label="进度" min-width="80" >
 					<template slot-scope="scope">
 						{{scope.row.totalProgress}}%
@@ -483,7 +483,8 @@
 			//进入info界面
 			intoInfo(row) {
 				this.selectProject = row;
-				this.showInfo = true;
+				this.$router.push({ name:'XmProjectInfoRoute', params: row })
+				//this.showInfo = true;
 			},
 
 			//筛选项目

src/views/xm/core/xmQuestion/XmQuestionAdd.vue

@@ -14,8 +14,8 @@
 						<el-form-item label="隶属故事" prop="menuName">
 							<el-tag v-if="addForm.menuId!='' && addForm.menuId!=null " closable @close="handleCloseMenuTag">{{addForm.menuName}}</el-tag><el-button @click="showSelectMenu">选故事</el-button>
 						</el-form-item>   
-						<el-form-item label="问题标题" prop="name">
-							<el-input v-model="addForm.name" placeholder="问题标题" ></el-input>
+						<el-form-item label="缺陷标题" prop="name">
+							<el-input v-model="addForm.name" placeholder="缺陷标题" ></el-input>
 						</el-form-item>  
 						<el-form-item label="优先级别" prop="priority">
 							<el-radio-group v-model="addForm.priority">
@@ -59,7 +59,7 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
-				<el-form-item label="问题描述" prop="description"> 
+				<el-form-item label="缺陷描述" prop="description"> 
         			<vue-editor :id="'description_'+addForm.id" :branch-id="userInfo.branchId" v-model="addForm.description"></vue-editor>
 				</el-form-item>   
 				<el-form-item class="add-btns">
@@ -152,7 +152,7 @@
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				addFormRules: {
 					name: [
-						{required: true, message: '问题标题不可为空', trigger: 'blur' }
+						{required: true, message: '缺陷标题不可为空', trigger: 'blur' }
 					],
 					askUsername: [
 						{required: true, message: '提出人不可为空', trigger: 'blur' }

src/views/xm/core/xmQuestion/XmQuestionCenter.vue

@@ -11,8 +11,8 @@
 			<el-table :data="xmQuestions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="40"></el-table-column>
 				<el-table-column sortable type="index" width="40"></el-table-column>
-				<el-table-column prop="id" label="问题编号" min-width="80" ></el-table-column>
-				<el-table-column prop="name" label="问题标题" min-width="80" ></el-table-column>
+				<el-table-column prop="id" label="缺陷编号" min-width="80" ></el-table-column>
+				<el-table-column prop="name" label="缺陷标题" min-width="80" ></el-table-column>
 				<el-table-column prop="projectId" label="项目编号" min-width="80" ></el-table-column>
 				<el-table-column prop="projectName" label="项目名称" min-width="80" ></el-table-column>
 				<el-table-column prop="taskId" label="任务编号" min-width="80" ></el-table-column>
@@ -23,10 +23,10 @@
 				<el-table-column prop="handlerUserid" label="处理人编号" min-width="80" ></el-table-column>
 				<el-table-column prop="handlerUsername" label="处理人" min-width="80" ></el-table-column>
 				<el-table-column prop="priority" label="优先级别" min-width="80" ></el-table-column>
-				<el-table-column prop="solution" label="解决方案3不是问题，4已解决，6延后处理" min-width="80" ></el-table-column>
-				<el-table-column prop="description" label="问题描述" min-width="80" ></el-table-column>
-				<el-table-column prop="createUserid" label="问题创建人编号" min-width="80" ></el-table-column>
-				<el-table-column prop="createUsername" label="问题创建人" min-width="80" ></el-table-column>
+				<el-table-column prop="solution" label="解决方案3不是缺陷，4已解决，6延后处理" min-width="80" ></el-table-column>
+				<el-table-column prop="description" label="缺陷描述" min-width="80" ></el-table-column>
+				<el-table-column prop="createUserid" label="缺陷创建人编号" min-width="80" ></el-table-column>
+				<el-table-column prop="createUsername" label="缺陷创建人" min-width="80" ></el-table-column>
 				<el-table-column prop="createTime" label="创建时间" min-width="80" ></el-table-column>
 				<el-table-column prop="status" label="状态，0未提交，2已领取，4已解决，5已关闭" min-width="80" ></el-table-column>
 				<el-table-column prop="bizProcInstId" label="当前流程实例编号" min-width="80" ></el-table-column>

src/views/xm/core/xmQuestion/XmQuestionEdit.vue

@@ -6,7 +6,7 @@
 				
 					<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
 						<el-col :span="12"> 
-								<el-form-item label="问题标题" prop="name">
+								<el-form-item label="缺陷标题" prop="name">
 									{{editForm.name}} 
 								</el-form-item>  
 								<el-form-item label="隶属项目" prop="projectName">
@@ -90,7 +90,7 @@
 							</el-row> 
 						</el-col>
 						<el-col :span="24">
-							<el-form-item label="问题描述" prop="description">
+							<el-form-item label="缺陷描述" prop="description">
 								<div class="wf-main-context-box" v-if="editForm.description">
 									<div style="padding:10px;" class="wf-main-context" v-html="editForm.description"></div>
 								</div>
@@ -122,7 +122,7 @@
 					<el-button @click.native="handleCancel">取消</el-button>  
 					<el-button v-if="editForm.bugStatus !='closed'" v-loading="load.edit" type="primary" @click.native="handleQuestion(editForm.bugStatus)" :disabled="load.edit==true">暂存</el-button>
 					<el-button v-if="editForm.bugStatus=='active'" v-loading="load.edit" type="primary" @click.native="handleQuestion('confirmed')" :disabled="load.edit==true">确认</el-button>  
-					<el-button v-if="editForm.bugStatus=='active'" v-loading="load.edit" type="primary" @click.native="handleQuestion('active')" :disabled="load.edit==true">不是问题</el-button>  
+					<el-button v-if="editForm.bugStatus=='active'" v-loading="load.edit" type="primary" @click.native="handleQuestion('active')" :disabled="load.edit==true">不是缺陷</el-button>  
 					<el-button v-if="editForm.bugStatus=='active'" v-loading="load.edit" type="primary" @click.native="handleQuestion('resolved')" :disabled="load.edit==true">直接解决</el-button>  
 					<el-button v-if="editForm.bugStatus=='active'" v-loading="load.edit" type="primary" @click.native="handleQuestion('closed')" :disabled="load.edit==true">直接关闭</el-button>  
 					<el-button v-if="editForm.bugStatus=='confirmed'" v-loading="load.edit" type="primary" @click.native="handleQuestion('resolved')" :disabled="load.edit==true">解决</el-button> 
@@ -192,7 +192,7 @@
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				editFormRules: {
 					name: [
-						{required: true, message: '问题标题不可为空', trigger: 'blur' }
+						{required: true, message: '缺陷标题不可为空', trigger: 'blur' }
 					],
 					askUsername: [
 						{required: true, message: '提出人不可为空', trigger: 'blur' }

src/views/xm/core/xmQuestion/XmQuestionMng.vue

@@ -17,7 +17,7 @@
 				<el-button v-else    @click="showProductVisible" type="plian">选产品</el-button>
 				<el-button v-if=" !filters.menus || filters.menus.length==0" @click="showMenu"> 选择故事</el-button>
 				<el-tag v-else   closable @close="clearFiltersMenu(filters.menus[0])">{{filters.menus[0].menuName.substr(0,5)}}等({{filters.menus.length}})个</el-tag>
-				<el-input style="width:200px;" v-model="filters.key" placeholder="问题名称">
+				<el-input style="width:200px;" v-model="filters.key" placeholder="缺陷名称">
 					<template slot="append">
 						<el-button @click="searchXmQuestions" type="primary" icon="el-icon-search"></el-button>
 					</template>
@@ -61,7 +61,7 @@
 							<el-select v-model="filters.hisHandleStatus" placeholder="请选择状态"  clearable @change="changeHisHandleStatus">
 								<el-option v-for="(b,index) in options['bugStatus']" :value="b.optionValue"  :key="index" :label="b.optionName">{{b.optionName}}
 								</el-option>
-							</el-select>的问题
+							</el-select>的缺陷
 						</el-col> 
 						<el-col :span="24" style="padding-top:5px;">
 								<font class="more-label-font">故事:</font>
@@ -125,7 +125,7 @@
 				<!--列表 XmQuestion xm_question-->
 				<el-table ref="table" :max-height="tableHeight" :data="xmQuestions" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 					<el-table-column sortable type="index" width="45"></el-table-column> 
-					<el-table-column prop="name" label="问题名称"  min-width="200" show-overflow-tooltip> 
+					<el-table-column prop="name" label="缺陷名称"  min-width="200" show-overflow-tooltip> 
 						<template slot-scope="scope">
 							{{scope.row.id}}&nbsp;<el-link type="primary" @click="showEdit(scope.row)">{{scope.row.name}}</el-link> 
 						</template>
@@ -184,12 +184,12 @@
 				<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>
 			<!--编辑 XmQuestion xm_question界面-->
-			<el-dialog title="编辑问题"   :visible.sync="editFormVisible" fullscreen  width="100%"  append-to-body   :close-on-click-modal="false">
+			<el-dialog title="编辑缺陷"   :visible.sync="editFormVisible" fullscreen  width="100%"  append-to-body   :close-on-click-modal="false">
 					<xm-question-edit :sel-project=" {id:editForm.projectId,name:editForm.projectName} " :xm-question="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-question-edit>
 			</el-dialog>
 	
 			<!--新增 XmQuestion xm_question界面-->
-			<el-dialog title="新增问题"  :visible.sync="addFormVisible"  fullscreen width="100%"  append-to-body   :close-on-click-modal="false">
+			<el-dialog title="新增缺陷"  :visible.sync="addFormVisible"  fullscreen width="100%"  append-to-body   :close-on-click-modal="false">
 				<xm-question-add :xm-test-case-exec="xmTestCaseExec" :xm-test-case="xmTestCase" :qtype="qtype" :sel-project=" filters.selProject " :xm-question="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-question-add>
 			</el-dialog>  
 			<el-dialog title="选中用户" v-if=" filters.selProject " :visible.sync="selectUserVisible"  width="80%"  append-to-body   :close-on-click-modal="false">
@@ -310,7 +310,7 @@
 					{
 						key: 'name',
 						type: 'text',
-						name: '问题名称'
+						name: '缺陷名称'
 					},
 					{
 						key: 'bugStatus',
@@ -436,7 +436,7 @@
 					if(this.filters.hisHandleStatus){
 						params.hisHandlerUserid=this.filters.hisHandler.userid;
 					}else{
-						this.$message({ message: "请选择曾经的问题状态", type: 'error' });
+						this.$message({ message: "请选择曾经的缺陷状态", type: 'error' });
 						return;
 					}
 					
@@ -832,10 +832,10 @@
 				} 
 				if(bizKey=="xm_question_up_approva"){
 					//预算变更审核
-					params.mainTitle='关于问题【'+row.name+"】升级的申请";
+					params.mainTitle='关于缺陷【'+row.name+"】升级的申请";
 					params.mainContext='项目编号：'+row.projectId+','+'项目名称：'+row.projectName+',任务名称：'+row.taskName
-										+'<br>'+row.askUsername+'于'+row.createTime+'提出问题('+row.id+')：'+row.name
-										+'<br>问题描述：'+row.description;
+										+'<br>'+row.askUsername+'于'+row.createTime+'提出缺陷('+row.id+')：'+row.name
+										+'<br>缺陷描述：'+row.description;
 					params.restUrl=config.getXmBasePath()+"/xm/core/xmQuestion/processApprova"; 
 					this.$router.push({name:'ProcdefListForBizStart',params:params}); 				
 					

src/views/xm/core/xmQuestionHandle/XmQuestionHandleAdd.vue

@@ -30,8 +30,8 @@
 				<el-form-item label="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" prop="bizFlowState">
 					<el-input v-model="addForm.bizFlowState" placeholder="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" ></el-input>
 				</el-form-item> 
-				<el-form-item label="问题编号" prop="questionId">
-					<el-input v-model="addForm.questionId" placeholder="问题编号" ></el-input>
+				<el-form-item label="缺陷编号" prop="questionId">
+					<el-input v-model="addForm.questionId" placeholder="缺陷编号" ></el-input>
 				</el-form-item> 
 				<el-form-item label="最后更新日期" prop="lastUpdateTime">
 					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.lastUpdateTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>

src/views/xm/core/xmQuestionHandle/XmQuestionHandleEdit.vue

@@ -30,8 +30,8 @@
 				<el-form-item label="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" prop="bizFlowState">
 					<el-input v-model="editForm.bizFlowState" placeholder="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除"></el-input>
 				</el-form-item> 
-				<el-form-item label="问题编号" prop="questionId">
-					<el-input v-model="editForm.questionId" placeholder="问题编号"></el-input>
+				<el-form-item label="缺陷编号" prop="questionId">
+					<el-input v-model="editForm.questionId" placeholder="缺陷编号"></el-input>
 				</el-form-item> 
 				<el-form-item label="最后更新日期" prop="lastUpdateTime">
 					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.lastUpdateTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>

src/views/xm/core/xmQuestionHandle/XmQuestionHandleMng.vue

@@ -20,7 +20,7 @@
 				<el-table-column prop="handleStatus" label="create创建（active激活）–confirm确认（confirmed已确认）–solve解决（resolved已解决）–close关闭（closed已关闭）" min-width="80" ></el-table-column>
 				<el-table-column prop="bizProcInstId" label="当前流程实例编号" min-width="80" ></el-table-column>
 				<el-table-column prop="bizFlowState" label="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" min-width="80" ></el-table-column>
-				<el-table-column prop="questionId" label="问题编号" min-width="80" ></el-table-column>
+				<el-table-column prop="questionId" label="缺陷编号" min-width="80" ></el-table-column>
 				<el-table-column prop="lastUpdateTime" label="最后更新日期" min-width="80" ></el-table-column>
 				<el-table-column prop="createTime" label="创建时间" min-width="80" ></el-table-column>
 				<el-table-column prop="actWorkload" label="实际工时" min-width="80" ></el-table-column>

src/views/xm/core/xmQuestionTag/XmQuestionTagAdd.vue

@@ -1,10 +1,10 @@
 <template>
 	<section>
 		<el-row class="app-container">
-			<!--新增界面 XmQuestionTag 问题标签关联表--> 
+			<!--新增界面 XmQuestionTag 缺陷标签关联表--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
-				<el-form-item label="问题编号" prop="questionId">
-					<el-input v-model="addForm.questionId" placeholder="问题编号" ></el-input>
+				<el-form-item label="缺陷编号" prop="questionId">
+					<el-input v-model="addForm.questionId" placeholder="缺陷编号" ></el-input>
 				</el-form-item> 
 				<el-form-item label="标签编号" prop="tagId">
 					<el-input v-model="addForm.tagId" placeholder="标签编号" ></el-input>
@@ -61,7 +61,7 @@
 						//{ required: true, message: '主键不能为空', trigger: 'blur' }
 					]
 				},
-				//新增界面数据 问题标签关联表
+				//新增界面数据 缺陷标签关联表
 				addForm: {
 					questionId:'',tagId:'',tagName:'',ctime:'',id:''
 				}
@@ -76,7 +76,7 @@
 				this.$refs['addForm'].resetFields();
 				this.$emit('cancel');
 			},
-			//新增提交XmQuestionTag 问题标签关联表 父组件监听@submit="afterAddSubmit"
+			//新增提交XmQuestionTag 缺陷标签关联表 父组件监听@submit="afterAddSubmit"
 			addSubmit: function () {
 				
 				this.$refs.addForm.validate((valid) => {

src/views/xm/core/xmQuestionTag/XmQuestionTagEdit.vue

@@ -1,10 +1,10 @@
 <template>
 	<section>
 		<el-row class="app-container"> 
-		<!--编辑界面 XmQuestionTag 问题标签关联表--> 
+		<!--编辑界面 XmQuestionTag 缺陷标签关联表--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
-				<el-form-item label="问题编号" prop="questionId">
-					<el-input v-model="editForm.questionId" placeholder="问题编号"></el-input>
+				<el-form-item label="缺陷编号" prop="questionId">
+					<el-input v-model="editForm.questionId" placeholder="缺陷编号"></el-input>
 				</el-form-item> 
 				<el-form-item label="标签编号" prop="tagId">
 					<el-input v-model="editForm.tagId" placeholder="标签编号"></el-input>
@@ -61,7 +61,7 @@
 						//{ required: true, message: '主键不能为空', trigger: 'blur' }
 					]
 				},
-				//编辑界面数据  XmQuestionTag 问题标签关联表
+				//编辑界面数据  XmQuestionTag 缺陷标签关联表
 				editForm: {
 					questionId:'',tagId:'',tagName:'',ctime:'',id:''
 				}
@@ -76,7 +76,7 @@
 				this.$refs['editForm'].resetFields();
 				this.$emit('cancel');
 			},
-			//编辑提交XmQuestionTag 问题标签关联表父组件监听@submit="afterEditSubmit"
+			//编辑提交XmQuestionTag 缺陷标签关联表父组件监听@submit="afterEditSubmit"
 			editSubmit: function () {
 				this.$refs.editForm.validate((valid) => {
 					if (valid) {

src/views/xm/core/xmQuestionTag/XmQuestionTagMng.vue

@@ -3,15 +3,15 @@
 		<el-row class="app-container">
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmQuestionTags">查询</el-button>
-			<el-button type="primary" @click="showAdd">+问题标签关联表</el-button>
+			<el-button type="primary" @click="showAdd">+缺陷标签关联表</el-button>
 			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
 		</el-row>
 		<el-row class="app-container"> 
-			<!--列表 XmQuestionTag 问题标签关联表-->
+			<!--列表 XmQuestionTag 缺陷标签关联表-->
 			<el-table :data="xmQuestionTags" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column sortable type="selection" width="40"></el-table-column>
 				<el-table-column sortable type="index" width="40"></el-table-column>
-				<el-table-column prop="questionId" label="问题编号" min-width="80" ></el-table-column>
+				<el-table-column prop="questionId" label="缺陷编号" min-width="80" ></el-table-column>
 				<el-table-column prop="tagId" label="标签编号" min-width="80" ></el-table-column>
 				<el-table-column prop="tagName" label="标签名称" min-width="80" ></el-table-column>
 				<el-table-column prop="ctime" label="添加时间" min-width="80" ></el-table-column>
@@ -25,13 +25,13 @@
 			</el-table>
 			<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> 
 		
-			<!--编辑 XmQuestionTag 问题标签关联表界面-->
-			<el-dialog title="编辑问题标签关联表" :visible.sync="editFormVisible"  width="50%"  append-to-body   :close-on-click-modal="false">
+			<!--编辑 XmQuestionTag 缺陷标签关联表界面-->
+			<el-dialog title="编辑缺陷标签关联表" :visible.sync="editFormVisible"  width="50%"  append-to-body   :close-on-click-modal="false">
 				  <xm-question-tag-edit :xm-question-tag="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-question-tag-edit>
 			</el-dialog>
 	
-			<!--新增 XmQuestionTag 问题标签关联表界面-->
-			<el-dialog title="新增问题标签关联表" :visible.sync="addFormVisible"  width="50%"  append-to-body  :close-on-click-modal="false">
+			<!--新增 XmQuestionTag 缺陷标签关联表界面-->
+			<el-dialog title="新增缺陷标签关联表" :visible.sync="addFormVisible"  width="50%"  append-to-body  :close-on-click-modal="false">
 				<xm-question-tag-add :xm-question-tag="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-question-tag-add>
 			</el-dialog> 
 		</el-row>
@@ -114,7 +114,7 @@
 				 this.pageInfo.count=true; 
 				 this.getXmQuestionTags();
 			},
-			//获取列表 XmQuestionTag 问题标签关联表
+			//获取列表 XmQuestionTag 缺陷标签关联表
 			getXmQuestionTags() {
 				let params = {
 					pageSize: this.pageInfo.pageSize,
@@ -148,12 +148,12 @@
 				}).catch( err => this.load.list = false );
 			},
 
-			//显示编辑界面 XmQuestionTag 问题标签关联表
+			//显示编辑界面 XmQuestionTag 缺陷标签关联表
 			showEdit: function ( row,index ) {
 				this.editFormVisible = true;
 				this.editForm = Object.assign({}, row);
 			},
-			//显示新增界面 XmQuestionTag 问题标签关联表
+			//显示新增界面 XmQuestionTag 缺陷标签关联表
 			showAdd: function () {
 				this.addFormVisible = true;
 				//this.addForm=Object.assign({}, this.editForm);

src/views/xm/core/xmTask/XmTaskMng.vue

@@ -1769,6 +1769,7 @@ XmProjectGroupSelect,XmProductSelect
 				this.filters.product=this.xmProduct;
 			}
 			this.$nextTick(()=>{
+				debugger
 				this.getXmTasks();     
 				var clientRect=this.$refs.table.$el.getBoundingClientRect(); 
 				var subHeight=140/1000 * window.innerHeight;

src/views/xm/core/xmTestCaseExec/XmTestCaseExecAdd.vue

@@ -27,14 +27,14 @@
 				<el-form-item label="到期时间" prop="endTime">
 					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.endTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
 				</el-form-item> 
-				<el-form-item label="问题描述" prop="remark">
-					<el-input v-model="addForm.remark" placeholder="问题描述" ></el-input>
+				<el-form-item label="缺陷描述" prop="remark">
+					<el-input v-model="addForm.remark" placeholder="缺陷描述" ></el-input>
 				</el-form-item> 
-				<el-form-item label="问题创建人编号" prop="createUserid">
-					<el-input v-model="addForm.createUserid" placeholder="问题创建人编号" ></el-input>
+				<el-form-item label="缺陷创建人编号" prop="createUserid">
+					<el-input v-model="addForm.createUserid" placeholder="缺陷创建人编号" ></el-input>
 				</el-form-item> 
-				<el-form-item label="问题创建人" prop="createUsername">
-					<el-input v-model="addForm.createUsername" placeholder="问题创建人" ></el-input>
+				<el-form-item label="缺陷创建人" prop="createUsername">
+					<el-input v-model="addForm.createUsername" placeholder="缺陷创建人" ></el-input>
 				</el-form-item> 
 				<el-form-item label="创建时间" prop="createTime">
 					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.createTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>

src/views/xm/core/xmTestCaseExec/XmTestCaseExecEdit.vue

@@ -27,14 +27,14 @@
 				<el-form-item label="到期时间" prop="endTime">
 					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.endTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
 				</el-form-item> 
-				<el-form-item label="问题描述" prop="remark">
-					<el-input v-model="editForm.remark" placeholder="问题描述"></el-input>
+				<el-form-item label="缺陷描述" prop="remark">
+					<el-input v-model="editForm.remark" placeholder="缺陷描述"></el-input>
 				</el-form-item> 
-				<el-form-item label="问题创建人编号" prop="createUserid">
-					<el-input v-model="editForm.createUserid" placeholder="问题创建人编号"></el-input>
+				<el-form-item label="缺陷创建人编号" prop="createUserid">
+					<el-input v-model="editForm.createUserid" placeholder="缺陷创建人编号"></el-input>
 				</el-form-item> 
-				<el-form-item label="问题创建人" prop="createUsername">
-					<el-input v-model="editForm.createUsername" placeholder="问题创建人"></el-input>
+				<el-form-item label="缺陷创建人" prop="createUsername">
+					<el-input v-model="editForm.createUsername" placeholder="缺陷创建人"></el-input>
 				</el-form-item> 
 				<el-form-item label="创建时间" prop="createTime">
 					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.createTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>

src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue

@@ -191,7 +191,7 @@
 			<el-dialog title="测试用例" :visible.sync="caseVisible"  width="80%"  append-to-body   :close-on-click-modal="false">
 				  <xm-test-case-edit :xm-test-case="xmTestCase"   :visible="caseVisible" @cancel="caseVisible=false" ></xm-test-case-edit>
 			</el-dialog>
-			<el-dialog title="问题列表" :visible.sync="bugsVisible"  width="80%"  append-to-body  fullscreen :close-on-click-modal="false">
+			<el-dialog title="缺陷列表" :visible.sync="bugsVisible"  width="80%"  append-to-body  fullscreen :close-on-click-modal="false">
 				  <xm-question-mng :xm-test-case="xmTestCase" :xm-test-case-exec="editForm" :sel-project="filters.selProject" :visible="bugsVisible" @cancel="bugsVisible=false" ></xm-question-mng>
 			</el-dialog>
 			
@@ -199,7 +199,7 @@
 				  <xm-product-select  :isSelectProduct="true" :selProject="filters.selProject" :visible="productSelectVisible" @cancel="productSelectVisible=false" @selected="onProductSelected"></xm-product-select>
 			</el-dialog>
 			<!--新增 XmQuestion xm_question界面-->
-			<el-dialog title="新增问题" :visible.sync="addBugVisible"  fullscreen width="100%"  append-to-body   :close-on-click-modal="false">
+			<el-dialog title="新增缺陷" :visible.sync="addBugVisible"  fullscreen width="100%"  append-to-body   :close-on-click-modal="false">
 				<xm-question-add :xm-test-case-exec="editForm" :xm-test-case="xmTestCase" :qtype="'bug'" :sel-project=" filters.selProject "   :visible="addBugVisible" @cancel="addBugVisible=false"></xm-question-add>
 			</el-dialog> 
 		</el-row>