Commit 3df3b002 by 郑艺斌

fix: 修改首页跳转地址

parent c29b1e65
......@@ -26,7 +26,7 @@
<el-menu-item class="jp-navbar__switch" style="padding:0;">
<el-breadcrumb separator="/" style="display: flex;align-items: center;height: 100%;">
<el-breadcrumb-item>
<router-link to="/home">首页</router-link>
<router-link to="/taskPlan/taskChainList/index">首页</router-link>
</el-breadcrumb-item>
<el-breadcrumb-item v-if="breadcrumb !== '' && breadcrumb !== '首页'" :key="index"
v-for="(breadcrumb, index) in breadcrumbs">{{ breadcrumb }}
......@@ -81,11 +81,11 @@
</el-dropdown-menu>
</el-dropdown>
</el-menu-item>
<el-menu-item class="hide-sm" @click="showRight">
<!-- <el-menu-item class="hide-sm" @click="showRight">
<template slot="title">
<i class="el-icon-more rotate-90" @click="showRight"></i>
</template>
</el-menu-item>
</el-menu-item> -->
</el-menu>
</div>
......@@ -242,7 +242,6 @@ export default {
})
},
mounted () {
this.getMessageCount()
if (this.defaultLayout === 'top') {
this.fixTopMenu()
}
......
......@@ -161,7 +161,8 @@ export default {
// to reload home page
this.$router.replace({ path: '/redirect' + view.fullPath })
} else {
this.$router.push('/')
// this.$router.push('/')
this.$router.push('/taskPlan/taskChainList/index')
}
}
},
......
......@@ -85,11 +85,11 @@
<el-button v-if="hasPermission('equipmentAccount:view')" type="text" size="mini"
@click="accountDetails(scope.row)">详情
</el-button>
<el-divider direction="vertical"></el-divider>
<el-divider v-if="hasPermission('equipmentAccount:view')" direction="vertical"></el-divider>
<el-button v-if="hasPermission('equipmentAccount:edit')" type="text" size="mini"
@click="accountEdit(scope.row)"> 修改
</el-button>
<el-divider direction="vertical"></el-divider>
<el-divider v-if="hasPermission('equipmentAccount:edit')" direction="vertical"></el-divider>
<el-button v-if="hasPermission('equipmentAccount:del')" type="text" size="mini"
@click="accountDelete(scope.row)">删除
</el-button>
......
......@@ -66,11 +66,11 @@
<el-button v-if="hasPermission('factoryAdmin:view')" type="text" size="mini"
@click="factoryDetails(scope.row)">详情
</el-button>
<el-divider direction="vertical"></el-divider>
<el-divider v-if="hasPermission('factoryAdmin:view')" direction="vertical"></el-divider>
<el-button v-if="hasPermission('factoryAdmin:edit')" type="text" size="mini"
@click="factoryEdit(scope.row)"> 修改
</el-button>
<el-divider direction="vertical"></el-divider>
<el-divider v-if="hasPermission('factoryAdmin:edit')" direction="vertical"></el-divider>
<el-button v-if="hasPermission('factoryAdmin:del')" type="text" size="mini"
@click="factoryDelete(scope.row)">删除
</el-button>
......
......@@ -65,7 +65,7 @@
<el-button v-if="hasPermission('positionAdmin:view')" type="text" size="mini"
@click="positionAdminDetails(scope.row)">详情
</el-button>
<el-divider direction="vertical"></el-divider>
<el-divider v-if="hasPermission('positionAdmin:view')" direction="vertical"></el-divider>
<el-button v-if="hasPermission('positionAdmin:edit')" type="text" size="mini"
@click="positionAdminEdit(scope.row)"> 修改
</el-button>
......
......@@ -90,10 +90,8 @@ export default {
loading: false,
captchaImg: '',
inputForm: {
username: 'admin',
// username: '',
password: 'admin',
// password: '',
username: '',
password: '',
uuid: '',
code: ''
},
......
......@@ -100,9 +100,13 @@
@click="taskListDetails(scope.row)">子任务详情
</el-button>
</el-popover>
<el-divider direction="vertical" v-if="scope.row.taskStatus === '1' || scope.row.taskStatus === '2'">
<el-divider direction="vertical"
v-if="scope.row.taskStatus === '1' && hasPermission('taskChainList:stop')">
</el-divider>
<el-divider direction="vertical"
v-else-if="scope.row.taskStatus === '2' && hasPermission('taskChainList:renew')">
</el-divider>
<el-button v-if="scope.row.taskStatus === '1' && hasPermission('taskChainList:stop')" type="text"
<el-button v-if="scope.row.taskStatus==='1' && hasPermission('taskChainList:stop')" type="text"
size="mini" @click="setTaskStatus(scope.row,'2')">暂停
</el-button>
<el-button v-else-if="scope.row.taskStatus === '2' && hasPermission('taskChainList:renew')" type="text"
......
......@@ -51,11 +51,11 @@
<el-button v-if="hasPermission('taskChainTemplate:view')" type="text" size="mini"
@click="taskPlanDetails(scope.row)">详情
</el-button>
<el-divider direction="vertical"></el-divider>
<el-divider v-if="hasPermission('taskChainTemplate:view')" direction="vertical"></el-divider>
<el-button v-if="hasPermission('taskChainTemplate:edit')" type="text" size="mini"
@click="taskPlanEdit(scope.row)">修改
</el-button>
<el-divider direction="vertical"></el-divider>
<el-divider v-if="hasPermission('taskChainTemplate:edit')" direction="vertical"></el-divider>
<el-button v-if="hasPermission('taskChainTemplate:del')" type="text" size="mini"
@click="taskPlanDelete(scope.row)">删除
</el-button>
......
......@@ -73,11 +73,11 @@
<el-button v-if="hasPermission('taskPlanTemplate:view')" type="text" size="mini"
@click="taskPlanDetails(scope.row)">详情
</el-button>
<el-divider direction="vertical"></el-divider>
<el-divider v-if="hasPermission('taskPlanTemplate:view')" direction="vertical"></el-divider>
<el-button v-if="hasPermission('taskPlanTemplate:edit')" type="text" size="mini"
@click="taskPlanEdit(scope.row)">修改
</el-button>
<el-divider direction="vertical"></el-divider>
<el-divider v-if="hasPermission('taskPlanTemplate:edit')" direction="vertical"></el-divider>
<el-button v-if="hasPermission('taskPlanTemplate:del')" type="text" size="mini"
@click="taskPlanDelete(scope.row)">删除
</el-button>
......
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