From 5fd9ab0d9b04fd7c29d2a147e3717ab7eff431be Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 13 Jul 2021 20:52:33 +0800
Subject: [PATCH] 整合冲突
---
src/views/securityGuard/securityGuardDetail.vue | 122 +-
src/api/securityGuard/securityGuard.js | 5
src/router/views/index.js | 32
src/views/securityGuard/securityGuard.vue | 1665 ++++++++++++++++++++-------------------
src/api/desk/notice.js | 81 +
src/views/resource/attach.vue | 545 +++++++-----
src/views/desk/notice.vue | 46
7 files changed, 1,356 insertions(+), 1,140 deletions(-)
diff --git a/src/api/desk/notice.js b/src/api/desk/notice.js
index e1507d7..de94928 100644
--- a/src/api/desk/notice.js
+++ b/src/api/desk/notice.js
@@ -1,50 +1,61 @@
import request from '@/router/axios';
export const getList = (current, size, params) => {
- return request({
- url: '/api/blade-desk/notice/list',
- method: 'get',
- params: {
- ...params,
- current,
- size,
- }
- })
+ return request({
+ url: '/api/blade-desk/notice/list',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const getListPage = (current, size, params) => {
+ return request({
+ url: '/api/blade-desk/notice/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
}
export const remove = (ids) => {
- return request({
- url: '/api/blade-desk/notice/remove',
- method: 'post',
- params: {
- ids,
- }
- })
+ return request({
+ url: '/api/blade-desk/notice/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
}
export const add = (row) => {
- return request({
- url: '/api/blade-desk/notice/submit',
- method: 'post',
- data: row
- })
+ return request({
+ url: '/api/blade-desk/notice/submit',
+ method: 'post',
+ data: row
+ })
}
export const update = (row) => {
- return request({
- url: '/api/blade-desk/notice/submit',
- method: 'post',
- data: row
- })
+ return request({
+ url: '/api/blade-desk/notice/submit',
+ method: 'post',
+ data: row
+ })
}
export const getNotice = (id) => {
- return request({
- url: '/api/blade-desk/notice/detail',
- method: 'get',
- params: {
- id
- }
- })
-}
-
+ return request({
+ url: '/api/blade-desk/notice/detail',
+ method: 'get',
+ params: {
+ id
+ }
+ })
+}
\ No newline at end of file
diff --git a/src/api/securityGuard/securityGuard.js b/src/api/securityGuard/securityGuard.js
index 47240d9..6e8dfc4 100644
--- a/src/api/securityGuard/securityGuard.js
+++ b/src/api/securityGuard/securityGuard.js
@@ -1,14 +1,13 @@
import request from '@/router/axios';
-export const getList = (current, size, params, deptId) => {
+export const getList = (current, size, params) => {
return request({
url: '/api/blade-user/page',
method: 'get',
params: {
...params,
current,
- size,
- deptId,
+ size
}
})
}
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 15e0374..26fc96d 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -156,17 +156,30 @@
import( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
}]
}, {
- path: '/securityGuard',
+ path: '/securityGuardDetail',
component: Layout,
- redirect: '/securityGuard/securityGuardDetail',
+ redirect: '/securityGuardDetail/index',
children: [{
- path: 'securityGuardDetail',
+ path: 'index',
name: '保安员详情',
meta: {
i18n: 'dict'
},
component: () =>
import( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuardDetail')
+ }]
+}, {
+ path: '/resource',
+ component: Layout,
+ redirect: '/resource/attach',
+ children: [{
+ path: 'attach',
+ name: '附件上传',
+ meta: {
+ i18n: 'dict'
+ },
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/views/resource/attach')
}]
}, {
path: '/securityUnitChild',
@@ -210,6 +223,19 @@
// }]
// },
{
+ path: '/desk',
+ component: Layout,
+ redirect: '/desk/notice',
+ children: [{
+ path: 'index',
+ name: '通知公告',
+ meta: {
+ i18n: 'dict'
+ },
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/views/desk/notice')
+ }]
+}, {
path: '/dispatch',
component: Layout,
redirect: '/dispatch/dispatch',
diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index c29559b..2b0b773 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -35,7 +35,7 @@
<el-tag>{{ row.categoryName }}</el-tag>
</template>
<template slot-scope="{ type, size, row }" slot="menu">
- <el-button :size="size" :type="type" @click="handleDelete"
+ <el-button :size="size" :type="type" @click="handleUploadPage(row)"
>附件上传
</el-button>
</template>
@@ -44,7 +44,7 @@
</template>
<script>
-import { getList, remove, update, add, getNotice } from "@/api/desk/notice";
+import { getListPage, remove, update, add, getNotice } from "@/api/desk/notice";
import { mapGetters } from "vuex";
export default {
@@ -53,6 +53,7 @@
form: {},
query: {},
loading: true,
+ deptId: "",
page: {
pageSize: 10,
currentPage: 1,
@@ -68,6 +69,7 @@
searchMenuSpan: 6,
border: false,
index: true,
+ stripe: true,
viewBtn: true,
selection: true,
excelBtn: false,
@@ -105,6 +107,23 @@
required: true,
message: "请输入通知类型",
trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "发布单位",
+ prop: "deptId",
+ type: "tree",
+ dicUrl: "/api/blade-system/dept/lazy-tree",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ rules: [
+ {
+ required: true,
+ message: "所属组织机构",
+ trigger: "click",
},
],
},
@@ -180,7 +199,22 @@
return ids.join(",");
},
},
+ mounted() {
+ //获取deptId
+ this.deptId = JSON.parse(
+ window.localStorage.getItem("saber-userInfo")
+ ).content.dept_id;
+ },
methods: {
+ //跳转到附近列表页面
+ handleUploadPage(row) {
+ this.$router.push({
+ path: `/resource/attach`,
+ query: {
+ deptId: row.deptId,
+ },
+ });
+ },
rowSave(row, done, loading) {
add(row).then(
() => {
@@ -290,18 +324,20 @@
const { releaseTimeRange } = this.query;
let values = {
...params,
+ ...this.deptId,
};
if (releaseTimeRange) {
values = {
...params,
- releaseTime_datege: releaseTimeRange[0],
- releaseTime_datelt: releaseTimeRange[1],
+ ...this.deptId,
+ startTime: releaseTimeRange[0],
+ endTime: releaseTimeRange[1],
...this.query,
};
values.releaseTimeRange = null;
}
this.loading = true;
- getList(page.currentPage, page.pageSize, values).then((res) => {
+ getListPage(page.currentPage, page.pageSize, values).then((res) => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
diff --git a/src/views/resource/attach.vue b/src/views/resource/attach.vue
index fa180b6..29abbf0 100644
--- a/src/views/resource/attach.vue
+++ b/src/views/resource/attach.vue
@@ -1,287 +1,344 @@
<template>
<basic-container>
- <avue-crud :option="option"
- :table-loading="loading"
- :data="data"
- :page.sync="page"
- :permission="permissionList"
- :before-open="beforeOpen"
- v-model="form"
- ref="crud"
- @row-del="rowDel"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad">
+ <avue-crud
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ v-model="form"
+ ref="crud"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ >
<template slot="menuLeft">
- <el-button type="primary"
- size="small"
- plain
- v-if="permission.attach_upload"
- icon="el-icon-upload2"
- @click="handleUpload">上 传
+ <el-button
+ type="primary"
+ size="small"
+ plain
+ v-if="permission.attach_upload"
+ icon="el-icon-upload2"
+ @click="handleUpload"
+ >上 传
</el-button>
- <el-button type="danger"
- size="small"
- icon="el-icon-delete"
- plain
- v-if="permission.attach_delete"
- @click="handleDelete">删 除
+ <el-button
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ plain
+ v-if="permission.attach_delete"
+ @click="handleDelete"
+ >删 除
</el-button>
</template>
<template slot-scope="scope" slot="menu">
- <el-button type="text"
- icon="el-icon-download"
- size="small"
- v-if="permission.attach_download"
- @click="handleDownload(scope.row)">下载
+ <el-button
+ type="text"
+ icon="el-icon-download"
+ size="small"
+ v-if="permission.attach_download"
+ @click="handleDownload(scope.row)"
+ >下载
</el-button>
</template>
- <template slot-scope="{row}"
- slot="attachSize">
- <el-tag>{{`${row.attachSize} KB`}}</el-tag>
+ <template slot-scope="{ row }" slot="attachSize">
+ <el-tag>{{ `${row.attachSize} KB` }}</el-tag>
</template>
</avue-crud>
- <el-dialog title="附件管理"
- append-to-body
- :visible.sync="attachBox"
- width="555px">
- <avue-form ref="form" :option="attachOption" v-model="attachForm" :upload-after="uploadAfter">
+ <el-dialog
+ title="附件管理"
+ append-to-body
+ :visible.sync="attachBox"
+ width="555px"
+ >
+ <avue-form
+ ref="form"
+ :option="attachOption"
+ v-model="attachForm"
+ :upload-after="uploadAfter"
+ >
</avue-form>
</el-dialog>
</basic-container>
</template>
<script>
- import {getList, getDetail, remove} from "@/api/resource/attach";
- import {mapGetters} from "vuex";
+import { getList, getDetail, remove } from "@/api/resource/attach";
+import { mapGetters } from "vuex";
- export default {
- data() {
- return {
- form: {},
- query: {},
- loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0
- },
- attachBox: false,
- selectionList: [],
- option: {
- height: 'auto',
- calcHeight: 30,
- tip: false,
- searchShow: true,
- searchMenuSpan: 6,
- border: true,
- index: true,
- viewBtn: true,
- selection: true,
- dialogClickModal: false,
- column: [
- {
- label: "附件地址",
- prop: "link",
- rules: [{
+export default {
+ data() {
+ var type = 4;
+ var deptid = this.$route.query.deptId;
+ return {
+ form: {},
+ query: {},
+ putParam: "",
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ attachBox: false,
+ selectionList: [],
+ option: {
+ height: "auto",
+ calcHeight: 30,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: false,
+ index: true,
+ stripe: true,
+ viewBtn: true,
+ selection: true,
+ dialogClickModal: false,
+ column: [
+ {
+ label: "附件地址",
+ prop: "link",
+ rules: [
+ {
required: true,
message: "请输入附件地址",
- trigger: "blur"
- }]
- },
- {
- label: "附件域名",
- prop: "domain",
- search: true,
- rules: [{
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "附件域名",
+ prop: "domain",
+ search: true,
+ rules: [
+ {
required: true,
message: "请输入附件域名",
- trigger: "blur"
- }]
- },
- {
- label: "附件名称",
- prop: "name",
- search: true,
- rules: [{
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "附件名称",
+ prop: "name",
+ search: true,
+ rules: [
+ {
required: true,
message: "请输入附件名称",
- trigger: "blur"
- }]
- },
- {
- label: "附件原名",
- prop: "originalName",
- search: true,
- rules: [{
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "附件原名",
+ prop: "originalName",
+ search: true,
+ rules: [
+ {
required: true,
message: "请输入附件原名",
- trigger: "blur"
- }]
- },
- {
- label: "附件拓展名",
- prop: "extension",
- rules: [{
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "附件拓展名",
+ prop: "extension",
+ rules: [
+ {
required: true,
message: "请输入附件拓展名",
- trigger: "blur"
- }]
- },
- {
- label: "附件大小",
- prop: "attachSize",
- slot: true,
- rules: [{
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "附件大小",
+ prop: "attachSize",
+ slot: true,
+ rules: [
+ {
required: true,
message: "请输入附件大小",
- trigger: "blur"
- }]
- },
- ]
- },
- data: [],
- attachForm: {},
- attachOption: {
- submitBtn: false,
- emptyBtn: false,
- column: [
- {
- label: '附件上传',
- prop: 'attachFile',
- type: 'upload',
- drag: true,
- loadText: '模板上传中，请稍等',
- span: 24,
- propsHttp: {
- res: 'data'
+ trigger: "blur",
},
- action: "/api/blade-resource/oss/endpoint/put-file-attach"
- }
- ]
- }
+ ],
+ },
+ ],
+ },
+ data: [],
+ attachForm: {},
+ attachOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: "附件上传",
+ prop: "attachFile",
+ type: "upload",
+ drag: true,
+ loadText: "模板上传中，请稍等",
+ span: 24,
+ propsHttp: {
+ res: "data",
+ },
+ action:
+ "/api/blade-resource/oss/endpoint/put-file-attach?type=" +
+ type +
+ "&deptid=" +
+ deptid,
+ },
+ ],
+ },
+ };
+ },
+ computed: {
+ ...mapGetters(["permission"]),
+ permissionList() {
+ return {
+ addBtn: false,
+ editBtn: false,
+ viewBtn: false,
+ delBtn: this.vaildData(this.permission.attach_delete, false),
};
},
- computed: {
- ...mapGetters(["permission"]),
- permissionList() {
- return {
- addBtn: false,
- editBtn: false,
- viewBtn: false,
- delBtn: this.vaildData(this.permission.attach_delete, false)
- };
- },
- ids() {
- let ids = [];
- this.selectionList.forEach(ele => {
- ids.push(ele.id);
- });
- return ids.join(",");
- }
+ ids() {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
},
- methods: {
- handleUpload() {
- this.attachBox = true;
- },
- uploadAfter(res, done, loading, column) {
- window.console.log(column);
- this.attachBox = false;
- this.refreshChange();
- done();
- },
- handleDownload(row) {
- window.open(`${row.link}`);
- },
- rowDel(row) {
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return remove(row.id);
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- });
- },
- handleDelete() {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
+ },
+ mounted() {
+ var flag = false,
+ i = 0,
+ ind = null;
+ this.$store.state.tags.tagList.forEach((item, index) => {
+ if (item.label == "附件上传") {
+ if (flag == false) {
+ ind = index;
+ flag = true;
}
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
+ i++;
+ }
+ });
+ if (i > 1) {
+ this.$store.state.tags.tagList.splice(ind, 1);
+ }
+ },
+ methods: {
+ handleUpload() {
+ this.attachBox = true;
+ },
+ uploadAfter(res, done, loading, column) {
+ window.console.log(column);
+ this.attachBox = false;
+ this.refreshChange();
+ done();
+ },
+ handleDownload(row) {
+ window.open(`${row.link}`);
+ },
+ rowDel(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(row.id);
})
- .then(() => {
- return remove(this.ids);
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- this.$refs.crud.toggleSelection();
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
});
- },
- beforeOpen(done, type) {
- if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then(res => {
- this.form = res.data.data;
+ });
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(this.ids);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
});
- }
- done();
- },
- searchReset() {
- this.query = {};
- this.onLoad(this.page);
- },
- searchChange(params, done) {
- this.query = params;
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
- },
- selectionChange(list) {
- this.selectionList = list;
- },
- selectionClear() {
- this.selectionList = [];
- this.$refs.crud.toggleSelection();
- },
- currentChange(currentPage) {
- this.page.currentPage = currentPage;
- },
- sizeChange(pageSize) {
- this.page.pageSize = pageSize;
- },
- refreshChange() {
- this.onLoad(this.page, this.query);
- },
- onLoad(page, params = {}) {
- this.loading = true;
- getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ beforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ getDetail(this.form.id).then((res) => {
+ this.form = res.data.data;
});
}
- }
- };
+ done();
+ },
+ searchReset() {
+ this.query = {};
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ params.type = 4;
+ params.deptid = this.$route.query.deptId;
+ this.loading = true;
+ getList(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query)
+ ).then((res) => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ });
+ },
+ },
+};
</script>
<style>
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 94256a5..4c85429 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -1,105 +1,107 @@
<template>
<el-row>
- <el-col :span="0" style="display: none">
- <div class="box">
- <el-scrollbar>
- <basic-container>
- <avue-tree
- :option="treeOption"
- :data="treeData"
- @node-click="nodeClick"
- />
- </basic-container>
- </el-scrollbar>
- </div>
- </el-col>
- <el-col :span="24">
+ <el-col :span="0" style="display: none">
+ <div class="box">
+ <el-scrollbar>
+ <basic-container>
+ <avue-tree
+ :option="treeOption"
+ :data="treeData"
+ @node-click="nodeClick"
+ />
+ </basic-container>
+ </el-scrollbar>
+ </div>
+ </el-col>
+ <el-col :span="24">
<basic-container>
- <avue-crud :option="option"
- :search.sync="search"
- :table-loading="loading"
- :data="data"
- ref="crud"
- v-model="form"
- :permission="permissionList"
- @row-del="rowDel"
- @row-update="rowUpdate"
- @row-save="rowSave"
- @row-click="rowClick"
- :before-open="beforeOpen"
- :page.sync="page"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad">
+ <avue-crud
+ :option="option"
+ :search.sync="search"
+ :table-loading="loading"
+ :data="data"
+ ref="crud"
+ v-model="form"
+ :permission="permissionList"
+ @row-del="rowDel"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @row-click="rowClick"
+ :before-open="beforeOpen"
+ :page.sync="page"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ >
<template slot="menuLeft">
- <el-button
- type="danger"
- style="display: none"
- size="small"
- plain
- icon="el-icon-delete"
- v-if="permission.user_delete"
- @click="handleDelete"
- >注 销
- </el-button>
- <el-button
- type="info"
- style="display: none"
- size="small"
- plain
- v-if="permission.user_role"
- icon="el-icon-user"
- @click="handleGrant"
- >角色配置
- </el-button>
- <el-button
- type="info"
- style="display: none"
- size="small"
- plain
- v-if="permission.user_reset"
- icon="el-icon-refresh"
- @click="handleReset"
- >密码重置
- </el-button>
- <el-button
- type="info"
- style="display: none"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-setting"
- @click="handlePlatform"
- >平台配置
- </el-button>
- <el-button
- type="success"
- style="display: none"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-upload2"
- @click="handleImport"
- >导入
- </el-button>
- <el-button
- type="warning"
- style="display: none"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-download"
- @click="handleExport"
- >导出
- </el-button>
- </template>
+ <el-button
+ type="danger"
+ style="display: none"
+ size="small"
+ plain
+ icon="el-icon-delete"
+ v-if="permission.user_delete"
+ @click="handleDelete"
+ >注 销
+ </el-button>
+ <el-button
+ type="info"
+ style="display: none"
+ size="small"
+ plain
+ v-if="permission.user_role"
+ icon="el-icon-user"
+ @click="handleGrant"
+ >角色配置
+ </el-button>
+ <el-button
+ type="info"
+ style="display: none"
+ size="small"
+ plain
+ v-if="permission.user_reset"
+ icon="el-icon-refresh"
+ @click="handleReset"
+ >密码重置
+ </el-button>
+ <el-button
+ type="info"
+ style="display: none"
+ size="small"
+ plain
+ v-if="userInfo.role_name.includes('admin')"
+ icon="el-icon-setting"
+ @click="handlePlatform"
+ >平台配置
+ </el-button>
+ <el-button
+ type="success"
+ style="display: none"
+ size="small"
+ plain
+ v-if="userInfo.role_name.includes('admin')"
+ icon="el-icon-upload2"
+ @click="handleImport"
+ >导入
+ </el-button>
+ <el-button
+ type="warning"
+ style="display: none"
+ size="small"
+ plain
+ v-if="userInfo.role_name.includes('admin')"
+ icon="el-icon-download"
+ @click="handleExport"
+ >导出
+ </el-button>
+ </template>
- <template slot-scope="{ type, size, row }" slot="menu">
- <!-- <el-button
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <!-- <el-button
style="display:none"
icon="el-icon-edit"
:size="size"
@@ -107,58 +109,67 @@
@click.stop="addOrUpdateHandle(row.id)"
>修改
</el-button> -->
- <el-button
- icon="el-icon-edit"
- :size="size"
- :type="type"
- @click.stop="rowDel(row)"
- >离职登记
- </el-button>
- </template>
-
- <template slot-scope="{row}"
- slot="tenantName">
- <el-tag>{{row.tenantName}}</el-tag>
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
+ @click.stop="rowDel(row)"
+ >离职登记
+ </el-button>
</template>
- <template slot-scope="{row}"
- slot="roleName">
- <el-tag>{{row.roleName}}</el-tag>
+
+ <template slot-scope="{ row }" slot="sex">
+ <el-tag v-if="row.sex == 1">男</el-tag>
+ <el-tag v-if="row.sex == 2">女</el-tag>
</template>
- <template slot-scope="{row}"
- slot="deptName">
- <el-tag>{{row.deptName}}</el-tag>
+
+ <template slot-scope="{ row }" slot="tenantName">
+ <el-tag>{{ row.tenantName }}</el-tag>
</template>
- <template slot-scope="{row}"
- slot="userTypeName">
- <el-tag>{{row.userTypeName}}</el-tag>
+ <template slot-scope="{ row }" slot="roleName">
+ <el-tag>{{ row.roleName }}</el-tag>
+ </template>
+ <template slot-scope="{ row }" slot="deptName">
+ <el-tag>{{ row.deptName }}</el-tag>
+ </template>
+ <template slot-scope="{ row }" slot="userTypeName">
+ <el-tag>{{ row.userTypeName }}</el-tag>
</template>
</avue-crud>
- <el-dialog title="用户角色配置"
- append-to-body
- :visible.sync="roleBox"
- width="345px">
-
- <el-tree :data="roleGrantList"
- show-checkbox
- check-strictly
- default-expand-all
- node-key="id"
- ref="treeRole"
- :default-checked-keys="roleTreeObj"
- :props="props">
+ <el-dialog
+ title="用户角色配置"
+ append-to-body
+ :visible.sync="roleBox"
+ width="345px"
+ >
+ <el-tree
+ :data="roleGrantList"
+ show-checkbox
+ check-strictly
+ default-expand-all
+ node-key="id"
+ ref="treeRole"
+ :default-checked-keys="roleTreeObj"
+ :props="props"
+ >
</el-tree>
<span slot="footer" class="dialog-footer">
<el-button @click="roleBox = false">取 消</el-button>
- <el-button type="primary"
- @click="submitRole">确 定</el-button>
+ <el-button type="primary" @click="submitRole">确 定</el-button>
</span>
</el-dialog>
- <el-dialog title="用户数据导入"
- append-to-body
- :visible.sync="excelBox"
- width="555px">
- <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+ <el-dialog
+ title="用户数据导入"
+ append-to-body
+ :visible.sync="excelBox"
+ width="555px"
+ >
+ <avue-form
+ :option="excelOption"
+ v-model="excelForm"
+ :upload-after="uploadAfter"
+ >
<template slot="excelTemplate">
<el-button type="primary" @click="handleTemplate">
点击下载<i class="el-icon-download el-icon--right"></i>
@@ -166,32 +177,34 @@
</template>
</avue-form>
</el-dialog>
- <el-dialog title="用户平台配置"
- append-to-body
- :visible.sync="platformBox">
- <avue-crud :option="platformOption"
- :table-loading="platformLoading"
- :data="platformData"
- ref="platformCrud"
- v-model="platformForm"
- :before-open="platformBeforeOpen"
- :page.sync="platformPage"
- :permission="platformPermissionList"
- @row-update="platformRowUpdate"
- @search-change="platformSearchChange"
- @search-reset="platformSearchReset"
- @selection-change="platformSelectionChange"
- @current-change="platformCurrentChange"
- @size-change="platformSizeChange"
- @refresh-change="platformRefreshChange"
- @on-load="platformOnLoad">
- <template slot-scope="{row}"
- slot="tenantName">
- <el-tag>{{row.tenantName}}</el-tag>
+ <el-dialog
+ title="用户平台配置"
+ append-to-body
+ :visible.sync="platformBox"
+ >
+ <avue-crud
+ :option="platformOption"
+ :table-loading="platformLoading"
+ :data="platformData"
+ ref="platformCrud"
+ v-model="platformForm"
+ :before-open="platformBeforeOpen"
+ :page.sync="platformPage"
+ :permission="platformPermissionList"
+ @row-update="platformRowUpdate"
+ @search-change="platformSearchChange"
+ @search-reset="platformSearchReset"
+ @selection-change="platformSelectionChange"
+ @current-change="platformCurrentChange"
+ @size-change="platformSizeChange"
+ @refresh-change="platformRefreshChange"
+ @on-load="platformOnLoad"
+ >
+ <template slot-scope="{ row }" slot="tenantName">
+ <el-tag>{{ row.tenantName }}</el-tag>
</template>
- <template slot-scope="{row}"
- slot="userTypeName">
- <el-tag>{{row.userTypeName}}</el-tag>
+ <template slot-scope="{ row }" slot="userTypeName">
+ <el-tag>{{ row.userTypeName }}</el-tag>
</template>
</avue-crud>
</el-dialog>
@@ -201,118 +214,120 @@
</template>
<script>
- import {
- getList,
- getUser,
- getUserPlatform,
- remove,
- update,
- updatePlatform,
- add,
- grant,
- resetPassword,
- getUserPractitionersInfo,
- saveOrUpdateUserPractitionersInfo
- } from "@/api/system/user";
- import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
- import {getRoleTree} 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, securityBaseInfoColumns } from "./data";
+import {
+ getUser,
+ getUserPlatform,
+ remove,
+ update,
+ updatePlatform,
+ add,
+ grant,
+ resetPassword,
+ getUserPractitionersInfo,
+ saveOrUpdateUserPractitionersInfo,
+} from "@/api/system/user";
+import { getList } from "@/api/securityGuard/securityGuard";
+import { getDeptTree, getDeptLazyTree } from "@/api/system/dept";
+import { getRoleTree } 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";
- export default {
- data() {
- const validatePass = (rule, value, callback) => {
- if (value === '') {
- callback(new Error('请输入密码'));
- } else {
- callback();
- }
- };
- const validatePass2 = (rule, value, callback) => {
- if (value === '') {
- callback(new Error('请再次输入密码'));
- } else if (value !== this.form.password) {
- callback(new Error('两次输入密码不一致!'));
- } else {
- callback();
- }
- };
- return {
- form: {},
- search:{},
- roleBox: false,
- excelBox: false,
- platformBox: false,
- initFlag: true,
- selectionList: [],
- query: {},
- loading: true,
- platformLoading: false,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0
- },
- platformPage: {
- pageSize: 10,
- currentPage: 1,
- total: 0
- },
- init: {
- roleTree: [],
- deptTree: [],
- },
- props: {
- label: "title",
- value: "key"
- },
- roleGrantList: [],
- roleTreeObj: [],
- treeDeptId: '',
- treeData: [],
- treeOption: {
- nodeKey: 'id',
- lazy: true,
- treeLoad: function (node, resolve) {
- const parentId = (node.level === 0) ? 0 : node.data.id;
- getDeptLazyTree(parentId).then(res => {
- resolve(res.data.data.map(item => {
+export default {
+ data() {
+ const validatePass = (rule, value, callback) => {
+ if (value === "") {
+ callback(new Error("请输入密码"));
+ } else {
+ callback();
+ }
+ };
+ const validatePass2 = (rule, value, callback) => {
+ if (value === "") {
+ callback(new Error("请再次输入密码"));
+ } else if (value !== this.form.password) {
+ callback(new Error("两次输入密码不一致!"));
+ } else {
+ callback();
+ }
+ };
+ return {
+ form: {},
+ search: {},
+ roleBox: false,
+ excelBox: false,
+ platformBox: false,
+ initFlag: true,
+ selectionList: [],
+ query: {},
+ loading: true,
+ platformLoading: false,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ platformPage: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ init: {
+ roleTree: [],
+ deptTree: [],
+ },
+ props: {
+ label: "title",
+ value: "key",
+ },
+ roleGrantList: [],
+ roleTreeObj: [],
+ treeDeptId: "",
+ treeData: [],
+ treeOption: {
+ nodeKey: "id",
+ lazy: true,
+ treeLoad: function (node, resolve) {
+ const parentId = node.level === 0 ? 0 : node.data.id;
+ getDeptLazyTree(parentId).then((res) => {
+ resolve(
+ res.data.data.map((item) => {
return {
...item,
- leaf: !item.hasChildren
- }
- }))
- });
- },
- addBtn: false,
- menu: false,
- size: 'small',
- props: {
- labelText: '标题',
- label: 'title',
- value: 'value',
- children: 'children'
- }
+ leaf: !item.hasChildren,
+ };
+ })
+ );
+ });
},
- option: {
- height: 'auto',
- calcHeight: 80,
- tip: false,
- searchShow: true,
- searchMenuSpan: 6,
- border: false,
- stripe: true,
- index: true,
- delBtnText: "注销",
- selection: true,
- viewBtn: true,
- //dialogType: 'drawer',
- dialogClickModal: false,
- column: securityFormPageColumn,
- group: [
+ addBtn: false,
+ menu: false,
+ size: "small",
+ props: {
+ labelText: "标题",
+ label: "title",
+ value: "value",
+ children: "children",
+ },
+ },
+ option: {
+ height: "auto",
+ calcHeight: 80,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: false,
+ stripe: true,
+ index: true,
+ delBtnText: "注销",
+ selection: true,
+ viewBtn: true,
+ //dialogType: 'drawer',
+ dialogClickModal: false,
+ column: securityFormPageColumn,
+ group: [
{
label: "基础信息",
labelWidth: "110",
@@ -336,7 +351,7 @@
required: true,
message: "请选择组织机构",
trigger: "blur",
- }
+ },
],
},
{
@@ -347,25 +362,30 @@
required: true,
message: "请输入登录账号",
trigger: "blur",
- }
+ },
],
// disabled: true,
- },{
- label: '密码',
- prop: 'password',
- hide: true,
- editDisplay: false,
- viewDisplay: false,
- rules: [{required: true, validator: validatePass, trigger: 'blur'}]
- },
- {
- label: '确认密码',
- prop: 'password2',
- hide: true,
- editDisplay: false,
- viewDisplay: false,
- rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
- },
+ },
+ {
+ label: "密码",
+ prop: "password",
+ hide: true,
+ editDisplay: false,
+ viewDisplay: false,
+ rules: [
+ { required: true, validator: validatePass, trigger: "blur" },
+ ],
+ },
+ {
+ label: "确认密码",
+ prop: "password2",
+ hide: true,
+ editDisplay: false,
+ viewDisplay: false,
+ rules: [
+ { required: true, validator: validatePass2, trigger: "blur" },
+ ],
+ },
{
label: "用户姓名",
prop: "realName",
@@ -389,7 +409,8 @@
{
label: "用户昵称",
prop: "name",
- }, {
+ },
+ {
label: "所属行政区",
prop: "jurisdiction",
// multiple: true,
@@ -408,7 +429,8 @@
trigger: "click",
},
],
- },{
+ },
+ {
label: "所属角色",
prop: "roleId",
multiple: true,
@@ -421,12 +443,13 @@
slot: true,
rules: [
{
- required: false,
+ required: true,
message: "请选择所属角色",
trigger: "click",
},
],
- },{
+ },
+ {
label: "所属岗位",
prop: "postId",
type: "tree",
@@ -492,7 +515,7 @@
value: "dictKey",
},
dataType: "number",
- slot: true
+ slot: true,
},
{
label: "政治面貌",
@@ -521,6 +544,7 @@
label: "用户性别",
prop: "sex",
type: "select",
+ slot: true,
dicData: [
{
label: "男",
@@ -530,10 +554,10 @@
label: "女",
value: 2,
},
- {
- label: "未知",
- value: 3,
- },
+ // {
+ // label: "未知",
+ // value: 3,
+ // },
],
},
{
@@ -622,554 +646,595 @@
],
},
],
- },
- data: [],
- platformQuery: {},
- platformSelectionList: [],
- platformData: [],
- platformForm: {},
- platformOption: {
- tip: false,
- searchShow: true,
- searchMenuSpan: 6,
- border: true,
- index: true,
- selection: true,
- viewBtn: true,
- dialogClickModal: false,
- menuWidth: 120,
- editBtnText: '配置',
- column: [
- {
- label: "登录账号",
- prop: "account",
- search: true,
- display: false
+ },
+ data: [],
+ platformQuery: {},
+ platformSelectionList: [],
+ platformData: [],
+ platformForm: {},
+ platformOption: {
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ selection: true,
+ viewBtn: true,
+ dialogClickModal: false,
+ menuWidth: 120,
+ editBtnText: "配置",
+ column: [
+ {
+ label: "登录账号",
+ prop: "account",
+ search: true,
+ display: false,
+ },
+ {
+ label: "所属保安单位",
+ prop: "tenantName",
+ slot: true,
+ display: false,
+ },
+ {
+ label: "用户姓名",
+ prop: "realName",
+ search: true,
+ display: false,
+ },
+ {
+ label: "用户平台",
+ prop: "userTypeName",
+ slot: true,
+ display: false,
+ },
+ {
+ label: "用户平台",
+ type: "select",
+ dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
},
- {
- label: "所属保安单位",
- prop: "tenantName",
- slot: true,
- display: false
- },
- {
- label: "用户姓名",
- prop: "realName",
- search: true,
- display: false
- },
- {
- label: "用户平台",
- prop: "userTypeName",
- slot: true,
- display: false
- },
- {
- label: "用户平台",
- type: "select",
- dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- search: true,
- hide: true,
- display: false,
- prop: "userType",
- rules: [{
+ dataType: "number",
+ search: true,
+ hide: true,
+ display: false,
+ prop: "userType",
+ rules: [
+ {
required: true,
message: "请选择用户平台",
- trigger: "blur"
- }]
- },
- {
- label: "用户拓展",
- prop: "userExt",
- type: "textarea",
- minRows: 8,
- span: 24,
- overHidden: true,
- row: true,
- hide: true,
- },
- ],
- },
- excelForm: {},
- excelOption: {
- submitBtn: false,
- emptyBtn: false,
- column: [
- {
- label: '模板上传',
- prop: 'excelFile',
- type: 'upload',
- drag: true,
- loadText: '模板上传中，请稍等',
- span: 24,
- propsHttp: {
- res: 'data'
+ trigger: "blur",
},
- tip: '请上传 .xls,.xlsx 标准格式文件',
- action: "/api/blade-user/import-user"
+ ],
+ },
+ {
+ label: "用户拓展",
+ prop: "userExt",
+ type: "textarea",
+ minRows: 8,
+ span: 24,
+ overHidden: true,
+ row: true,
+ hide: true,
+ },
+ ],
+ },
+ excelForm: {},
+ excelOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: "模板上传",
+ prop: "excelFile",
+ type: "upload",
+ drag: true,
+ loadText: "模板上传中，请稍等",
+ span: 24,
+ propsHttp: {
+ res: "data",
},
- {
- label: "数据覆盖",
- prop: "isCovered",
- type: "switch",
- align: "center",
- width: 80,
- dicData: [
- {
- label: "否",
- value: 0
- },
- {
- label: "是",
- value: 1
- }
- ],
- value: 0,
- slot: true,
- rules: [
- {
- required: true,
- message: "请选择是否覆盖",
- trigger: "blur"
- }
- ]
- },
- {
- label: '模板下载',
- prop: 'excelTemplate',
- formslot: true,
- span: 24,
- }
- ]
- }
+ tip: "请上传 .xls,.xlsx 标准格式文件",
+ action: "/api/blade-user/import-user",
+ },
+ {
+ label: "数据覆盖",
+ prop: "isCovered",
+ type: "switch",
+ align: "center",
+ width: 80,
+ dicData: [
+ {
+ label: "否",
+ value: 0,
+ },
+ {
+ label: "是",
+ value: 1,
+ },
+ ],
+ value: 0,
+ slot: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择是否覆盖",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "模板下载",
+ prop: "excelTemplate",
+ formslot: true,
+ span: 24,
+ },
+ ],
+ },
+ };
+ },
+ watch: {
+ "form.tenantId"() {
+ if (this.form.tenantId !== "" && this.initFlag) {
+ this.initData(this.form.tenantId);
+ }
+ },
+ "form.deptId"() {
+ this.initData(this.form.tenantId);
+ },
+ "excelForm.isCovered"() {
+ if (this.excelForm.isCovered !== "") {
+ const column = this.findObject(this.excelOption.column, "excelFile");
+ column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
+ }
+ },
+ },
+ computed: {
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.user_add, false),
+ viewBtn: this.vaildData(null, false),
+ delBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(this.permission.user_edit, false),
};
},
- watch: {
- 'form.tenantId'() {
- if (this.form.tenantId !== '' && this.initFlag) {
- this.initData(this.form.tenantId);
- }
- },
- 'excelForm.isCovered'() {
- if (this.excelForm.isCovered !== '') {
- const column = this.findObject(this.excelOption.column, "excelFile");
- column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
- }
- }
+ platformPermissionList() {
+ return {
+ addBtn: false,
+ viewBtn: false,
+ delBtn: false,
+ editBtn: this.vaildData(this.permission.user_edit, false),
+ };
},
- computed: {
- ...mapGetters(["userInfo", "permission"]),
- permissionList() {
- return {
- addBtn: this.vaildData(this.permission.user_add, false),
- viewBtn: this.vaildData(null, false),
- delBtn: this.vaildData(null, false),
- editBtn: this.vaildData(this.permission.user_edit, false),
- };
- },
- platformPermissionList() {
- return {
- addBtn: false,
- viewBtn: false,
- delBtn: false,
- editBtn: this.vaildData(this.permission.user_edit, false)
- };
- },
- ids() {
- let ids = [];
- this.selectionList.forEach(ele => {
- ids.push(ele.id);
+ ids() {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ },
+ mounted() {
+ // 非保安单位模式默认加载管理组数据
+ if (!website.tenantMode) {
+ this.initData(website.tenantId);
+ }
+ },
+ methods: {
+ //行点击事件
+ rowClick(row) {
+ this.$router.push({
+ path: "/securityGuardDetail",
+ query: { row: JSON.stringify(row) },
+ });
+ },
+ nodeClick(data) {
+ this.treeDeptId = data.id;
+ this.page.currentPage = 1;
+ this.onLoad(this.page);
+ },
+ initData(tenantId) {
+ getRoleTree(tenantId).then((res) => {
+ const column = this.findObject(this.option.group, "roleId");
+ column.dicData = res.data.data;
+ });
+ getDeptTree(tenantId).then((res) => {
+ const column = this.findObject(this.option.group, "deptId");
+ column.dicData = res.data.data;
+ });
+ getPostList(tenantId).then((res) => {
+ const column = this.findObject(this.option.group, "postId");
+ column.dicData = res.data.data;
+ });
+ },
+ submitRole() {
+ const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
+ grant(this.ids, roleList).then(() => {
+ this.roleBox = false;
+ this.$message({
+ type: "success",
+ message: "操作成功!",
});
- return ids.join(",");
- },
- },
- mounted() {
- // 非保安单位模式默认加载管理组数据
- if (!website.tenantMode) {
- this.initData(website.tenantId);
- }
- },
- methods: {
- //行点击事件
- rowClick(row) {
- this.$router.push({
- path: "/securityGuard/securityGuardDetail",
- query: { row: row },
- });
- },
- nodeClick(data) {
- this.treeDeptId = data.id;
- this.page.currentPage = 1;
this.onLoad(this.page);
- },
- initData(tenantId) {
- getRoleTree(tenantId).then(res => {
- const column = this.findObject(this.option.group, "roleId");
- column.dicData = res.data.data;
- });
- getDeptTree(tenantId).then(res => {
- const column = this.findObject(this.option.group, "deptId");
- column.dicData = res.data.data;
- });
- getPostList(tenantId).then(res => {
- const column = this.findObject(this.option.group, "postId");
- column.dicData = res.data.data;
- });
- },
- submitRole() {
- const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
- grant(this.ids, roleList).then(() => {
- this.roleBox = false;
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- this.onLoad(this.page);
- });
- },
- rowSave(row, done, loading) {
- debugger;
- if(row.deptId){
- row.deptId = row.deptId;
- }
- if(row.roleId){
- row.roleId = row.roleId.join(",");
- }
- if(row.postId){
- row.postId = row.postId.join(",");
- }
- const userPractitionersList = [];
- var userPractitionersInfo = row.UserPractitionersInfo;
- if (userPractitionersInfo.length > 0) {
- userPractitionersInfo.forEach((item) => {
- const info = {
- companyname: item.companyname,
- department: item.department,
- departureTime: item.departureTime,
- entryTime: item.entryTime,
- name: row.realName,
- leaving: item.leaving,
- cardid: row.cardid,
- post: item.post,
- responsibilities: item.responsibilities,
- };
- userPractitionersList.push(info);
- });
- }
- var IdCardNo = row.cardid;
- add(row).then(
- () => {
- const experience = {
- cardid: IdCardNo,
- userPractitionersInfo: userPractitionersList,
- };
- //新增从业信息
- saveOrUpdateUserPractitionersInfo(experience).then(() => {
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- });
- this.initFlag = false;
- this.onLoad(this.page);
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
- }
- );
- },
- rowUpdate(row, index, done, loading) {
+ });
+ },
+ rowSave(row, done, loading) {
+ if (row.deptId) {
row.deptId = row.deptId;
+ }
+ if (row.roleId) {
row.roleId = row.roleId.join(",");
+ }
+ if (row.postId) {
row.postId = row.postId.join(",");
- const userPractitionersList = [];
- var userPractitionersInfo = row.UserPractitionersInfo;
- if (userPractitionersInfo.length > 0) {
- userPractitionersInfo.forEach((item) => {
- const info = {
- companyname: item.companyname,
- department: item.department,
- departureTime: item.departureTime,
- entryTime: item.entryTime,
- name: row.realName,
- leaving: item.leaving,
- cardid: row.cardid,
- post: item.post,
- responsibilities: item.responsibilities,
- };
- userPractitionersList.push(info);
- });
- }
- var IdCardNo = row.cardid;
- update(row).then(
- () => {
- const experience = {
- cardid: IdCardNo,
- userPractitionersInfo: userPractitionersList,
- };
- //更新从业信息
- saveOrUpdateUserPractitionersInfo(experience).then(() => {
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- });
- this.initFlag = false;
- this.onLoad(this.page);
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
- }
- );
- },
- rowDel(row) {
- this.$confirm("确定将选择用户登记离职?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- row.status = "0";
- return update(row);
- })
- .then(() => {
- this.onLoad(this.page);
+ }
+ const userPractitionersList = [];
+ var userPractitionersInfo = row.UserPractitionersInfo;
+ if (userPractitionersInfo.length > 0) {
+ userPractitionersInfo.forEach((item) => {
+ const info = {
+ companyname: item.companyname,
+ department: item.department,
+ departureTime: item.departureTime,
+ entryTime: item.entryTime,
+ name: row.realName,
+ leaving: item.leaving,
+ cardid: row.cardid,
+ post: item.post,
+ responsibilities: item.responsibilities,
+ };
+ userPractitionersList.push(info);
+ });
+ }
+ var IdCardNo = row.cardid;
+ add(row).then(
+ () => {
+ const experience = {
+ cardid: IdCardNo,
+ userPractitionersInfo: userPractitionersList,
+ };
+ //新增从业信息
+ saveOrUpdateUserPractitionersInfo(experience).then(() => {
this.$message({
type: "success",
message: "操作成功!",
});
});
- },
- searchReset() {
- this.query = {};
- this.treeDeptId = '';
- this.onLoad(this.page);
- },
- searchChange(params, done) {
- this.query = params;
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
- },
- selectionChange(list) {
- this.selectionList = list;
- },
- selectionClear() {
- this.selectionList = [];
- this.$refs.crud.toggleSelection();
- },
- handleDelete() {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
+ this.initFlag = false;
+ this.onLoad(this.page);
+ // this.$message({
+ // type: "success",
+ // message: "操作成功!",
+ // });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
}
- this.$confirm("确定将选择用户注销?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return remove(this.ids);
- })
- .then(() => {
- this.onLoad(this.page);
+ );
+ },
+ rowUpdate(row, index, done, loading) {
+ row.deptId = row.deptId;
+ row.roleId = row.roleId.join(",");
+ row.postId = row.postId.join(",");
+ const userPractitionersList = [];
+ var userPractitionersInfo = row.UserPractitionersInfo;
+ if (userPractitionersInfo.length > 0) {
+ userPractitionersInfo.forEach((item) => {
+ const info = {
+ companyname: item.companyname,
+ department: item.department,
+ departureTime: item.departureTime,
+ entryTime: item.entryTime,
+ name: row.realName,
+ leaving: item.leaving,
+ cardid: row.cardid,
+ post: item.post,
+ responsibilities: item.responsibilities,
+ };
+ userPractitionersList.push(info);
+ });
+ }
+ var IdCardNo = row.cardid;
+ //值替换，education 放在页面会卡死
+ row.education = row.education1;
+ update(row).then(
+ () => {
+ const experience = {
+ cardid: IdCardNo,
+ userPractitionersInfo: userPractitionersList,
+ };
+ //更新从业信息
+ saveOrUpdateUserPractitionersInfo(experience).then(() => {
this.$message({
type: "success",
- message: "操作成功!"
+ message: "操作成功!",
});
- this.$refs.crud.toggleSelection();
});
- },
- handleReset() {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
+ this.initFlag = false;
+ this.onLoad(this.page);
+ // this.$message({
+ // type: "success",
+ // message: "操作成功!",
+ // });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
}
- this.$confirm("确定将选择账号密码重置为123456?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
+ );
+ },
+ rowDel(row) {
+ this.$confirm("确定将选择用户登记离职?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ row.status = "0";
+ return update(row);
})
- .then(() => {
- return resetPassword(this.ids);
- })
- .then(() => {
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- this.$refs.crud.toggleSelection();
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
});
- },
- handleGrant() {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
- }
- this.roleTreeObj = [];
- if (this.selectionList.length === 1) {
- this.roleTreeObj = this.selectionList[0].roleId.split(",");
- }
- getRoleTree().then(res => {
- this.roleGrantList = res.data.data;
- this.roleBox = true;
});
- },
- handlePlatform() {
- this.platformBox = true;
- },
- handleImport() {
- this.excelBox = true;
- },
- uploadAfter(res, done, loading, column) {
- window.console.log(column);
- this.excelBox = false;
- this.refreshChange();
- done();
- },
- handleExport() {
- this.$confirm("是否导出用户数据?", "提示", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(() => {
- window.open(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`);
- });
- },
- handleTemplate() {
- window.open(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`);
- },
- beforeOpen(done, type) {
- var that = this;
- if (["edit", "view"].includes(type)) {
- getUser(this.form.id).then(res => {
- this.form = res.data.data;
- if(this.form.hasOwnProperty("deptId")){
- this.form.deptId = this.form.deptId;
- }
- if(this.form.hasOwnProperty("roleId")){
- this.form.roleId = this.form.roleId.split(",");
- }
- if(this.form.hasOwnProperty("postId")){
- this.form.postId = this.form.postId.split(",");
- }
- var userInfo = res.data.data;
- //获取用户从业信息
- getUserPractitionersInfo(userInfo.cardid).then((res1) => {
- that.form.UserPractitionersInfo = res1.data.data;
- });
+ },
+ searchReset() {
+ this.query = {};
+ this.treeDeptId = "";
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择用户注销?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(this.ids);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
});
- }
- this.initFlag = true;
- done();
- },
- currentChange(currentPage) {
- this.page.currentPage = currentPage;
- },
- sizeChange(pageSize) {
- this.page.pageSize = pageSize;
- },
- refreshChange() {
- this.onLoad(this.page, this.query);
- },
- onLoad(page, params = {}) {
- this.loading = true;
- getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ handleReset() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择账号密码重置为123456?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return resetPassword(this.ids);
+ })
+ .then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ handleGrant() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.roleTreeObj = [];
+ if (this.selectionList.length === 1) {
+ this.roleTreeObj = this.selectionList[0].roleId.split(",");
+ }
+ getRoleTree().then((res) => {
+ this.roleGrantList = res.data.data;
+ this.roleBox = true;
+ });
+ },
+ handlePlatform() {
+ this.platformBox = true;
+ },
+ handleImport() {
+ this.excelBox = true;
+ },
+ uploadAfter(res, done, loading, column) {
+ window.console.log(column);
+ this.excelBox = false;
+ this.refreshChange();
+ done();
+ },
+ handleExport() {
+ this.$confirm("是否导出用户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }).then(() => {
+ window.open(
+ `/api/blade-user/export-user?${
+ this.website.tokenHeader
+ }=${getToken()}&account=${this.search.account}&realName=${
+ this.search.realName
+ }`
+ );
+ });
+ },
+ handleTemplate() {
+ window.open(
+ `/api/blade-user/export-template?${
+ this.website.tokenHeader
+ }=${getToken()}`
+ );
+ },
+ beforeOpen(done, type) {
+ var that = this;
+ if (["edit", "view"].includes(type)) {
+ getUser(this.form.id).then((res) => {
+ this.form = res.data.data;
+ var d = {
+ education1: res.data.data.education,
+ };
+ this.form = {
+ ...this.form,
+ ...d,
+ };
+ // this.from["education1"] = res.data.data.education;
+ if (this.form.hasOwnProperty("deptId")) {
+ this.form.deptId = this.form.deptId;
+ }
+ if (this.form.hasOwnProperty("roleId")) {
+ this.form.roleId = this.form.roleId.split(",");
+ }
+ if (this.form.hasOwnProperty("postId")) {
+ this.form.postId = this.form.postId.split(",");
+ }
+ var userInfo = res.data.data;
+ //获取用户从业信息
+ getUserPractitionersInfo(userInfo.cardid).then((res1) => {
+ that.form.UserPractitionersInfo = res1.data.data;
+ });
+ });
+ }
+ this.initFlag = true;
+ done();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ let values = {
+ ...params,
+ };
+ values = {
+ ...params,
+ ...this.query,
+ };
+ this.loading = true;
+ getList(page.currentPage, page.pageSize, values, this.treeDeptId).then(
+ (res) => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
- });
- },
- platformRowUpdate(row, index, done, loading) {
- updatePlatform(row.id, row.userType, row.userExt).then(() => {
+ }
+ );
+ },
+ platformRowUpdate(row, index, done, loading) {
+ updatePlatform(row.id, row.userType, row.userExt).then(
+ () => {
this.platformOnLoad(this.platformPage);
this.$message({
type: "success",
- message: "操作成功!"
+ message: "操作成功!",
});
done();
- }, error => {
+ },
+ (error) => {
window.console.log(error);
loading();
- });
- },
- platformBeforeOpen(done, type) {
- if (["edit", "view"].includes(type)) {
- getUserPlatform(this.platformForm.id).then(res => {
- this.platformForm = res.data.data;
- });
}
- done();
- },
- platformSearchReset() {
- this.platformQuery = {};
- this.platformOnLoad(this.platformPage);
- },
- platformSearchChange(params, done) {
- this.platformQuery = params;
- this.platformPage.currentPage = 1;
- this.platformOnLoad(this.platformPage, params);
- done();
- },
- platformSelectionChange(list) {
- this.platformSelectionList = list;
- },
- platformSelectionClear() {
- this.platformSelectionList = [];
- this.$refs.platformCrud.toggleSelection();
- },
- platformCurrentChange(currentPage) {
- this.platformPage.currentPage = currentPage;
- },
- platformSizeChange(pageSize) {
- this.platformPage.pageSize = pageSize;
- },
- platformRefreshChange() {
- this.platformOnLoad(this.platformPage, this.platformQuery);
- },
- platformOnLoad(page, params = {}) {
- this.platformLoading = true;
- getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
- const data = res.data.data;
- this.platformPage.total = data.total;
- this.platformData = data.records;
- this.platformLoading = false;
- this.selectionClear();
+ );
+ },
+ platformBeforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ getUserPlatform(this.platformForm.id).then((res) => {
+ this.platformForm = res.data.data;
});
}
- }
- };
+ done();
+ },
+ platformSearchReset() {
+ this.platformQuery = {};
+ this.platformOnLoad(this.platformPage);
+ },
+ platformSearchChange(params, done) {
+ this.platformQuery = params;
+ this.platformPage.currentPage = 1;
+ this.platformOnLoad(this.platformPage, params);
+ done();
+ },
+ platformSelectionChange(list) {
+ this.platformSelectionList = list;
+ },
+ platformSelectionClear() {
+ this.platformSelectionList = [];
+ this.$refs.platformCrud.toggleSelection();
+ },
+ platformCurrentChange(currentPage) {
+ this.platformPage.currentPage = currentPage;
+ },
+ platformSizeChange(pageSize) {
+ this.platformPage.pageSize = pageSize;
+ },
+ platformRefreshChange() {
+ this.platformOnLoad(this.platformPage, this.platformQuery);
+ },
+ platformOnLoad(page, params = {}) {
+ this.platformLoading = true;
+ getList(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query),
+ this.treeDeptId
+ ).then((res) => {
+ const data = res.data.data;
+ this.platformPage.total = data.total;
+ this.platformData = data.records;
+ this.platformLoading = false;
+ this.selectionClear();
+ });
+ },
+ },
+};
</script>
<style>
- .box {
- height: 800px;
- }
+.box {
+ height: 800px;
+}
- .el-scrollbar {
- height: 100%;
- }
+.el-scrollbar {
+ height: 100%;
+}
- .box .el-scrollbar__wrap {
- overflow: scroll;
- }
+.box .el-scrollbar__wrap {
+ overflow: scroll;
+}
</style>
diff --git a/src/views/securityGuard/securityGuardDetail.vue b/src/views/securityGuard/securityGuardDetail.vue
index e4501d0..f23308e 100644
--- a/src/views/securityGuard/securityGuardDetail.vue
+++ b/src/views/securityGuard/securityGuardDetail.vue
@@ -2,8 +2,7 @@
<div class="dispatch">
<avue-tabs :option="optionTABS" @change="handleChangeTABS"></avue-tabs>
<span v-if="typeTABS.prop === 'tab1'">
- <avue-form ref="form" v-model="obj0" :option="option0">
- </avue-form>
+ <avue-form ref="form" v-model="obj0" :option="option0"> </avue-form>
</span>
<span v-else-if="typeTABS.prop === 'tab2'">
<avue-crud
@@ -32,9 +31,13 @@
</template>
<script>
-import { securityBaseInfoColumn, practitionersColumn,trackRecordColumn } from "./data";
-import {getUserPractitionersInfo} from "@/api/system/user";
-import {add,update,page,remove,getPerformanceInfo} from "@/api/performance/performance";
+import {
+ securityBaseInfoColumn,
+ practitionersColumn,
+ trackRecordColumn,
+} from "./data";
+import { getUserPractitionersInfo } from "@/api/system/user";
+import { add, update, page, remove } from "@/api/performance/performance";
export default {
data() {
return {
@@ -58,9 +61,9 @@
},
],
},
- current:1,
- size:10,
- cardid: "",
+ current: 1,
+ size: 10,
+ cardid: "",
name: "",
dispatcherCompany: "",
id: "",
@@ -70,7 +73,7 @@
option0: {
emptyBtn: false,
submitBtn: false,
- labelWidth:"110",
+ labelWidth: "110",
gutter: 30,
column: securityBaseInfoColumn,
},
@@ -91,34 +94,34 @@
data1: [],
data2: [],
option1: {
- card: false,
- menu:false,
- addBtn:false,
- height:'auto',
- widtd:"auto",
+ card: true,
+ menu: false,
+ addBtn: false,
+ height: "auto",
+ widtd: "auto",
calcHeight: 54,
border: false,
- stripe:true,
+ stripe: true,
tip: false,
index: true,
dialogClickModal: false,
- headerAlign: 'center',
- align: 'center',
+ headerAlign: "center",
+ align: "center",
column: practitionersColumn,
},
option2: {
card: true,
- menu:true,
- height:'auto',
- widtd:"auto",
+ menu: true,
+ height: "auto",
+ widtd: "auto",
calcHeight: 54,
border: false,
- stripe:true,
+ stripe: true,
tip: false,
index: true,
dialogClickModal: false,
- headerAlign: 'center',
- align: 'center',
+ headerAlign: "center",
+ align: "center",
column: trackRecordColumn,
},
};
@@ -138,40 +141,41 @@
if (column.prop == "tab1") {
this.loading1 = false;
} else if (column.prop == "tab2") {
- //查询当前保安员的从业记录信息
- this.getPractitionersPageInfo();
- this.loading1 = false;
+ //查询当前保安员的从业记录信息
+ this.getPractitionersPageInfo();
+ this.loading1 = false;
} else if (column.prop == "tab3") {
- //查询当前保安员的现实表现记录
- this.getPerformancePageInfo();
- this.loading2 = false;
+ //查询当前保安员的现实表现记录
+ this.getPerformancePageInfo();
+ this.loading2 = false;
}
},
//查询当前保安员的从业记录信息
- getPractitionersPageInfo(){
- var that = this;
- //获取用户从业信息
- getUserPractitionersInfo(this.cardid).then(res1 =>{
- that.data1 = res1.data.data;
- })
+ getPractitionersPageInfo() {
+ var that = this;
+ //获取用户从业信息
+ getUserPractitionersInfo(this.cardid).then((res1) => {
+ that.data1 = res1.data.data;
+ });
},
//查询当前保安员的现实表现记录信息
- getPerformancePageInfo(){
- //获取现实表现信息
- var param = {
- cardid:this.cardid
- }
- page(this.current,this.size,param).then(res2 =>{
- const data = res2.data.data;
- this.page2.total = data.total;
- this.data2 = data.records;
- console.log(this.data2, 1);
- this.loading2 = false;
- })
+ getPerformancePageInfo() {
+ //获取现实表现信息
+ var param = {
+ cardid: this.cardid,
+ };
+ page(this.current, this.size, param).then((res2) => {
+ const data = res2.data.data;
+ this.page2.total = data.total;
+ this.data2 = data.records;
+ console.log(this.data2, 1);
+ this.loading2 = false;
+ });
},
rowSave2(form, done, loading) {
form.cardid = this.cardid;
- add(form).then((res) => {
+ add(form).then(
+ (res) => {
this.getPerformancePageInfo(this.page2);
this.$message({
type: "success",
@@ -223,8 +227,10 @@
},
mounted() {
this.typeTABS = this.optionTABS.column[0];
- if (this.$route.query.row) {
- var row = this.$route.query.row;
+ var data = JSON.parse(this.$route.query.row);
+ if (data) {
+ var row = data;
+ // var row = this.$route.query.row;
for (var k in row) {
this.obj0[k] = row[k];
}
@@ -234,6 +240,22 @@
this.dispatcherCompany = row.dispatcherCompany;
this.id = row.id;
}
+
+ var flag = false,
+ i = 0,
+ ind = null;
+ this.$store.state.tags.tagList.forEach((item, index) => {
+ if (item.label == "保安员详情") {
+ if (flag == false) {
+ ind = index;
+ flag = true;
+ }
+ i++;
+ }
+ });
+ if (i > 1) {
+ this.$store.state.tags.tagList.splice(ind, 1);
+ }
},
};
</script>
--
Gitblit v1.9.3