Skip to content

Chatopera OpenSource / ferry_web

Go to a project
Commit 6c7a45ca by YuleiLan
Options

完善系统配置功能。

parent 09e1815a
Inline Side-by-side
Showing with 51 additions and 16 deletions
src/layout/components/Sidebar/Logo.vue
...@@ -2,18 +2,19 @@ ...@@ -2,18 +2,19 @@
<div class="sidebar-logo-container" :class="{'collapse':collapse}"> <div class="sidebar-logo-container" :class="{'collapse':collapse}">
<transition name="sidebarLogoFade"> <transition name="sidebarLogoFade">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/"> <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
<img v-if="logo" src="@/assets/logo/ferry_logo_white.png" class="sidebar-logo"> <img v-if="sysInfo.logo" :src="sysInfo.logo" class="sidebar-logo">
<h1 v-else class="sidebar-title">{{ title }} </h1> <h1 v-else class="sidebar-title">{{ sysInfo.name }} </h1>
</router-link> </router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/"> <router-link v-else key="expand" class="sidebar-logo-link" to="/">
<img v-if="logo" src="@/assets/logo/ferry_logo_white.png" class="sidebar-logo"> <img v-if="sysInfo.logo" :src="sysInfo.logo" class="sidebar-logo">
<h1 class="sidebar-title">{{ title }} </h1> <h1 class="sidebar-title">{{ sysInfo.name }} </h1>
</router-link> </router-link>
</transition> </transition>
</div> </div>
</template> </template>
<script> <script>
import { getSettings } from '@/api/system/settings'
export default { export default {
name: 'SidebarLogo', name: 'SidebarLogo',
props: { props: {
...@@ -24,10 +25,19 @@ export default { ...@@ -24,10 +25,19 @@ export default {
}, },
data() { data() {
return { return {
title: 'FERRY 管理平台', sysInfo: {
logo: '@/assets/logo/ferry_logo_white.png' name: '',
logo: ''
} }
} }
},
created() {
getSettings({
classify: 1
}).then(response => {
this.sysInfo = response.data[0].content
})
}
} }
</script> </script>
......
src/styles/index.scss
...@@ -121,7 +121,7 @@ aside { ...@@ -121,7 +121,7 @@ aside {
//main-container全局样式 //main-container全局样式
.app-container { .app-container {
padding: 20px; padding: 15px;
} }
.components-container { .components-container {
......
src/views/login/index.vue
...@@ -114,6 +114,7 @@ ...@@ -114,6 +114,7 @@
<script> <script>
import { getCodeImg } from '@/api/login' import { getCodeImg } from '@/api/login'
import { getSettings } from '@/api/system/settings'
import moment from 'moment' import moment from 'moment'
import SocialSign from './components/SocialSignin' import SocialSign from './components/SocialSignin'
...@@ -171,6 +172,7 @@ export default { ...@@ -171,6 +172,7 @@ export default {
this.getCode() this.getCode()
// window.addEventListener('storage', this.afterQRScan) // window.addEventListener('storage', this.afterQRScan)
this.getCurrentTime() this.getCurrentTime()
this.getSystemSetting()
}, },
mounted() { mounted() {
if (this.loginForm.username === '') { if (this.loginForm.username === '') {
...@@ -184,6 +186,13 @@ export default { ...@@ -184,6 +186,13 @@ export default {
// window.removeEventListener('storage', this.afterQRScan) // window.removeEventListener('storage', this.afterQRScan)
}, },
methods: { methods: {
getSystemSetting() {
getSettings({
classify: 1
}).then(response => {
this.sysInfo = response.data[0].content
})
},
getCurrentTime() { getCurrentTime() {
this.timer = setInterval(_ => { this.timer = setInterval(_ => {
this.currentTime = moment().format('YYYY-MM-DD HH时mm分ss秒') this.currentTime = moment().format('YYYY-MM-DD HH时mm分ss秒')
......
src/views/system/settings/index.vue
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item style="margin-bottom: 0"> <el-form-item style="margin-bottom: 0">
<el-button type="primary" @click="submitForm('ruleForm', 1)">确定</el-button> <el-button v-permisaction="['system:settings:index:config']" type="primary" @click="submitForm('ruleForm', 1)">确定</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -46,12 +46,12 @@ ...@@ -46,12 +46,12 @@
<el-table-column <el-table-column
prop="local_field_name" prop="local_field_name"
label="字段名称" label="字段名称"
width="180" width="150"
/> />
<el-table-column <el-table-column
prop="local_field_nick" prop="local_field_nick"
label="字段昵称" label="字段昵称"
width="180" width="150"
/> />
<el-table-column <el-table-column
prop="ldap_field_name" prop="ldap_field_name"
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="margin-top: 20px"> <div style="margin-top: 20px">
<el-button type="primary" @click="submitForm('ruleForm', 2)">确定</el-button> <el-button v-permisaction="['system:settings:index:ldap']" type="primary" @click="submitForm('ruleForm', 2)">确定</el-button>
</div> </div>
</div> </div>
</el-card> </el-card>
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
rules: { rules: {
name: [ name: [
{ required: true, message: '请输入系统名称', trigger: 'blur' }, { required: true, message: '请输入系统名称', trigger: 'blur' },
{ min: 3, max: 5, message: '长度在 3 到 6 个字符', trigger: 'blur' } { min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur' }
], ],
logo: [ logo: [
{ required: true, message: '请设置Logo', trigger: 'blur' } { required: true, message: '请设置Logo', trigger: 'blur' }
...@@ -107,25 +107,42 @@ export default { ...@@ -107,25 +107,42 @@ export default {
getSettings().then(response => { getSettings().then(response => {
for (var v of response.data) { for (var v of response.data) {
if (v.classify === 1) { if (v.classify === 1) {
if (v.content === undefined || v.content === null) {
this.ruleForm = {
name: '',
logo: ''
}
} else {
this.ruleForm = v.content this.ruleForm = v.content
}
} else if (v.classify === 2) { } else if (v.classify === 2) {
if (v.content === undefined || v.content === null) {
this.tableData = []
} else {
this.tableData = v.content this.tableData = v.content
} }
} }
}
}) })
}, },
// 提交配置信息 // 提交配置信息
submitForm(formName, classify) { submitForm(formName, classify) {
this.$refs[formName].validate((valid) => { var requestStatus = false
if (valid) {
var jsonValue = { var jsonValue = {
classify: classify classify: classify
} }
if (classify === 1) { if (classify === 1) {
this.$refs[formName].validate((valid) => {
if (valid) {
jsonValue.content = this.ruleForm jsonValue.content = this.ruleForm
requestStatus = true
}
})
} else if (classify === 2) { } else if (classify === 2) {
jsonValue.content = this.tableData jsonValue.content = this.tableData
requestStatus = true
} }
if (requestStatus) {
setSettings(jsonValue).then(response => { setSettings(jsonValue).then(response => {
this.$message({ this.$message({
message: '设置成功', message: '设置成功',
...@@ -133,7 +150,6 @@ export default { ...@@ -133,7 +150,6 @@ export default {
}) })
}) })
} }
})
}, },
resetForm(formName) { resetForm(formName) {
this.$refs[formName].resetFields() this.$refs[formName].resetFields()
......
src/views/system/sysuser/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-row :gutter="20"> <el-row :gutter="20">
<!--部门数据--> <!--部门数据-->
<el-col :span="4" :xs="24"> <el-col :span="4" :xs="24" style="padding-right: 0;">
<el-card class="box-card"> <el-card class="box-card">
<div class="head-container"> <div class="head-container">
<el-input <el-input
......
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 sign in to comment