end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

界面优化

master
陈裕财 5 years ago
parent
92442e7bed
commit
af5b753500
5 changed files with 179 additions and 123 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/xm/core/xmMenu/XmMenuMng.vue
  2. 2
      src/views/xm/core/xmMenu/XmMenuSelect.vue
  3. 34
      src/views/xm/core/xmProject/XmProjectMng.vue
  4. 217
      src/views/xm/core/xmQuestion/XmQuestionEdit.vue
  5. 47
      src/views/xm/core/xmQuestion/XmQuestionMng.vue

2
src/views/xm/core/xmMenu/XmMenuMng.vue
View File

@ -95,7 +95,7 @@
trigger="click" > trigger="click" >
<div v-html="scope.row.remark"> <div v-html="scope.row.remark">
</div> </div>
<div slot="reference">{{scope.row.remark?scope.row.remark.substr(0,20)+"...":""}}</div>
<div slot="reference">{{scope.row.remark?scope.row.remark.substr(0,18)+"...":""}}</div>
</el-popover> </el-popover>
<div v-else v-html="scope.row.remark"> <div v-else v-html="scope.row.remark">
</div> </div>

2
src/views/xm/core/xmMenu/XmMenuSelect.vue
View File

@ -33,7 +33,7 @@
width="400" width="400"
trigger="click" trigger="click"
:content="scope.row.remark"> :content="scope.row.remark">
<div slot="reference">{{scope.row.remark?scope.row.remark.substr(0,20)+"...":""}}</div>
<div slot="reference">{{scope.row.remark?scope.row.remark.substr(0,18)+"...":""}}</div>
</el-popover> </el-popover>
<div v-else v-html="scope.row.remark"></div> <div v-else v-html="scope.row.remark"></div>
</template> </template>

34
src/views/xm/core/xmProject/XmProjectMng.vue
View File

@ -23,17 +23,28 @@
<el-menu-item index="7-2">选项2</el-menu-item> <el-menu-item index="7-2">选项2</el-menu-item>
<el-menu-item index="7-3">选项3</el-menu-item> <el-menu-item index="7-3">选项3</el-menu-item>
</el-submenu> --> </el-submenu> -->
<el-popover
placement="top-start"
title=""
width="200"
trigger="hover" >
<el-row>
<el-col :span="24" style="padding-top:5px;">
<el-checkbox v-model="finishFlag">未结束</el-checkbox>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<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>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<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>
</el-col>
</el-row>
<el-button circle slot="reference" icon="el-icon-more"></el-button>
</el-popover>
</el-menu> </el-menu>
</el-row>
<el-row style="padding-left:10px;">
<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>
<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>
</el-row>
</el-row>
<el-row class="app-container"> <el-row class="app-container">
<!--列表 XmProject xm_project--> <!--列表 XmProject xm_project-->
<el-row v-show="showType" v-loading="load.list"> <el-row v-show="showType" v-loading="load.list">
@ -206,6 +217,9 @@
console.log("shotType_change"); console.log("shotType_change");
this.xmProjects = []; this.xmProjects = [];
this.getXmProjects(); this.getXmProjects();
},
"finishFlag":function(val){
this.searchXmProjects();
} }
}, },
data() { data() {

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

@ -2,101 +2,113 @@
<section> <section>
<el-row class="xm-question"> <el-row class="xm-question">
<!--新增界面 XmQuestion xm_question--> <!--新增界面 XmQuestion xm_question-->
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editForm">
<el-row>
<el-col :span="12">
<el-form-item label="问题标题" prop="name">
{{editForm.name}}
</el-form-item>
<el-form-item label="隶属项目" prop="projectName">
{{selProject.name}}
</el-form-item>
<el-form-item label="隶属任务" prop="taskName">
<el-tag v-if="editForm.taskId!='' && editForm.taskId!=null " closable @close="handleCloseTaskTag">{{editForm.taskName}}</el-tag><el-button @click="showSelectTask">选任务</el-button>
</el-form-item>
<el-form-item label="优先级别" prop="priority">
<el-radio-group v-model="editForm.priority">
<el-radio v-for="(i,index) in options['urgencyLevel']" :label="i.optionValue" :key="index">{{i.optionName}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="严重程度" prop="bugSeverity">
<el-radio-group v-model="editForm.bugSeverity">
<el-radio v-for="(i,index) in options['bugSeverity']" :label="i.optionValue" :key="index">{{i.optionName}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="解决方案" prop="solution">
<el-radio-group v-model="editForm.solution">
<el-radio v-for="(i,index) in options['bugSolution']" :label="i.optionValue" :key="index">{{i.optionName}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="到期时间" prop="endTime">
<el-date-picker :clearable="false" style="width:100%;" type="date" placeholder="选择日期" v-model="editForm.endTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="提出人" prop="askUsername">
提出： {{editForm.askUsername}} 创建人： {{userInfo.username}} 时间：{{formateDate(new Date()).substr(0,10)}}
</el-form-item>
<el-form-item label="指派给" prop="handlerUsername">
{{editForm.handlerUsername}} <el-button @click="sendToAsk">指派给提出人</el-button><el-button @click="sendToCreater">指派给创建人</el-button><el-button @click="showGroupUsers('handlerUsername')">选其它人</el-button>
</el-form-item>
<el-form-item label="问题描述" prop="description">
<div v-html="editForm.description"></div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item>
<el-col :span="24">测试步骤</el-col>
<el-col :span="24">
<vue-editor :id="'opStep'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.opStep" ref="opStep"></vue-editor>
</el-col>
<el-col :span="24" offset="0">预期结果</el-col>
<el-col :span="24" offset="0">
<vue-editor :id="'expectResult'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.expectResult" ref="expectResult"></vue-editor>
</el-col>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="流转信息">
<!--列表 XmQuestionHandle xm_question_handle-->
<el-table :data="xmQuestionHandles" highlight-current-row v-loading="load.list" border style="width: 100%;">
<el-table-column sortable type="index" width="40"></el-table-column>
<el-table-column label="处理意见" prop="receiptMessage" min-width="350" >
<template slot-scope="scope">
<div v-html="scope.row.receiptMessage"></div>
</template>
</el-table-column>
<el-table-column prop="handlerUsername" label="指派动作" min-width="300" >
<template slot-scope="scope">
时间：{{scope.row.receiptTime}},由{{scope.row.handlerUsername}} 指派给 {{scope.row.targetUsername}}
</template>
</el-table-column>
<el-table-column prop="handleStatus" label="状态" min-width="80" :formatter="formatterOption"></el-table-column>
<el-table-column prop="handleSolution" label="解决方案" min-width="100" :formatter="formatterOption"></el-table-column>
<el-row>
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editForm">
<el-col :span="12">
<el-form-item label="问题标题" prop="name">
{{editForm.name}}
</el-form-item>
<el-form-item label="隶属项目" prop="projectName">
{{selProject.name}}
</el-form-item>
<el-form-item label="隶属任务" prop="taskName">
<el-tag v-if="editForm.taskId!='' && editForm.taskId!=null " closable @close="handleCloseTaskTag">{{editForm.taskName}}</el-tag><el-button @click="showSelectTask">选任务</el-button>
</el-form-item>
<el-form-item label="优先级别" prop="priority">
<el-radio-group v-model="editForm.priority">
<el-radio v-for="(i,index) in options['urgencyLevel']" :label="i.optionValue" :key="index">{{i.optionName}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="严重程度" prop="bugSeverity">
<el-radio-group v-model="editForm.bugSeverity">
<el-radio v-for="(i,index) in options['bugSeverity']" :label="i.optionValue" :key="index">{{i.optionName}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="解决方案" prop="solution">
<el-radio-group v-model="editForm.solution">
<el-radio v-for="(i,index) in options['bugSolution']" :label="i.optionValue" :key="index">{{i.optionName}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="到期时间" prop="endTime">
<el-date-picker :clearable="false" style="width:100%;" type="date" placeholder="选择日期" v-model="editForm.endTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="提出人" prop="askUsername">
提出： {{editForm.askUsername}} 创建人： {{userInfo.username}} 时间：{{formateDate(new Date()).substr(0,10)}}
</el-form-item>
<el-form-item label="指派给" prop="handlerUsername">
{{editForm.handlerUsername}} <el-button @click="sendToAsk">指派给提出人</el-button><el-button @click="sendToCreater">指派给创建人</el-button><el-button @click="showGroupUsers('handlerUsername')">选其它人</el-button>
</el-form-item>
</el-col>
<el-col :span="12">
<el-row class="app-container">
<el-col :span="24" class="label-font">测试步骤</el-col>
<el-col :span="24" style="padding-top:12px;">
<div v-html="editForm.opStep"></div>
</el-col>
</el-row>
<el-row class="app-container">
<el-col :span="24" class="label-font">预期结果</el-col>
<el-col :span="24" style="padding-top:12px;">
<div v-html="editForm.expectResult"></div>
</el-col>
</el-row>
<el-row class="app-container">
<el-col :span="24" class="label-font">流转信息
<el-button icon="el-icon-search" v-if="flowInfoVisible==false" @click="showFlowInfo" >查询流转信息</el-button>
<el-button icon="el-icon-search" v-else @click="flowInfoVisible=false" >隐藏流转信息</el-button>
</el-col>
<el-col :span="24" style="padding-top:12px;">
<!--列表 XmQuestionHandle xm_question_handle-->
<el-table v-show="flowInfoVisible" max-height="300" :data="xmQuestionHandles" highlight-current-row v-loading="load.list" border style="width: 100%;">
<el-table-column sortable type="index" width="40"></el-table-column>
<el-table-column label="处理意见" prop="receiptMessage" min-width="200" >
<template slot-scope="scope">
<div v-html="scope.row.receiptMessage"></div>
</template>
</el-table-column>
<el-table-column prop="handlerUsername" label="指派动作" width="250" >
<template slot-scope="scope">
<el-tag>{{scope.row.handlerUsername}}</el-tag> 指派给 <el-tag> {{scope.row.targetUsername}} </el-tag><br><span style="font-size:8px;">{{scope.row.receiptTime}}</span>
</template>
</el-table-column>
<el-table-column prop="handleStatus" label="状态" width="80" :formatter="formatterOption"></el-table-column>
<el-table-column prop="handleSolution" label="解决方案" width="100" :formatter="formatterOption"></el-table-column>
</el-table>
</el-form-item>
<el-form-item label="处理意见" prop="description">
<vue-editor :id="'description_'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.receiptMessage"></vue-editor>
</el-form-item>
<el-form-item class="add-btns">
<el-col style="text-align:center;" :span="24">
<el-button @click.native="handleCancel">取消</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('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>
<el-button v-if="editForm.bugStatus=='confirmed'" v-loading="load.edit" type="primary" @click.native="handleQuestion('closed')" :disabled="load.edit==true">关闭</el-button>
<el-button v-if="editForm.bugStatus=='resolved'" v-loading="load.edit" type="primary" @click.native="handleQuestion('closed')" :disabled="load.edit==true">关闭</el-button>
<el-button v-if="editForm.bugStatus=='resolved'" v-loading="load.edit" type="primary" @click.native="handleQuestion('active')" :disabled="load.edit==true">重新激活</el-button>
<el-button v-if="editForm.bugStatus=='closed'" v-loading="load.edit" type="primary" @click.native="handleQuestion('active')" :disabled="load.edit==true">重新激活</el-button>
</el-col>
</el-form-item>
</el-form>
</el-table>
</el-col>
</el-row>
</el-col>
<el-col :span="24">
<el-form-item label="问题描述" prop="description">
<div v-html="editForm.description"></div>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="处理意见" prop="description">
<vue-editor :id="'description_'+editForm.id" :branch-id="userInfo.branchId" v-model="editForm.receiptMessage"></vue-editor>
</el-form-item>
</el-col>
</el-form>
</el-row>
<el-row class="app-container">
<el-col style="text-align:center;" :span="24">
<el-button @click.native="handleCancel">取消</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('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>
<el-button v-if="editForm.bugStatus=='confirmed'" v-loading="load.edit" type="primary" @click.native="handleQuestion('closed')" :disabled="load.edit==true">关闭</el-button>
<el-button v-if="editForm.bugStatus=='resolved'" v-loading="load.edit" type="primary" @click.native="handleQuestion('closed')" :disabled="load.edit==true">关闭</el-button>
<el-button v-if="editForm.bugStatus=='resolved'" v-loading="load.edit" type="primary" @click.native="handleQuestion('active')" :disabled="load.edit==true">重新激活</el-button>
<el-button v-if="editForm.bugStatus=='closed'" v-loading="load.edit" type="primary" @click.native="handleQuestion('active')" :disabled="load.edit==true">重新激活</el-button>
</el-col>
</el-row>
<el-dialog title="选中用户" :visible.sync="selectUserVisible" width="80%" append-to-body :close-on-click-modal="false"> <el-dialog title="选中用户" :visible.sync="selectUserVisible" width="80%" append-to-body :close-on-click-modal="false">
<xm-group-mng :sel-project="selProject" :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-mng> <xm-group-mng :sel-project="selProject" :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-mng>
</el-dialog> </el-dialog>
@ -133,9 +145,11 @@
}, },
'visible':function(visible) { 'visible':function(visible) {
if(visible==true){ if(visible==true){
this.getXmQuestionHandle();
//this.getXmQuestionHandle();
//从新打开页面时某些数据需要重新加载，可以在这里添加 //从新打开页面时某些数据需要重新加载，可以在这里添加
}
}else{
this.flowInfoVisible=false;
}
} }
}, },
data() { data() {
@ -170,6 +184,7 @@
userFieldName:'', userFieldName:'',
xmQuestionHandles:[], xmQuestionHandles:[],
selectTaskVisible:false, selectTaskVisible:false,
flowInfoVisible:false,
/**end 在上面加自定义属性**/ /**end 在上面加自定义属性**/
}//end return }//end return
},//end data },//end data
@ -325,6 +340,10 @@
this.editForm.handlerUsername=this.editForm.askUsername this.editForm.handlerUsername=this.editForm.askUsername
this.editForm.handlerUserid=this.editForm.askUserid this.editForm.handlerUserid=this.editForm.askUserid
},
showFlowInfo:function(){
this.flowInfoVisible=true;
this.getXmQuestionHandle();
} }
/**end 在上面加自定义方法**/ /**end 在上面加自定义方法**/
@ -345,7 +364,7 @@
this.options['urgencyLevel']=res.data.data.urgencyLevel this.options['urgencyLevel']=res.data.data.urgencyLevel
} }
}); });
this.getXmQuestionHandle();
//this.getXmQuestionHandle();
/**在下面写其它函数***/ /**在下面写其它函数***/
}//end mounted }//end mounted
@ -369,4 +388,8 @@
.add-btns >>> .el-form-item__content{ .add-btns >>> .el-form-item__content{
margin-left: 0 !important; margin-left: 0 !important;
} }
.label-font{
font-weight: 700;
font-size: 14px;
}
</style> </style>

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

@ -1,7 +1,8 @@
<template> <template>
<section> <section>
<el-row class="xm-question"> <el-row class="xm-question">
<el-row class="app-container">
<el-row class="app-container">
<el-select v-model="filters.bugStatus" placeholder="请选择状态" clearable @change="changeBugStatus"> <el-select v-model="filters.bugStatus" placeholder="请选择状态" clearable @change="changeBugStatus">
<el-option v-for="(b,index) in options['bugStatus']" :value="b.optionValue" :key="index" :label="b.optionName">{{b.optionName}} <el-option v-for="(b,index) in options['bugStatus']" :value="b.optionValue" :key="index" :label="b.optionName">{{b.optionName}}
</el-option> </el-option>
@ -17,18 +18,36 @@
<el-select v-model="filters.bugSeverity" placeholder="请选择严重程度" clearable @change="changeBugSeverity"> <el-select v-model="filters.bugSeverity" placeholder="请选择严重程度" clearable @change="changeBugSeverity">
<el-option v-for="(b,index) in options['bugSeverity']" :value="b.optionValue" :key="index" :label="b.optionName">{{b.optionName}} <el-option v-for="(b,index) in options['bugSeverity']" :value="b.optionValue" :key="index" :label="b.optionName">{{b.optionName}}
</el-option> </el-option>
</el-select>
<el-tag v-if="filters.selProject && !selProject" closable @close="clearProject" @click="showProjectList(true)">{{ filters.selProject.name }}</el-tag>
<el-tag v-if="!filters.selProject" @click="showProjectList(true)" type="success">未选项目，点我</el-tag>
指派给:<el-tag v-if="!filters.handlerUsername" @click="showGroupUsers('handlerUsername')">未选，点我</el-tag><el-tag v-if="filters.handlerUsername" closable @close="clearHandler" @click="showGroupUsers('handlerUsername')">{{filters.handlerUsername}}</el-tag>
<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>
</el-input>
<el-button @click="handleExport" type="primary" icon="el-icon-download">导出</el-button>
</el-select>
<el-input style="width:300px;" v-model="filters.key" placeholder="问题名称">
<template slot="append">
<el-button @click="searchXmQuestions" type="primary" icon="el-icon-search"></el-button>
</template>
</el-input>
<el-button type="primary" icon="el-icon-plus" @click="showAdd">
</el-button>
<el-popover
placement="top-start"
title=""
width="400"
trigger="hover" >
<el-row>
<el-col :span="24" style="padding-top:12px;">
<el-tag v-if="filters.selProject && !selProject" closable @close="clearProject" @click="showProjectList(true)">{{ filters.selProject.name }}</el-tag>
<el-tag v-if="!filters.selProject" @click="showProjectList(true)" type="success">未选项目，点我</el-tag>
</el-col>
<el-col :span="24" style="padding-top:12px;">
指派给:<el-tag v-if="!filters.handlerUsername" @click="showGroupUsers('handlerUsername')">未选，点我</el-tag>
<el-tag v-if="filters.handlerUsername" closable @close="clearHandler" @click="showGroupUsers('handlerUsername')">{{filters.handlerUsername}}</el-tag>
</el-col>
<el-col :span="24" style="padding-top:12px;">
<el-button @click="handleExport" icon="el-icon-download">导出</el-button>
</el-col>
</el-row>
<el-button slot="reference" icon="el-icon-more" circle></el-button>
</el-popover>
</el-row> </el-row>
<el-row class="app-container"> <el-row class="app-container">
<!--列表 XmQuestion xm_question--> <!--列表 XmQuestion xm_question-->
@ -36,7 +55,7 @@
<el-table-column sortable type="index" width="45"></el-table-column> <el-table-column sortable type="index" width="45"></el-table-column>
<el-table-column prop="name" label="问题名称" min-width="200"> <el-table-column prop="name" label="问题名称" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="primary" @click="showEdit(scope.row)">{{scope.row.id}}</el-link> &nbsp;{{scope.row.name}}
{{scope.row.id}}&nbsp;<el-link type="primary" @click="showEdit(scope.row)">{{scope.row.name}}</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="bugStatus" label="状态" width="100" :formatter="formatterOption"> <el-table-column prop="bugStatus" label="状态" width="100" :formatter="formatterOption">

Write Preview
Loading…
Cancel
Save