Commit c8e002c5 by chehuidong

bug

parent 03b1c304
...@@ -5,8 +5,8 @@ import SaasManage from '@/views/saasManage/indexPage.vue' ...@@ -5,8 +5,8 @@ import SaasManage from '@/views/saasManage/indexPage.vue'
import LoginPage from '@/views/LoginPage.vue' import LoginPage from '@/views/LoginPage.vue'
import menuPage from '@/views/menu.vue' import menuPage from '@/views/menu.vue'
import TaskManage from '@/views/taskManage/index.vue' import TaskManage from '@/views/taskManage/index.vue'
import HomePage from '@/views/homePage/index.vue'
export const DEFAULT_DASHBOARD = 'saasManage' export const DEFAULT_DASHBOARD = 'home'
Vue.use(VueRouter) Vue.use(VueRouter)
...@@ -16,13 +16,20 @@ const routes = [ ...@@ -16,13 +16,20 @@ const routes = [
name: 'login', name: 'login',
component: LoginPage, component: LoginPage,
}, },
{ {
path: '/', path: '/',
name: 'home', name: 'home',
component: HomeView, component: HomeView,
redirect: '/saas/manage', redirect: '/saas/home',
children: [ children: [
{ {
path: '/saas/home',
name: 'home',
component: HomePage,
meta: { title: '首页' },
},
{
path: '/saas/manage', path: '/saas/manage',
name: 'saasManage', name: 'saasManage',
meta: { title: 'ERP管理' }, meta: { title: 'ERP管理' },
......
...@@ -87,7 +87,7 @@ export default { ...@@ -87,7 +87,7 @@ export default {
setToken(res.data.token) setToken(res.data.token)
setUser(res.data.saasUser) setUser(res.data.saasUser)
this.setUserInfo(res.data.saasUser) this.setUserInfo(res.data.saasUser)
this.$router.push('/saas/manage') this.$router.push('/saas/home')
} }
} catch (e) { } catch (e) {
console.error(e) console.error(e)
......
<template>
<div>首页</div>
</template>
<script>
export default {
data() {
return {}
},
}
</script>
<style>
</style>
\ No newline at end of file
...@@ -377,9 +377,7 @@ ...@@ -377,9 +377,7 @@
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="数据库名称">
label="数据库名称"
>
<el-input <el-input
style="width: 200px" style="width: 200px"
:value="`saas_${editForm.databaseName || ''}`" :value="`saas_${editForm.databaseName || ''}`"
...@@ -471,7 +469,11 @@ ...@@ -471,7 +469,11 @@
prop="contactPhone" prop="contactPhone"
:rules="[ :rules="[
{ required: true, message: '请输入联系电话' }, { required: true, message: '请输入联系电话' },
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的电话号码格式', trigger: 'blur' }, {
pattern: /^1[3-9]\d{9}$/,
message: '请输入正确的电话号码格式',
trigger: 'blur',
},
]" ]"
> >
<el-input <el-input
...@@ -679,7 +681,10 @@ export default { ...@@ -679,7 +681,10 @@ export default {
this.getList() this.getList()
}, },
rowClick(row) { rowClick(row) {
if (this.selection.length === 1 && this.selection[0] === row) { if (
this.selection.length === 1 &&
this.selection[0] === row
) {
this.selection = [] this.selection = []
this.$refs.table.clearSelection() this.$refs.table.clearSelection()
} else { } else {
...@@ -750,9 +755,4 @@ export default { ...@@ -750,9 +755,4 @@ export default {
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
} }
.pagination {
text-align: center;
padding-top: 10px;
}
</style> </style>
...@@ -77,11 +77,7 @@ ...@@ -77,11 +77,7 @@
>新增</el-button >新增</el-button
> >
</el-form-item> </el-form-item>
<el-form-item>
<el-button type="danger" @click="deleteSection()"
>删除</el-button
>
</el-form-item>
<!-- <el-form-item> <!-- <el-form-item>
<el-button type="info" @click="addDialog(2)">重置密码</el-button> <el-button type="info" @click="addDialog(2)">重置密码</el-button>
</el-form-item>--> </el-form-item>-->
...@@ -90,7 +86,6 @@ ...@@ -90,7 +86,6 @@
<table-vue <table-vue
:sourceData="sourceData" :sourceData="sourceData"
ref="multipleTable" ref="multipleTable"
:selection="true"
:tableColumns="usersTableColumns" :tableColumns="usersTableColumns"
@currentChange="currentTabFn" @currentChange="currentTabFn"
:rowClassName="cellClass" :rowClassName="cellClass"
...@@ -381,6 +376,7 @@ export default { ...@@ -381,6 +376,7 @@ export default {
<span title="编辑" class="icon-view "> <span title="编辑" class="icon-view ">
<i <i
class="el-icon-edit-outline" class="el-icon-edit-outline"
style="color:#E6A23C"
onClick={(e) => onClick={(e) =>
this.addDialog(2, item, e) this.addDialog(2, item, e)
} }
...@@ -388,16 +384,16 @@ export default { ...@@ -388,16 +384,16 @@ export default {
</span> </span>
<span title="重置密码" class="icon-view "> <span title="重置密码" class="icon-view ">
<i <i
style="color:#67C23A"
class="el-icon-refresh-left" class="el-icon-refresh-left"
onClick={(e) => this.resetPwd(e, item)} onClick={(e) => this.resetPwd(e, item)}
></i> ></i>
</span> </span>
<span title="删除" class="icon-view "> <span title="删除" class="icon-view ">
<i <i
style="color:#F56C6C"
class="el-icon-delete" class="el-icon-delete"
onClick={(e) => onClick={(e) => this.deleteSection(item)}
this.deleteSection(item)
}
></i> ></i>
</span> </span>
</div> </div>
......
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