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

优化loading、弹窗显示等方式

上级 c63b0152
...@@ -41,8 +41,10 @@ ...@@ -41,8 +41,10 @@
<div style="display: flex; justify-content: center;align-items: center"> <div style="display: flex; justify-content: center;align-items: center">
<span>值班日期:&nbsp;</span> <span>值班日期:&nbsp;</span>
<DatePicker type="daterange" @on-change="dutyDateSelect" placeholder="请选择值班日期" <DatePicker v-model="dutyDateX" type="daterange" @on-change="dutyDateSelect"
placeholder="请选择值班日期"
style="width: 10vw"/> style="width: 10vw"/>
</div> </div>
</Col> </Col>
<Col :span="4.5"> <Col :span="4.5">
...@@ -91,13 +93,14 @@ ...@@ -91,13 +93,14 @@
</div> </div>
</template> </template>
<Table <Table
:columns="columns" :loading="tableLoading"
:data="data" :columns="columns"
:height="tableHeightCal" :data="data"
@on-select="onSelect" :height="tableHeightCal"
@on-select-cancel="onSelectCancel" @on-select="onSelect"
@on-select-all="onSelectAll" @on-select-cancel="onSelectCancel"
@on-select-all-cancel="onSelectAllCancel"> @on-select-all="onSelectAll"
@on-select-all-cancel="onSelectAllCancel">
<template #is_lead="{row}"> <template #is_lead="{row}">
{{ ['值班教师', '值班领导'][row.is_lead] }} {{ ['值班教师', '值班领导'][row.is_lead] }}
</template> </template>
...@@ -516,10 +519,16 @@ ...@@ -516,10 +519,16 @@
exportModalShow: false, exportModalShow: false,
// 模板导出选择年月 // 模板导出选择年月
tempYearMonth: '', tempYearMonth: '',
// 默认查询条件值班日期
dutyDateX: [],
}; };
}, },
//监听属性 类似于data概念", //监听属性 类似于data概念",
computed: { computed: {
// table高度计算
tableHeightCal() {
return document.documentElement.clientHeight - 360
},
util() { util() {
return util return util
} }
...@@ -966,6 +975,17 @@ ...@@ -966,6 +975,17 @@
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染 //生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
mounted() { mounted() {
// 默认查询当前月条件初始化
let nowDate = new Date()
let startTime = dayjs(nowDate).format('YYYY-MM-') + dayjs(nowDate).startOf('month').format('DD')
let endTime = dayjs(nowDate).format('YYYY-MM-') + dayjs(nowDate).endOf('month').format('DD')
this.cityListAllObject.startTimeFlag = startTime
this.cityListAllObject.endtTimeFlag = endTime
this.cityListAlltSearchFlagObject.startTimeSearch = startTime
this.cityListAlltSearchFlagObject.endTimeSearch = endTime
this.dutyDateX = [new Date(startTime), new Date(endTime)]
this.addDutySearchSelectList() this.addDutySearchSelectList()
this.getWatchList() // 初始化值班列表 this.getWatchList() // 初始化值班列表
this.getSearchSelectList() // 初始化搜索select this.getSearchSelectList() // 初始化搜索select
......
...@@ -40,7 +40,8 @@ ...@@ -40,7 +40,8 @@
<div style="display: flex; justify-content: center;align-items: center"> <div style="display: flex; justify-content: center;align-items: center">
<span>值班日期:&nbsp;</span> <span>值班日期:&nbsp;</span>
<DatePicker type="daterange" @on-change="signDateSelect" placeholder="请选择值班日期" <DatePicker v-model="dutyDateX" type="daterange" @on-change="signDateSelect"
placeholder="请选择值班日期"
style="width: 10vw"/> style="width: 10vw"/>
</div> </div>
</Col> </Col>
...@@ -83,7 +84,7 @@ ...@@ -83,7 +84,7 @@
</ButtonGroup> </ButtonGroup>
</template> </template>
<Table :columns="column" :data="data" :loading="loading" @on-select="radioSelection" <Table :columns="column" :data="data" :height="tableHeightCal" :loading="loading" @on-select="radioSelection"
@on-select-cancel="cancelSelection" @on-select-cancel="cancelSelection"
@on-select-all="allSelection" @on-select-all-cancel="cancelSelectionAll"> @on-select-all="allSelection" @on-select-all-cancel="cancelSelectionAll">
<template #sign_set="{row}"> <template #sign_set="{row}">
...@@ -132,6 +133,7 @@ ...@@ -132,6 +133,7 @@
:key="pageKey" :key="pageKey"
show-sizer show-sizer
show-elevator show-elevator
:page-size-opts="[100, 200, 500, 1000]"
:total="total" :total="total"
:page-size="page_size" :page-size="page_size"
model-value="page_index" model-value="page_index"
...@@ -193,6 +195,7 @@ ...@@ -193,6 +195,7 @@
//例如:import 《组件名称》 from '《组件路径》'; //例如:import 《组件名称》 from '《组件路径》';
import * as api from '../../api/lezRequest' import * as api from '../../api/lezRequest'
import error from "@/plugins/error"; import error from "@/plugins/error";
import * as hooks from "../../hooks/index"
import dayjs from 'dayjs' import dayjs from 'dayjs'
export default { export default {
...@@ -264,7 +267,7 @@ ...@@ -264,7 +267,7 @@
}, },
page_index: 1, page_index: 1,
page_size: 10, page_size: 100,
total: 0, total: 0,
column: [ column: [
{ {
...@@ -314,10 +317,18 @@ ...@@ -314,10 +317,18 @@
} }
], ],
data: [], data: [],
// 默认查询条件值班日期
dutyDateX: [],
}; };
}, },
//监听属性 类似于data概念", //监听属性 类似于data概念",
computed: {}, computed: {
// table高度计算
tableHeightCal() {
return document.documentElement.clientHeight - 360
},
},
//监控data中的数据变化", //监控data中的数据变化",
watch: { watch: {
// signArray(newValue ,oldValue){ // signArray(newValue ,oldValue){
...@@ -429,7 +440,7 @@ ...@@ -429,7 +440,7 @@
signDataInputDateSelect(e) { signDataInputDateSelect(e) {
this.signyDataInputObject.watch_date = e[0] + '-' + e[1] this.signyDataInputObject.watch_date = e[0] + '-' + e[1]
this.signyDataInputObject.startTime = e[0] this.signyDataInputObject.startTime = e[0]
this.signyDataInputObject.startTime = e[1] this.signyDataInputObject.endTime = e[1]
console.log("🚀🚀🚀,") console.log("🚀🚀🚀,")
}, },
signCancel() { signCancel() {
...@@ -493,7 +504,6 @@ ...@@ -493,7 +504,6 @@
let res = await api.SignSetSave(data) let res = await api.SignSetSave(data)
await this.GetSignRecordList() await this.GetSignRecordList()
} }
let flag let flag
switch (e.sign_set) { switch (e.sign_set) {
case 0 : case 0 :
...@@ -506,9 +516,7 @@ ...@@ -506,9 +516,7 @@
signSetRequest(e, flag) signSetRequest(e, flag)
break; break;
} }
console.log("🚀🚀🚀,", e, flag) console.log("🚀🚀🚀,", e, flag)
}, },
async GetSignRecordList() { async GetSignRecordList() {
...@@ -625,6 +633,19 @@ ...@@ -625,6 +633,19 @@
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染 //生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
mounted() { mounted() {
// 默认查询当前月条件初始化
let nowDate = new Date()
let startTime = dayjs(nowDate).format('YYYY-MM-') + dayjs(nowDate).startOf('month').format('DD')
let endTime = dayjs(nowDate).format('YYYY-MM-') + dayjs(nowDate).endOf('month').format('DD')
this.signyDataInputObject.startTime = startTime
this.signyDataInputObject.endTime = endTime
this.selectObject.startTimeSearch = startTime
this.selectObject.endTimeSearch = endTime
this.selectObject.startTime = startTime
this.selectObject.endTime = endTime
this.dutyDateX = [new Date(startTime), new Date(endTime)]
this.GetSignRecordList() // 初始化 this.GetSignRecordList() // 初始化
this.addDutySearchSelectList() // 获取四个select this.addDutySearchSelectList() // 获取四个select
this.addDutySearchSelectList1() // 获取四个select this.addDutySearchSelectList1() // 获取四个select
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或