Skip to content

A
attendance-performance-platform
Commit e7ff8e04 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents df85fb78 dc8707c7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 517 additions and 415 deletions
attendance-performance-manager-ui/admin/src/assets/mixins/table.js
View file @ e7ff8e04
......@@ -24,8 +24,13 @@ export default {
delete this.query.year;
}
if (this.query.createTimeMonth == undefined) {
delete this.query.createTimeStart;
delete this.query.createTimeEnd;
if (this.query.createTimeStart1 || this.query.createTimeEnd1) {
this.query.createTimeEnd = this.query.createTimeEnd1;
this.query.createTimeStart = this.query.createTimeStart1;
} else {
delete this.query.createTimeStart;
delete this.query.createTimeEnd;
}
}
this.getData();
},
......@@ -80,7 +85,7 @@ export default {
return;
}
this.tableData.loading = true;
console.log(this.query);
this.$post(this.pageInfo.list, this.query, {
cancelToken: this.source.token,
})
......
attendance-performance-manager-ui/admin/src/components/SearchForm.vue
View file @ e7ff8e04
......@@ -111,7 +111,7 @@
v-if="item.type === 'date' && !item.valueFormat"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
:placeholder="item.label ? item.label : '选择日期'"
>
</el-date-picker>
......@@ -120,7 +120,7 @@
v-if="item.type === 'date' && item.valueFormat"
type="date"
:value-format="item.valueFormat"
placeholder="选择日期"
:placeholder="item.label ? item.label : '选择日期'"
>
</el-date-picker>
......@@ -352,6 +352,9 @@ export default {
if (this.form.createTimeMonth) {
this.form.createTimeStart = this.form.createTimeMonth + "-01";
this.form.createTimeEnd = this.form.createTimeMonth + "-31";
} else if (this.form.createTimeStart1 || this.form.createTimeEnd1) {
this.form.createTimeStart = this.form.createTimeStart1;
this.form.createTimeEnd = this.form.createTimeEnd1;
} else {
this.form.createTimeStart = undefined;
this.form.createTimeEnd = undefined;
......@@ -397,18 +400,24 @@ export default {
let data = this.decode(params);
// Object.assign({}, query, data)
console.log({
...query,
...data,
});
if (!query.yearmonth) {
query.year = undefined;
query.month = undefined;
}
if (!query.createTimeMonth) {
query.createTimeEnd = undefined;
query.createTimeStart = undefined;
if (query.createTimeStart1 || query.createTimeEnd1) {
query.createTimeEnd = query.createTimeEnd1;
query.createTimeStart = query.createTimeStart1;
} else {
query.createTimeEnd = undefined;
query.createTimeStart = undefined;
}
}
console.log({
...query,
...data,
});
this.$router.push({
path: path,
query: {
......
attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue
View file @ e7ff8e04
......@@ -94,13 +94,13 @@ export default {
label: "请假类型",
},
{
name: "createTimeStart",
name: "createTimeStart1",
type: "date",
label: "开始时间",
fuzzy: false,
},
{
name: "createTimeEnd",
name: "createTimeEnd1",
type: "date",
label: "结束时间",
fuzzy: false,
......
attendance-performance-manager-ui/admin/src/views/attendance/record/hik/list.vue
View file @ e7ff8e04
......@@ -121,6 +121,12 @@
</div>
</div>
</el-drawer>
<div class="mask" v-if="progress">
<el-progress
:stroke-width="26"
:percentage="percent"
></el-progress>
</div>
</div>
</template>
......@@ -220,25 +226,26 @@ export default {
},
/** 导出Excel */
doExport() {
if(this.isExport==true) {
this.$message.info("考勤数据正在导出中，请勿重复点击！")
if (this.isExport == true) {
this.$message.info("考勤数据正在导出中，请勿重复点击！");
return false;
}
this.isExport = true;
this.progress = true;
let params = {};
for (let value of this.config.search) {
if (this.query[value.name]) {
params[value.name] = this.query[value.name];
}
}
this.percent = 75;
if (this.selection.length > 0) {
params["idList"] = this.selection;
}
let that=this;
let that = this;
this.$download(
"/attendance/record/hik/exportExcel",
{
......@@ -247,10 +254,13 @@ export default {
{ type: "excel" }
)
.then(() => {
console.log("isExport222:",this.isExport)
that.isExport = false})
this.percent = 100;
this.progress = false;
that.isExport = false;
})
.catch((error) => {
this.isExport = false;
this.progress = false;
this.$message.error(error.message);
});
},
......@@ -273,7 +283,9 @@ export default {
data() {
return {
showBtn: false,
isExport:false,
progress: false,
isExport: false,
percent: 0,
upload: {
headers: {
Authorization: window.sessionStorage.getItem("token") || "",
......@@ -373,6 +385,21 @@ export default {
};
</script>
<style scoped lang="scss">
.mask {
width: 100%;
height: 100vh;
position: fixed;
top: 0;
left: 0;
z-index: 99;
padding: 0 30%;
padding-top: 20%;
background: rgba(0, 0, 0, 0.6);
}
::v-deep .el-progress__text {
color: #409eff;
font-weight: 600;
}
.hisList {
padding: 15px;
.list {
......
attendance-performance-manager-ui/admin/src/views/attendance/record/list.vue
View file @ e7ff8e04
......@@ -179,6 +179,12 @@
<el-button @click="upload.open = false">取 消</el-button>
</div>
</el-dialog>
<div class="mask" v-if="progress">
<el-progress
:stroke-width="26"
:percentage="percent"
></el-progress>
</div>
</div>
</template>
......@@ -333,6 +339,7 @@ export default {
/** 导出Excel */
doExport() {
this.isExport = true;
this.progress = true;
let params = {};
for (let value of this.config.search) {
if (this.query[value.name]) {
......@@ -342,6 +349,7 @@ export default {
if (this.selection.length > 0) {
params["idList"] = this.selection;
}
this.percent = 70;
if (this.checkList.length > 0) {
params["properties"] = this.checkList;
}
......@@ -353,10 +361,14 @@ export default {
{ type: "excel" }
)
.then(() => {
this.percent = 100;
this.progress = false;
this.isExport = false;
this.checkList = [];
})
.catch((error) => {
this.progress = false;
this.isExport = false;
this.$message.error(error.message);
});
......@@ -407,6 +419,8 @@ export default {
},
data() {
return {
progress: false,
percent: 0,
upload: {
// 是否显示弹出层（员工关怀信息导入）
open: false,
......@@ -578,6 +592,21 @@ export default {
};
</script>
<style scoped lang="less">
.mask {
width: 100%;
height: 100vh;
position: fixed;
top: 0;
left: 0;
z-index: 99;
padding: 0 30%;
padding-top: 20%;
background: rgba(0, 0, 0, 0.6);
}
::v-deep .el-progress__text {
color: #409eff;
font-weight: 600;
}
.totalNum {
background: rgba(64, 158, 255, 0.2);
padding: 15px;
......
attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue
View file @ e7ff8e04
......@@ -13,6 +13,9 @@
</LayoutTable>
<dialog-show ref="dialogform" @ok="getData" />
<div class="mask" v-if="progress">
<el-progress :stroke-width="26" :percentage="percent"></el-progress>
</div>
</div>
</template>
......@@ -27,10 +30,12 @@ export default {
},
mixins: [table],
created() {},
methods: {
/** 导出Excel */
doExport() {
this.progress = true;
this.percent = 75;
this.isExport = true;
this.$download(
"/staff/perform/summary/exportExcel",
......@@ -40,9 +45,14 @@ export default {
},
{ type: "excel" }
)
.then(() => (this.isExport = false))
.then(() => {
this.percent = 100;
this.progress = false;
this.isExport = false;
})
.catch((error) => {
this.isExport = false;
this.progress = false;
this.$message.error(error.message);
});
},
......@@ -62,6 +72,8 @@ export default {
data() {
return {
isExport: false,
progress: false,
percent: 0,
config: {
isshowTabPane: true,
search: [
......@@ -167,3 +179,20 @@ export default {
},
};
</script>
<style lang="less" scoped>
.mask {
width: 100%;
height: 100vh;
position: fixed;
top: 0;
left: 0;
z-index: 99;
padding: 0 30%;
padding-top: 20%;
background: rgba(0, 0, 0, 0.6);
}
::v-deep .el-progress__text {
color: #409eff;
font-weight: 600;
}
</style>
attendance-performance-manager/pom.xml
View file @ e7ff8e04
......@@ -43,7 +43,7 @@
<profiles.dingtalk.appSecret>bF2WALmo5_Wuj3hg5gXeWqezrYnZChUJ88HjzNWpkA9ivdOxfBDGOGYcfVRfB3vd</profiles.dingtalk.appSecret>
<profiles.dingtalk.aesKey>1QcPYuSpAc98OS3qQwwx5HPH85CZDidxF95yBGad2fJ</profiles.dingtalk.aesKey>
<profiles.dingtalk.token>m3WeuVx5kcTY76kh22uWZOTSu0XjvcwNhd</profiles.dingtalk.token>
<profiles.dingtalk.opUserId>manager8325</profiles.dingtalk.opUserId>
<profiles.dingtalk.opUserId>254868153920685466</profiles.dingtalk.opUserId>
<profiles.webUrl>http://8.136.255.30:11039/attendance</profiles.webUrl>
<package.environment>serve</package.environment>
<skipUi>false</skipUi>
......@@ -78,7 +78,7 @@
<profiles.dingtalk.appSecret>bF2WALmo5_Wuj3hg5gXeWqezrYnZChUJ88HjzNWpkA9ivdOxfBDGOGYcfVRfB3vd</profiles.dingtalk.appSecret>
<profiles.dingtalk.aesKey>1QcPYuSpAc98OS3qQwwx5HPH85CZDidxF95yBGad2fJ</profiles.dingtalk.aesKey>
<profiles.dingtalk.token>m3WeuVx5kcTY76kh22uWZOTSu0XjvcwNhd</profiles.dingtalk.token>
<profiles.dingtalk.opUserId>manager8325</profiles.dingtalk.opUserId>
<profiles.dingtalk.opUserId>254868153920685466</profiles.dingtalk.opUserId>
<profiles.webUrl>http://8.136.255.30:11039/attendance</profiles.webUrl>
<package.environment>test</package.environment>
<skipUi>false</skipUi>
......@@ -111,7 +111,7 @@
<profiles.dingtalk.appSecret>bF2WALmo5_Wuj3hg5gXeWqezrYnZChUJ88HjzNWpkA9ivdOxfBDGOGYcfVRfB3vd</profiles.dingtalk.appSecret>
<profiles.dingtalk.aesKey>1QcPYuSpAc98OS3qQwwx5HPH85CZDidxF95yBGad2fJ</profiles.dingtalk.aesKey>
<profiles.dingtalk.token>m3WeuVx5kcTY76kh22uWZOTSu0XjvcwNhd</profiles.dingtalk.token>
<profiles.dingtalk.opUserId>manager8325</profiles.dingtalk.opUserId>
<profiles.dingtalk.opUserId>254868153920685466</profiles.dingtalk.opUserId>
<profiles.webUrl>http://8.136.255.30:21039/attendance</profiles.webUrl>
<package.environment>build</package.environment>
<skipUi>false</skipUi>
......@@ -143,7 +143,7 @@
<profiles.dingtalk.appSecret>bF2WALmo5_Wuj3hg5gXeWqezrYnZChUJ88HjzNWpkA9ivdOxfBDGOGYcfVRfB3vd</profiles.dingtalk.appSecret>
<profiles.dingtalk.aesKey>1QcPYuSpAc98OS3qQwwx5HPH85CZDidxF95yBGad2fJ</profiles.dingtalk.aesKey>
<profiles.dingtalk.token>m3WeuVx5kcTY76kh22uWZOTSu0XjvcwNhd</profiles.dingtalk.token>
<profiles.dingtalk.opUserId>manager8325</profiles.dingtalk.opUserId>
<profiles.dingtalk.opUserId>254868153920685466</profiles.dingtalk.opUserId>
<profiles.webUrl>https://ybswxxcx.zwfwhfgjjfzj.yibin.gov.cn/performance-h5</profiles.webUrl>
<package.environment>build</package.environment>
<skipUi>false</skipUi>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment