lingling
/
welfare-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop

This commit is contained in:
aoli.qu 2021-08-24 15:08:45 +08:00
parent 6ee4855483 3b1251ce56
commit ba8e580e10
4 changed files with 124 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/project/project.js
View File

@ -6,7 +6,7 @@ const projectApi = {
// update: 'sys/menu/update', // update: 'sys/menu/update',
// del: 'sys/menu/delete', // del: 'sys/menu/delete',
// updateStatus: 'sys/menu/updateStatus', // updateStatus: 'sys/menu/updateStatus',
list: 'project/projectList' list: 'project/pageList'
} }
// export function menuAdd (params) { // export function menuAdd (params) {
@ -41,11 +41,7 @@ export function getProjectList (params) {
return request({ return request({
url: projectApi.list, url: projectApi.list,
method: 'get', method: 'get',
data: params, params: params
headers: {
'Authorization':'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdhYTViMGZiLTkyOWQtNDhhZS04ODU1LWJkNzM5MjdlOTNiZCJ9.CZzowaB-w2krGpNttPZBNLfq1mw775Lh-sx1K8onfgSwNzA6bw-P7CqC4vgH29xjDv3ey4zEFDzV9pHnrAGrDA'
}
//Authorization: "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdhYTViMGZiLTkyOWQtNDhhZS04ODU1LWJkNzM5MjdlOTNiZCJ9.CZzowaB-w2krGpNttPZBNLfq1mw775Lh-sx1K8onfgSwNzA6bw-P7CqC4vgH29xjDv3ey4zEFDzV9pHnrAGrDA"
}) })
} }
// export function menuUpdateStatus (params) { // export function menuUpdateStatus (params) {

27
src/config/router.config.js
View File

@ -65,6 +65,33 @@ export const asyncRouterMap = [
} }
] ]
}, },
// 项目管理
{
path: '/project',
redirect: '/project/projectList',
component: RouteView,
meta: { title: '项目管理', icon: bxAnaalyse, permission: [ 'from' ] },
children: [
{
path: '/project/projectList',
name: 'projectList',
component: () => import('@/views/project/ProjectList'),
meta: { title: '自主项目', keepAlive: true, permission: [ 'form' ] }
},
{
path: '/form/step-form',
name: 'StepForm',
component: () => import('@/views/form/stepForm/StepForm'),
meta: { title: '系统推荐', keepAlive: true, permission: [ 'form' ] }
},
{
path: '/form/advanced-form',
name: 'AdvanceForm',
component: () => import('@/views/form/advancedForm/AdvancedForm'),
meta: { title: '终端培训', keepAlive: true, permission: [ 'form' ] }
}
]
},
// forms // forms
{ {
path: '/form', path: '/form',

4
src/core/lazy_use.js
View File

@ -44,7 +44,8 @@ import {
Statistic, Statistic,
Descriptions, Descriptions,
message, message,
notification notification,
space
} from 'ant-design-vue' } from 'ant-design-vue'
import Viser from 'viser-vue' import Viser from 'viser-vue'
@ -97,6 +98,7 @@ Vue.use(PageHeader)
Vue.use(Result) Vue.use(Result)
Vue.use(Statistic) Vue.use(Statistic)
Vue.use(Descriptions) Vue.use(Descriptions)
Vue.use(space)
Vue.prototype.$confirm = Modal.confirm Vue.prototype.$confirm = Modal.confirm
Vue.prototype.$message = message Vue.prototype.$message = message

245
src/views/project/ProjectList.vue
View File

@ -1,132 +1,68 @@
<template> <template>
<div> <div>
<div class="table-page-search-wrapper"> <a-space direction="vertical" style="width: 100%;">
<a-form layout="inline"> <a-space direction="horizontal">
<a-row :gutter="48"> 项目名:
<a-col :md="8" :sm="24"> <a-input v-model="queryParam.projectName" style="width: 100%" />
<a-form-item label="项目名"> 项目状态:
<a-input v-model="queryParam.projectName" style="width: 100%" /> <a-select v-model="queryParam.status" placeholder="请选择" default-value="null" style="width: 120px">
</a-form-item> <a-select-option value="null">全部</a-select-option>
</a-col> <a-select-option value="1">运行中</a-select-option>
<a-col :md="8" :sm="24"> <a-select-option value="2">已结束</a-select-option>
<a-form-item label="项目状态"> <a-select-option value="1">未发布</a-select-option>
<a-select v-model="queryParam.status" placeholder="请选择" default-value="null" weight="20px"> </a-select>
<a-select-option value="null">全部</a-select-option> 开始时间:
<a-select-option value="1">运行中</a-select-option> <a-date-picker v-model="queryParam.stateDate" style="width: 100%" placeholder="请输入开始时间" />
<a-select-option value="2">已结束</a-select-option> 结束时间:
<a-select-option value="1">未发布</a-select-option> <a-date-picker v-model="queryParam.endDate" style="width: 100%" placeholder="请输入结束时间" />
</a-select> 培训方式:
</a-form-item> <a-select v-model="queryParam.trainWay" placeholder="请选择" default-value="null" style="width: 120px">
</a-col> <a-select-option value="null">全部</a-select-option>
<a-col :md="8" :sm="24"> <a-select-option value="1">培训</a-select-option>
<a-form-item label="开始时间"> <a-select-option value="2">考试</a-select-option>
<a-date-picker v-model="queryParam.stateDate" style="width: 100%" placeholder="请输入开始时间" /> <a-select-option value="3">培训-练习</a-select-option>
</a-form-item> <a-select-option value="4">培训-练习-考试</a-select-option>
</a-col> </a-select>
<a-col :md="8" :sm="24">
<a-form-item label="结束时间">
<a-date-picker v-model="queryParam.endDate" style="width: 100%" placeholder="请输入结束时间" />
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
<a-form-item label="培训方式">
<a-select v-model="queryParam.trainWay" placeholder="请选择" default-value="null" weight="20px">
<a-select-option value="null">全部</a-select-option>
<a-select-option value="1">培训</a-select-option>
<a-select-option value="2">考试</a-select-option>
<a-select-option value="3">培训-练习</a-select-option>
<a-select-option value="4">培训-练习-考试</a-select-option>
</a-select>
</a-form-item>
</a-col>
<!-- <template v-if="advanced">
<a-col :md="8" :sm="24">
<a-form-item label="调用次数">
<a-input-number v-model="queryParam.callNo" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
<a-form-item label="更新日期">
<a-date-picker v-model="queryParam.date" style="width: 100%" placeholder="请输入更新日期" />
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
<a-form-item label="使用状态">
<a-select v-model="queryParam.useStatus" placeholder="请选择" default-value="0">
<a-select-option value="0">全部</a-select-option>
<a-select-option value="1">关闭</a-select-option>
<a-select-option value="2">运行中</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
<a-form-item label="使用状态">
<a-select placeholder="请选择" default-value="0">
<a-select-option value="0">全部</a-select-option>
<a-select-option value="1">关闭</a-select-option>
<a-select-option value="2">运行中</a-select-option>
</a-select>
</a-form-item>
</a-col>
</template> -->
<a-col :md="(!advanced && 8) || 24" :sm="24">
<span
class="table-page-search-submitButtons"
:style="(advanced && { float: 'right', overflow: 'hidden' }) || {}"
>
<a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
<a-button style="margin-left: 8px" @click="() => (queryParam = {})">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
<div class="table-operator"> <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">查询</a-button>
<a-button type="primary" icon="plus" @click="handleEdit()">新建</a-button> <a-button icon="redo" @click="() => (queryParam = {})">重置</a-button>
<!-- <a-button type="dashed" @click="tableOption">{{ (optionAlertShow && '关闭') || '开启' }} alert</a-button> --> </a-space>
<a-dropdown v-action:edit v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay"> <a-space direction="horizontal">
<a-menu-item key="1"><a-icon type="delete" />删除</a-menu-item> <a-button type="primary" icon="plus" @click="handleEdit()">新建</a-button>
<a-menu-item key="2"><a-icon type="lock" />锁定</a-menu-item> <a-button type="primary" icon="minus" @click="handleEdit()">删除</a-button>
</a-menu> </a-space>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /> </a-button>
</a-dropdown> <s-table ref="table" size="default" rowKey="key" :columns="columns" :data="loadData" :rowSelection="options.rowSelection">
</div> <span slot="serial" slot-scope="text, record, index">
{{ index + 1 }}
</span>
<span slot="action" slot-scope="text, record">
<template>
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
</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>
</s-table>
</a-space>
<s-table
ref="table"
size="default"
rowKey="key"
:columns="columns"
:data="loadData"
:alert="options.alert"
:rowSelection="options.rowSelection"
>
<span slot="serial" slot-scope="text, record, index">
{{ index + 1 }}
</span>
<span slot="action" slot-scope="text, record">
<template>
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
</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>
</s-table>
</div> </div>
</template> </template>
@ -150,59 +86,62 @@ export default {
// 表头 // 表头
columns: [ columns: [
{ {
title: '#', title: '序号',
width: 60,
scopedSlots: { customRender: 'serial' }, scopedSlots: { customRender: 'serial' },
}, },
{ {
title: '项目名称', title: '项目名称',
dataIndex: 'projectName', dataIndex: 'projectName',
key: 'projectName'
}, },
{ {
title: '时间', title: '时间',
dataIndex: 'description', dataIndex: 'description',
}, },
{ {
title: '服务调用次数', title: '人数',
dataIndex: 'callNo', dataIndex: 'callNo',
sorter: true, // sorter: true,
needTotal: true, needTotal: true,
customRender: (text) => text + ' 次', // customRender: (text) => text + ' 次',
}, },
{ {
title: '状态', title: '项目类型',
dataIndex: 'description',
},
{
title: '项目状态',
dataIndex: 'description',
},
{
title: '创建人员',
dataIndex: 'projectStatus', dataIndex: 'projectStatus',
needTotal: true,
}, },
{ {
title: '更新时间', title: '创建时间',
dataIndex: 'updatedAt', dataIndex: 'updatedAt',
sorter: true, sorter: true,
}, },
// {
// title: '操作',
// dataIndex: 'action',
// width: '150px',
// scopedSlots: { customRender: 'action' },
// },
{ {
title: '操作', title: '操作',
dataIndex: 'action', key: 'operation',
width: '150px', width: 100,
scopedSlots: { customRender: 'action' }, align: 'center',
}, scopedSlots: { customRender: 'action' }
}
], ],
// 加载数据方法 必须为 Promise 对象 // 加载数据方法 必须为 Promise 对象
loadData: (parameter) => { loadData: parameter => {
console.log('loadData.parameter', parameter) return getProjectList(Object.assign(parameter, this.queryParam)).then(res => { return res; })
return getProjectList(Object.assign(parameter, this.queryParam)).then((res) => {
return res.rows
})
}, },
// // 加载数据方法 必须为 Promise 对象
// loadData: (parameter) => {
// console.log('loadData.parameter', parameter)
// return request({
// url: '/dawa/project/pageList',
// method: get,
// data: this.queryParam,
// })
// },
selectedRowKeys: [], selectedRowKeys: [],
selectedRows: [], selectedRows: [],
@ -254,7 +193,7 @@ export default {
handleEdit(record) { handleEdit(record) {
this.$emit('onEdit', record) this.$emit('onEdit', record)
}, },
handleOk() {}, handleOk() { },
onSelectChange(selectedRowKeys, selectedRows) { onSelectChange(selectedRowKeys, selectedRows) {
this.selectedRowKeys = selectedRowKeys this.selectedRowKeys = selectedRowKeys