This commit is contained in:
shijing 2022-07-18 14:35:50 +08:00
commit 10d8beadcb
8 changed files with 346 additions and 242 deletions

View File

@ -262,15 +262,6 @@ export default {
return await http.post(this.url,data);
}
},
/*update: {
name: "更新岗位",
req: async function(id, data){
return await http.put(
`${config.API_URL}/system/post_role/${id}/`,
data
);
}
},*/
delete: {
name: "删除岗位",
req: async function(id){

View File

@ -310,7 +310,7 @@ export default {
this.$emit("dataChange", res, this.tableData);
} catch (error) {
this.loading = false;
if(error.response.data){
if(error.response && error.response.data){
this.emptyText = error.response.data.err_msg;
}else{
this.emptyText = error.statusText || "数据格式错误";

View File

@ -34,6 +34,7 @@ const routes = [
"title": "首页",
"icon": "el-icon-home-filled",
"type": "menu",
"perms": ["home"]
},
"children": [
{
@ -43,6 +44,7 @@ const routes = [
"title": "控制台",
"icon": "el-icon-monitor",
"affix": true,
"perms": ["dashboard"]
},
"component": "home"
},
@ -52,7 +54,8 @@ const routes = [
"meta": {
"title": "驾驶舱",
"icon": "el-icon-position",
"fullpage": true
"fullpage": true,
"perms": ["bigScreen"]
},
"component": "bigScreen"
},
@ -61,7 +64,8 @@ const routes = [
"path": "/usercenter",
"meta": {
"title": "帐号信息",
"icon": "el-icon-user"
"icon": "el-icon-user",
"perms": ["userCenter"]
},
"component": "userCenter"
}
@ -74,6 +78,7 @@ const routes = [
"title": "事件",
"icon": "el-icon-goods-filled",
"type": "menu",
"perms": ["ecm"]
},
"children": [
{
@ -114,6 +119,7 @@ const routes = [
"meta": {
"title": "我的事件",
"icon": "el-icon-document-remove",
"perms": ["myevent"]
},
"component": "ecm/myevent"
},
@ -123,6 +129,7 @@ const routes = [
"meta": {
"title": "提醒配置",
"icon": "el-icon-setting",
"perms": ["notify_setting"]
},
"component": "ecm/notify_setting"
},
@ -133,6 +140,7 @@ const routes = [
"meta": {
"title": "算法配置",
"icon": "el-icon-setting",
"perms": ["algo"]
},
"component": "ecm/algo"
}
@ -144,7 +152,8 @@ const routes = [
"meta": {
"title": "工单",
"icon": "el-icon-circle-check-filled",
"type": "menu"
"type": "menu",
"perms": ["wf"]
},
"children": [
{
@ -153,6 +162,7 @@ const routes = [
"meta": {
"title": "工作流",
"icon": "el-icon-guide",
"perms": ["workflow"]
},
"component": "wf/workflow"
},
@ -173,6 +183,7 @@ const routes = [
"meta": {
"title": "全部工单",
"icon": "el-icon-folder",
"perms": ["allwork"]
},
"component": "wf/allwork"
@ -183,7 +194,7 @@ const routes = [
"meta": {
"title": "我创建的",
"icon": "el-icon-folder-add",
"perms": ["ownerwork"]
},
"component": "wf/ownerwork"
}
@ -195,7 +206,7 @@ const routes = [
"meta": {
"title": "待办工单",
"icon": "el-icon-folder-opened",
"perms": ["duyt"]
},
"component": "wf/dutywork"
},
@ -205,7 +216,7 @@ const routes = [
"meta": {
"title": "我处理的",
"icon": "el-icon-expand",
"perms": ["worked"]
},
"component": "wf/worked"
},
@ -215,7 +226,7 @@ const routes = [
"meta": {
"title": "抄送我的",
"icon": "el-icon-edit-pen",
"perms": ["ccwork"]
},
"component": "wf/ccwork"
},
@ -240,7 +251,8 @@ const routes = [
"meta": {
"title": "作业",
"icon": "el-icon-list",
"type": "menu"
"type": "menu",
"perms": ["opm"]
},
"children": [
{
@ -249,6 +261,7 @@ const routes = [
"meta": {
"title": "作业列表",
"icon": "el-icon-tickets",
"perms": ["operation"]
},
"component": "opm/operation"
},
@ -258,6 +271,7 @@ const routes = [
"meta": {
"title": "许可证分类",
"icon": "el-icon-ticket",
"perms": ["oplcate"]
},
"component": "opm/oplcate"
},
@ -369,7 +383,8 @@ const routes = [
"meta": {
"title": "相关方",
"icon": "el-icon-avatar",
"type": "menu"
"type": "menu",
"perms": ["rpm"]
},
"children": [
{
@ -378,6 +393,7 @@ const routes = [
"meta": {
"title": "相关方列表",
"icon": "el-icon-tickets",
"perms": ["rparty"]
},
"component": "rpm/rparty"
},
@ -387,6 +403,7 @@ const routes = [
"meta": {
"title": "相关方人员",
"icon": "el-icon-user",
"perms": ["remployee"]
},
"component": "rpm/remployee"
},
@ -396,6 +413,7 @@ const routes = [
"meta": {
"title": "人员证书",
"icon": "el-icon-postcard",
"perms": ["rcertificate"]
},
"component": "rpm/rcertificate"
},
@ -405,6 +423,7 @@ const routes = [
"meta": {
"title": "资料库",
"icon": "el-icon-shopping-bag",
"perms": ["rfile"]
},
"component": "rpm/rfile"
},
@ -414,6 +433,7 @@ const routes = [
"meta": {
"title": "入厂项目",
"icon": "el-icon-calendar",
"perms": ["rpj"]
},
"component": "rpm/rpj"
},
@ -436,7 +456,8 @@ const routes = [
"meta": {
"title": "访客",
"icon": "el-icon-user-filled",
"type": "menu"
"type": "menu",
"perms": ["vm"]
},
"children": [
{
@ -445,6 +466,7 @@ const routes = [
"meta": {
"title": "来访项目",
"icon": "el-icon-tickets",
"perms": ["visit"]
},
"component": "vm/visit"
},
@ -454,6 +476,7 @@ const routes = [
"meta": {
"title": "来访人员",
"icon": "el-icon-user",
"perms": ["visitor"]
},
"component": "vm/visitor"
},{
@ -486,7 +509,8 @@ const routes = [
"meta": {
"title": "区域",
"icon": "el-icon-location-filled",
"type": "menu"
"type": "menu",
"perms": ["am"]
},
"children": [
{
@ -495,6 +519,7 @@ const routes = [
"meta": {
"title": "区域列表",
"icon": "el-icon-tickets",
"perms": ["area"]
},
"component": "am/area"
},
@ -504,6 +529,7 @@ const routes = [
"meta": {
"title": "门禁通道",
"icon": "el-icon-phone",
"perms": ["eqm"]
},
"component": "am/em1"
},
@ -513,6 +539,7 @@ const routes = [
"meta": {
"title": "视频通道",
"icon": "el-icon-video-camera",
"perms": ["monitor"]
},
"component": "am/monitor"
},
@ -522,6 +549,7 @@ const routes = [
"meta": {
"title": "喇叭通道",
"icon": "el-icon-mic",
"perms": ["audio"]
},
"component": "am/audio"
},{
@ -530,6 +558,7 @@ const routes = [
"meta": {
"title": "定位标签",
"icon": "el-icon-map-location",
"perms": ["blt"]
},
"component": "am/blt"
},
@ -541,7 +570,8 @@ const routes = [
"meta": {
"title": "人事",
"icon": "el-icon-platform",
"type": "menu"
"type": "menu",
"perms": ["hrm"]
},
"children": [
@ -551,6 +581,7 @@ const routes = [
"meta": {
"title": "企业员工",
"icon": "el-icon-user",
"perms": ["employee"]
},
"component": "hrm/employee"
}
@ -561,6 +592,7 @@ const routes = [
"meta": {
"title": "证书列表",
"icon": "el-icon-tickets",
"perms": ["certificates"]
},
"component": "hrm/certificates"
}
@ -571,7 +603,8 @@ const routes = [
"meta": {
"title": "相关证书",
"icon": "el-icon-menu",
"hidden": true
"hidden": true,
"perms": ["certificates"]
},
"component": "hrm/certificate"
},
@ -584,7 +617,8 @@ const routes = [
"meta": {
"title": "系统",
"icon": "el-icon-tools",
"type": "menu"
"type": "menu",
"perms": ["sys"]
},
"children": [
{
@ -593,7 +627,8 @@ const routes = [
"meta": {
"title": "账户管理",
"icon": "el-icon-user",
"type": "menu"
"type": "menu",
"perms": ["user"]
},
"component": "sys/user"
},
@ -603,7 +638,8 @@ const routes = [
"meta": {
"title": "部门管理",
"icon": "sc-icon-organization",
"type": "menu"
"type": "menu",
"perms": ["dept"]
},
"component": "sys/dept"
},
@ -613,7 +649,8 @@ const routes = [
"meta": {
"title": "岗位管理",
"icon": "el-icon-postcard",
"type": "menu"
"type": "menu",
"perms": ["post"]
},
"component": "sys/post"
},
@ -623,7 +660,8 @@ const routes = [
"meta": {
"title": "角色管理",
"icon": "el-icon-notebook",
"type": "menu"
"type": "menu",
"perms": ["role"]
},
"component": "sys/role"
},
@ -633,7 +671,8 @@ const routes = [
"meta": {
"title": "字典管理",
"icon": "el-icon-document",
"type": "menu"
"type": "menu",
"perms": ["dict"]
},
"component": "sys/dict"
},
@ -643,7 +682,8 @@ const routes = [
"meta": {
"title": "计划任务",
"icon": "el-icon-alarm-clock",
"type": "menu"
"type": "menu",
"perms": ["task"]
},
"component": "sys/task"
}

View File

@ -2,6 +2,9 @@ import tool from '@/utils/tool';
export function permission(data) {
let permissions = tool.data.get("PERMISSIONS");
if (permissions.indexOf('superuser')>-1){
return true
}
if(!permissions){
return false;
}

View File

@ -2,34 +2,37 @@
<el-container>
<el-header>
<div class="left-panel">
<el-button type="primary" icon="el-icon-refresh" @click="syncData"
<el-button type="primary" icon="el-icon-refresh" @click="syncData" :syncLoading="syncLoading"
>同步</el-button
>
</div>
<div class="right-panel">
<el-input
v-model="search.keyword"
<!-- <el-input
v-model="query.code"
placeholder="编号"
clearable
@click="upsearch"
@click="handleQuery"
></el-input>
<el-button
type="primary"
icon="el-icon-search"
@click="upsearch"
></el-button>
@click="handleQuery"
></el-button> -->
</div>
</el-header>
<el-main class="nopadding">
<scTable
ref="table"
:apiObj="apiObj"
:pageStr="pageStr"
:pageSizeStr="pageSizeStr"
:parseData="parseData"
row-key="id"
@selection-change="selectionChange"
stripe
@resetQuery="resetQuery"
>
<el-table-column type="selection" width="50"></el-table-column>
<!-- <el-table-column type="selection" width="50"></el-table-column> -->
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column
label="喇叭名称"
@ -46,14 +49,14 @@
<el-table-column
label="设备sn"
prop="sn"
min-width="90"
min-width="150"
></el-table-column>
<el-table-column label="ip" prop="extra" min-width="90">
<template #default="scope">
<span v-if="scope.row.extra">{{ scope.row.extra.ip }}</span>
</template>
</el-table-column>
<el-table-column label="状态" prop="extra" min-width="90">
<el-table-column label="在线状态" prop="extra" min-width="90">
<template #default="scope">
<span v-if="scope.row.extra">{{ scope.row.extra.online }}</span>
</template>
@ -105,6 +108,15 @@ export default {
return {
syncLoading: false,
apiObj: this.$API.am.tdevice.speaker,
pageStr: "page",
pageSizeStr: "pageSize",
parseData: (res) => {
return {
data: res, //
rows: res.rows, //
total: res.total, //
};
},
dialogSave: false,
limitedVisible: false,
query: {},
@ -128,7 +140,9 @@ export default {
},
//
upsearch() {},
handleQuery() {
this.$refs.table.refresh();
},
resetQuery() {
this.query = {};

View File

@ -11,17 +11,17 @@
>
</div>
<div class="right-panel">
<el-input
v-model="search.keyword"
<!-- <el-input
v-model="query.channelCode"
placeholder="编号"
clearable
@click="upsearch"
@click="handleQuery"
></el-input>
<el-button
type="primary"
icon="el-icon-search"
@click="upsearch"
></el-button>
@click="handleQuery"
></el-button> -->
</div>
</el-header>
<el-main class="nopadding">
@ -151,9 +151,6 @@ export default {
syncLoading: false,
query: {},
selection: [],
search: {
keyword: null,
},
channelId: "",
params: {
json: {
@ -246,7 +243,7 @@ export default {
},
//
upsearch() {},
handleQuery() {this.$refs.table.refresh();},
resetQuery() {
this.query = {};

View File

@ -1,199 +1,259 @@
<template>
<el-container>
<el-aside width="40%">
<el-container>
<el-header>
<div class="left-panel">
<div style="margin-right: 20px">岗位列表</div>
<el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
</div>
</el-header>
<el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe highlightCurrentRow @row-click="rowClick"
:hidePagination="true">
<!-- <el-table-column type="selection" width="50"></el-table-column> -->
<el-table-column label="" type="index"></el-table-column>
<el-table-column label="名称" prop="name" width="120"></el-table-column>
<el-table-column label="标识" prop="code" width="60"></el-table-column>
<el-table-column label="最短在岗(h)" prop="min_hour" width="100"></el-table-column>
<el-table-column label="最长在岗(h)" prop="max_hour" width="100"></el-table-column>
<el-table-column label="操作" fixed="right" align="right">
<template #default="scope">
<el-button type="warning" link size="small" @click="table_edit(scope.row)">编辑
</el-button>
</template>
</el-table-column>
</scTable>
</el-main>
</el-container>
</el-aside>
<el-container>
<el-header>
<div class="left-panel">
<div style="margin-right: 20px">岗位权限</div>
<el-button type="primary" icon="el-icon-plus" @click="addPostRole"></el-button>
<el-button type="danger" plain icon="el-icon-delete" @click="delPostRole"></el-button>
</div>
</el-header>
<el-main class="nopadding">
<scTable ref="table2" :apiObj="apiObj2" row-key="id" stripe :hidePagination="true">
<!-- <el-table-column type="selection" width="50"></el-table-column> -->
<el-table-column label="" type="index"></el-table-column>
<el-table-column label="所属岗位" prop="post" min-width="80">
<template #default="scope">{{scope.row.post_.name}}</template>
</el-table-column>
<el-table-column label="拥有角色" prop="role" min-width="80">
<template #default="scope">{{scope.row.role_.name}}</template>
</el-table-column>
<el-table-column label="权限范围" prop="data_range" min-width="80">
<template #default="scope">{{options[scope.row.data_range]}}</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="right">
<template #default="scope">
<el-button type="warning" link size="small" @click="postRoleEdit(scope.row)">编辑
</el-button>
<el-button type="warning" link size="small" @click="postRoleDel(scope.row)">删除
</el-button>
</template>
</el-table-column>
</scTable>
</el-main>
</el-container>
</el-container>
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
@closed="dialog.save=false"></save-dialog>
<save-role-dialog v-if="dialog.roleSave" ref="saveRoleDialog" @success="handleSaveRoleSuccess"
@closed="dialog.roleSave=false"></save-role-dialog>
<el-container>
<el-aside width="40%">
<el-container>
<el-header>
<div class="left-panel">
<div style="margin-right: 20px">岗位列表</div>
<el-button
type="primary"
icon="el-icon-plus"
@click="add"
></el-button>
</div>
</el-header>
<el-main class="nopadding">
<scTable
ref="table"
:apiObj="apiObj"
row-key="id"
stripe
highlightCurrentRow
@row-click="rowClick"
:hidePagination="true"
>
<!-- <el-table-column type="selection" width="50"></el-table-column> -->
<el-table-column label="" type="index"></el-table-column>
<el-table-column
label="名称"
prop="name"
width="120"
></el-table-column>
<el-table-column
label="标识"
prop="code"
width="60"
></el-table-column>
<el-table-column
label="最短在岗(h)"
prop="min_hour"
width="100"
></el-table-column>
<el-table-column
label="最长在岗(h)"
prop="max_hour"
width="100"
></el-table-column>
<el-table-column label="操作" fixed="right" align="right">
<template #default="scope">
<el-button
type="warning"
link
size="small"
@click="table_edit(scope.row)"
>编辑
</el-button>
</template>
</el-table-column>
</scTable>
</el-main>
</el-container>
</el-aside>
<el-container>
<el-header>
<div class="left-panel">
<div style="margin-right: 20px">岗位权限</div>
<el-button
type="primary"
icon="el-icon-plus"
@click="addPostRole"
></el-button>
<el-button
type="danger"
plain
icon="el-icon-delete"
@click="delPostRole"
></el-button>
</div>
</el-header>
<el-main class="nopadding">
<scTable
ref="table2"
:apiObj="apiObj2"
row-key="id"
stripe
:hidePagination="true"
>
<!-- <el-table-column type="selection" width="50"></el-table-column> -->
<el-table-column label="" type="index"></el-table-column>
<el-table-column label="所属岗位" prop="post" min-width="80">
<template #default="scope">{{ scope.row.post_.name }}</template>
</el-table-column>
<el-table-column label="拥有角色" prop="role" min-width="80">
<template #default="scope">{{ scope.row.role_.name }}</template>
</el-table-column>
<el-table-column label="权限范围" prop="data_range" min-width="80">
<template #default="scope">{{
options[scope.row.data_range]
}}</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="right">
<template #default="scope">
<el-button
type="warning"
link
size="small"
@click="postRoleDel(scope.row)"
>删除
</el-button>
</template>
</el-table-column>
</scTable>
</el-main>
</el-container>
</el-container>
<save-dialog
v-if="dialog.save"
ref="saveDialog"
@success="handleSaveSuccess"
@closed="dialog.save = false"
></save-dialog>
<save-role-dialog
v-if="dialog.roleSave"
ref="saveRoleDialog"
@success="handleSaveRoleSuccess"
@closed="dialog.roleSave = false"
></save-role-dialog>
</template>
<script>
import saveDialog from './post_form.vue'
import saveRoleDialog from './post_role_form.vue'
export default {
name: 'listSon',
components: {
saveDialog,
saveRoleDialog,
},
data() {
return {
apiObj: this.$API.system.post.list,
apiObj2: this.$API.system.postrole.list,
dialog: {
save: false,
roleSave: false,
},
selection: [],
postId:'',
options: {
10: "全部",
20: "自定义",
30: "同级及以下",
40: "本级及以下",
50: "本级",
60: "仅本人"
},
}
},
methods: {
rowClick(row) {
let params = {
post: row.id
};
this.postId = row.id;
this.$refs.table2.reload(params)
},
//
add() {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open()
})
},
//
table_edit(row) {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open('edit').setData(row)
})
},
//
async batch_del() {
var confirmRes = await this.$confirm(`确定删除选中的 ${this.selection.length} 项吗?`, '提示', {
type: 'warning',
confirmButtonText: '删除',
confirmButtonClass: 'el-button--danger'
}).catch(() => {
})
import saveDialog from "./post_form.vue";
import saveRoleDialog from "./post_role_form.vue";
export default {
name: "listSon",
components: {
saveDialog,
saveRoleDialog,
},
data() {
return {
apiObj: this.$API.system.post.list,
apiObj2: this.$API.system.postrole.list,
dialog: {
save: false,
roleSave: false,
},
selection: [],
postId: "",
options: {
10: "全部",
20: "自定义",
30: "同级及以下",
40: "本级及以下",
50: "本级",
60: "仅本人",
},
};
},
methods: {
rowClick(row) {
let params = {
post: row.id,
};
this.apiObj2 = this.$API.system.postrole.list;
this.postId = row.id;
this.$refs.table2.reload(params);
},
//
add() {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open();
});
},
//
table_edit(row) {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("edit").setData(row);
});
},
//
async batch_del() {
var confirmRes = await this.$confirm(
`确定删除选中的 ${this.selection.length} 项吗?`,
"提示",
{
type: "warning",
confirmButtonText: "删除",
confirmButtonClass: "el-button--danger",
}
).catch(() => {});
if (!confirmRes) {
return false
}
if (!confirmRes) {
return false;
}
var ids = this.selection.map(v => v.id)
this.$refs.table.removeKeys(ids)
this.$message.success("操作成功")
var ids = this.selection.map((v) => v.id);
this.$refs.table.removeKeys(ids);
this.$message.success("操作成功");
},
//
handleSaveSuccess(data, mode) {
//
if (mode == "add") {
this.$refs.table.unshiftRow(data);
} else if (mode == "edit") {
this.$refs.table.updateKey(data);
}
},
//
handleSaveSuccess(data, mode) {
//
if (mode == 'add') {
this.$refs.table.unshiftRow(data)
} else if (mode == 'edit') {
this.$refs.table.updateKey(data)
}
//
// this.$refs.table.refresh()
},
//
handleSaveRoleSuccess() {
this.$refs.table2.refresh()
},
addPostRole(){
this.dialog.roleSave = true;
this.$nextTick(() => {
this.$refs.saveRoleDialog.open("add").setData({postId:this.postId})
})
},
postRoleEdit(row){
this.dialog.roleSave = true;
this.$nextTick(() => {
this.$refs.saveRoleDialog.open("edit").setData(row)
})
},
delPostRole(){
},
closed(){
this.dialog.save = false;
this.dialog.roleSave = false;
this.postId = '';
this.$refs.table2.refresh();
},
postRoleDel(row){
this.$confirm(`确定删除选中的岗位关系吗?`, '提示', {
type: 'warning'
}).then(() => {
this.$API.system.postrole.delete.req(row.id).then(res=>{
if(res.err_msg){
this.$message.error(res.err_msg)
}else{
const loading = this.$loading();
this.$refs.table2.refresh();
loading.close();
this.$message.success("操作成功")
}
})
}).catch(() => {
})
},
}
}
//
// this.$refs.table.refresh()
},
//
handleSaveRoleSuccess() {
this.$refs.table2.refresh();
},
addPostRole() {
this.dialog.roleSave = true;
this.$nextTick(() => {
this.$refs.saveRoleDialog.open("add").setData({ postId: this.postId });
});
},
postRoleEdit(row) {
this.dialog.roleSave = true;
this.$nextTick(() => {
this.$refs.saveRoleDialog.open("edit").setData(row);
});
},
delPostRole() {},
closed() {
this.dialog.save = false;
this.dialog.roleSave = false;
this.postId = "";
this.$refs.table2.refresh();
},
postRoleDel(row) {
this.$confirm(`确定删除选中的岗位关系吗?`, "提示", {
type: "warning",
})
.then(() => {
this.$API.system.postrole.delete.req(row.id).then((res) => {
if (res.err_msg) {
this.$message.error(res.err_msg);
} else {
const loading = this.$loading();
this.$refs.table2.refresh();
loading.close();
this.$message.success("操作成功");
}
});
})
.catch(() => {});
},
},
};
</script>
<style>

View File

@ -133,6 +133,7 @@ export default {
},
//
async submit() {
var valid = await this.$refs.form.validate().catch(() => {});
if (!valid) {
return false;
@ -140,11 +141,9 @@ export default {
this.isSaveing = true;
try {
let res;
if (this.mode === "add") {
res = await this.$API.system.postrole.create.req(this.form);
} else if (this.mode === "edit") {
res = await this.$API.system.postrole.update.req(this.form.id, this.form);
}
this.isSaveing = false;
this.$emit("success", this.form, this.mode);
this.visible = false;