suojin
/
lab-ops-ui-web
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://42.192.7.176:3000/suojin/lab-ops-ui-web

Browse Source
master
zhangdi 11 months ago
parent 0fe3d0bdab 62a3006d9f
commit 0b7c97ea9b
6 changed files with 123 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/views/authority/apiscope.vue
  2. 14
      src/views/authority/datascope.vue
  3. 33
      src/views/authority/role.vue
  4. 8
      src/views/businessManagement/ordinary.vue
  5. 8
      src/views/device/deviceSystem.vue
  6. 88
      src/views/system/user.vue

14
src/views/authority/apiscope.vue
Unescape View File

@ -126,6 +126,13 @@
delBtn: false,
menuWidth: 150,
dialogClickModal: false,
searchShowBtn: false, // 栏目折叠显隐
refreshBtn: false, // 刷新
columnBtn: false, // 操作列显隐
gridBtn:false,
excelBtn: false, // 导出Excel
printBtn: false, // 表格打印导出
filterBtn: false, // 筛选
column: [
{
label: "菜单名称",
@ -313,6 +320,13 @@
menuWidth: 200,
dialogWidth: 900,
dialogClickModal: false,
searchShowBtn: false, // 栏目折叠显隐
refreshBtn: false, // 刷新
columnBtn: false, // 操作列显隐
gridBtn:false,
excelBtn: false, // 导出Excel
printBtn: false, // 表格打印导出
filterBtn: false, // 筛选
column: [
{
label: "权限名称",

14
src/views/authority/datascope.vue
Unescape View File

@ -130,6 +130,13 @@
delBtn: false,
menuWidth: 150,
dialogClickModal: false,
searchShowBtn: false, // 栏目折叠显隐
refreshBtn: false, // 刷新
columnBtn: false, // 操作列显隐
gridBtn:false,
excelBtn: false, // 导出Excel
printBtn: false, // 表格打印导出
filterBtn: false, // 筛选
column: [
{
label: "菜单名称",
@ -317,6 +324,13 @@
menuWidth: 200,
dialogWidth: 900,
dialogClickModal: false,
searchShowBtn: false, // 栏目折叠显隐
refreshBtn: false, // 刷新
columnBtn: false, // 操作列显隐
gridBtn:false,
excelBtn: false, // 导出Excel
printBtn: false, // 表格打印导出
filterBtn: false, // 筛选
column: [
{
label: "权限名称",

33
src/views/authority/role.vue
Unescape View File

@ -119,6 +119,13 @@
viewBtn: true,
dialogWidth: 900,
dialogClickModal: false,
searchShowBtn: false, // 栏目折叠显隐
refreshBtn: false, // 刷新
columnBtn: false, // 操作列显隐
gridBtn:false,
excelBtn: false, // 导出Excel
printBtn: false, // 表格打印导出
filterBtn: false, // 筛选
column: [
{
label: "角色名称",
@ -185,19 +192,19 @@
}
]
},
{
label: "角色排序",
prop: "sort",
type: "number",
span: 24,
rules: [
{
required: true,
message: "请输入角色排序",
trigger: "blur"
}
]
}
// {
// label: "角色排序",
// prop: "sort",
// type: "number",
// span: 24,
// rules: [
// {
// required: true,
// message: "请输入角色排序",
// trigger: "blur"
// }
// ]
// }
]
},
data: []

8
src/views/businessManagement/ordinary.vue
Unescape View File

@ -832,6 +832,11 @@ export default {
prop: "finishTime",
sortable: true,
},
{
label:'维修人员',
prop:"repairPersonName",
hide:false
},
{
label: "审批时间",
labelWidth: 120,
@ -952,6 +957,9 @@ export default {
finishTime: { required: true, message: '请选择计划完成时间', trigger: 'blur' },
repairPerson: { required: true, message: '请选择维修人员', trigger: 'blur' },
}
if(this.role_id == '1839552581620793346'){
this.option.column.find(item => item.prop == 'repairPersonName').hide = true
}
} else if (this.role_id == '1839600115013713921') {
this.option.column.find(item => item.prop == 'finishTime').hide = true
this.option.column.find(item => item.prop == 'approveTime').hide = false

8
src/views/device/deviceSystem.vue
Unescape View File

@ -208,7 +208,7 @@
</el-table-column>
<el-table-column label="巡检周期" prop="period">
<template slot-scope="scope">
<el-select v-model="scope.row.period + ''" placeholder="巡检周期" :disabled="viewType == 'view'">
<el-select v-model="scope.row.period" placeholder="巡检周期" :disabled="viewType == 'view'">
<el-option v-for="item in periodArr" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"></el-option>
</el-select>
@ -629,6 +629,8 @@ export default {
let arr = val.split('；')
if (this.tableData.length != 0) {
console.log('tableData------------------>',this.tableData)
console.log('addForm------------------>',this.addForm.cycle)
let arr1 = JSON.parse(JSON.stringify(this.tableData))
if (val == '' && this.addForm.requirement == '') {
arr1 = []
@ -638,8 +640,8 @@ export default {
arr1[index] = {
...arr1[index],
checkContent: item,
craft: '',
period: arr1[index] ? arr1[index].period : this.addForm.period,
craft: arr1[index] ? item === arr1[index].checkContent ? arr1[index].craft : '' : '',
period: arr1[index] ? arr1[index].period : this.addForm.cycle,
startTime: arr1[index] ? arr1[index].startTime : this.addForm.startTime
}
// }

88
src/views/system/user.vue
Unescape View File

@ -4,7 +4,7 @@
<div class="box">
<el-scrollbar>
<basic-container>
<avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" />
<avue-tree ref="avueTree" :option="treeOption" :data="treeData" @node-click="nodeClick" />
</basic-container>
</el-scrollbar>
</div>
@ -23,10 +23,10 @@
<el-button type="danger" size="small" plain icon="el-icon-delete"
v-if="permission.user_delete && !auditMode" @click="handleDelete">删 除
</el-button>
<el-button type="primary" size="small" plain icon="el-icon-s-operation"
<!-- <el-button type="primary" size="small" plain icon="el-icon-s-operation"
v-if="userInfo.role_name.includes('admin') && !auditMode" @click="handleAudit">审 核
</el-button>
<el-button type="success" size="small" plain icon="el-icon-check"
</el-button> -->
<!-- <el-button type="success" size="small" plain icon="el-icon-check"
v-if="userInfo.role_name.includes('admin') && auditMode" @click="handleAuditPass">通 过
</el-button>
<el-button type="danger" size="small" plain icon="el-icon-close"
@ -34,19 +34,19 @@
</el-button>
<el-button type="primary" size="small" plain icon="el-icon-refresh-left"
v-if="userInfo.role_name.includes('admin') && auditMode" @click="handleAuditBack">返 回
</el-button>
</el-button> -->
<el-button type="info" size="small" plain v-if="permission.user_role && !auditMode" icon="el-icon-user"
@click="handleGrant">角色配置
</el-button>
<el-button type="info" size="small" plain v-if="permission.user_reset && !auditMode" icon="el-icon-refresh"
@click="handleReset">密码重置
</el-button>
<el-button type="info" size="small" plain v-if="userInfo.role_name.includes('admin') && !auditMode"
<!-- <el-button type="info" size="small" plain v-if="userInfo.role_name.includes('admin') && !auditMode"
icon="el-icon-setting" @click="handlePlatform">平台配置
</el-button>
<el-button type="info" size="small" plain v-if="userInfo.role_name.includes('admin') && !auditMode"
icon="el-icon-coordinate" @click="handleLock">账号解封
</el-button>
</el-button> -->
<el-button type="success" size="small" plain v-if="userInfo.role_name.includes('admin') && !auditMode"
icon="el-icon-upload2" @click="handleImport">导入
</el-button>
@ -192,15 +192,20 @@ export default {
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
}
}))
});
console.log('node------------->',node)
if(node.level < 2){
const parentId = (node.level === 0) ? 0 : node.data.id;
getDeptLazyTree(parentId).then(res => {
resolve(res.data.data.map(item => {
return {
...item,
leaf: !item.hasChildren
}
}))
});
}else{
return resolve([])
}
},
addBtn: false,
menu: false,
@ -217,6 +222,7 @@ export default {
calcHeight: 30,
tip: false,
searchShow: true,
searchEnter:true,
searchMenuSpan: 6,
border: true,
index: true,
@ -225,6 +231,13 @@ export default {
viewBtn: true,
dialogType: 'drawer',
dialogClickModal: false,
searchShowBtn: false, // 栏目折叠显隐
refreshBtn: false, // 刷新
columnBtn: false, // 操作列显隐
gridBtn:false,
excelBtn: false, // 导出Excel
printBtn: false, // 表格打印导出
filterBtn: false, // 筛选
column: [
{
label: "登录账号",
@ -363,16 +376,16 @@ export default {
prop: 'detailInfo',
icon: 'el-icon-s-order',
column: [
{
label: "用户昵称",
prop: "name",
hide: true,
rules: [{
required: true,
message: "请输入用户昵称",
trigger: "blur"
}]
},
// {
// label: "用户昵称",
// prop: "name",
// hide: true,
// rules: [{
// required: true,
// message: "请输入用户昵称",
// trigger: "blur"
// }]
// },
{
label: "用户姓名",
prop: "realName",
@ -680,6 +693,19 @@ export default {
});
getDeptTree(tenantId).then(res => {
const column = this.findObject(this.option.group, "deptId");
if(this.treeDeptId != ''){
this.form.deptId = [this.treeDeptId]
}
res.data.data.map(item =>{
if(item.parentId == '0' && item.hasChildren && item.children.length != 0){
item.children.map(item1 =>{
if(item1.hasChildren){
item1.children = []
}
})
}
})
console.log('res.data.data------------------->',res.data.data)
column.dicData = res.data.data;
});
getPostList(tenantId).then(res => {
@ -702,6 +728,14 @@ export default {
row.deptId = func.join(row.deptId);
row.roleId = func.join(row.roleId);
row.postId = func.join(row.postId);
if (row.deptId.split(',').length > 1) {
this.$message({
type: "error",
message: "所属部门只能选择一个！"
});
loading();
return false
}
add(row).then(() => {
this.initFlag = false;
this.onLoad(this.page);
@ -760,6 +794,8 @@ export default {
searchReset() {
this.query = {};
this.treeDeptId = '';
this.form.deptId = []
this.$refs.avueTree.setCurrentKey(null)
this.onLoad(this.page);
},
searchChange(params, done) {

Write Preview
Loading…
Cancel
Save