From e83ecb7c6d0ab7662518389092e82fb252bc658f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 14 Aug 2021 18:36:13 +0800
Subject: [PATCH] 打印路径修改，保安员查询修改
---
src/api/system/user.js | 9
public/securityPrint.html | 2
src/api/system/role.js | 133 +++--
src/api/securityGuard/securityGuard.js | 2
src/views/securityGuard/securityGuard.vue | 180 +++++---
src/views/trainExam/performance.vue | 1
public/papers.html | 2
src/views/securityGuard/data.js | 870 ++++++++++++++++++++--------------------
public/papersApply.html | 2
src/views/exam/performance.vue | 2
10 files changed, 638 insertions(+), 565 deletions(-)
diff --git a/public/papers.html b/public/papers.html
index dfe0ad7..46276e4 100644
--- a/public/papers.html
+++ b/public/papers.html
@@ -121,7 +121,7 @@
var examType = JSON.parse(getData("data")).examType;
// console.log(JSON.parse(getData("data")), 111);
- axios.get('http://223.82.109.183:2080/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
+ axios.get('http://223.82.109.183:2080/api/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
// axios.get('http://localhost:81/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
var data = res.data.data;
var str = `<span class="title">${data.examName}</span>
diff --git a/public/papersApply.html b/public/papersApply.html
index a3300db..1e7229d 100644
--- a/public/papersApply.html
+++ b/public/papersApply.html
@@ -77,7 +77,7 @@
var name = JSON.parse(getData("data")).name;
// console.log(JSON.parse(getData("data")), 111);
- axios.get('http://223.82.109.183:2080/apply/getApplyDetailList?examId=' + id).then(function(res) {
+ axios.get('http://223.82.109.183:2080/api/apply/getApplyDetailList?examId=' + id).then(function(res) {
// axios.get('http://localhost:81/apply/getApplyDetailList?examId=' + id).then(function(res) {
var data = res.data;
var list = data.applyList;
diff --git a/public/securityPrint.html b/public/securityPrint.html
index 6935f39..adb33b4 100644
--- a/public/securityPrint.html
+++ b/public/securityPrint.html
@@ -199,7 +199,7 @@
var securityName = JSON.parse(getData("data")).securityName;
// console.log(JSON.parse(getData("data")), 111);
- axios.get('http://223.82.109.183:2080/apply/userDetail?id=' + id).then(function(res) {
+ axios.get('http://223.82.109.183:2080/api/apply/userDetail?id=' + id).then(function(res) {
var data = res.data.data;
var str = `<div id="table1"></div>
<div id="table">
diff --git a/src/api/securityGuard/securityGuard.js b/src/api/securityGuard/securityGuard.js
index 97a0d98..b95ca3c 100644
--- a/src/api/securityGuard/securityGuard.js
+++ b/src/api/securityGuard/securityGuard.js
@@ -2,7 +2,7 @@
export const getList = (current, size, params) => {
return request({
- url: '/api/blade-user/page',
+ url: '/api/blade-user/pages',
method: 'get',
params: {
...params,
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 8d34555..ed4e242 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -1,89 +1,100 @@
import request from '@/router/axios';
export const getList = (current, size, params) => {
- return request({
- url: '/api/blade-system/role/list',
- method: 'get',
- params: {
- ...params,
- current,
- size,
- }
- })
+ return request({
+ url: '/api/blade-system/role/list',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
}
export const grantTree = () => {
- return request({
- url: '/api/blade-system/menu/grant-tree',
- method: 'get',
- })
+ return request({
+ url: '/api/blade-system/menu/grant-tree',
+ method: 'get',
+ })
}
export const grant = (roleIds, menuIds, dataScopeIds, apiScopeIds) => {
- return request({
- url: '/api/blade-system/role/grant',
- method: 'post',
- data: {
- roleIds,
- menuIds,
- dataScopeIds,
- apiScopeIds
- }
- })
+ return request({
+ url: '/api/blade-system/role/grant',
+ method: 'post',
+ data: {
+ roleIds,
+ menuIds,
+ dataScopeIds,
+ apiScopeIds
+ }
+ })
}
export const remove = (ids) => {
- return request({
- url: '/api/blade-system/role/remove',
- method: 'post',
- params: {
- ids,
- }
- })
+ return request({
+ url: '/api/blade-system/role/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
}
export const add = (row) => {
- return request({
- url: '/api/blade-system/role/submit',
- method: 'post',
- data: row
- })
+ return request({
+ url: '/api/blade-system/role/submit',
+ method: 'post',
+ data: row
+ })
}
export const update = (row) => {
- return request({
- url: '/api/blade-system/role/submit',
- method: 'post',
- data: row
- })
+ return request({
+ url: '/api/blade-system/role/submit',
+ method: 'post',
+ data: row
+ })
}
export const getRole = (roleIds) => {
- return request({
- url: '/api/blade-system/menu/role-tree-keys',
- method: 'get',
- params: {
- roleIds,
- }
- })
+ return request({
+ url: '/api/blade-system/menu/role-tree-keys',
+ method: 'get',
+ params: {
+ roleIds,
+ }
+ })
}
export const getRoleTree = (tenantId) => {
- return request({
- url: '/api/blade-system/role/tree',
- method: 'get',
- params: {
- tenantId,
- }
- })
+ return request({
+ url: '/api/blade-system/role/tree',
+ method: 'get',
+ params: {
+ tenantId,
+ }
+ })
}
export const getRoleTreeById = (roleId) => {
- return request({
- url: '/api/blade-system/role/tree-by-id',
- method: 'get',
- params: {
- roleId,
- }
- })
+ return request({
+ url: '/api/blade-system/role/tree-by-id',
+ method: 'get',
+ params: {
+ roleId,
+ }
+ })
}
+
+
+export const getRoleDetail = (id) => {
+ return request({
+ url: '/api/blade-system/role/details',
+ method: 'get',
+ params: {
+ id,
+ }
+ })
+}
\ No newline at end of file
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 147dd73..e2369c7 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -31,6 +31,15 @@
})
}
+
+export const securitySave = (row) => {
+ return request({
+ url: '/api/blade-user/securitySave',
+ method: 'post',
+ data: row
+ })
+}
+
export const update = (row) => {
return request({
url: '/api/blade-user/update',
diff --git a/src/views/exam/performance.vue b/src/views/exam/performance.vue
index 1c9f5d8..919de01 100644
--- a/src/views/exam/performance.vue
+++ b/src/views/exam/performance.vue
@@ -450,9 +450,11 @@
},
questionBankRowUpdate(row, index, done, loading) {
+ debugger;
update({
theoryGrade: row.theoryGrade,
learnGrade: row.learnGrade,
+ examId:row.examId,
id: row.id,
}).then(
() => {
diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index 565ff83..d50ba09 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -1,314 +1,314 @@
//保安员基本信息
export var securityBaseInfoColumn = [{
- label: "",
- labelWidth: "20",
- type: 'title',
- prop: "title",
- span: 24,
- styles: {
- fontSize: '24px'
- }
-},
-{
- label: "所属保安公司",
- prop: "deptId",
- type: "tree",
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
- // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
- props: {
- label: "title",
- value: "id",
- },
- disabled: true,
- span: 24,
-},
-{
- label: "登录账号",
- prop: "account",
- disabled: true
-},
-{
- label: "用户姓名",
- prop: "realName",
- disabled: true,
-},
-{
- label: "用户昵称",
- prop: "name",
- disabled: true
-},
-{
- label: "手机号码",
- prop: "phone",
- disabled: true
-},
-{
- label: "电子邮箱",
- prop: "email",
- disabled: true
-},
-{
- label: "身份证号",
- prop: "cardid",
- disabled: true
-},
-{
- label: "籍贯",
- prop: "nativeplace",
- disabled: true
-},
-{
- label: "民族",
- prop: "nation",
- disabled: true
-},
-{
- label: "是否持证",
- prop: "hold",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
- props: {
- label: "dictValue",
- value: "dictKey",
- },
- type: "select",
- disabled: true
-},
-{
- label: "保安员证编号",
- prop: "securitynumber",
- disabled: true
-},
-{
- label: "所属辖区",
- prop: "jurisdiction",
- // multiple: true,
- type: "tree",
- dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
- props: {
- label: "title",
- value: "id",
- },
- disabled: true
-},
-{
- label: "最高学历",
- prop: "education",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- disabled: true
-},
-{
- label: "政治面貌",
- prop: "politicaloutlook",
- disabled: true
-},
-{
- label: "身高",
- prop: "height",
- disabled: true
-},
-{
- label: "联系地址",
- prop: "address",
- disabled: true
-},
-{
- label: "户口所在地",
- prop: "registered",
- disabled: true
-},
-{
- label: "入职时间",
- prop: "rtime",
- type: 'date',
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- disabled: true
-},
-{
- label: "用户性别",
- prop: "sex",
- type: "select",
- dicData: [{
- label: "男",
- value: 1
+ label: "",
+ labelWidth: "20",
+ type: 'title',
+ prop: "title",
+ span: 24,
+ styles: {
+ fontSize: '24px'
+ }
},
{
- label: "女",
- value: 2
+ label: "所属保安公司",
+ prop: "deptId",
+ type: "tree",
+ dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ disabled: true,
+ span: 24,
},
{
- label: "未知",
- value: 3
+ label: "登录账号",
+ prop: "account",
+ disabled: true
+ },
+ {
+ label: "用户姓名",
+ prop: "realName",
+ disabled: true,
+ },
+ {
+ label: "用户昵称",
+ prop: "name",
+ disabled: true
+ },
+ {
+ label: "手机号码",
+ prop: "phone",
+ disabled: true
+ },
+ {
+ label: "电子邮箱",
+ prop: "email",
+ disabled: true
+ },
+ {
+ label: "身份证号",
+ prop: "cardid",
+ disabled: true
+ },
+ {
+ label: "籍贯",
+ prop: "nativeplace",
+ disabled: true
+ },
+ {
+ label: "民族",
+ prop: "nation",
+ disabled: true
+ },
+ {
+ label: "是否持证",
+ prop: "hold",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ type: "select",
+ disabled: true
+ },
+ {
+ label: "保安员证编号",
+ prop: "securitynumber",
+ disabled: true
+ },
+ {
+ label: "所属辖区",
+ prop: "jurisdiction",
+ // multiple: true,
+ type: "tree",
+ dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ disabled: true
+ },
+ {
+ label: "最高学历",
+ prop: "education",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ slot: true,
+ disabled: true
+ },
+ {
+ label: "政治面貌",
+ prop: "politicaloutlook",
+ disabled: true
+ },
+ {
+ label: "身高",
+ prop: "height",
+ disabled: true
+ },
+ {
+ label: "联系地址",
+ prop: "address",
+ disabled: true
+ },
+ {
+ label: "户口所在地",
+ prop: "registered",
+ disabled: true
+ },
+ {
+ label: "入职时间",
+ prop: "rtime",
+ type: 'date',
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ disabled: true
+ },
+ {
+ label: "用户性别",
+ prop: "sex",
+ type: "select",
+ dicData: [{
+ label: "男",
+ value: 1
+ },
+ {
+ label: "女",
+ value: 2
+ },
+ {
+ label: "未知",
+ value: 3
+ }
+ ],
+ disabled: true
+ },
+ {
+ label: "用户生日",
+ type: "date",
+ prop: "birthday",
+ disabled: true
}
- ],
- disabled: true
-},
-{
- label: "用户生日",
- type: "date",
- prop: "birthday",
- disabled: true
-}
]
export var securityBaseInfoColumns = [{
- label: "所属保安单位",
- prop: "tenantId",
- type: "tree",
- dicUrl: "/api/blade-system/tenant/select",
- props: {
- label: "tenantName",
- value: "tenantId"
- },
- disabled: true,
- span: 24,
-},
-{
- label: "登录账号",
- prop: "account",
- disabled: true
-},
-{
- label: "用户姓名",
- prop: "realName",
- rules: [{
- required: true,
- message: "请输入用户姓名",
- trigger: "blur"
- }, {
- min: 2,
- max: 5,
- message: '姓名长度在2到5个字符'
- }]
-},
-{
- label: "用户昵称",
- prop: "name"
-},
-{
- label: "手机号码",
- prop: "phone",
- overHidden: true,
- rules: [{
- required: true,
- message: "请输入手机号",
- trigger: "blur"
- }]
-},
-{
- label: "电子邮箱",
- prop: "email",
- hide: true,
- overHidden: true
-},
-{
- label: "身份证号",
- prop: "cardid",
- hide: true,
- overHidden: true,
- rules: [{
- required: true,
- message: "请输入身份证号",
- trigger: "blur"
- }]
-},
-{
- label: "籍贯",
- prop: "nativeplace",
- hide: true,
- overHidden: true
-},
-{
- label: "民族",
- prop: "nation",
- hide: true,
- overHidden: true
-},
-{
- label: "最高学历",
- prop: "education",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- rules: [{
- required: true,
- message: "请选择学历",
- trigger: "blur"
- }]
-},
-{
- label: "政治面貌",
- prop: "politicaloutlook",
- hide: true,
- overHidden: true
-},
-{
- label: "身高",
- prop: "height",
- hide: true,
- overHidden: true
-},
-{
- label: "联系地址",
- prop: "address",
- hide: true,
- overHidden: true
-},
-{
- label: "户口所在地",
- prop: "registered",
- hide: true,
- overHidden: true
-},
-{
- label: "入职时间",
- prop: "rtime",
- type: 'date',
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- hide: true,
- overHidden: true
-},
-{
- label: "用户性别",
- prop: "sex",
- type: "select",
- dicData: [{
- label: "男",
- value: 1
+ label: "所属保安单位",
+ prop: "tenantId",
+ type: "tree",
+ dicUrl: "/api/blade-system/tenant/select",
+ props: {
+ label: "tenantName",
+ value: "tenantId"
+ },
+ disabled: true,
+ span: 24,
},
{
- label: "女",
- value: 2
+ label: "登录账号",
+ prop: "account",
+ disabled: true
},
{
- label: "未知",
- value: 3
+ label: "用户姓名",
+ prop: "realName",
+ rules: [{
+ required: true,
+ message: "请输入用户姓名",
+ trigger: "blur"
+ }, {
+ min: 2,
+ max: 5,
+ message: '姓名长度在2到5个字符'
+ }]
+ },
+ {
+ label: "用户昵称",
+ prop: "name"
+ },
+ {
+ label: "手机号码",
+ prop: "phone",
+ overHidden: true,
+ rules: [{
+ required: true,
+ message: "请输入手机号",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "电子邮箱",
+ prop: "email",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "身份证号",
+ prop: "cardid",
+ hide: true,
+ overHidden: true,
+ rules: [{
+ required: true,
+ message: "请输入身份证号",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "籍贯",
+ prop: "nativeplace",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "民族",
+ prop: "nation",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "最高学历",
+ prop: "education",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请选择学历",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "政治面貌",
+ prop: "politicaloutlook",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "身高",
+ prop: "height",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "联系地址",
+ prop: "address",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "户口所在地",
+ prop: "registered",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "入职时间",
+ prop: "rtime",
+ type: 'date',
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "用户性别",
+ prop: "sex",
+ type: "select",
+ dicData: [{
+ label: "男",
+ value: 1
+ },
+ {
+ label: "女",
+ value: 2
+ },
+ {
+ label: "未知",
+ value: 3
+ }
+ ],
+ hide: true
+ },
+ {
+ label: "用户生日",
+ type: "date",
+ prop: "birthday",
+ hide: true
}
- ],
- hide: true
-},
-{
- label: "用户生日",
- type: "date",
- prop: "birthday",
- hide: true
-}
]
@@ -445,154 +445,154 @@
export var securityFormPageColumn = [{
- label: "姓名",
- prop: "realName",
- search: true,
- searchSpan: 4,
- searchLabelWidth: 50,
- display: false
-},
-{
- label: "性别",
- prop: "sex",
- type: "select",
- dicData: [{
- label: "男",
- value: 1,
+ label: "姓名",
+ prop: "realName",
+ search: true,
+ searchSpan: 4,
+ searchLabelWidth: 50,
+ display: false
},
{
- label: "女",
- value: 2,
+ label: "性别",
+ prop: "sex",
+ type: "select",
+ dicData: [{
+ label: "男",
+ value: 1,
+ },
+ {
+ label: "女",
+ value: 2,
+ },
+ {
+ label: "未知",
+ value: 3,
+ },
+ ],
+ display: false
},
- {
- label: "未知",
- value: 3,
- },
- ],
- display: false
-},
-{
- label: "籍贯",
- prop: "nativeplace",
- display: false
-},
-{
- label: "民族",
- prop: "nation",
- display: false
-},
-{
- label: "出生日期",
- prop: "birthday",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- display: false
-},
-{
- label: "学历",
- prop: "education",
- display: false,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
- props: {
- label: "dictValue",
- value: "dictKey"
+ {
+ label: "籍贯",
+ prop: "nativeplace",
+ display: false
},
- type: "select",
- hide: true,
- rules: [{
- required: true,
- message: "请选择学历",
- trigger: "blur"
- }],
-},
-{
- label: "联系电话",
- prop: "phone",
- display: false
-},
-{
- label: "邮箱",
- prop: "email",
- display: false,
- width: 150
-},
-{
- label: "入职时间",
- prop: "rtime",
- display: false
-},
-{
- label: "保安公司名称",
- searchLabelWidth: "110",
- // prop: "deptName",
- prop: "deptId",
- type: "tree",
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
- props: {
- label: "title",
- value: "id",
+ {
+ label: "民族",
+ prop: "nation",
+ display: false
},
- slot: true,
- searchSpan: 4,
- display: false,
- search: true,
- width: 260
-},
-{
- label: "是否持证",
- prop: "hold",
- slot: true,
- display: false,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
- props: {
- label: "dictValue",
- value: "dictKey"
+ {
+ label: "出生日期",
+ prop: "birthday",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ display: false
},
- type: "select",
- rules: [{
- required: true,
- message: "请选择",
- trigger: "blur"
- }],
-},
-// {
-// label: "入职时间",
-// prop: "rtime",
-// type: "datetime",
-// format: "yyyy-MM-dd",
-// valueFormat: "yyyy-MM-dd",
-// searchRange: true,
-// searchSpan: 6,
-// hide: true,
-// addDisplay: false,
-// editDisplay: false,
-// viewDisplay: false,
-// search: true,
-// rules: [{
-// required: true,
-// message: "请输入时间",
-// trigger: "blur"
-// }]
-// },
-{
- label: "在职状态",
- prop: "status",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=workerState",
- props: {
- label: "dictValue",
- value: "dictKey"
+ {
+ label: "学历",
+ prop: "education",
+ display: false,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ type: "select",
+ hide: true,
+ rules: [{
+ required: true,
+ message: "请选择学历",
+ trigger: "blur"
+ }],
},
- dataType: "number",
- display: false,
- searchSpan: 4,
- search: true,
- rules: [{
- required: true,
- message: "请选择在职状态",
- trigger: "blur"
- }]
-},
+ {
+ label: "联系电话",
+ prop: "phone",
+ display: false
+ },
+ {
+ label: "邮箱",
+ prop: "email",
+ display: false,
+ width: 150
+ },
+ {
+ label: "入职时间",
+ prop: "rtime",
+ display: false
+ },
+ {
+ label: "保安公司名称",
+ searchLabelWidth: "110",
+ // prop: "deptName",
+ prop: "deptId",
+ type: "tree",
+ dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ slot: true,
+ searchSpan: 6,
+ display: false,
+ search: true,
+ width: 260
+ },
+ {
+ label: "是否持证",
+ prop: "hold",
+ slot: true,
+ display: false,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ type: "select",
+ rules: [{
+ required: true,
+ message: "请选择",
+ trigger: "blur"
+ }],
+ },
+ // {
+ // label: "入职时间",
+ // prop: "rtime",
+ // type: "datetime",
+ // format: "yyyy-MM-dd",
+ // valueFormat: "yyyy-MM-dd",
+ // searchRange: true,
+ // searchSpan: 6,
+ // hide: true,
+ // addDisplay: false,
+ // editDisplay: false,
+ // viewDisplay: false,
+ // search: true,
+ // rules: [{
+ // required: true,
+ // message: "请输入时间",
+ // trigger: "blur"
+ // }]
+ // },
+ {
+ label: "在职状态",
+ prop: "status",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=workerState",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ display: false,
+ searchSpan: 4,
+ search: true,
+ rules: [{
+ required: true,
+ message: "请选择在职状态",
+ trigger: "blur"
+ }]
+ },
]
\ No newline at end of file
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 0b0f7c1..fc9a98e 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -247,6 +247,7 @@
update,
updatePlatform,
add,
+ securitySave,
grant,
resetPassword,
getUserPractitionersInfo,
@@ -254,12 +255,13 @@
} from "@/api/system/user";
import { getList } from "@/api/securityGuard/securityGuard";
import { getDeptLazyTree } from "@/api/system/dept";
-import { getRoleTree } from "@/api/system/role";
+import { getRoleTree,getRoleDetail } from "@/api/system/role";
import { getPostList } from "@/api/system/post";
import { mapGetters } from "vuex";
import website from "@/config/website";
import { getToken } from "@/util/auth";
import { securityFormPageColumn } from "./data";
+import { mapState } from 'vuex';
export default {
data() {
@@ -280,6 +282,7 @@
}
};
return {
+ securityid:"",
excelBox1: false,
excelForm1: {},
excelOption1: {
@@ -404,7 +407,6 @@
value: "id",
},
// disabled: true,
- span: 24,
rules: [
{
required: true,
@@ -462,6 +464,10 @@
],
},
{
+ label: "昵称",
+ prop: "name",
+ },
+ {
label: "个人照片",
type: "upload",
listType: "picture-img",
@@ -479,14 +485,12 @@
row: true,
prop: "myPicture",
},
- {
- label: "编号",
- prop: "code",
- },
- {
- label: "昵称",
- prop: "name",
- },
+
+ // {
+ // label: "编号",
+ // prop: "code",
+ // },
+
{
label: "所属辖区",
prop: "jurisdiction",
@@ -501,49 +505,49 @@
slot: true,
rules: [
{
- required: true,
+ required: false,
message: "请选择所属辖区",
trigger: "click",
},
],
},
- {
- label: "所属角色",
- prop: "roleId",
- multiple: true,
- type: "tree",
- dicData: [],
- props: {
- label: "title",
- },
- checkStrictly: true,
- slot: true,
- rules: [
- {
- required: true,
- message: "请选择所属角色",
- trigger: "click",
- },
- ],
- },
- {
- label: "所属岗位",
- prop: "postId",
- type: "tree",
- multiple: true,
- dicData: [],
- props: {
- label: "postName",
- value: "id",
- },
- rules: [
- {
- required: false,
- message: "请选择所属岗位",
- trigger: "click",
- },
- ],
- },
+ // {
+ // label: "所属角色",
+ // prop: "roleId",
+ // multiple: true,
+ // type: "tree",
+ // dicData: [],
+ // props: {
+ // label: "title",
+ // },
+ // checkStrictly: true,
+ // slot: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择所属角色",
+ // trigger: "click",
+ // },
+ // ],
+ // },
+ // {
+ // label: "所属岗位",
+ // prop: "postId",
+ // type: "tree",
+ // multiple: true,
+ // dicData: [],
+ // props: {
+ // label: "postName",
+ // value: "id",
+ // },
+ // rules: [
+ // {
+ // required: false,
+ // message: "请选择所属岗位",
+ // trigger: "click",
+ // },
+ // ],
+ // },
{
label: "是否持证",
prop: "hold",
@@ -917,12 +921,29 @@
});
return ids.join(",");
},
+ ...mapState({
+ userInfo: state => state.user.userInfo
+ })
},
mounted() {
+ this.option.column[0].hide = true
// 非保安单位模式默认加载管理组数据
if (!website.tenantMode) {
this.initData(website.tenantId);
}
+
+ //获取当前登录人员的角色信息
+ var roleIds = this.userInfo.role_id.split(",");
+ roleIds.forEach(roleId =>{
+ getRoleDetail(roleId).then((res) => {
+ var roleAlias = res.data.data.roleAlias;
+ if(roleAlias=="保安公司管理员" || roleAlias=="保安" || roleAlias=="未持证保安"){
+ const column = this.findObject(this.option.column, "deptId");
+ column.search = false;
+
+ }
+ })
+ })
},
methods: {
handleImport1() {
@@ -1003,26 +1024,43 @@
userPractitionersList.push(info);
});
}
- var IdCardNo = row.id;
- add(row).then(
- () => {
- const experience = {
- securityid: IdCardNo,
+ const user = {
+ account: row.account,
+ address: row.address,
+ birthday: row.birthday,
+ cardid: row.cardid,
+ deptId: row.deptId,
+ education: row.education,
+ email: row.email,
+ height: row.height,
+ hold: row.hold,
+ jurisdiction: row.jurisdiction,
+ myPicture: row.myPicture,
+ name:row.name,
+ nation:row.nation,
+ nativeplace:row.nativeplace,
+ password: row.password,
+ password2:row.password2,
+ phone: row.phone,
+ politicaloutlook:row.politicaloutlook,
+ realName: row.realName,
+ registered:row.registered,
+ rtime: row.rtime,
+ securitynumber:row.securitynumber,
+ sex: row.sex
+ }
+ const userMap = {
+ user: user,
userPractitionersInfo: userPractitionersList,
};
- //新增从业信息
- saveOrUpdateUserPractitionersInfo(experience).then(() => {
- this.$message({
- type: "success",
- message: "操作成功!",
- });
+ securitySave(userMap).then(
+ () => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
});
this.initFlag = false;
this.onLoad(this.page);
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // });
done();
},
(error) => {
@@ -1257,10 +1295,22 @@
};
values = {
...params,
- deptId: this.deptId,
- roleId: this.roleId,
+ roleAlias:"111",
...this.query,
};
+
+ //获取当前登录人员的角色信息
+ var roleIds = this.userInfo.role_id.split(",");
+ roleIds.forEach(roleId =>{
+ getRoleDetail(roleId).then((res) => {
+ var roleAlias = res.data.data.roleAlias;
+ if(roleAlias=="保安公司管理员"){
+ values["deptId"] = this.userInfo.dept_id;
+ }
+ })
+ })
+
+
if (this.userInfo.role_id == "1414840172333842433") {
console.log("是公安add jurisdiction");
values["jurisdiction"] = this.userInfo.jurisdiction;
diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
index d077e07..88729af 100644
--- a/src/views/trainExam/performance.vue
+++ b/src/views/trainExam/performance.vue
@@ -453,6 +453,7 @@
update({
theoryGrade: row.theoryGrade,
learnGrade: row.learnGrade,
+ examId:row.examId,
id: row.id,
}).then(
() => {
--
Gitblit v1.9.3