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-22 15:34:01 +08:00
parent 5aef5f20f6
commit 52983c4e4c
12 changed files with 103 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/components/commonDialog.vue
View File

@ -162,10 +162,10 @@
</template> </template>
<template v-else-if="item.t_slot === 'examineStatus'"> <template v-else-if="item.t_slot === 'examineStatus'">
<span v-if="scope.row[item.t_props]==0">{{ '审核中' }}</span> <span v-if="scope.row[item.t_props]==0">{{ '待审核' }}</span>
<span v-if="scope.row[item.t_props]==1">{{ '通过' }}</span> <span v-if="scope.row[item.t_props]==1">{{ '通过' }}</span>
<span v-if="scope.row[item.t_props]==2">{{ '不通过' }}</span> <span v-if="scope.row[item.t_props]==2">{{ '不通过' }}</span>
<span v-if="scope.row[item.t_props]==3">{{ '待审核' }}</span> <span v-if="scope.row[item.t_props]==3">{{ '已撤回' }}</span>
<span v-else>{{ }}</span> <span v-else>{{ }}</span>
</template> </template>

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

@ -62,7 +62,7 @@ export default {
// console.log(this.orgNumBean,22222222222222) // console.log(this.orgNumBean,22222222222222)
let arr = this.handleTree(this.orgNumBean, "orgId"); let arr = this.handleTree(this.orgNumBean, "orgId");
this.treeData = { this.treeData = {
orgName:'公司架构', orgName:'组织架构',
orgId:'0', orgId:'0',
personNum:'', personNum:'',
children:arr children:arr

82
src/views/dashboard/topOne.vue
View File

@ -73,12 +73,12 @@ export default {
}, },
pageData:{}, pageData:{},
todayAbnormalBean:{ todayAbnormalBean:{
lateNum:'1', lateNum:'0',
earlyNum:'1', earlyNum:'0',
skippingNum:'1', skippingNum:'0',
leaveNum:'1', leaveNum:'0',
addressErrorNum:'1', addressErrorNum:'0',
einErrorNum:'1', einErrorNum:'0',
} }
} }
}, },
@ -123,8 +123,8 @@ export default {
title:'今日出勤状态', title:'今日出勤状态',
percentage:this.pageData.todayAttBean.attRate+'%', percentage:this.pageData.todayAttBean.attRate+'%',
data:[ data:[
{value:Number(this.pageData.todayAttBean.shouldAttNum),name:'应出勤人数'}, {value:Number(this.pageData.todayAttBean.shouldAttNum)||0,name:'应出勤人数'},
{value:Number(this.pageData.todayAttBean.actualAttNum),name:'实际出勤人数'} {value:Number(this.pageData.todayAttBean.actualAttNum)||0,name:'实际出勤人数'}
], ],
} }
var option = { var option = {
@ -167,10 +167,63 @@ export default {
}, //提示框，鼠标悬浮交互时的信息提示 }, //提示框，鼠标悬浮交互时的信息提示
legend: { legend: {
left: "center", left: "center",
orient: 'horizontal',
bottom: "5%", bottom: "5%",
itemGap: 8, itemGap: 80,
itemWidth: 12, icon: 'circle',
itemHeight: 12, itemWidth: 8,
itemHeight: 8,
itemStyle: {
borderColor: '#fff', // 设置边框颜色
borderWidth: 0 // 设置边框宽度为0，即无边框
},
textStyle: {
color: "#333",
rich: {
a: {
verticalAlign: "right",
align: "left",
width: 90,
fontSize: 14,
},
b: {
align: "left",
fontSize: 14,
color: "#ff5722",
},
df: {
align: "left",
fontSize: 16,
fontWeight: "600",
color: "#f7c122",
},
yjf: {
align: "left",
fontSize: 16,
fontWeight: "600",
color: "#6395fa",
},
},
},
formatter: (name) => {
let total = 0;
let target;
let className = "b";
for (let i = 0, l = data.data.length; i < l; i++) {
total += Number(data.data[i].value);
if (data.data[i].name == name) {
target = data.data[i].value;
}
if (name == "应出勤人数") {
className = "yjf";
}
if (name == "实际出勤人数") {
className = "df";
}
}
let str = "{a|" + name + "}{" + className + "|" + target +"}";
return str;
},
}, },
series: [ series: [
{ {
@ -186,6 +239,7 @@ export default {
show: false, show: false,
}, },
}, },
data: [ data: [
{ value: data.data[0].value, name: data.data[0].name }, { value: data.data[0].value, name: data.data[0].name },
{ value: data.data[1].value, name: data.data[1].name }, { value: data.data[1].value, name: data.data[1].name },
@ -198,6 +252,12 @@ export default {
center: ["50%", "50%"], center: ["50%", "50%"],
hoverAnimation: false, hoverAnimation: false,
color: "#fff", color: "#fff",
label: {
position: "center",
normal: {
show: false,
},
},
data: [ data: [
{ {
value: 0, value: 0,

6
src/views/dashboard/topTwo.vue
View File

@ -31,7 +31,11 @@ export default {
props: { props: {
pageData: { pageData: {
// required: true, // required: true,
type: Object type: Object,
default:{
processedData:'0',
unProcessedData:'0'
}
}, },
}, },

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

@ -380,6 +380,7 @@ export default {
console.log(this.orgList) console.log(this.orgList)
this.reset(); this.reset();
this.open = true; this.open = true;
this.isView = false;
this.title = "新增"; this.title = "新增";
}, },
// 多选框选中数据 // 多选框选中数据
@ -458,7 +459,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const Ids = row.id; const Ids = row.id;
this.$modal.confirm('是否确认删除编号为"' + Ids + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除该申请？').then(function() {
return delHoliday(Ids); return delHoliday(Ids);
}).then(() => { }).then(() => {
this.getList(); this.getList();

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

@ -371,6 +371,7 @@
console.log(this.orgList) console.log(this.orgList)
this.reset(); this.reset();
this.open = true; this.open = true;
this.isView = false;
this.title = "新增"; this.title = "新增";
}, },
// 多选框选中数据 // 多选框选中数据
@ -449,7 +450,7 @@
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const Ids = row.id; const Ids = row.id;
this.$modal.confirm('是否确认删除编号为"' + Ids + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除该申请？').then(function() {
return delHoliday(Ids); return delHoliday(Ids);
}).then(() => { }).then(() => {
this.getList(); this.getList();

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

@ -122,7 +122,7 @@
@pagination="getList" @pagination="getList"
/> />
<el-dialog title="批量修改" :visible.sync="open" width="1200px" append-to-body> <el-dialog title="批量修改" :visible.sync="open" width="1200px" append-to-body @close="cancel">
<el-table v-loading="loading" :data="dialogList" width="100%" height="500px"> <el-table v-loading="loading" :data="dialogList" width="100%" height="500px">
<el-table-column label="序号" type="index" width="55" align="center" fixed/> <el-table-column label="序号" type="index" width="55" align="center" fixed/>
<el-table-column label="姓名" align="center" prop="userName" fixed/> <el-table-column label="姓名" align="center" prop="userName" fixed/>
@ -315,13 +315,14 @@
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange=[]
this.getWeekDates(); this.getWeekDates();
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.dialogList = selection; this.dialogList=selection.slice();
}, },
openDialog(){ openDialog(){
console.log(this.dialogList) console.log(this.dialogList)
@ -334,8 +335,7 @@
submitEdit(){ submitEdit(){
let paramList = [] let paramList = []
var index = this.dialogList.findIndex(item => {return !item.toErrorRemake||item.toErrorRemake==""||!item.offErrorRemake||item.offErrorRemake==""}) var index = this.dialogList.findIndex(item => {return !item.toErrorRemake||item.toErrorRemake==""||!item.offErrorRemake||item.offErrorRemake==""})
console.log(index)
this.$modal.msgSuccess("修改申请提交成功,耐心等待审批，请勿重复提交！");
if(index>-1){ if(index>-1){
// this.$modal.msgSuccess("原因说明不可为空！"); // this.$modal.msgSuccess("原因说明不可为空！");
this.$message({ message: '原因说明不可为空！', type: 'warning' }) this.$message({ message: '原因说明不可为空！', type: 'warning' })
@ -368,9 +368,9 @@
} }
}, },
cancel(){ cancel(){
this.getList();
this.open=false; this.open=false;
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('system/dict/type/export', { this.download('system/dict/type/export', {

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

@ -73,13 +73,13 @@
<div v-else>{{ scope.row.lateNum}}</div> <div v-else>{{ scope.row.lateNum}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="早退人数" align="center" prop="eaelyNum"> <el-table-column label="早退人数" align="center" prop="earlyNum">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.eaelyNum!=0" <div v-if="scope.row.earlyNum!=0"
@click="openRecord(scope.row,title3)" style="color: #02a7f0; cursor: pointer"> @click="openRecord(scope.row,title3)" style="color: #02a7f0; cursor: pointer">
{{ scope.row.eaelyNum}} {{ scope.row.earlyNum}}
</div> </div>
<div v-else>{{ scope.row.eaelyNum}}</div> <div v-else>{{ scope.row.earlyNum}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="旷工人数" align="center" prop="skippingNum"> <el-table-column label="旷工人数" align="center" prop="skippingNum">
@ -325,6 +325,7 @@
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange = []; this.dateRange = [];
this.getWeekDates();
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },

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

@ -67,7 +67,7 @@
<div v-else>{{ scope.row.lateNum}}</div> <div v-else>{{ scope.row.lateNum}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="早退次数" align="center" prop="eaelyNum"> <el-table-column label="早退次数" align="center" prop="earlyNum">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.earlyNum!=0" <div v-if="scope.row.earlyNum!=0"
@click="openRecord(scope.row,title3)" style="color: #02a7f0; cursor: pointer"> @click="openRecord(scope.row,title3)" style="color: #02a7f0; cursor: pointer">

1
src/views/report/originalReport/index.vue
View File

@ -217,6 +217,7 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange=[]
this.getWeekDates(); this.getWeekDates();
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();

2
src/views/setting/devices/index.vue
View File

@ -300,7 +300,7 @@
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const Ids = row.id; const Ids = row.id;
this.$modal.confirm('是否确认删除编号为"' + Ids + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除该数据项？').then(function() {
return delMachine(Ids); return delMachine(Ids);
}).then(() => { }).then(() => {
this.getList(); this.getList();

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

@ -115,7 +115,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="参与考勤人员：" prop="checkList"> <el-form-item label="参与考勤人员：" prop="checkList">
<treeselect v-model="form.checkList" :multiple="true" :flat="true" :options="personOptions" :normalizer="normalizer" placeholder="选择部门负责人" @input="handleSelect"/> <treeselect v-model="form.checkList" :multiple="true" :flat="true" :options="personOptions" :normalizer="normalizer" placeholder="选择部门和人员" @input="handleSelect"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -541,7 +541,7 @@
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const groupIds = row.groupId || this.ids; const groupIds = row.groupId || this.ids;
this.$modal.confirm('是否确认删除编号为"' + groupIds + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除该数据项？').then(function() {
return delAttGroup(groupIds); return delAttGroup(groupIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();