Browse Source

界面优化

master
陈裕财 5 years ago
parent
commit
b55ab03b1e
  1. 2
      src/views/xm/core/xmMenu/XmMenuSelect.vue
  2. 17
      src/views/xm/core/xmMenu/XmMenuWithPlan.vue
  3. 12
      src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
  4. 2
      src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
  5. 14
      src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
  6. 30
      src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
  7. 14
      src/views/xm/core/xmProjectState/XmProjectStateMng.vue
  8. 14
      src/views/xm/core/xmQuestion/XmQuestionMng.vue
  9. 8
      src/views/xm/core/xmTask/XmTaskMng.vue
  10. 4
      src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue

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

@ -16,7 +16,7 @@
<el-button type="warning" v-if="multi" v-on:click="multiSelectedConfirm">确认选择</el-button>
</el-row>
<el-row class="app-container">
<el-table :data="xmMenusTreeData" default-expand-all row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table max-height="650" :data="xmMenusTreeData" default-expand-all row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column v-if="multi" type="selection" width="50"></el-table-column>
<el-table-column prop="menuName" label="故事名称" min-width="140" >
<template slot-scope="scope">

17
src/views/xm/core/xmMenu/XmMenuWithPlan.vue

@ -2,15 +2,18 @@
<section>
<el-row class="app-container">
<el-checkbox v-model="gstcVisible" >甘特图</el-checkbox>
<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="searchXmMenus">查询</el-button>
<el-button type="warning" v-if=" batchEditVisible!=true " v-loading="load.edit" :disabled="load.edit==true" v-on:click="loadTasksToXmMenuPlan">根据任务汇总更新数据</el-button>
<el-button type="primary" v-if=" batchEditVisible!=true " @click="showBatchEdit" v-loading="load.edit">批量修改</el-button>
<el-button type="primary" v-if=" batchEditVisible==true " @click="saveBatchEdit" v-loading="load.edit">批量保存</el-button>
<el-button type="primary" v-if=" batchEditVisible==true " @click="noBatchEdit" v-loading="load.edit">返回</el-button>
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
<template slot="append">
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus" icon="el-icon-search"></el-button>
</template>
</el-input>
<el-button type="warning" v-if=" batchEditVisible!=true " v-loading="load.edit" :disabled="load.edit==true" v-on:click="loadTasksToXmMenuPlan" icon="el-icon-s-data">根据任务汇总更新数据</el-button>
<el-button type="primary" v-if=" batchEditVisible!=true " @click="showBatchEdit" v-loading="load.edit" icon="el-icon-edit">批量修改</el-button>
<el-button type="primary" v-if=" batchEditVisible==true " @click="saveBatchEdit" v-loading="load.edit" icon="el-icon-finished">批量保存</el-button>
<el-button v-if=" batchEditVisible==true " @click="noBatchEdit" v-loading="load.edit" icon="el-icon-back">返回</el-button>
</el-row>
<el-row class="app-container" v-show="!batchEditVisible">
<el-table v-if="!gstcVisible" :data="xmMenusTreeData" default-expand-all row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table max-height="650" v-if="!gstcVisible" :data="xmMenusTreeData" default-expand-all row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @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 prop="menuName" label="故事名称" min-width="150" >
<template slot-scope="scope">

12
src/views/xm/core/xmProjectContract/XmProjectContractMng.vue

@ -1,10 +1,14 @@
<template>
<section>
<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="searchXmProjectContracts">查询</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-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
<template slot="append">
<el-button v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectContracts" icon="el-icon-search"></el-button>
</template>
</el-input>
<el-button type="primary" @click="showAdd" icon="el-icon-plus">添加合同</el-button>
<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete">批量删除</el-button>
</el-row>
<el-row class="app-container">
<!--列表 XmProjectContract xm_project_contract-->

2
src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue

@ -2,7 +2,7 @@
<section>
<el-row class="app-container">
<el-col :span="16">
<el-button type="primary" @click="userConfirm">确认选择用户</el-button>
<el-button type="primary" @click="userConfirm" icon="el-icon-finished">确认选择用户</el-button>
</el-col>
<el-col :span="8" class="hidden-sm-and-down">
<el-tooltip content="黄色表示选中"><span class="addXmProjectGroupFormworkSquare"></span></el-tooltip>

14
src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue

@ -2,14 +2,14 @@
<section>
<el-row class="app-container">
<el-col :span="16">
<el-button v-if="!isSelectSingleUser && !isSelectMultiUser" type="plain" @click="showGroupFormwork">从模板导入项目团队组</el-button>
<el-button v-if="!isSelectSingleUser && !isSelectMultiUser" type="primary" @click="groupConfirm">保存</el-button>
<el-button v-if="!isSelectSingleUser && !isSelectMultiUser" type="warning" @click="showGroupState">查看团队进度</el-button>
<el-button v-if="!isSelectSingleUser && !isSelectMultiUser" type="primary" @click="showGroupFormwork" icon="el-icon-plus">从模板导入项目团队组</el-button>
<el-button v-if="!isSelectSingleUser && !isSelectMultiUser" type="primary" @click="groupConfirm" icon="el-icon-finished">保存</el-button>
<el-button v-if="!isSelectSingleUser && !isSelectMultiUser" type="plain" @click="showGroupState" icon="el-icon-s-data">查看团队进度</el-button>
<el-button v-else type="primary" @click="userConfirm">确认选择用户</el-button>
<el-button v-if="!isSelectSingleUser && !isSelectMultiUser" type="plain" @click="xmRecordVisible=true">查看团队变化日志</el-button>
<el-button v-if="!isSelectSingleUser && !isSelectMultiUser" type="plain" @click="doSearchImGroupsByProjectId">查看绑定即聊情况</el-button>
<el-button @click="groupRoleDescVisible=true">角色说明</el-button>
<el-button v-else type="primary" @click="userConfirm" icon="el-icon-finished">确认选择用户</el-button>
<el-button v-if="!isSelectSingleUser && !isSelectMultiUser" type="plain" @click="xmRecordVisible=true" icon="el-icon-document">查看团队变化日志</el-button>
<el-button v-if="!isSelectSingleUser && !isSelectMultiUser" type="plain" @click="doSearchImGroupsByProjectId" icon="el-icon-document">查看绑定即聊情况</el-button>
<el-button @click="groupRoleDescVisible=true" icon="el-icon-document">角色说明</el-button>
</el-col>
<el-col :span="8" class="hidden-sm-and-down">

30
src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue

@ -2,17 +2,17 @@
<section>
<el-row class="app-container" v-if="simple!==true">
<el-button v-if="batchEditVisible==false" type="success" @click="showAdd" v-loading="load.add">添加计划</el-button>
<el-button v-if="batchEditVisible==false" type="success" @click="showPhaseTemplate" v-loading="load.add">由模板导入计划</el-button>
<el-button v-if="batchEditVisible==false" type="success" @click="showMenu" v-loading="load.add">由故事批量创建</el-button>
<el-button v-if="batchEditVisible==false" type="primary" @click="showAdd" v-loading="load.add" icon="el-icon-plus">添加计划</el-button>
<el-button v-if="batchEditVisible==false" type="primary" @click="showPhaseTemplate" v-loading="load.add" icon="el-icon-plus">由模板导入计划</el-button>
<el-button v-if="batchEditVisible==false" type="primary" @click="showMenu" v-loading="load.add" icon="el-icon-plus">由故事批量创建</el-button>
<el-button v-if="batchEditVisible==false" type="warning" @click="loadTasksToXmProjectPhase(sels)" v-loading="load.edit">由任务汇总实际数据</el-button>
<el-button type="success" v-if="batchEditVisible==false" @click="batchEditVisible=true" v-loading="load.edit">批量修改</el-button>
<el-button v-if="batchEditVisible==true" type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button>
<el-button type="warning" v-if="batchEditVisible==true" @click="saveBatchEdit" v-loading="load.edit">批量保存</el-button>
<el-button v-if="batchEditVisible==false" type="warning" @click="loadTasksToXmProjectPhase(sels)" v-loading="load.edit" icon="el-icon-s-data">由任务汇总实际数据</el-button>
<el-button type="success" v-if="batchEditVisible==false" @click="batchEditVisible=true" v-loading="load.edit" icon="el-icon-edit">批量修改</el-button>
<el-button v-if="batchEditVisible==true" type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete">批量删除</el-button>
<el-button type="warning" v-if="batchEditVisible==true" @click="saveBatchEdit" v-loading="load.edit" icon="el-icon-finished">批量保存</el-button>
<el-button v-if=" batchEditVisible==true" type="success" @click="handlePopover(null,'add')" >+计划</el-button>
<el-button type="primary" v-if="batchEditVisible==true" @click="noBatchEdit" v-loading="load.edit">返回</el-button>
<el-button v-if=" batchEditVisible==true" type="success" @click="handlePopover(null,'add')" icon="el-icon-plus"></el-button>
<el-button v-if="batchEditVisible==true" @click="noBatchEdit" v-loading="load.edit" icon="el-icon-back">返回</el-button>
</el-row>
<el-row class="app-container" v-if="simple!==true">
@ -22,11 +22,15 @@
<span style="margin-left:10px;font-size:14px;">外购人力总预算</span><el-tag :type="phaseBudgetData.surplusPlanOutUserAt>0?'warning':'danger'">{{toFixed(selProject.planOutUserAt/10000,2)}}{{toFixed(phaseBudgetData.surplusPlanOutUserAt/10000,2)}}</el-tag>
<div v-if="batchEditVisible!=true" style=" float:right;margin-right:10px;" >
<el-checkbox v-model="gstcVisible" >甘特图</el-checkbox>
<el-input v-model="filters.key" style="width:200px;" placeholder="模糊查询"></el-input>
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectPhases">查询</el-button>
<el-input v-model="filters.key" style="width:200px;" placeholder="模糊查询">
<template slot="append">
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectPhases" icon="el-icon-search"></el-button>
</template>
</el-input>
</div>
</el-row>
<el-table ref="selectPhaseTable" v-show="simple==true" :data="projectPhaseTreeData" :show-summary="false" row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table max-height="650" ref="selectPhaseTable" v-show="simple==true" :data="projectPhaseTreeData" :show-summary="false" row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column prop="phaseName" label="阶段名称" min-width="160" >
<template slot="header" slot-scope="scope">
<div>阶段名称 <el-tag size="mini" v-if="editForm.id" closable @close="clearSelectPhase()">{{editForm.seqNo}}&nbsp;{{editForm.phaseName}}</el-tag></div>
@ -39,7 +43,7 @@
<el-pagination v-show="simple==true" layout="total, 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 class="app-container" v-show="simple!=true">
<!--列表 XmProjectPhase xm_project_phase-->
<el-table v-show="!gstcVisible && batchEditVisible==false && simple!==true" default-expand-all :data="projectPhaseTreeData" :summary-method="getSummariesForNoBatchEdit" :show-summary="true" row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table max-height="650" v-show="!gstcVisible && batchEditVisible==false && simple!==true" default-expand-all :data="projectPhaseTreeData" :summary-method="getSummariesForNoBatchEdit" :show-summary="true" row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @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 prop="phaseName" label="阶段名称" min-width="160" >
<template slot-scope="scope">

14
src/views/xm/core/xmProjectState/XmProjectStateMng.vue

@ -1,15 +1,19 @@
<template>
<section>
<el-row class="app-container">
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input>
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
<template slot="append">
<el-button v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectStates" icon="el-icon-search"></el-button>
</template>
</el-input>
<el-tag v-if="!this.selProject && this.filters.selProject " closable @close="closeSelectProject">{{this.filters.selProject.name}}</el-tag><el-button v-if="!this.selProject" @click="showProjectList" type="plian">选项目</el-button>
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectStates">查询</el-button>
<el-button type="success" @click="loadTasksToXmProjectState">刷新数据</el-button>
<el-button type="success" @click="loadTasksSettleToXmProjectState">刷新结算数据</el-button>
<el-button type="success" @click="loadTasksToXmProjectState" icon="el-icon-s-data">刷新数据</el-button>
<el-button type="success" @click="loadTasksSettleToXmProjectState" icon="el-icon-s-data">刷新结算数据</el-button>
</el-row>
<el-row class="app-container">
<!--列表 XmProjectState 项目指标日统计表-->
<el-table :data="xmProjectStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table max-height="650" :data="xmProjectStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column type="selection" width="45"></el-table-column>
<el-table-column sortable type="index" width="45"> </el-table-column>
<el-table-column type="expand" width="45">

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

@ -5,7 +5,7 @@
<el-menu-item class="showall" index="">全部状态</el-menu-item>
<el-menu-item v-for="(b,index) in options['bugStatus']" :index="b.optionValue" :key="index">{{b.optionName}}</el-menu-item>
<div style="line-height:50px;float:right;margin-right:10px;">
<el-button @click="showAdd" type="success">{{qtype=='risk'?'新建风险':'新建问题'}}</el-button>
<el-button @click="showAdd" type="primary" icon="el-icon-plus">{{qtype=='risk'?'新建风险':'新建问题'}}</el-button>
</div>
</el-menu>
<el-menu active-text-color="#00abfc" :default-active="filters.solution" @select="changeSolution" class="el-menu-demo" mode="horizontal">
@ -24,13 +24,17 @@
<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="问题名称"></el-input>
<el-button @click="searchXmQuestions" type="primary">查询</el-button>
<el-button @click="handleExport" type="primary">导出</el-button>
<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>
</div>
</el-menu>
<!--列表 XmQuestion xm_question-->
<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 max-height="650" :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">
<template slot-scope="scope">

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

@ -43,13 +43,13 @@
trigger="hover" >
<el-row>
<el-col :span="24" style="padding-top:5px;">
<el-button type="primary" v-if=" isTaskCenter!='1' && isMy!='1'" @click="showBatchEdit" v-loading="load.edit">批量修改任务</el-button>
<el-button type="primary" v-if=" isTaskCenter!='1' && isMy!='1'" @click="showBatchEdit" v-loading="load.edit" icon="el-icon-edit">批量修改任务</el-button>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-button v-if=" isTaskCenter!='1' && isMy!='1'" @click="showTaskTemplate" type="success">从模板快速导入任务</el-button>
<el-button v-if=" isTaskCenter!='1' && isMy!='1'" @click="showTaskTemplate" type="success" icon="el-icon-plus">从模板快速导入任务</el-button>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-button v-if=" isTaskCenter!='1' && isMy!='1'" @click="showMenu" type="success">由故事快速创建任务</el-button>
<el-button v-if=" isTaskCenter!='1' && isMy!='1'" @click="showMenu" type="success" icon="el-icon-plus">由故事快速创建任务</el-button>
</el-col>
</el-row>
<el-button slot="reference" icon="el-icon-more" circle></el-button>
@ -533,7 +533,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
xmTasks: [],//
pageInfo:{//
total:0,//0>0
pageSize:10,//
pageSize:20,//
count:false,//
pageNum:1,//1
orderFields:['create_time'],// ['sex','student_id']

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

@ -26,8 +26,8 @@
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTestCaseExecs" icon="el-icon-search"></el-button>
</template>
</el-input>
<el-button v-if="batchEditVisible" type="warning" @click="batchEditXmTestCaseExec">批量保存</el-button>
<el-button v-if="batchEditVisible" type="success" @click="noBatchEdit" icon="el-icon-back">返回</el-button>
<el-button v-if="batchEditVisible" type="warning" @click="batchEditXmTestCaseExec" icon="el-icon-finished">批量保存</el-button>
<el-button v-if="batchEditVisible" @click="noBatchEdit" icon="el-icon-back">返回</el-button>
</el-row>
<el-row class="app-container">
<!--列表 XmTestCaseExec xm_test_case_exec-->

Loading…
Cancel
Save