Skip to content

T
template_vue
Commit 48b990d7 authored by 高宇's avatar 高宇
Browse files
Options

删除菜单

parent d12c80ef
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 82 deletions
src/views/dashboard/index.vue deleted 100644 → 0
View file @ d12c80ef
<template>
<!-- <div class="dashboard-container">-->
<!-- <div class="dashboard-text">当前用户: {{ name }}</div>-->
<!-- <div class="dashboard-text">当前权限: <span v-for="role in roles" :key="role">{{ role }}</span></div>-->
<!-- </div>-->
</template>
<script>
import { mapGetters } from 'vuex'
export default {
name: 'Dashboard',
computed: {
...mapGetters([
'name',
'roles'
])
}
}
</script>
<style lang="scss" scoped>
.dashboard {
&-container {
margin: 30px;
}
&-text {
font-size: 30px;
line-height: 46px;
}
}
</style>
src/views/equipment/basicInfo.vue
View file @ 48b990d7
......@@ -63,7 +63,7 @@
</el-table-column>
<el-table-column label="pgx" prop="pgx">
<template slot-scope="scope">
<span>{{replace(scope.row.pgx)}}</span>
<span>{{ replace(scope.row.pgx) }}</span>
</template>
</el-table-column>
<el-table-column label="ptype" prop="ptype">
......@@ -326,7 +326,7 @@ export default {
methods: {
replace(value) {
console.log('value')
if (this.dictList.length>0) {
if (this.dictList.length > 0) {
return this.dictList.find(item => item.dictValue === value).dictLabel
} else {
return value
......
src/views/system/role/index.vue
View file @ 48b990d7
......@@ -28,7 +28,8 @@
type="primary"
icon="el-icon-search"
size="small"
@click="handleQuery">
@click="handleQuery"
>
查询
</el-button>
</el-form-item>
......@@ -99,13 +100,13 @@
style="color: #49cec9"
@click="handleUpdate(scope.row)"
>修改</el-button>
<!-- <el-button-->
<!-- v-hasPermi="['sys:role:update']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-circle-check"-->
<!-- @click="handleMenu(scope.row)"-->
<!-- >数据权限</el-button>-->
<!-- <el-button-->
<!-- v-hasPermi="['sys:role:update']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-circle-check"-->
<!-- @click="handleMenu(scope.row)"-->
<!-- >数据权限</el-button>-->
<el-button
size="mini"
type="text"
......@@ -260,8 +261,8 @@ import {
listRole,
updateRole
} from '@/api/system/role'
import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
import {roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
// import { getRolesByInsId } from '../../../api/businessManage/template'
export default {
name: 'Role',
......
src/views/system/user/index.vue
View file @ 48b990d7
......@@ -149,12 +149,12 @@
style="color: #49cec9"
@click="handleUpdate(scope.row)"
>修改</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- :loading="addLoading"-->
<!-- @click="handleResetPwd(scope.row)"-->
<!-- >重置</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- :loading="addLoading"-->
<!-- @click="handleResetPwd(scope.row)"-->
<!-- >重置</el-button>-->
<el-button
v-if="scope.row.businessId !== 1"
size="mini"
......@@ -228,7 +228,6 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="用户名称" prop="name">
......@@ -378,22 +377,22 @@ import {
updateUser,
uploadFalseFile
} from '@/api/system/user'
import {getToken} from '@/utils/auth'
import {treeselect} from '@/api/system/dept'
import { getToken } from '@/utils/auth'
import { treeselect } from '@/api/system/dept'
import TreeSelect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import {getlistRole} from '@/api/system/role'
import { getlistRole } from '@/api/system/role'
export default {
name: 'User',
components: { TreeSelect },
data() {
var trueGroupName = (rule, value, callback) => {
if (value && !value.trim()) {
return callback(new Error('请输入正确的用户昵称'))
}
callback()
}
// const trueGroupName = (rule, value, callback) => {
// if (value && !value.trim()) {
// return callback(new Error('请输入正确的用户昵称'))
// }
// callback()
// }
var passwordCheck = (rule, value, callback) => {
const pattern = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/
if (!pattern.test(value)) {
......@@ -401,27 +400,27 @@ export default {
}
callback()
}
var phone = (rule, value, callback) => {
if (!value) {
return callback(new Error('请输入手机号'))
} else {
callback()
}
}
var idNumber = (rule, value, callback) => {
if (!value) {
return callback(new Error('请输入身份证号'))
} else {
callback()
}
}
var name = (rule, value, callback) => {
if (!value) {
return callback(new Error('请输入用户类型'))
} else {
callback()
}
}
// var phone = (rule, value, callback) => {
// if (!value) {
// return callback(new Error('请输入手机号'))
// } else {
// callback()
// }
// }
// var idNumber = (rule, value, callback) => {
// if (!value) {
// return callback(new Error('请输入身份证号'))
// } else {
// callback()
// }
// }
// var name = (rule, value, callback) => {
// if (!value) {
// return callback(new Error('请输入用户类型'))
// } else {
// callback()
// }
// }
return {
pwdTypeMap: {
text: true,
......@@ -537,7 +536,6 @@ export default {
{ required: true, message: '请输入登录名', trigger: 'blur' }
],
password: [
{ required: true, message: '请输入用户密码', trigger: 'blur' },
{ min: 8, max: 16, message: '长度在 8 到 16 个字符', trigger: 'blur' },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment