!38 新增页面

Merge pull request !38 from hbzgyjh/auto-5488917-develop-1629881599558
This commit is contained in:
覃杰 2021-08-25 08:54:01 +00:00 committed by Gitee
commit 37a10f81cd
4 changed files with 127 additions and 103 deletions

View File

@ -1,7 +1,7 @@
import request from '@/utils/request' import request from '@/utils/request'
const projectApi = { const projectApi = {
// add: 'sys/menu/add', add: 'project/add',
// get: 'sys/menu/get', // get: 'sys/menu/get',
// update: 'sys/menu/update', // update: 'sys/menu/update',
// del: 'sys/menu/delete', // del: 'sys/menu/delete',
@ -9,13 +9,13 @@ const projectApi = {
list: 'project/pageList' list: 'project/pageList'
} }
// export function menuAdd (params) { export function projectAdd (params) {
// return request({ return request({
// url: menuApi.add, url: projectApi.add,
// method: 'post', method: 'post',
// data: params data: params
// }) })
// } }
// export function menuGet (params) { // export function menuGet (params) {
// return request({ // return request({
// url: menuApi.get, // url: menuApi.get,
@ -38,6 +38,7 @@ const projectApi = {
// }) // })
// } // }
export function getProjectList (params) { export function getProjectList (params) {
console.log("------------{}",params)
return request({ return request({
url: projectApi.list, url: projectApi.list,
method: 'get', method: 'get',

View File

@ -74,15 +74,21 @@ export const asyncRouterMap = [
// 项目管理 // 项目管理
{ {
path: '/project', path: '/project',
redirect: '/project/projectList', redirect: '/project/list',
component: RouteView, component: RouteView,
meta: { title: '项目管理', icon: bxAnaalyse, permission: ['from'] }, meta: { title: '项目管理', icon: bxAnaalyse, permission: ['from'] },
children: [ children: [
{ {
path: '/project/projectList', path: '/project/list',
name: 'projectList', name: 'projectList',
component: () => import('@/views/project/ProjectList'), component: () => import('@/views/project/ProjectList'),
meta: { title: '自主项目', keepAlive: true, permission: ['form'] } meta: { title: '自主项目', keepAlive: true, permission: ['form'] },
},
{
path: '/project/add',
name: 'ProjectForm',
component: () => import('@/views/project/ProjectForm'),
meta: { title: '新增项目', keepAlive: true, permission: ['form'] }
}, },
{ {
path: '/form/step-form', path: '/form/step-form',

View File

@ -0,0 +1,38 @@
<template>
<div>
<h1>hello word</h1>
</div>
</template>
<script>
//jsjsjson
//import from ''
export default {
//import使
name: 'projectForm',
components: {},
props: {},
data() {
//
return {}
},
// data
computed: {},
//data
watch: {},
//
methods: {},
created() {}, // - 访this
mounted() {}, // - 访DOM
beforeCreate() {}, // -
beforeMount() {}, // -
beforeUpdate() {}, // -
updated() {}, // -
beforeDestroy() {}, // -
destroyed() {}, // -
activated() {}, //keep-alive
}
</script>
<style scoped>
</style>

View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<a-space direction="vertical" style="width: 100%;"> <a-space direction="vertical" style="width: 100%">
<a-space direction="horizontal"> <a-space direction="horizontal">
项目名: 项目名:
<a-input v-model="queryParam.projectName" style="width: 100%" /> <a-input v-model="queryParam.projectName" style="width: 100%" />
@ -12,9 +12,9 @@
<a-select-option value="1">未发布</a-select-option> <a-select-option value="1">未发布</a-select-option>
</a-select> </a-select>
开始时间: 开始时间:
<a-date-picker v-model="queryParam.stateDate" style="width: 100%" placeholder="请输入开始时间" /> <a-date-picker v-model="queryParam.startDate" style="width: 100%" placeholder="请输入开始时间" valueFormat="YYYY-MM-DD HH:mm:ss"/>
结束时间: 结束时间:
<a-date-picker v-model="queryParam.endDate" style="width: 100%" placeholder="请输入结束时间" /> <a-date-picker v-model="queryParam.endDate" style="width: 100%" placeholder="请输入结束时间" valueFormat="YYYY-MM-DD HH:mm:ss"/>
培训方式: 培训方式:
<a-select v-model="queryParam.trainWay" placeholder="请选择" default-value="null" style="width: 120px"> <a-select v-model="queryParam.trainWay" placeholder="请选择" default-value="null" style="width: 120px">
<a-select-option value="null">全部</a-select-option> <a-select-option value="null">全部</a-select-option>
@ -29,40 +29,35 @@
</a-space> </a-space>
<a-space direction="horizontal"> <a-space direction="horizontal">
<a-button type="primary" icon="plus" @click="handleEdit()">新建</a-button> <a-button type="primary" icon="plus" @click="handledCreate()">新建</a-button>
<a-button type="primary" icon="minus" @click="handleEdit()">删除</a-button> <a-button type="primary" icon="minus" @click="handleEdit()">删除</a-button>
</a-space> </a-space>
<s-table ref="table" size="default" rowKey="key" :columns="columns" :data="loadData" :rowSelection="options.rowSelection"> <s-table
ref="table"
size="default"
rowKey="key"
:columns="columns"
:data="loadData"
:rowSelection="options.rowSelection"
>
<span slot="serial" slot-scope="text, record, index"> <span slot="serial" slot-scope="text, record, index">
{{ index + 1 }} {{ index + 1 }}
</span> </span>
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<template> <template>
<a @click="handleEdit(record)">编辑</a> <a href="javascript:;" @click="handleEdit(record)">修改</a>
<a-divider type="vertical" />
<a-popconfirm title="是否删除?" @confirm="() => handleDelete(record)">
<a href="javascript:;">删除</a>
</a-popconfirm>
<a-divider type="vertical" />
<a href="javascript:;" @click="handleDetail(record)">详情</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
</template> </template>
<a-dropdown>
<a class="ant-dropdown-link"> 更多
<a-icon type="down" />
</a>
<a-menu slot="overlay">
<a-menu-item>
<a href="javascript:;">详情</a>
</a-menu-item>
<a-menu-item v-if="$auth('table.disable')">
<a href="javascript:;">禁用</a>
</a-menu-item>
<a-menu-item v-if="$auth('table.delete')">
<a href="javascript:;">删除</a>
</a-menu-item>
</a-menu>
</a-dropdown>
</span> </span>
</s-table> </s-table>
</a-space> </a-space>
</div> </div>
</template> </template>
@ -70,102 +65,91 @@
import moment from 'moment' import moment from 'moment'
import { STable } from '@/components' import { STable } from '@/components'
import { getProjectList } from '@/api/project/project' import { getProjectList } from '@/api/project/project'
import ProjectForm from '@/views/project/ProjectForm'
import router from '@/router/index.js'
export default { export default {
name: 'TableList', name: 'ProjectList',
props: { },
components: { components: {
STable, STable,
ProjectForm,
router
}, },
data() { data() {
return { return {
mdl: {},
// /
advanced: false,
// //
queryParam: {}, queryParam: {},
// //
columns: [ columns: [
{ { title: '序号', width: 60, scopedSlots: { customRender: 'serial' } },
title: '序号', { title: '项目名称', dataIndex: 'projectName', key: 'projectName' },
width: 60,
scopedSlots: { customRender: 'serial' },
},
{
title: '项目名称',
dataIndex: 'projectName',
key: 'projectName'
},
{ {
title: '时间', title: '时间',
dataIndex: 'description', dataIndex: 'startDate',
}, customRender: (text, record, index) => {
{ return record.startDate + ' - ' + record.endDate
title: '人数', },
dataIndex: 'callNo',
// sorter: true,
needTotal: true,
// customRender: (text) => text + ' ',
},
{
title: '项目类型',
dataIndex: 'description',
}, },
{ title: '人数', dataIndex: 'personNum', customRender: (text) => text + '人' },
{ title: '项目类型', dataIndex: 'projectType' },
{ {
title: '项目状态', title: '项目状态',
dataIndex: 'description', dataIndex: 'status',
customRender: (text, record, index) => {
// 1- 2- 3- 4- 5-
if (text == 1) {
return '未发布'
}
if (text == 2) {
return '未开始'
}
if (text == 3) {
return '进行中'
}
if (text == 4) {
return '已完成'
}
if (text == 5) {
return '已中止'
}
},
}, },
{ { title: '创建人员', dataIndex: 'createBy' },
title: '创建人员', { title: '创建时间', dataIndex: 'createDate' },
dataIndex: 'projectStatus',
},
{
title: '创建时间',
dataIndex: 'updatedAt',
sorter: true,
},
// {
// title: '',
// dataIndex: 'action',
// width: '150px',
// scopedSlots: { customRender: 'action' },
// },
{ {
title: '操作', title: '操作',
key: 'operation', key: 'operation',
width: 100, width: 200,
align: 'center', align: 'center',
scopedSlots: { customRender: 'action' } scopedSlots: { customRender: 'action' },
} },
], ],
// Promise // Promise
loadData: parameter => { loadData: (parameter) => {
return getProjectList(Object.assign(parameter, this.queryParam)).then(res => { return res; }) return getProjectList(Object.assign(parameter, this.queryParam)).then((res) => {
return res
})
}, },
selectedRowKeys: [], selectedRowKeys: [],
selectedRows: [], selectedRows: [],
// custom table alert & rowSelection
options: {
alert: {
show: true,
clear: () => {
this.selectedRowKeys = []
},
},
rowSelection: {
selectedRowKeys: this.selectedRowKeys,
onChange: this.onSelectChange,
},
},
optionAlertShow: false,
} }
}, },
created() { created() {
this.tableOption() this.tableOption()
getRoleList({ t: new Date() })
}, },
methods: { methods: {
//
handledCreate() {
return this.$router.push(
// {name: 'ProjectForm'}
{path: 'project/project/add',}
)
// router.push()
},
tableOption() { tableOption() {
if (!this.optionAlertShow) { if (!this.optionAlertShow) {
this.options = { this.options = {
@ -190,11 +174,6 @@ export default {
} }
}, },
handleEdit(record) {
this.$emit('onEdit', record)
},
handleOk() { },
onSelectChange(selectedRowKeys, selectedRows) { onSelectChange(selectedRowKeys, selectedRows) {
this.selectedRowKeys = selectedRowKeys this.selectedRowKeys = selectedRowKeys
this.selectedRows = selectedRows this.selectedRows = selectedRows