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

Merge remote-tracking branch 'origin/pc'

此差异已折叠。
export * from "./postApiCommonFileUpload";
export * from "./getApiCommonGetCommentContentSelect";
export * from "./getApiCommonGetPersonByCondiction";
export * from "./getApiCommonGetRoleSelect";
export * from "./getApiCommonGetPlaceTypeSelect";
export * from "./getApiCommonGetPlaceSelect";
export * from "./getApiCommonGetKeyByActivityList";
export * from "./getApiCommonGetSexSelect";
export * from "./postApiCommonFileUpload";
export * from "./getApiCommonGetCommentContentSelect";
export * from "./getApiCommonGetPersonByCondiction";
export * from "./getApiCommonGetRoleSelect";
export * from "./getApiCommonGetPlaceTypeSelect";
export * from "./getApiCommonGetPlaceSelect";
export * from "./getApiCommonGetKeyByActivityList";
export * from "./getApiCommonGetSexSelect";
......@@ -8,6 +8,7 @@ export declare function getApiGetTokenInfo(): import("axios").AxiosPromise<{
msg: string;
msg_detail: string;
response: {
userid: string;
cardNumber: string;
name: string;
type: any;
......
import { type UserType } from "../../interface";
/**
* WX单点
* /api/sso/wx
......@@ -20,9 +19,6 @@ export declare function getApiSsoWx(params: GetApiSsoWxParams): import("axios").
};
}>;
interface GetApiSsoWxParams {
userType: UserType;
code: string;
sign: string;
timestamp: string;
token: string;
}
export {};
......@@ -5,10 +5,7 @@ import request from "@/plugins/request";
*/
export function getApiSsoWx(params) {
const paramsInput = {
...params.userType,
code: params.code,
sign: params.sign,
timestamp: params.timestamp,
token: params.token,
};
return request.get(`/api/sso/wx`, {
params: paramsInput,
......
export * from "./getApiLoginCheckLoginTest";
export * from "./getApiSsoPc";
export * from "./getApiSsoWx";
export * from "./getApiSsoWxsan";
export * from "./getApiGetTokenInfo";
export * from "./getApiRefreshToken";
export * from "./getApiLoginCheckLoginTest";
export * from "./getApiSsoPc";
export * from "./getApiSsoWx";
export * from "./getApiSsoWxsan";
export * from "./getApiGetTokenInfo";
export * from "./getApiRefreshToken";
......@@ -3,18 +3,24 @@
* /api/PlaceType/GetPlaceTypeInfo
*/
export declare function getApiPlaceTypeGetPlaceTypeInfo(params: GetApiPlaceTypeGetPlaceTypeInfoParams): import("axios").AxiosPromise<{
id: string;
place_type_name: string;
time_split: number;
service_interval_time: string;
instructions: string;
read_time: string;
is_enable: number;
is_del: number;
createby: string;
createtime: string;
modifyby: string;
modify_time: string;
code: number;
status: string;
msg: string;
msg_detail: string;
response: {
id: string;
place_type_name: string;
time_split: number;
service_interval_time: string;
instructions: string;
read_time: number;
is_enable: number;
is_del: number;
createby: string;
createtime: string;
modifyby: string;
modify_time: string;
};
}>;
interface GetApiPlaceTypeGetPlaceTypeInfoParams {
id?: string;
......
......@@ -33,7 +33,7 @@ export declare function getApiPlaceTypeGetPlaceTypeList(params: GetApiPlaceTypeG
time_split: number;
service_interval_time: string;
instructions: string;
read_time: string;
read_time: number;
is_enable: number;
is_del: number;
createby: string;
......
export * from "./getApiPlaceTypeGetPlaceTypeList";
export * from "./getApiPlaceTypeGetPlaceTypeInfo";
export * from "./postApiPlaceTypePlaceTypeSave";
export * from "./getApiPlaceTypePlaceTypeDel";
export * from "./getApiPlaceTypePlaceTypeEnable";
export * from "./getApiPlaceTypeGetPlaceTypeList";
export * from "./getApiPlaceTypeGetPlaceTypeInfo";
export * from "./postApiPlaceTypePlaceTypeSave";
export * from "./getApiPlaceTypePlaceTypeDel";
export * from "./getApiPlaceTypePlaceTypeEnable";
export * from "./Commodity";
export * from "./Common";
export * from "./Key";
export * from "./Login";
export * from "./Place";
export * from "./PlaceType";
export * from "./Role";
export * from "./SysConfig";
export * from "./Commodity";
export * from "./Common";
export * from "./Key";
export * from "./Login";
export * from "./Place";
export * from "./PlaceType";
export * from "./Role";
export * from "./SysConfig";
......@@ -4,7 +4,7 @@ export interface PlaceType {
time_split?: number;
service_interval_time?: string;
instructions?: string;
read_time?: string;
read_time?: number;
is_enable?: number;
is_del?: number;
createby?: string;
......
import { type UserType, type RoleAndPowerViewModel } from "../../interface";
export interface UserJwtViewModel {
userid?: string;
cardNumber?: string;
name?: string;
type?: UserType;
......
export * from "./apiTypes/Commodity";
export * from "./apiTypes/CommodityListMessageModel";
export * from "./apiTypes/Option";
export * from "./apiTypes/TableTitle";
export * from "./apiTypes/CommodityMessageModel";
export * from "./apiTypes/CommodityMessageModelPageModel";
export * from "./apiTypes/Int64MessageModel";
export * from "./apiTypes/PlaceFile";
export * from "./apiTypes/PlaceFileMessageModel";
export * from "./apiTypes/SelectResponses";
export * from "./apiTypes/SelectResponsesListMessageModel";
export * from "./apiTypes/PersonResponse";
export * from "./apiTypes/KeyResponse";
export * from "./apiTypes/KeyResponseListMessageModel";
export * from "./apiTypes/KeySearchRequest";
export * from "./apiTypes/Key";
export * from "./apiTypes/KeyMessageModel";
export * from "./apiTypes/KeyMessageModelPageModel";
export * from "./apiTypes/KeyViewModel";
export * from "./apiTypes/KeyViewModelMessageModel";
export * from "./apiTypes/StringMessageModel";
export * from "./apiTypes/KeyOperateRequest";
export * from "./apiTypes/KeyTrackSearchRequest";
export * from "./apiTypes/KeyTrack";
export * from "./apiTypes/KeyTrackMessageModel";
export * from "./apiTypes/KeyTrackMessageModelPageModel";
export * from "./apiTypes/TokenViewModel";
export * from "./apiTypes/ComplexTokenViewModel";
export * from "./apiTypes/ComplexTokenViewModelMessageModel";
......@@ -10,12 +33,20 @@ export * from "./apiTypes/RoleAndPowerViewModel";
export * from "./apiTypes/UserJwtViewModel";
export * from "./apiTypes/UserJwtViewModelMessageModel";
export * from "./apiTypes/TokenViewModelMessageModel";
export * from "./apiTypes/Option";
export * from "./apiTypes/TableTitle";
export * from "./apiTypes/PlaceSearchRequest";
export * from "./apiTypes/Place";
export * from "./apiTypes/PlaceMessageModel";
export * from "./apiTypes/PlaceMessageModelPageModel";
export * from "./apiTypes/PlaceViewModel";
export * from "./apiTypes/PlaceViewModelMessageModel";
export * from "./apiTypes/PlaceRequest";
export * from "./apiTypes/PlaceTimeViewModel";
export * from "./apiTypes/PlaceTimeViewModelListMessageModel";
export * from "./apiTypes/PlaceOutResponse";
export * from "./apiTypes/PlaceOutResponseMessageModel";
export * from "./apiTypes/PlaceType";
export * from "./apiTypes/PlaceTypeMessageModel";
export * from "./apiTypes/PlaceTypeMessageModelPageModel";
export * from "./apiTypes/StringMessageModel";
export * from "./apiTypes/RolePower";
export * from "./apiTypes/RolePowerListMessageModel";
export * from "./apiTypes/PlaceSysconfig";
......
export * from "./apiTypes/Commodity";
export * from "./apiTypes/CommodityListMessageModel";
export * from "./apiTypes/Option";
export * from "./apiTypes/TableTitle";
export * from "./apiTypes/CommodityMessageModel";
export * from "./apiTypes/CommodityMessageModelPageModel";
export * from "./apiTypes/Int64MessageModel";
export * from "./apiTypes/PlaceFile";
export * from "./apiTypes/PlaceFileMessageModel";
export * from "./apiTypes/SelectResponses";
export * from "./apiTypes/SelectResponsesListMessageModel";
export * from "./apiTypes/PersonResponse";
export * from "./apiTypes/KeyResponse";
export * from "./apiTypes/KeyResponseListMessageModel";
export * from "./apiTypes/KeySearchRequest";
export * from "./apiTypes/Key";
export * from "./apiTypes/KeyMessageModel";
export * from "./apiTypes/KeyMessageModelPageModel";
export * from "./apiTypes/KeyViewModel";
export * from "./apiTypes/KeyViewModelMessageModel";
export * from "./apiTypes/StringMessageModel";
export * from "./apiTypes/KeyOperateRequest";
export * from "./apiTypes/KeyTrackSearchRequest";
export * from "./apiTypes/KeyTrack";
export * from "./apiTypes/KeyTrackMessageModel";
export * from "./apiTypes/KeyTrackMessageModelPageModel";
export * from "./apiTypes/TokenViewModel";
export * from "./apiTypes/ComplexTokenViewModel";
export * from "./apiTypes/ComplexTokenViewModelMessageModel";
......@@ -10,12 +33,20 @@ export * from "./apiTypes/RoleAndPowerViewModel";
export * from "./apiTypes/UserJwtViewModel";
export * from "./apiTypes/UserJwtViewModelMessageModel";
export * from "./apiTypes/TokenViewModelMessageModel";
export * from "./apiTypes/Option";
export * from "./apiTypes/TableTitle";
export * from "./apiTypes/PlaceSearchRequest";
export * from "./apiTypes/Place";
export * from "./apiTypes/PlaceMessageModel";
export * from "./apiTypes/PlaceMessageModelPageModel";
export * from "./apiTypes/PlaceViewModel";
export * from "./apiTypes/PlaceViewModelMessageModel";
export * from "./apiTypes/PlaceRequest";
export * from "./apiTypes/PlaceTimeViewModel";
export * from "./apiTypes/PlaceTimeViewModelListMessageModel";
export * from "./apiTypes/PlaceOutResponse";
export * from "./apiTypes/PlaceOutResponseMessageModel";
export * from "./apiTypes/PlaceType";
export * from "./apiTypes/PlaceTypeMessageModel";
export * from "./apiTypes/PlaceTypeMessageModelPageModel";
export * from "./apiTypes/StringMessageModel";
export * from "./apiTypes/RolePower";
export * from "./apiTypes/RolePowerListMessageModel";
export * from "./apiTypes/PlaceSysconfig";
......
<template>
<!-- 通用新增、编辑Modal -->
<div>
<Modal
v-model="show"
:title="modalTitle"
:width="width"
:before-close="beforeClose">
<template>
<!-- Modal全局loading -->
<Spin size="large" fix v-if="loading"></Spin>
<Form
ref="form"
label-colon
:model="formData"
:rules="rules"
:label-width="formLabelWidth">
<Row>
<Col v-bind="grid" v-for="item in formItem.filter(a => a.type != 'file')" :key="item.id">
<FormItem :label="item.name" :prop="item.name">
<Input
v-if="item.type == 'input'"
v-model="formData[item.id]"
clearable
placeholder="请输入"/>
<Select
v-else-if="item.type == 'select'"
v-model="formData[item.id]"
clearable>
<Option
v-for="it in item.optList"
:key="it.value"
:value="it.value">{{ it.label }}</Option>
</Select>
<Switch
v-else-if="item.type == 'switch'"
v-model="formData[item['id']]"/>
</FormItem>
</Col>
<!-- 文件类型 -->
<Col span="12" v-for="(item, index) in formItem.filter(a => a.type == 'file')" :key="item.id">
<FormItem :label="item.name" :prop="item.name">
<Upload
multiple
action="#"
:before-upload="(file) => uploadFile(file, item.id, index)">
<Button
icon="ios-cloud-upload-outline"
:loading="uploadBtLoading[index]">选择文件</Button>
</Upload>
</FormItem>
</Col>
</Row>
</Form>
</template>
<template #footer>
<Button @click="onCancel">取消</Button>
<Button type="primary" @click="onSubmit">提交</Button>
</template>
</Modal>
</div>
</template>
<script>
export default {
props: {
// Modal全局loading
loading: { type: Boolean, default: false },
// 表单项、规则、label宽度
formItem: { type: Array, require: true },
formRule: { type: Object, default: () => {} },
formLabelWidth: { type: Number, default: 80 },
// Modal显示value
value: { type: Boolean, require: true },
// Modal宽度
width: { default: '520' },
},
watch: {
value(newVal) {
this.show = newVal
},
},
data() {
return {
// Modal显示value
show: this.value,
modalTitle: '编辑',
// 表单数据
formData: {},
rules: {},
grid: {
xl: 12,
lg: 12,
md: 24,
sm: 24,
xs: 24
},
// 需要转换开关的formItem列表
switchTransformList: [],
// 上传按钮loading
uploadBtLoading: [],
}
},
computed: {},
created() {},
mounted() {},
methods: {
/**
* Modal打开初始化
* @param {String} addOrEdit add.新增 edit.编辑
*/
modalInit(addOrEdit = 'add', row) {
if (addOrEdit == 'add') {
this.modalTitle = '新增'
this.formData = row ? Object.assign({}, row) : {}
} else if (addOrEdit == 'edit') {
this.modalTitle = '编辑'
this.formData = Object.assign({}, row)
// switch值转换
this.switchTransformList = this.formItem.filter(a => a.type == 'switch').map(a => a.id)
this.switchTransformList.forEach(a => {
this.formData[a] = this.formData[a] == 1
})
}
// 设置上传按钮loading
this.formItem.forEach(a => {
if (a.type == 'file') {
this.uploadBtLoading.push(false)
}
})
},
// 上传文件
uploadFile(file, id, i) {
this.uploadBtLoading[i] = true
let fd = new FormData()
fd.append('file', file)
this.asc.postApiCommonFileUpload(file).then(res => {
console.log('上传后', res)
})
return false
},
// Modal关闭前回调
beforeClose() {
this.$emit('onClose')
},
// 取消
onCancel() {
this.$emit('onCancel')
this.$emit('onClose')
},
// 提交
onSubmit() {
let obj = Object.assign({}, this.formData)
this.switchTransformList.forEach(a => {
obj[a] = obj[a] ? 1 : 0
})
this.$emit('onSubmit', obj)
},
},
}
</script>
<style scoped lang="less">
.ivu-form-item{
padding-right: 15px;
}
</style>
\ No newline at end of file
<template>
<!-- 通用Table -->
<div>
<Table
class="ivu-mt"
:columns="tableColumns"
:data="tableData"
:loading="tableLoading"
:size="tableSize"
>
<template slot-scope="{ row }" slot="status">
<Switch size="large" v-model="row.status" :true-value="1" :false-value="0" @on-change="switchChange(row)">
<span type="md-checkmark" slot="open" >启用</span>
<span type="md-close" slot="close">停用</span>
</Switch>
</template>
<template slot-scope="{ row }" slot="action">
<Button type="info" size="small" @click="edit(row)">编辑</Button>
<Poptip confirm transfer title="是否确认删除?" @on-ok="del(row)">
<Button type="error" size="small" style="margin-left: 20px">删除</Button>
</Poptip>
</template>
</Table>
<div class="ivu-text-center ivu-mt">
<Page
:total="dataCount"
:current.sync="pageIndex"
:page-size="pageSize"
:page-size-opts="pageSizeOpts"
show-total
show-sizer
@on-change="handleChangePage"
@on-page-size-change="handleChangePageSize"
/>
</div>
</div>
</template>
<script>
export default {
props: {
tableColumns: { type: Array, require: true },
tableData: { type: Array, require: true },
tableLoading: { type: Boolean, default: false },
tableSize: { type: String, default: 'default' },
dataCount: { type: Number, require: true },
pageIndex: { type: Number, require: true },
pageSize: { type: Number, require: true },
pageSizeOpts: { type: Array, default: () => [10, 20, 50, 100] },
},
data() {
return {}
},
computed: {},
created() {},
mounted() {},
methods: {
// 编辑行
edit(row) {
this.$emit('rowEdit', row)
},
// 删除行
del(row) {
this.$emit('rowDelete', row)
},
// 翻页
handleChangePage(val) {
this.$emit('onPageChange', val)
},
// 更改每页长度
handleChangePageSize(val) {
this.$emit('onPageSizeChange', val)
},
},
}
</script>
<style scoped lang="less">
</style>
\ No newline at end of file
此差异已折叠。
......@@ -71,6 +71,7 @@ const refreshToken = async () => {
// 请求拦截器
service.interceptors.request.use(
config => {
// console.log('配置', config)
// 在请求发送之前做一些处理
// const token = util.cookies.get('token');
let token = util.cookies.get('site-management-token')
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或