zzyuan
/
gz-att-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

This commit is contained in:
zzyuan 2024-10-28 11:05:42 +08:00
parent 9b37fb7b57
commit b1dd43dbac
8 changed files with 121 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/dashboard/bottomOne.vue
View File

@ -2,7 +2,7 @@
<div class="content"> <div class="content">
<div class="content-box"> <div class="content-box">
<div class="title-box"> <div class="title-box">
<div style="margin-left: 10px;font-size: 22px;font-weight: bold;">当月异常统计</div> <div style="margin-left: 10px;font-size: 22px;font-weight: bold;">组织架构</div>
</div> </div>
<div class="chart-box"> <div class="chart-box">
<vue2-org-tree name="test" <vue2-org-tree name="test"

55
src/views/dashboard/bottomTwo.vue
View File

@ -5,7 +5,7 @@
<div style="margin-left: 10px;font-size: 22px;font-weight: bold;">当月异常统计</div> <div style="margin-left: 10px;font-size: 22px;font-weight: bold;">当月异常统计</div>
</div> </div>
<div class="chart-box" @click="toggleDialog(12)"> <div class="chart-box" @click="toggleDialog(12)">
<div id="barBox" style="width: 100%;height: 380px;"></div> <div id="barBox" style="width: 100%;height: 400px;"></div>
</div> </div>
</div> </div>
</div> </div>
@ -23,12 +23,12 @@ export default {
// required: true, // required: true,
type: Object, type: Object,
default:{ default:{
addressErrorNum:'0', addressErrorNum:0,
earlyNum:'0', earlyNum:0,
einErrorNum:'0', einErrorNum:0,
lateNum:'0', lateNum:0,
leaveNum:'0', leaveNum:0,
skippingNum:'0' skippingNum:0
} }
}, },
@ -40,34 +40,61 @@ export default {
barYData:[22, 18, 11, 23, 29, 33] barYData:[22, 18, 11, 23, 29, 33]
} }
}, },
watch: {
pageData: {
handler() {
this.getInitData()
},
immediate: true
}
},
created() { created() {
}, },
mounted() { mounted() {
this.$nextTick(() => {
this.getInitData() this.getInitData()
})
}, },
methods: { methods: {
getInitData(){ getInitData(){
console.log(this.pageData) setTimeout(()=>{
this.barYData=[this.pageData.lateNum,this.pageData.earlyNum,this.pageData.skippingNum,this.pageData.leaveNum,this.pageData.addressErrorNum,this.pageData.einErrorNum] this.barYData=[Number(this.pageData.lateNum),Number(this.pageData.earlyNum),Number(this.pageData.skippingNum),Number(this.pageData.leaveNum),Number(this.pageData.addressErrorNum),Number(this.pageData.einErrorNum)]
console.log(this.barYData)
this.initChart() this.initChart()
},500)
}, },
initChart(){ initChart(){
this.pieCharts = echarts.init(document.getElementById('barBox')) this.pieCharts = echarts.init(document.getElementById('barBox'))
var option = { var option = {
grid: {
left: '5%',
right: '5%',
bottom: '5%',
top: '5%',
containLabel: true,
},
xAxis: { xAxis: {
data: ['迟到', '早退', '旷工', '请假', '打卡地异常', '出入异常'] data: ['迟到', '早退', '旷工', '请假', '打卡地异常', '出入异常']
}, },
yAxis: {}, yAxis: {},
series: [{ series: [{
type: 'bar', type: 'bar',
data:this.barYData data:this.barYData,
itemStyle:{
color:"#157DF3"
}
}] }]
}; };
this.pieCharts.setOption(option) this.pieCharts.setOption(option)
// 监听柱状图的点击事件
this.pieCharts.on('click', function (params) {
// 控制台输出点击的数据的信息
console.log(params);
// 在这里添加你的点击事件逻辑
// 例如：弹窗显示点击的数据的详细信息
// alert('你点击的是：' + params.name);
});
}, },
toggleDialog(v) { toggleDialog(v) {
this.$emit('openDialog', { order: v }) this.$emit('openDialog', { order: v })
@ -98,7 +125,7 @@ export default {
} }
.chart-box{ .chart-box{
width: 100%; width: 100%;
height: 400px; height: 450px;
} }

7
src/views/exceptionHandle/errorForm/index.vue
View File

@ -226,7 +226,7 @@
name:undefined, name:undefined,
orgName: undefined, orgName: undefined,
}, },
leaveType:'',
queryRecord: { queryRecord: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
@ -418,12 +418,14 @@
if(this.title=='轮休未审批记录'){ if(this.title=='轮休未审批记录'){
getDetailExceptionRest(this.addDateRange(this.queryRecord, this.dateRange)).then(response => { getDetailExceptionRest(this.addDateRange(this.queryRecord, this.dateRange)).then(response => {
this.tableDataRecord = response.rows; this.tableDataRecord = response.rows;
this.leaveType="轮休"
this.totalTwo = response.total; this.totalTwo = response.total;
this.loadingTwo = false; this.loadingTwo = false;
}); });
}else if(this.title=='外出办事未审批记录'){ }else if(this.title=='外出办事未审批记录'){
getDetailExceptionOut(this.addDateRange(this.queryRecord, this.dateRange)).then(response => { getDetailExceptionOut(this.addDateRange(this.queryRecord, this.dateRange)).then(response => {
this.tableDataRecord = response.rows; this.tableDataRecord = response.rows;
this.leaveType="外出办事"
this.totalTwo = response.total; this.totalTwo = response.total;
this.loadingTwo = false; this.loadingTwo = false;
}); });
@ -452,7 +454,8 @@
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.form.orgId = this.queryRecord.orgId; this.form.orgId = this.queryRecord.orgId;
this.form.title = '轮休外出办事异常数据'; this.form.title = this.leaveType+'异常数据';
this.form.leaveType=this.leaveType
console.log(this.form) console.log(this.form)
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {

38
src/views/process/outApply/index.vue
View File

@ -144,14 +144,18 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="外出开始时间：" prop="leaveStartDate"> <el-form-item label="外出开始时间：" prop="leaveStartDate">
<el-date-picker <el-date-picker
v-model="form.leaveStartDate" :clearable="false" :readonly="isView" v-model="form.leaveStartDate" :clearable="false" :disabled="isView"
type="date" value-format="yyyy-MM-dd" style="width: 70%;" @change="handleDateChange" type="date" value-format="yyyy-MM-dd" style="width: 100%;" @change="handleDateChange"
placeholder="外出开始时间" :pickerOptions="startPickerOptions"> placeholder="外出开始时间" :pickerOptions="startPickerOptions">
</el-date-picker> </el-date-picker>
<el-select v-model="form.leaveStartInterval" style="width: 25%;margin-left: 10px;" :disabled="isView" @change="handleDateChange"> </el-form-item>
</el-col>
<el-col :span="4">
<el-form-item prop="leaveStartInterval" label-width="0px">
<el-select v-model="form.leaveStartInterval" style="width: 80%;margin-left: 10px;" :disabled="isView" @change="handleDateChange">
<el-option <el-option
v-for="item in timeStatusList" v-for="item in timeStatusList"
:key="item.id" :key="item.id"
@ -161,14 +165,18 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="外出结束时间:" prop="leaveEndDate"> <el-form-item label="外出结束时间:" prop="leaveEndDate">
<el-date-picker <el-date-picker
v-model="form.leaveEndDate" :clearable="false" :readonly="isView" v-model="form.leaveEndDate" :clearable="false" :disabled="isView"
type="date" value-format="yyyy-MM-dd" style="width: 70%;" @change="handleDateChange" type="date" value-format="yyyy-MM-dd" style="width: 100%;" @change="handleDateChange"
placeholder="外出结束时间" :pickerOptions="endPickerOptions"> placeholder="外出结束时间" :pickerOptions="endPickerOptions">
</el-date-picker> </el-date-picker>
<el-select v-model="form.leaveEndInterval" style="width: 25%;margin-left: 10px;" :disabled="isView" @change="handleDateChange"> </el-form-item>
</el-col>
<el-col :span="4">
<el-form-item prop="leaveEndInterval" label-width="0px">
<el-select v-model="form.leaveEndInterval" style="width: 80%;margin-left: 10px;" :disabled="isView" @change="handleDateChange">
<el-option <el-option
v-for="item in timeStatusList" v-for="item in timeStatusList"
:key="item.id" :key="item.id"
@ -182,7 +190,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="外出时长(天)：" prop="leaveDuration"> <el-form-item label="外出时长(天)：" prop="leaveDuration">
<el-input v-model="form.leaveDuration" disabled /> <el-input v-model="form.leaveDuration" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -277,9 +285,15 @@ export default {
leaveStartDate: [ leaveStartDate: [
{ required: true, message: "外出开始时间不能为空", trigger: "blur" } { required: true, message: "外出开始时间不能为空", trigger: "blur" }
], ],
leaveStartInterval: [
{ required: true, message: "不能为空", trigger: "change" }
],
leaveEndDate: [ leaveEndDate: [
{ required: true, message: "外出结束时间不能为空", trigger: "blur" } { required: true, message: "外出结束时间不能为空", trigger: "blur" }
], ],
leaveEndInterval: [
{ required: true, message: "不能为空", trigger: "change" }
],
leaveDuration: [ leaveDuration: [
{ required: true, message: "外出时长不能为空", trigger: "blur" } { required: true, message: "外出时长不能为空", trigger: "blur" }
], ],
@ -353,10 +367,10 @@ export default {
userName:this.userInfo.name, userName:this.userInfo.name,
orgId: undefined, orgId: undefined,
leaveStartDate: undefined, leaveStartDate: undefined,
leaveStartInterval:'1', leaveStartInterval:undefined,
leaveEndDate: undefined, leaveEndDate: undefined,
leaveEndInterval:'1', leaveEndInterval:undefined,
leaveDuration:0.5, leaveDuration:undefined,
leaveType:"外出办事", leaveType:"外出办事",
examineStatus:"0", examineStatus:"0",
leaveReason:undefined, leaveReason:undefined,

46
src/views/process/restApply/index.vue
View File

@ -147,14 +147,18 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="轮休开始时间：" prop="leaveStartDate"> <el-form-item label="外出开始时间：" prop="leaveStartDate">
<el-date-picker <el-date-picker
v-model="form.leaveStartDate" :clearable="false" :readonly="isView" v-model="form.leaveStartDate" :clearable="false" :disabled="isView"
type="date" value-format="yyyy-MM-dd" style="width: 70%;" @change="handleDateChange" type="date" value-format="yyyy-MM-dd" style="width: 100%;" @change="handleDateChange"
placeholder="轮休开始时间" :pickerOptions="startPickerOptions"> placeholder="外出开始时间" :pickerOptions="startPickerOptions">
</el-date-picker> </el-date-picker>
<el-select v-model="form.leaveStartInterval" style="width: 25%;margin-left: 10px;" :disabled="isView" @change="handleDateChange"> </el-form-item>
</el-col>
<el-col :span="4">
<el-form-item prop="leaveStartInterval" label-width="0px">
<el-select v-model="form.leaveStartInterval" style="width: 80%;margin-left: 10px;" :disabled="isView" @change="handleDateChange">
<el-option <el-option
v-for="item in timeStatusList" v-for="item in timeStatusList"
:key="item.id" :key="item.id"
@ -164,14 +168,18 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="轮休结束时间:" prop="leaveEndDate"> <el-form-item label="外出结束时间:" prop="leaveEndDate">
<el-date-picker <el-date-picker
v-model="form.leaveEndDate" :clearable="false" :readonly="isView" v-model="form.leaveEndDate" :clearable="false" :disabled="isView"
type="date" value-format="yyyy-MM-dd" style="width: 70%;" @change="handleDateChange" type="date" value-format="yyyy-MM-dd" style="width: 100%;" @change="handleDateChange"
placeholder="轮休结束时间" :pickerOptions="endPickerOptions"> placeholder="外出结束时间" :pickerOptions="endPickerOptions">
</el-date-picker> </el-date-picker>
<el-select v-model="form.leaveEndInterval" style="width: 25%;margin-left: 10px;" :disabled="isView" @change="handleDateChange"> </el-form-item>
</el-col>
<el-col :span="4">
<el-form-item prop="leaveEndInterval" label-width="0px">
<el-select v-model="form.leaveEndInterval" style="width: 80%;margin-left: 10px;" :disabled="isView" @change="handleDateChange">
<el-option <el-option
v-for="item in timeStatusList" v-for="item in timeStatusList"
:key="item.id" :key="item.id"
@ -185,7 +193,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="轮休时长(天)：" prop="leaveDuration"> <el-form-item label="轮休时长(天)：" prop="leaveDuration">
<el-input v-model="form.leaveDuration" disabled /> <el-input v-model="form.leaveDuration" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -268,9 +276,15 @@
leaveStartDate: [ leaveStartDate: [
{ required: true, message: "轮休开始时间不能为空", trigger: "blur" } { required: true, message: "轮休开始时间不能为空", trigger: "blur" }
], ],
leaveStartInterval: [
{ required: true, message: "不能为空", trigger: "change" }
],
leaveEndDate: [ leaveEndDate: [
{ required: true, message: "轮休结束时间不能为空", trigger: "blur" } { required: true, message: "轮休结束时间不能为空", trigger: "blur" }
], ],
leaveEndInterval: [
{ required: true, message: "不能为空", trigger: "change" }
],
leaveDuration: [ leaveDuration: [
{ required: true, message: "轮休时长不能为空", trigger: "blur" } { required: true, message: "轮休时长不能为空", trigger: "blur" }
], ],
@ -344,10 +358,10 @@
userName:this.userInfo.name, userName:this.userInfo.name,
orgId: undefined, orgId: undefined,
leaveStartDate: undefined, leaveStartDate: undefined,
leaveStartInterval:'1', leaveStartInterval:undefined,
leaveEndDate: undefined, leaveEndDate: undefined,
leaveEndInterval:'1', leaveEndInterval:undefined,
leaveDuration:0.5, leaveDuration:undefined,
leaveType:"轮休", leaveType:"轮休",
examineStatus:"0", examineStatus:"0",
leaveReason:undefined, leaveReason:undefined,

2
src/views/report/attReport/index.vue
View File

@ -122,7 +122,7 @@
<el-table-column label="修改上班状态" align="center" prop="toWorkAttStatus" width="180"> <el-table-column label="修改上班状态" align="center" prop="toWorkAttStatus" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select <el-select
v-model="scope.row.toWorkAttStatus" v-model="scope.row.toWorkAttStatus" @change="changeToWorkAttStatus"
placeholder="修改后上班状态" style="width: 95%"> placeholder="修改后上班状态" style="width: 95%">
<el-option <el-option
v-for="dict in dict.type.att_status" v-for="dict in dict.type.att_status"

4
src/views/report/dayReport/index.vue
View File

@ -12,7 +12,7 @@
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="部门" prop="orgId"> <!-- <el-form-item label="部门" prop="orgId">
<treeselect v-model="queryParams.orgId" :options="deptOptions" :normalizer="normalizer" @select="handleSelect" placeholder="选择部门" style="width: 240px"/> <treeselect v-model="queryParams.orgId" :options="deptOptions" :normalizer="normalizer" @select="handleSelect" placeholder="选择部门" style="width: 240px"/>
</el-form-item> </el-form-item>
<el-form-item label="姓名" prop="userName"> <el-form-item label="姓名" prop="userName">
@ -23,7 +23,7 @@
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item> -->

4
src/views/setting/rules/index.vue
View File

@ -558,6 +558,10 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .vue-treeselect__multi-value{
overflow-y: auto!important;
max-height: 120px!important;
}
::v-deep .vue-treeselect__value-container{ ::v-deep .vue-treeselect__value-container{
overflow-y: auto!important; overflow-y: auto!important;