ZF/xm-ui-web
1
0
Fork 0
mirror of https://gitee.com/maimengcloud/xm-ui-web.git synced 2025-12-30 10:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
陈裕财
2024-08-08 08:37:52 +08:00
parent ab002df3b8
commit e702c1c756
12 changed files with 75 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/xm/core/xmGroupState/XmGroupStateOverview.vue
View File

@@ -162,7 +162,7 @@
<el-col :span="8">
<div title="（已完成工时-当前应完成工时）/ 当前应完成工时">
<div style="text-align:center;">
<span style="font-size:24px;" v-text="deviationRate" ></span>
<span style="font-size:24px;" v-text="deviationRate||0" ></span>
<span style="font-size:12px;">%</span>
</div>
<div style="text-align:center;font-size:12px;">预估偏差率</div>
@@ -288,6 +288,9 @@ deviation:function (){
},
deviationRate:function (){
if(!this.xmGroupStateCpd.estimateWorkload || this.xmGroupStateCpd.estimateWorkload==0){
return 100
}
return Math.round(this.deviation/this.xmGroupStateCpd.estimateWorkload*100);
},
remainWorkload:function (){

5
src/views/xm/core/xmIteration/XmIterationOverview.vue
View File

@@ -179,7 +179,7 @@
<el-col :span="8">
<div title="（已完成工时-当前应完成工时）/ 当前应完成工时">
<div style="text-align:center;">
<span style="font-size:24px;" v-text="deviationRate" ></span>
<span style="font-size:24px;" v-text="deviationRate||0" ></span>
<span style="font-size:12px;">%</span>
</div>
<div style="text-align:center;font-size:12px;">预估偏差率</div>
@@ -306,6 +306,9 @@ export default {
},
deviationRate:function (){
if(!this.xmIteration.estimateWorkload || this.xmIteration.estimateWorkload==0){
return 100
}
return Math.round(this.deviation/this.xmIteration.estimateWorkload*100);
},
remainWorkload:function (){

9
src/views/xm/core/xmMenu/XmMenuOverview.vue
View File

@@ -177,7 +177,7 @@
<el-col :span="8">
<div>
<div style="text-align:center;">
<span style="font-size:24px;" v-text="deviationRate" ></span>
<span style="font-size:24px;" v-text="deviationRate||0" ></span>
<span style="font-size:5px;">%</span>
</div>
<div style="text-align:center;font-size:5px;">预估偏差率</div>
@@ -271,10 +271,13 @@ import { useUserStore } from '@/store/modules/user'
return Math.round(this.xmMenu.actWorkload/this.xmMenu.budgetWorkload*100);
},
deviation:function (){
return this.xmMenuCpd.actWorkload-this.estimateWorkload;
return this.xmMenuCpd.actWorkload-this.xmMenuCpd.estimateWorkload;
},
deviationRate:function (){
return Math.round(this.deviation/this.estimateWorkload*100);
if(!this.xmMenuCpd.estimateWorkload || this.xmMenuCpd.estimateWorkload==0){
return 100
}
return Math.round(this.deviation/this.xmMenuCpd.estimateWorkload*100);
},
remainWorkload:function (){
return this.xmMenu.budgetWorkload - this.xmMenu.actWorkload;

5
src/views/xm/core/xmProduct/XmProductOverview.vue
View File

@@ -178,7 +178,7 @@
<el-col :span="8">
<div title="（已完成工时-当前应完成工时）/ 当前应完成工时">
<div style="text-align:center;">
<span style="font-size:24px;" v-text="deviationRate"></span>
<span style="font-size:24px;" v-text="deviationRate||0"></span>
<span style="font-size:12px;">%</span>
</div>
<div style="text-align:center;font-size:12px;">预估偏差率</div>
@@ -305,6 +305,9 @@ export default {
},
deviationRate: function () {
if(!this.xmProduct.estimateWorkload || this.xmProduct.estimateWorkload==0){
return 100
}
return Math.round(this.deviation / this.xmProduct.estimateWorkload * 100);
},
remainWorkload: function () {

5
src/views/xm/core/xmProject/XmProjectOverview.vue
View File

@@ -181,7 +181,7 @@
<el-col :span="8">
<div title="（已完成工时-当前应完成工时）/ 当前应完成工时">
<div style="text-align:center;">
<span style="font-size:24px;" v-text="deviationRate" ></span>
<span style="font-size:24px;" v-text="deviationRate||0" ></span>
<span style="font-size:12px;">%</span>
</div>
<div style="text-align:center;font-size:12px;">预估偏差率</div>
@@ -312,6 +312,9 @@ export default {
},
deviationRate:function (){
if(!this.selProject.estimateWorkload || this.selProject.estimateWorkload==0){
return 100
}
return Math.round(this.deviation/this.selProject.estimateWorkload*100);
},
remainWorkload:function (){

6
src/views/xm/core/xmQuestion/XmQuestionEdit.vue
View File

@@ -148,7 +148,7 @@
<el-tab-pane
:label="'工时( ' + (editForm.actWorkload ? editForm.actWorkload : 0) + ' / ' + (editForm.budgetWorkload ? editForm.budgetWorkload : 0) + ' h )'"
name="55">
<xm-workload-record v-if="activateTabPaneName == '55'" biz-type="2" :xm-question="editForm" :parentOpType="currOpType" @editFields="Object.assign(editForm,$event)"/>
<xm-workload-record v-if="activateTabPaneName == '55'" biz-type="2" :xm-task="xmTask" :xm-question="editForm" :parentOpType="currOpType" @editFields="Object.assign(editForm,$event)"/>
</el-tab-pane>
<el-tab-pane label="流转记录" name="4" v-if="subOpType != 'add'">
<xm-question-handle-mng v-if="activateTabPaneName == '4'" :bug="editForm" :visible="activateTabPaneName == '4'" />
@@ -190,9 +190,9 @@
<XmMenuSelect width="100%" showStyle="tag" v-model="editForm.menuId" :init-name="editForm.menuName" :xmProduct="xmProductCpd||{id:editForm.productId}" @change2="onSelectedMenu"/>
</el-form-item>
<!-- <el-form-item label="归属任务" prop="taskId" v-if="editForm.projectId">
<el-form-item label="归属任务" prop="taskId" v-if="editForm.projectId">
<XmTaskSelect width="100%" showStyle="tag" v-model="editForm.taskId" :xmProduct="xmProductCpd||{id:editForm.productId}" :selProject="{id:editForm.projectId}" :menuId="editForm.menuId" @change2="onSelectedTask" :disabled="xmTask?.id"/>
</el-form-item> -->
</el-form-item>
</span>
<el-form-item label="最新意见" prop="remarks"/>

3
src/views/xm/core/xmQuestion/XmQuestionMng.vue
View File

@@ -46,9 +46,6 @@
<el-table-column prop="name" label="缺陷名称" min-width="400" fixed="left">
<template #default="scope">
<el-link @click="showEdit(scope.row)"> {{scope.row.name}}</el-link>
<span class="tool-bar">
<el-button @click="copy(scope.row,scope.$index)" icon="document-copy" circle title="复制一行"/>
</span>
</template>
</el-table-column>
<el-table-column prop="bugStatus" label="状态" width="120" item-code="bugStatus">

57
src/views/xm/core/xmWorkload/XmWorkloadEdit.vue
View File

@@ -323,28 +323,50 @@ export default {
this.editForm.bizDate = util.getDate();
if (!this.editForm.ttype) {
this.editForm.ttype = "4"
}
if (this.xmQuestion && this.xmQuestion.id) {
this.editForm.bugId = this.xmQuestion.id
this.editForm.taskId=this.xmQuestion.taskId
this.editForm.caseId=this.xmQuestion.caseId
this.editForm.planId=this.xmQuestion.caseExecId
this.editForm.bizName = this.xmQuestion.name
this.editForm.menuId=this.xmQuestion.menuId
this.editForm.funcId=this.xmQuestion.funcId
this.editForm.projectId=this.xmQuestion.projectId
this.editForm.productId=this.xmQuestion.productId
}
if (this.xmTask && this.xmTask.id) {
this.editForm.taskId = this.xmTask.id
this.editForm.ttype = this.xmTask.taskType
this.editForm.bizName = this.xmTask.name
}
if (this.xmMenu && this.xmMenu.menuId) {
this.editForm.menuId = this.xmMenu.menuId
this.editForm.bizName = this.xmMenu.menuName
}
if (this.xmQuestion && this.xmQuestion.id) {
this.editForm.bugId = this.xmQuestion.id
this.editForm.bizName = this.xmQuestion.name
}
if (this.xmTestCase && this.xmTestCase.id) {
this.editForm.caseId = this.xmTestCase.id
this.editForm.bizName = this.xmTestCase.caseName
this.editForm.bizName = this.xmTask.name
this.editForm.menuId=this.xmTask.menuId || this.editForm.menuId
this.editForm.funcId=this.xmTask.funcId || this.editForm.funcId
this.editForm.projectId=this.xmTask.projectId || this.editForm.projectId
this.editForm.productId=this.xmTask.productId || this.editForm.productId
}
if (this.xmTestPlanCase && this.xmTestPlanCase.planId) {
this.editForm.planId = this.xmTestPlanCase.planId
this.editForm.caseId = this.xmTestPlanCase.caseId
this.editForm.bizName = this.xmTestPlanCase.caseName
this.editForm.bizName = this.xmTestPlanCase.caseName
this.editForm.menuId=this.xmTestPlanCase.menuId || this.editForm.menuId
this.editForm.funcId=this.xmTestPlanCase.funcId || this.editForm.funcId
this.editForm.projectId=this.xmTestPlanCase.projectId || this.editForm.projectId
this.editForm.productId=this.xmTestPlanCase.productId || this.editForm.productId
}
if (this.xmTestCase && this.xmTestCase.id) {
this.editForm.caseId = this.xmTestCase.id
this.editForm.bizName = this.xmTestCase.caseName
this.editForm.menuId=this.xmTestCase.menuId || this.editForm.menuId
this.editForm.funcId=this.xmTestCase.funcId || this.editForm.funcId
this.editForm.productId=this.xmTestCase.productId || this.editForm.productId
}
if (this.xmMenu && this.xmMenu.menuId) {
this.editForm.menuId = this.xmMenu.menuId
this.editForm.bizName = this.xmMenu.menuName
this.editForm.funcId=this.xmMenu.funcId || this.editForm.funcId
this.editForm.productId=this.xmMenu.productId || this.editForm.productId
}
this.editForm.workload = 8
@@ -355,6 +377,13 @@ export default {
this.editForm.ubranchId = this.userInfo.branchId
this.editForm.rworkload = null;
this.editForm.workloadFillType = "1";
//报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行
if(this.bizType=='1'){//任务
this.editForm.ttype='6'
}
if(this.bizType=='2'|| this.bizType=='3' || this.bizType=='4'){//测试相关
this.editForm.ttype='5'
}
}
},
listXmTaskExecuser() {

1
src/views/xm/core/xmWorkload/XmWorkloadMng.vue
View File

@@ -133,6 +133,7 @@
</template>
</el-table-column>
<el-table-column prop="bugId" label="缺陷编号" width="120" show-overflow-tooltip sortable />
<el-table-column prop="taskId" label="任务编号" width="120" show-overflow-tooltip sortable />
<el-table-column prop="menuId" label="需求编号" width="120" show-overflow-tooltip sortable />
<el-table-column prop="funcId" label="模块编号" width="120" show-overflow-tooltip sortable />
<el-table-column prop="caseId" label="测试用例编号" width="120" show-overflow-tooltip sortable />

6
src/views/xm/pro/XmOverview.vue
View File

@@ -215,7 +215,7 @@
<el-col :span="8">
<div title="（已完成工时-当前应完成工时）/ 当前应完成工时">
<div style="text-align:center;">
<span style="font-size:24px;" v-text="deviationRate" ></span>
<span style="font-size:24px;" v-text="deviationRate||0" ></span>
<span style="font-size:14px;">%</span>
</div>
<div style="text-align:center;font-size:14px;">预估偏差率</div>
@@ -343,8 +343,8 @@ export default {
},
deviationRate:function (){
if(!this.xmBranch.estimateWorkload||!this.deviation){
return 0
if(!this.xmBranch.estimateWorkload || this.xmBranch.estimateWorkload==0){
return 100
}
return Math.round(this.deviation/this.xmBranch.estimateWorkload*100);
},

2
src/views/xm/pro/rpt/product/questionDayAccumulate.vue
View File

@@ -58,7 +58,7 @@ import { useUserStore } from '@/store/modules/user'
if(this.rawDatas.length==0){
return []
}else{
return this.rawDatas.map(i=> i.menuUnstartCnt)
return this.rawDatas.map(i=> i.activeBugs)
}
},
confirmedBugsCpd(){

4
vite.config.ts
View File

@@ -30,13 +30,13 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
open: env.VITE_OPEN === 'true',
// 本地跨域代理. 目前注释的原因：暂时没有用途，server 端已经支持跨域
proxy: {
/**
['/api/lcode']: {
target: 'http://localhost:7014',
ws: false,
changeOrigin: true,
rewrite: (path) => path.replace(new RegExp(`^/api/lcode`), '/'),
}, /**
},
['/api/m1/workflow']: {
target: 'http://localhost:7080',
ws: false,