提交 c3896cbf 编写于 作者: 刘英杰's avatar 刘英杰

- 20240919 房间管理 修复未提交dock_state 字段

上级 94eb886c
流水线 #29362 已失败 ,包含阶段
in 30 second
.ivu-form-item[data-v-14beac01]{padding-right:15px}.fileRow[data-v-14beac01]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-14beac01]{color:#ed4014}.fileRow .delIcon[data-v-14beac01]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}.cyrIcon[data-v-5d7afb56]{color:#515a6e}.cyrIcon[data-v-5d7afb56]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-5d7afb56]:active{color:#3f485c}
\ No newline at end of file
.ivu-form-item[data-v-14beac01]{padding-right:15px}.fileRow[data-v-14beac01]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-14beac01]{color:#ed4014}.fileRow .delIcon[data-v-14beac01]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}.cyrIcon[data-v-3446cdf4]{color:#515a6e}.cyrIcon[data-v-3446cdf4]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-3446cdf4]:active{color:#3f485c}
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>场地管理</title><link href=css/app.f8f860e0.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 场地管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors.c0d93cbb.js></script><script src=js/app.59b6d3e7.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>场地管理</title><link href=css/app~748942c6.f8f860e0.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 场地管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors~253ae210.9f23d3b4.js></script><script src=js/chunk-vendors~678f84af.ad057430.js></script><script src=js/app~748942c6.e7a53109.js></script></body></html>
\ No newline at end of file
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
......@@ -16,3 +16,4 @@ export * from "./getApiActivityParticipantDel";
export * from "./getApiActivityGetActivityTrackList";
export * from "./getApiActivityActivityApplyTime";
export * from "./getApiActivityActivityOverTimeApproval";
export * from "./postApiActivityExport";
......@@ -16,3 +16,4 @@ export * from "./getApiActivityParticipantDel";
export * from "./getApiActivityGetActivityTrackList";
export * from "./getApiActivityActivityApplyTime";
export * from "./getApiActivityActivityOverTimeApproval";
export * from "./postApiActivityExport";
import { type AxiosRequestConfig } from "axios";
import { type ActivityExportRequest } from "../../interface";
/**
* 导出活动
* /api/Activity/Export
*/
export declare function postApiActivityExport(input?: ActivityExportRequest, config?: AxiosRequestConfig): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: string;
}>;
import request from "@/plugins/request";
/**
* 导出活动
* /api/Activity/Export
*/
export function postApiActivityExport(input, config) {
return request.post(`/api/Activity/Export`, input, config);
}
export interface ActivityExportRequest {
/** 角色id */
role_id?: string;
/** 用户卡号/名称 */
user_card_name?: string;
/** 场地编号/名称 */
place_code_name?: string;
/** 场地类型 */
place_type_id?: string;
/** 场地允许使用性别 */
sex?: string;
/** 活动状态 */
state?: string;
/** 开始时间 */
begin_time?: string;
/** 结束时间 */
end_time?: string;
}
......@@ -21,6 +21,7 @@ export * from "./apiTypes/ParticipantViewModelMessageModelPageModel";
export * from "./apiTypes/ParticipantInsRequest";
export * from "./apiTypes/ActivityTrackViewModel";
export * from "./apiTypes/ActivityTrackViewModelListMessageModel";
export * from "./apiTypes/ActivityExportRequest";
export * from "./apiTypes/Commodity";
export * from "./apiTypes/CommodityListMessageModel";
export * from "./apiTypes/CommodityMessageModel";
......
......@@ -21,6 +21,7 @@ export * from "./apiTypes/ParticipantViewModelMessageModelPageModel";
export * from "./apiTypes/ParticipantInsRequest";
export * from "./apiTypes/ActivityTrackViewModel";
export * from "./apiTypes/ActivityTrackViewModelListMessageModel";
export * from "./apiTypes/ActivityExportRequest";
export * from "./apiTypes/Commodity";
export * from "./apiTypes/CommodityListMessageModel";
export * from "./apiTypes/CommodityMessageModel";
......
......@@ -7,8 +7,11 @@
:searchCondList="searchCondList"
:labelWidth="120"
@onSubmit="search"
@onReset="reset"></SearchCondForm>
@onReset="reset">
</SearchCondForm>
<div style="display: flex;">
<Button type="primary" class="ivu-ml-8" @click="importDuty.show = true"><Icon type="ios-cloud-download-outline"/>导出活动数据</Button>
</div>
<!-- 数据table -->
<CTable
:tableColumns="tableColumns.filter(a => a.show)"
......@@ -23,33 +26,15 @@
<template #state="{ row }">
<Tag :color="configStates.activityRequest.tag[row.state]">{{configStates.activityRequest.array[row.state]}}</Tag>
<!-- <h4 v-if="row.state == 1">审批中</h4>-->
<!-- <h4 v-if="row.state == 2">已取消</h4>-->
<!-- <h4 v-if="row.state == 3">驳回</h4>-->
<!-- <h4 v-if="row.state == 4">审批通过</h4>-->
<!-- <h4 v-if="row.state == 5">邀请中</h4>-->
<!-- <h4 v-if="row.state == 6">邀请超时</h4>-->
<!-- <h4 v-if="row.state == 7">待使用</h4>-->
<!-- <h4 v-if="row.state == 8">使用中</h4>-->
<!-- <h4 v-if="row.state == 9">已结束</h4>-->
<!-- <h4 v-if="row.state == 10">强制结束</h4>-->
</template>
<template #overtime_state="{ row }">
<Tag :color="configStates.activeOvertime.tag[row.overtime_state]">{{configStates.activeOvertime.array[row.overtime_state]}}</Tag>
<!-- <h4 v-if="row.overtime_state == 0">未加时</h4>-->
<!-- <h4 v-if="row.overtime_state == 1">申请中</h4>-->
<!-- <h4 v-if="row.overtime_state == 2">加时</h4>-->
<!-- <h4 v-if="row.overtime_state == 3">不通过</h4>-->
</template>
<template #key_state="{ row }">
<Tag :color="configStates.keyState.tag[row.key_state]">{{configStates.keyState.array[row.key_state]}}</Tag>
<!-- <h4 v-if="row.key_state == 0">未领取</h4>-->
<!-- <h4 v-if="row.key_state == 1">借出</h4>-->
<!-- <h4 v-if="row.key_state == 2">归还</h4>-->
</template>
<template #participant="{ row }">
<Icon class="cyrIcon" type="md-person" @click="ptcDetails(row)"/>
......@@ -306,6 +291,26 @@
<Button @click="trkModalShow = false">关闭</Button>
</template>
</Modal>
<!-- 活动导出 -->
<Modal v-model="importDuty.show" width="460">
<template #header>
<p style="color:#2D8CF0;text-align:center">
<Icon type="ios-information-circle"></Icon>
<span>导出活动数据</span>
</p>
</template>
<div style="text-align:center">
<Form :label-width="80" >
<FormItem label="活动日期" prop="user">
<DatePicker v-model="importDuty.date" style="width: 100%" type="daterange" placement="bottom-end" placeholder="请选择活动日期" />
</FormItem>
</Form>
</div>
<template #footer>
<Button type="primary" size="large" :loading="importDuty.loading" long @click="importDutyFun">导出活动数据</Button>
</template>
</Modal>
</Card>
</div>
</template>
......@@ -316,7 +321,9 @@ import CTable from '@/components/CTable.vue'
import CEditModal from '@/components/CEditModal.vue'
import SearchCondForm from '@/components/SearchCondForm.vue'
import { cloneDeep } from 'lodash'
import dayjs from "dayjs";
import * as hooks from '@/hook/index'
import * as api from '@/api/controller/index'
export default {
name: 'list',
......@@ -327,6 +334,21 @@ export default {
},
data(){
return {
importDuty: {
loading:false,
show: false,
date:[dayjs().format('YYYY-MM-DD'),dayjs().format('YYYY-MM-DD')],
formData: {
"role_id": "",
"user_card_name": "",
"place_code_name": "",
"place_type_id": "",
"sex": "",
"state": "",
"begin_time": "",
"end_time": ""
}
},
// 搜索项
searchCondList: [
{ id: 'user_card_name', name: '用户卡号/姓名', type: 'input', show: true, optList: [] },
......@@ -596,6 +618,7 @@ export default {
// 查询条件初始化
created(){},
mounted(){
// 获取场地类型
this.asc.getApiCommonGetPlaceTypeSelect().then(res => {
// console.log('场地类型', res)
......@@ -625,6 +648,20 @@ export default {
this.getData()
},
methods: {
importDutyFun(){
//值班附件导出
this.importDuty.loading =true
let date = {
begin_time: dayjs(this.importDuty.date[0]).format('YYYY-MM-DD'),
end_time: dayjs(this.importDuty.date[1]).format('YYYY-MM-DD'),
}
return api.postApiActivityExport ( {...this.importDuty.formData,...this.params,...date}).then(res=>{
window.location.href = res.response
this.importDuty.loading =false
}).finally(()=>{
this.importDuty.loading =false
})
},
// 搜索
search(val) {
Object.keys(val).forEach(a => {
......
......@@ -254,7 +254,6 @@ export default {
// console.log('查询数据', res)
this.tableData = res.response.data
this.dataCount = res.response.data_count
this.tableLoading = false
})
},
......
此差异已折叠。
......@@ -25,6 +25,17 @@ module.exports = {
}
},
configureWebpack: (config) => {
/**
* 基于
* */
if (process.env.NODE_ENV === 'production') {// 为生产环境修改配置...
/* 压缩打包 */
config.optimization.splitChunks.chunks = 'all';
config.optimization.splitChunks.minSize = 1000000;
config.optimization.splitChunks.maxSize = 3000000;
}
},
/*configureWebpack: (config) => {
if (process.env.NODE_ENV === 'production') {// 为生产环境修改配置...
config.mode = 'production';
config["performance"] = {//打包文件大小配置
......@@ -32,7 +43,7 @@ module.exports = {
"maxAssetSize": 30000000
}
}
},
},*/
css: {
loaderOptions: {
less: {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或