Skip to content

9
91isoft_sys_web
Commit 216ae298 authored by zhangyichen's avatar zhangyichen
Browse files
Options

Merge branch 'master' into demo1

parents 83a88b91 f67fcdc7
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 33 deletions
public/index.html
View file @ 216ae298
......@@ -12,7 +12,19 @@
<noscript>
<strong>We're sorry but <%= webpackConfig.name %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="splash"></div>
<div id="app"></div>
<!-- built files will be auto injected -->
<style>
#splash {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: #f4f4f4 url("loading-unscreen.gif") no-repeat center;
z-index: -1;
}
</style>
</body>
</html>
src/views/monitor/loginInfo/index.vue
View file @ 216ae298
......@@ -87,7 +87,11 @@
<el-table-column label="用户名称" align="center" prop="username" />
<el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
<el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />
<el-table-column label="登录状态" align="center" prop="status">
<template slot-scope="scope">
<span>{{ statusFormat(scope.row.status) || '-' }}</span>
</template>
</el-table-column>>
<el-table-column label="提示信息" align="center" prop="msg" >
<template slot-scope="scope">
<span>{{ scope.row.msg || '-' }}</span>
......@@ -187,7 +191,13 @@ export default {
},
// 登录状态字典翻译
statusFormat(row, column) {
return this.selectDictLabel(this.statusOptions, row.status)
// return this.selectDictLabel(this.statusOptions, row.status)
switch (row) {
case '1' :
return '成功'
case '2' :
return '失败'
}
},
/** 查询按钮操作 */
handleQuery() {
......
src/views/system/role/index.vue
View file @ 216ae298
......@@ -142,9 +142,9 @@
<el-form-item label="权限字符" prop="roleKey">
<el-input v-model.trim="form.roleKey" show-word-limit :maxlength="30" placeholder="请输入权限字符" />
</el-form-item>
<el-form-item label="角色排序" prop="roleSort">
<el-input-number v-model="form.roleSort" style="width: 100%" controls-position="right" :min="0" :max="9999" placeholder="请输入角色排序"/>
</el-form-item>
<!-- <el-form-item label="角色排序" prop="roleSort">-->
<!-- <el-input-number v-model="form.roleSort" style="width: 100%" controls-position="right" :min="0" :max="9999" placeholder="请输入角色排序"/>-->
<!-- </el-form-item>-->
<el-form-item label="角色状态">
<el-radio-group v-model="form.flag">
<el-radio
......@@ -420,7 +420,6 @@ export default {
this.formDeptData.label = data.label
this.formDeptData.dataScope = data.dataScope
this.$nextTick(_ => {
console.log(this.menuCheckStrictly)
this.$refs.dept.setCheckedKeys([])
this.$refs.dept.setCheckedKeys(this.idList)
this.formDeptData.deptCheckStrictlyOne = this.menuCheckStrictly
......@@ -529,9 +528,12 @@ export default {
this.menuOptionDataIdList.push(item.id)
})
}
const list = document.querySelectorAll('.el-tree-node__label')
list.forEach(item => {
item.title = item.innerText
this.$nextTick(() => {
const list = document.querySelectorAll('.el-tree-node__label')
console.log(list)
list.forEach(item => {
item.title = item.innerText
})
})
})
}
......@@ -592,7 +594,7 @@ export default {
menuIds: [],
menuName: undefined,
deptIds: [],
menuCheckStrictly: true,
menuCheckStrictly: false,
deptCheckStrictly: true,
remarks: undefined
}
......@@ -658,13 +660,14 @@ export default {
const roleId = row.businessId || this.ids
const roleMenu = this.getRoleMenuTreeselect(roleId, 1)
getRole(roleId).then(response => {
this.form = response.data
this.open = true
this.getMenuTreeselect(roleId)
this.$nextTick(() => {
roleMenu.then(res => {
this.$refs.menu.setCheckedKeys(res.data.checkedKeys)
})
roleMenu.then(res => {
this.form.menuCheckStrictly = false
this.$refs.menu.setCheckedKeys(res.data.checkedKeys)
setTimeout(_ => {
this.form = response.data
}, 350)
})
this.title = '修改角色'
})
......
src/views/system/user/index.vue
View file @ 216ae298
......@@ -201,19 +201,19 @@
<el-row>
<el-col :span="12">
<el-form-item label="登录名" prop="username">
<el-input v-model="form.username" placeholder="请输入登录名" maxlength="30" show-word-limit/>
<el-input v-model="form.username" placeholder="请输入登录名" maxlength="30" show-word-limit />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份证号" prop="idNumber">
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" show-word-limit/>
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" show-word-limit />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="用户昵称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" show-word-limit/>
<el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" show-word-limit />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -243,7 +243,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" show-word-limit/>
<el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" show-word-limit />
</el-form-item>
</el-col>
</el-row>
......@@ -260,16 +260,16 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="labelHeight" label="角色" prop="roleList">
<el-select v-model="form.roleList" style="width: 100%" multiple placeholder="请选择角色">
<el-option
v-for="(item,index) in roleOptions"
:key="index"
:label="item.roleName"
:value="item.businessId"
/>
</el-select>
</el-form-item>
<el-form-item class="labelHeight" label="角色" prop="roleList">
<el-select v-model="form.roleList" style="width: 100%" multiple placeholder="请选择角色">
<el-option
v-for="(item,index) in roleOptions"
:key="index"
:label="item.roleName"
:value="item.businessId"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
......@@ -290,7 +290,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm" :loading="priLoading">确 定</el-button>
<el-button type="primary" :loading="priLoading" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
<!-- 用户导入对话框 -->
......@@ -390,7 +390,7 @@ export default {
if (value === '' || value === null || value === undefined) {
callback()
} else {
const stuCardReg = /^[0-9]{17}[0-9,X,x]{1}/;
const stuCardReg = /^[0-9]{17}[0-9,X,x]{1}/
if (stuCardReg.test(value)) {
callback()
} else {
......@@ -402,7 +402,7 @@ export default {
if (value === '' || value === null || value === undefined) {
callback()
} else {
const stuCardReg = /^1[0-9]{10}/;
const stuCardReg = /^1[0-9]{10}/
if (stuCardReg.test(value)) {
callback()
} else {
......@@ -634,7 +634,7 @@ export default {
// { min: 18, max: 18, message: '长度18字符', trigger: 'blur' },
// { validator: idNumber, trigger: 'blur' }
// ]
},
}
}
},
......@@ -1039,6 +1039,9 @@ export default {
} else if (res.code === 41020) {
this.$message.info('上传超时,请重新上传')
this.importLoading = false
} else if (res.code === 502) {
this.$message.info('导入模板格式错误')
this.importLoading = false
}
this.importLoading = false
}).catch(err => {
......
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