Skip to content

A
attendance-performance-platform
Commit 26115a9e authored by dll's avatar dll
Browse files
Options

提交更新测试地址

parent 345060c3
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 67 deletions
attendance-performance-manager-ui/admin/.env.development
View file @ 26115a9e
#开发环境 #开发环境
NODE_ENV = "development" NODE_ENV = "development"
VUE_APP_API_BASE_URL= http://192.168.0.98:11039 VUE_APP_API_BASE_URL= http://192.168.0.98:11039
VUE_APP_API_BASE_URL = http://192.168.0.116:17500
\ No newline at end of file
attendance-performance-manager-ui/admin/src/assets/mixins/table.js
View file @ 26115a9e
...@@ -360,12 +360,13 @@ export default { ...@@ -360,12 +360,13 @@ export default {
formatterBanci(row,column,val){ formatterBanci(row,column,val){
const content = formatter(this.tableData, column, val) const content = formatter(this.tableData, column, val)
if (content) { if (content) {
// let string = row.attendanceTime.replace("、","<br>")
return <div> return <div>
<div> <div>
<el-tag type="info">{row.restTime}</el-tag> <el-tag type="info">{row.restTime}</el-tag>
</div> </div>
<div class="mt10"> <div class="mt10" style="background:#ecf5ff;color:#409EFF">
<el-tag>{row.attendanceTime}</el-tag> <p>{row.attendanceTime}</p>
</div> </div>
</div> </div>
} else { } else {
......
attendance-performance-manager-ui/admin/src/assets/utils/ajax.js
View file @ 26115a9e
...@@ -38,11 +38,11 @@ instance.interceptors.request.use(config => { ...@@ -38,11 +38,11 @@ instance.interceptors.request.use(config => {
// 代 // 代
// http://192.168.0.108/17500 // http://192.168.0.108/17500
const hostname = '192.168.0.116'
const port = '17500'
// const hostname = '192.168.0.108' // const hostname = '192.168.0.108'
// const port = '11039' // const port = '17500'
const hostname = '192.168.0.108'
const port = '11039'
// 动态修改请求地址 // 动态修改请求地址
if (config.url.startsWith('/')) { if (config.url.startsWith('/')) {
......
attendance-performance-manager-ui/admin/src/assets/utils/table.js
View file @ 26115a9e
...@@ -47,7 +47,7 @@ const formatterDate = (row, column) => { ...@@ -47,7 +47,7 @@ const formatterDate = (row, column) => {
const property = column.property; const property = column.property;
const time = row[property]; const time = row[property];
if(!time) return ''; if(!time) return '';
let date = new Date(Number(time)); let date = time.length<13?new Date(Number(time) * 1000) : new Date(Number(time));
let Y = date.getFullYear() + '-'; let Y = date.getFullYear() + '-';
let M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-'; let M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-';
let D = panLeft(date.getDate()) + ' '; let D = panLeft(date.getDate()) + ' ';
......
attendance-performance-manager-ui/admin/src/components/DataTable.vue
View file @ 26115a9e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
:formatter='column.formatter' :formatter='column.formatter'
:reserve-selection='column.reserveSelection' :reserve-selection='column.reserveSelection'
:subColumns='column.subColumns' :subColumns='column.subColumns'
:fixed="column.fixed"
> >
<el-table-column <el-table-column
v-for='sunColumn in column.subColumns' v-for='sunColumn in column.subColumns'
......
attendance-performance-manager-ui/admin/src/views/attendance/group/list.vue
View file @ 26115a9e
...@@ -88,16 +88,16 @@ ...@@ -88,16 +88,16 @@
}, },
], ],
columns: [ columns: [
{type: "selection", width: 60}, {type: "selection", width: 60,fixed:'left'},
{type: "index",label: "序号",width: 50}, {type: "index",label: "序号",width: 50,fixed:'left'},
{label: "考勤组名称", prop: "groupName",width:200}, {label: "考勤组名称", prop: "groupName",width:200,fixed:'left'},
{label: "人数", prop: "personNum",width: 80}, {label: "人数", prop: "personNum",width: 80,fixed:'left'},
{label: "负责人", prop: "responsibleName",width: 80},//未 {label: "负责人", prop: "responsibleName",width: 80,fixed:'left'},//未
{label: "类型", prop: "type",formatter: this.formatterattendType,width: 100}, {label: "类型", prop: "type",formatter: this.formatterattendType,width: 100,fixed:'left'},
// {label: "创建用户", prop: "createUserId", formatter: this.formatter}, // {label: "创建用户", prop: "createUserId", formatter: this.formatter},
......
attendance-performance-manager-ui/admin/src/views/attendance/record/error/drawershow.vue
View file @ 26115a9e
...@@ -128,27 +128,10 @@ ...@@ -128,27 +128,10 @@
edit(row) { edit(row) {
this.reset() this.reset()
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl ="attendance/record/edit"; this.urls.currUrl ="attendance/record/error/edit";
this.getData(); this.getData();
this.pageInfo.type="edit" this.pageInfo.type="edit"
this.title = "修改考勤打卡记录信息"; this.title = "处理异常";
},
/** 新增 */
add(row) {
this.reset()
this.urls.currUrl = "attendance/record/add";
this.getData();
this.pageInfo.type="add"
this.title = "新增考勤打卡记录信息";
},
/** 查看*/
view(row) {
this.reset()
this.query = { id: row.id };
this.urls.currUrl ="attendance/record/view";
this.getData();
this.pageInfo.type="view"
this.title = "考勤打卡记录信息详细";
}, },
/**取消按钮 */ /**取消按钮 */
cancel() { cancel() {
......
attendance-performance-manager-ui/admin/src/views/attendance/record/error/list.vue
View file @ 26115a9e
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
@click="morehandle" @click="morehandle"
>批量处理</el-button> >批量处理</el-button>
</LayoutTable> </LayoutTable>
<dialog-show ref="dialogform" @ok="getData" /> <drawer-show ref="drawerShow" @ok="getData" />
<!-- 撤销提示 --> <!-- 撤销提示 -->
<el-dialog :visible.sync="dialogVisible" title="提示" width="40%"> <el-dialog :visible.sync="dialogVisible" title="提示" width="40%">
<div>撤销异常处理结果后，当天的考勤结果将会重新计算，系统需要花费一点时间。</div> <div>撤销异常处理结果后，当天的考勤结果将会重新计算，系统需要花费一点时间。</div>
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import dialogShow from "./dialogshow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "AttendanceRecordErrorList", name: "AttendanceRecordErrorList",
components: { components: {
dialogShow drawerShow
}, },
mixins: [table], mixins: [table],
created() { created() {
...@@ -46,14 +46,18 @@ ...@@ -46,14 +46,18 @@
// toView(row) { // toView(row) {
// this.$refs.dialogform.view(row); // this.$refs.dialogform.view(row);
// }, // },
// morehandle(row){
// console.log(this.selection) morehandle(row){
// this.$refs.dialogform.edit(row); if(this.selection.length < 1){
// }, this.$message.error('请至少选择一条处理')
return
}
this.$refs.drawerShow.edit(row);
},
// 处理 // 处理
handle(err){ handle(err){
console.log(err) console.log(err)
this.$refs.dialogform.edit(err); this.$refs.drawerShow.edit(err);
}, },
// 撤销 // 撤销
reCancle(err){ reCancle(err){
...@@ -130,12 +134,11 @@ ...@@ -130,12 +134,11 @@
}, },
], ],
columns: [ columns: [
{type: "selection", width: 60}, {type: "selection", width: 60,fixed:'left'},
{type: "index",label: "序号",width: 50}, {type: "index",label: "序号",width: 50,fixed:'left'},
{label: "员工姓名", prop: "staffName",fixed:'left',width:100},
{label: "员工姓名", prop: "staffName"},
{label: "工号", prop: "workNum"}, {label: "工号", prop: "workNum"},
{label: "部门", prop: "staffName"}, {label: "部门", prop: "deptName"},
{label: "考勤组", prop: "deptName"}, {label: "考勤组", prop: "deptName"},
{label: "班次", prop: "shiftsName"}, {label: "班次", prop: "shiftsName"},
{label: "异常状态", prop: "errorStatus",formatter: this.formattereErrorStatus}, {label: "异常状态", prop: "errorStatus",formatter: this.formattereErrorStatus},
...@@ -150,13 +153,13 @@ ...@@ -150,13 +153,13 @@
{ {
label: "操作", label: "操作",
width: 240, width: 240,
formatter: row => { formatter: (row) => {
return ( return (
<span> <span>
<el-button type="text" size='mini' onClick={(row) => { <el-button type="text" size='mini' onClick={() => {
this.handle(row) this.handle(row)
}} v-if={row.processStatus == 0}>处理</el-button> }} v-if={row.processStatus == 0}>处理</el-button>
<el-button type="text" size='mini' onClick={(row) => { <el-button type="text" size='mini' onClick={() => {
this.reCancle(row) this.reCancle(row)
}} v-else>撤销</el-button> }} v-else>撤销</el-button>
</span> </span>
......
attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue
View file @ 26115a9e
...@@ -160,15 +160,14 @@ ...@@ -160,15 +160,14 @@
} }
], ],
columns: [ columns: [
{type: "selection", width: 60}, {type: "selection", width: 60,fixed:'left'},
{type: "index",label: "序号",width: 50}, {type: "index",label: "序号",width: 50,fixed:'left'},
{label: "窗口类别", prop: "windowCategory"}, {label: "窗口类别", prop: "windowCategory",fixed:'left',width:100},
{label:"部门",prop:"deptName"}, {label: "员工姓名", prop: "staffName",fixed:'left',width:100},
{label: "员工姓名", prop: "staffName"},
{label:"部门",prop:"deptName"},
{label: "回单位（天）", prop: "backToUnit"}, {label: "回单位（天）", prop: "backToUnit"},
{label: "因公请假（天）", prop: "onDutyLeave"}, {label: "因公请假（天）", prop: "onDutyLeave"},
...@@ -224,16 +223,16 @@ ...@@ -224,16 +223,16 @@
{label: "会议早退", prop: "earlyLeaveMeeting"}, {label: "会议早退", prop: "earlyLeaveMeeting"},
// {label: "创建用户", prop: "createUserId", formatter: this.formatter}, // {label: "创建用户", prop: "createUserId", formatter: this.formatter},
{ // {
label: "操作", // label: "操作",
width: 240, // width: 240,
formatter: row => { // formatter: row => {
return ( // return (
<table-buttons noAdd noEdit noView noDel row={row} onEdit={this.toEdit} // <table-buttons noAdd noEdit noView noDel row={row} onEdit={this.toEdit}
onView={this.toView} onDel={this.toDel} /> // onView={this.toView} onDel={this.toDel} />
); // );
} // }
} // }
] ]
}, },
setcolum:[], setcolum:[],
......
attendance-performance-manager-ui/admin/src/views/system/role/list.vue
View file @ 26115a9e
...@@ -168,6 +168,7 @@ export default { ...@@ -168,6 +168,7 @@ export default {
}, },
// 打开弹窗，获取已经选中的权限 // 打开弹窗，获取已经选中的权限
async setAuth({ id }) { async setAuth({ id }) {
console.log(id)
this.tableData.loading = true; this.tableData.loading = true;
try { try {
this.auth.form = this.initForm(); this.auth.form = this.initForm();
......
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