From 2f25575cb3c1d045bab1bb265ef73f40772c8fc0 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sun, 09 May 2021 16:46:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/security/security.vue | 8 ++--
src/views/attendance/attendance.vue | 109 ++++++++++++++++++++++++++----------------------------
2 files changed, 57 insertions(+), 60 deletions(-)
diff --git a/src/views/attendance/attendance.vue b/src/views/attendance/attendance.vue
index d5a2383..13e3c16 100644
--- a/src/views/attendance/attendance.vue
+++ b/src/views/attendance/attendance.vue
@@ -1,6 +1,6 @@
<template>
<el-row>
- <el-col :span="3">
+ <el-col :span="3" style="display:none">
<div class="box">
<el-scrollbar>
<basic-container>
@@ -9,7 +9,7 @@
</el-scrollbar>
</div>
</el-col>
- <el-col :span="21">
+ <el-col>
<basic-container>
<avue-crud :option="option"
:search.sync="search"
@@ -111,70 +111,69 @@
},
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
+ border: false,
+ stripe:true,
tip: false,
searchShow: true,
- searchMenuSpan: 3,
- // headerAlign:'center',
- maxHeight:'auto',
- align:'center',
- searchSpan: 4,
- border: true,
+ searchMenuSpan: 6,
index: true,
viewBtn: true,
selection: true,
+ labelWidth:120,
dialogClickModal: false,
+ headerAlign: 'center',
+ align: 'center',
column: [
- {
- label: "所属租户",
- prop: "tenantId",
- hide: true,
- width: 200,
- type: "tree",
- dicUrl: "/api/blade-system/tenant/select",
- props: {
- label: "tenantName",
- value: "tenantId"
- },
- addDisplay: website.tenantMode,
- editDisplay: website.tenantMode,
- viewDisplay: website.tenantMode,
- rules: [{
- required: true,
- message: "请输入所属租户",
- trigger: "click"
- }],
- span: 24,
- },
+ // {
+ // label: "所属租户",
+ // prop: "tenantId",
+ // hide: true,
+ // width: 200,
+ // type: "tree",
+ // dicUrl: "/api/blade-system/tenant/select",
+ // props: {
+ // label: "tenantName",
+ // value: "tenantId"
+ // },
+ // addDisplay: website.tenantMode,
+ // editDisplay: website.tenantMode,
+ // viewDisplay: website.tenantMode,
+ // rules: [{
+ // required: true,
+ // message: "请输入所属租户",
+ // trigger: "click"
+ // }],
+ // span: 24,
+ // },
{
label: "员工编号",
- width: 100,
searchSpan: 3,
prop: "number",
},
{
label: "姓名",
searchLabelWidth: 45,
+ searchSpan:3,
prop: "name",
- width: 90,
search: true,
},
- {
- label: "组织机构",
- prop: "deptName",
- type: "select",
- dicUrl: "/api/blade-system/dept/tree",
- width: 85,
- props: {
- label: "deptName",
- value: "deptId"
- },
- rules: [{
- required: true,
- message: "请输入组织机构",
- trigger: "blur"
- }]
- },
+ // {
+ // label: "组织机构",
+ // prop: "deptName",
+ // type: "select",
+ // dicUrl: "/api/blade-system/dept/tree",
+ // width: 85,
+ // props: {
+ // label: "deptName",
+ // value: "deptId"
+ // },
+ // rules: [{
+ // required: true,
+ // message: "请输入组织机构",
+ // trigger: "blur"
+ // }]
+ // },
{
label: "考勤时间",
prop: "releaseTimeRange",
@@ -198,7 +197,7 @@
label: "考勤时间",
prop: "clocktime",
type: "date",
- width: 130,
+ width: 200,
format: "yyyy-MM-dd hh:mm:ss",
valueFormat: "yyyy-MM-dd hh:mm:ss",
rules: [{
@@ -210,7 +209,6 @@
{
label: "星期",
prop: "week",
- width: 60,
rules: [{
required: true,
message: "请输入星期",
@@ -219,7 +217,6 @@
},
{
label: "天气",
- width: 90,
prop: "weather",
rules: [{
required: true,
@@ -251,7 +248,7 @@
label: "打卡类型",
searchSpan: 3,
prop: "clocktype",
- width: 80,
+ width: 120,
type: "select",
slot: true,
rules: [{
@@ -272,8 +269,8 @@
},
{
label: "考勤类型",
- width: 80,
search: true,
+ searchSpan:3,
prop: "attendancetype",
slot: true,
type: "select",
@@ -300,7 +297,7 @@
{
label: "考勤地址",
prop: "address",
- width: 350,
+ width: 450,
rules: [{
required: true,
message: "请输入地址",
@@ -316,10 +313,10 @@
...mapGetters(["permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.attendance_add, false),
+ addBtn: this.vaildData(null, false),
viewBtn: this.vaildData(this.permission.attendance_view, true),
delBtn: this.vaildData(this.permission.attendance_delete, true),
- editBtn: this.vaildData(this.permission.attendance_edit, false)
+ editBtn: this.vaildData(null, false)
};
},
ids() {
diff --git a/src/views/security/security.vue b/src/views/security/security.vue
index 503ef84..7005301 100644
--- a/src/views/security/security.vue
+++ b/src/views/security/security.vue
@@ -259,16 +259,16 @@
this.$nextTick(() => {
this.$refs.securityMap.onload = () => {
- if (window.frames[0].init) {
+ if (window.frames[1].init) {
if(row.jd=="" || row.jd=="0.0"){
//如果处警员无位置信息，则赋值一个默认数据，否则地图无法加载
- window.frames[0].init("SecurityMap", {
+ window.frames[1].init("SecurityMap", {
x: rwjd,
y: rwwd,
code:row.code
});
}else{
- window.frames[0].init("SecurityMap", {
+ window.frames[1].init("SecurityMap", {
x: row.jd,
y: row.wd,
code:row.code
@@ -276,7 +276,7 @@
}
} else {
- console.log(`没有找到到window.frames[0].init`)
+ console.log(`没有找到到window.frames[1].init`)
}
}
});
--
Gitblit v1.9.3