root/nl_demandmanage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add：首页、任务、需求

Browse Source
This commit is contained in:
liuxy
2025-01-20 10:07:22 +08:00
parent bf0248478c
commit e97a32433b
15 changed files with 410 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
nladmin-ui/src/views/monitor/server/index.vue
View File

@@ -15,7 +15,7 @@
</div>
<div style="color: #666; padding-top: 17px">
<span style="font-size: 15px;font-weight: bold">
{{ '刘先源, 上午好!' }}
{{ uiResultData.userInfo.userName + ', 辛苦了!' }}
</span>
</div>
<div style="color: #666; padding-top: 23px">
@@ -28,13 +28,13 @@
</div>
<div style="padding-top: 13px; width: 175px">
<span>
<el-progress :text-inside="true" :width="50" :stroke-width="20" :percentage="70"/>
<el-progress :text-inside="true" :width="50" :stroke-width="20" :percentage="uiResultData.userInfo.confirmTaskPer" />
</span>
</div>
</el-col>
<!-- 虚线 -->
<el-col :span="2">
<div class="vertical-dashed-line" style="width: 0px;height: 130px;border-left: 2px dashed #c4c4c4"></div>
<div class="vertical-dashed-line" style="width: 0px;height: 130px;border-left: 2px dashed #c4c4c4" />
</el-col>
<!-- 剩余工作统计 -->
<el-col :span="14">
@@ -56,13 +56,13 @@
</div>
<div style="color: #666; padding-top: 20px">
<span style="font-size: 20px;font-weight: bold;padding-left: 7px">
{{ '00' }}
{{ formatNum(uiResultData.userInfo.item ) }}
</span>
<span style="font-size: 20px;font-weight: bold;padding-left: 100px">
{{ '01' }}
{{ formatNum(uiResultData.userInfo.develop ) }}
</span>
<span style="font-size: 20px;font-weight: bold;padding-left: 97px">
{{ '12' }}
{{ formatNum(uiResultData.userInfo.other ) }}
</span>
</div>
</el-col>
@@ -79,7 +79,7 @@
<div class="t_btn2">
<el-table
ref="table"
:data="tableTaskData"
:data="uiResultData.tableTaskData"
:border="false"
:stripe="true"
size="mini"
@@ -87,9 +87,6 @@
>
<el-table-column show-overflow-tooltip prop="taskCode" label="任务编码" />
<el-table-column show-overflow-tooltip prop="taskName" label="任务描述" />
<el-table-column show-overflow-tooltip prop="demandVersion" label="需求版本" />
<el-table-column show-overflow-tooltip prop="projectName" label="项目名称" />
<el-table-column show-overflow-tooltip prop="projectCode" label="项目编码" />
<el-table-column show-overflow-tooltip prop="planDate" label="预计完成时间" width="120px" />
<el-table-column show-overflow-tooltip prop="useDate" label="消耗时间" />
<el-table-column show-overflow-tooltip prop="surplusDate" label="剩余时间" />
@@ -108,16 +105,16 @@
<div class="t_btn2">
<el-table
ref="table"
:data="tableItemNumData"
:data="uiResultData.tableItemNumData"
:border="false"
:stripe="true"
size="mini"
style="width: 100%;"
>
<el-table-column show-overflow-tooltip prop="itemName" label="项目名称" />
<el-table-column show-overflow-tooltip prop="totalTask" label="总任务数" />
<el-table-column show-overflow-tooltip prop="confirmTaskNum" label="已完成数" />
<el-table-column show-overflow-tooltip prop="overTaskNum" label="剩余任务数" />
<el-table-column show-overflow-tooltip prop="projectName" label="项目名称" />
<el-table-column show-overflow-tooltip prop="allTaskNum" label="总任务数" />
<el-table-column show-overflow-tooltip prop="ConfirmTaskNum" label="已完成数" />
<el-table-column show-overflow-tooltip prop="UnConfirmTaskNum" label="剩余任务数" />
</el-table>
</div>
</el-card>
@@ -136,16 +133,17 @@
<div class="t_btn2">
<el-table
ref="table"
:data="tableItemData"
:data="uiResultData.tableItemData"
:border="false"
:stripe="true"
size="mini"
@row-click="rowClick"
style="width: 100%;"
>
<el-table-column show-overflow-tooltip prop="itemName" label="项目名称" />
<el-table-column show-overflow-tooltip prop="itemRate" label="项目完成进度">
<el-table-column show-overflow-tooltip prop="projectName" label="项目名称" />
<el-table-column show-overflow-tooltip prop="itemConfirmPer" label="项目完成进度">
<template slot-scope="scope">
<el-progress :color="customColorMethod" :text-inside="true" :stroke-width="15" :percentage="scope.row.itemRate"/>
<el-progress :color="customColorMethod" :text-inside="true" :stroke-width="15" :percentage="scope.row.itemConfirmPer" />
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="onlineDate" label="上线时间" />
@@ -174,13 +172,13 @@
</div>
<div style="color: #666; padding-top: 20px; padding-left: 20px">
<span style="font-size: 20px;font-weight: bold;padding-left: 34px">
{{ '01' }}
{{ formatNum(uiResultData.userInfo.oneConfirmTask ) }}
</span>
<span style="font-size: 20px;font-weight: bold;padding-left: 100px">
{{ '01' }}
{{ formatNum(uiResultData.userInfo.oneUnConfirmTask ) }}
</span>
<span style="font-size: 20px;font-weight: bold;padding-left: 85px">
{{ '11' }}
{{ formatNum(uiResultData.userInfo.oneTotalTask ) }}
</span>
</div>
</el-card>
@@ -206,13 +204,13 @@
</div>
<div style="color: #666; padding-top: 20px; padding-left: 20px">
<span style="font-size: 20px;font-weight: bold;padding-left: 20px">
{{ '01' }}
{{ formatNum(uiResultData.userInfo.createItem ) }}
</span>
<span style="font-size: 20px;font-weight: bold;padding-left: 80px">
{{ '01' }}
{{ formatNum(uiResultData.userInfo.confirmItem ) }}
</span>
<span style="font-size: 20px;font-weight: bold;padding-left: 85px">
{{ '11' }}
{{ formatNum(uiResultData.userInfo.submitFile ) }}
</span>
</div>
<div style="color: #666; padding-top: 30px; padding-left: 20px">
@@ -225,10 +223,10 @@
</div>
<div style="color: #666; padding-top: 20px; padding-left: 20px">
<span style="font-size: 20px;font-weight: bold;padding-left: 20px">
{{ '01' }}
{{ formatNum(uiResultData.userInfo.createTask ) }}
</span>
<span style="font-size: 20px;font-weight: bold;padding-left: 80px">
{{ '01' }}
{{ formatNum(uiResultData.userInfo.confirmTask ) }}
</span>
</div>
</el-card>
@@ -240,43 +238,26 @@
</template>
<script>
import { initData } from '@/api/data'
import { queryHomeUiData } from '@/views/nlsystem/demandmanage/demandmanage'
export default {
name: 'ServerMonitor',
components: {},
data() {
return {
currentDate: '',
tableTaskData: [
{ 'taskCode': '120', 'taskName': '开能开发agv', 'demandVersion': 'V1.0.0.1', 'projectName': '上海开能', 'projectCode': 'H1110', 'overDate': '2025-01-23' },
{ 'taskCode': '120', 'taskName': '开能开发agv', 'demandVersion': 'V1.0.0.1', 'projectName': '上海开能', 'projectCode': 'H1110', 'overDate': '2025-01-23' },
{ 'taskCode': '120', 'taskName': '开能开发agv', 'demandVersion': 'V1.0.0.1', 'projectName': '上海开能', 'projectCode': 'H1110', 'overDate': '2025-01-23' },
{ 'taskCode': '120', 'taskName': '开能开发agv', 'demandVersion': 'V1.0.0.1', 'projectName': '上海开能', 'projectCode': 'H1110', 'overDate': '2025-01-23' },
{ 'taskCode': '120', 'taskName': '开能开发agv', 'demandVersion': 'V1.0.0.1', 'projectName': '上海开能', 'projectCode': 'H1110', 'overDate': '2025-01-23' }
],
tableItemData: [
{ 'itemName': '上海开能项目', 'itemRate': 10, 'onlineDate': '2025-01-01' },
{ 'itemName': '上海开能项目', 'itemRate': 67, 'onlineDate': '2025-01-01' },
{ 'itemName': '上海开能项目', 'itemRate': 32, 'onlineDate': '2025-01-01' },
{ 'itemName': '上海开能项目', 'itemRate': 80, 'onlineDate': '2025-01-01' }
],
tableItemNumData: [
{ 'itemName': '上海开能项目', 'totalTask': '10', 'confirmTaskNum': '2', 'overTaskNum': '8' },
{ 'itemName': '上海开能项目', 'totalTask': '10', 'confirmTaskNum': '2', 'overTaskNum': '8' },
{ 'itemName': '上海开能项目', 'totalTask': '10', 'confirmTaskNum': '2', 'overTaskNum': '8' },
{ 'itemName': '上海开能项目', 'totalTask': '10', 'confirmTaskNum': '2', 'overTaskNum': '8' }
],
uiResultData: null,
monitor: null
}
},
created() {
this.currentDate = this.getCurrentDate()
this.init()
this.monitor = window.setInterval(() => {
this.currentDate = this.getCurrentDate()
/* this.monitor = window.setInterval(() => {
setTimeout(() => {
this.init()
}, 2)
}, 3500)
}, 3500)*/
},
destroyed() {
clearInterval(this.monitor)
@@ -301,6 +282,31 @@ export default {
}
},
init() {
queryHomeUiData({}).then(res => {
this.uiResultData = res
})
},
// 格式化数字
formatNum(num) {
if (num === undefined) {
return '00'
}
num = num.toString()
if (num === '' || num === '0') {
return '00'
}
if (num.length < 2) {
return '0' + num
} else {
return num
}
},
// 本月上线项目点击时间
rowClick(row) {
debugger
queryHomeUiData({ 'id': row.id }).then(res => {
this.uiResultData = res
})
}
}
}

8
nladmin-ui/src/views/nlsystem/demandmanage/demandmanage.js
View File

@@ -40,4 +40,12 @@ export function queryUiData(data) {
})
}
export function queryHomeUiData(data) {
return request({
url: 'api/demandManage/queryHomeUiData',
method: 'post',
data
})
}
export default { add, edit, del, confirm, queryUiData }

10
nladmin-ui/src/views/nlsystem/demandtask/demantask.js
View File

@@ -64,4 +64,12 @@ export function startTask(data) {
})
}
export default { add, edit, del, queryUser, relevancyDemand, getUser, confirmUser, startTask }
export function confirmTask(data) {
return request({
url: 'api/demandTask/confirmTask',
method: 'post',
data
})
}
export default { add, edit, del, queryUser, relevancyDemand, getUser, confirmUser, startTask, confirmTask }

10
nladmin-ui/src/views/nlsystem/demandtask/index.vue
View File

@@ -89,7 +89,7 @@
icon="el-icon-check"
size="mini"
:disabled="crud.selections.length !== 1"
@click="confirm"
@click="confirmTask"
>
完成
</el-button>
@@ -283,6 +283,14 @@ export default {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
// 完成任务
confirmTask() {
const data = this.$refs.table.selection[0]
crudDemanTask.confirmTask(data).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}
}
}