Commit 4481f67c authored by 高宇's avatar 高宇

第三个页面

parent 6d8fe91d
...@@ -2,7 +2,6 @@ import request from '@/utils/request' ...@@ -2,7 +2,6 @@ import request from '@/utils/request'
import { encrypt } from '@/utils/jsencrypt' import { encrypt } from '@/utils/jsencrypt'
import Qs from 'qs' import Qs from 'qs'
// 登录方法
// 登录方法 // 登录方法
export function login(username, password, code, uuid) { export function login(username, password, code, uuid) {
const data = { const data = {
......
...@@ -3,6 +3,9 @@ import { constantRoutes } from '@/router' ...@@ -3,6 +3,9 @@ import { constantRoutes } from '@/router'
import { getInfo } from '@/api/login' import { getInfo } from '@/api/login'
import Layout from '@/layout/index' import Layout from '@/layout/index'
// pathList: 是要隐藏菜单的集合 system元素:一级菜单的路径(path)
const pathList = ['system','system/log','production','equipment','process','/none2','sample','tlias','/test','/inspect','/controlPlatform/control']
const permission = { const permission = {
state: { state: {
routes: [], routes: [],
...@@ -20,14 +23,20 @@ const permission = { ...@@ -20,14 +23,20 @@ const permission = {
return new Promise(resolve => { return new Promise(resolve => {
// 向后端请求路由数据 // 向后端请求路由数据
// getInfo().then(res => { // getInfo().then(res => {
const accessedRoutes = filterAsyncRouter(res.data.menus) var menus = []
res.data.menus.forEach(item => {
if (!pathList.includes(item.path)) {
menus.push(item)
}
})
const accessedRoutes = filterAsyncRouter(menus)
if (accessedRoutes[0]) { if (accessedRoutes[0]) {
const firstChild = getFirstChild(accessedRoutes[0]) const firstChild = getFirstChild(accessedRoutes[0])
accessedRoutes.push({ path: '*', redirect: '/404', hidden: true }) accessedRoutes.push({ path: '*', redirect: '/404', hidden: true })
accessedRoutes.push({ path: '/', redirect: firstChild, hidden: true }) accessedRoutes.push({ path: '/', redirect: firstChild, hidden: true })
commit('SET_ROUTES', accessedRoutes) commit('SET_ROUTES', accessedRoutes)
} }
const routers = { accessedRoutes: accessedRoutes, getRouters: res.data.menus } const routers = { accessedRoutes: accessedRoutes, getRouters: menus }
resolve(routers) resolve(routers)
// }) // })
}) })
......
...@@ -28,6 +28,12 @@ html { ...@@ -28,6 +28,12 @@ html {
overflow-x: hidden; overflow-x: hidden;
min-width: 300px; min-width: 300px;
} }
// 解决浏览器打印网站不全问题
@media print {
html, body{
height: inherit;
}
}
*, *,
*:before, *:before,
......
<template>
<div class="enterBound">
<div class="enterForm">
<div class="search">
<el-form :model="queryForm" label-width="40px">
<el-form-item label="XX:">
<el-input v-model="queryForm.value1"></el-input>
</el-form-item>
<el-form-item label="YY:">
<el-input v-model="queryForm.value1"></el-input>
</el-form-item>
</el-form>
</div>
<div class="enterTable">
<el-table :data="enterTable">
<el-table-column label="XX" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{scope.row.value1}}</span>
</template>
</el-table-column>
<el-table-column label="XX" min-width="38" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{scope.row.value2}}</span>
</template>
</el-table-column>
<el-table-column label="XX" min-width="38" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{scope.row.value3}}</span>
</template>
</el-table-column>
<el-table-column min-width="20" :show-overflow-tooltip="true">
<template slot-scope="scope">
<i class="el-icon-delete-solid" style="color: red"></i>
<!-- <span>{{scope.row.value3}}</span>-->
</template>
</el-table-column>
</el-table>
</div>
<div class="buttonRegion">
<el-button class="button_rowBtn" type="primary">保存</el-button>
<el-button class="button_rowBtn" type="primary">提交</el-button>
</div>
</div>
</div>
</template>
<script>
export default {
name: "enterbound",
data() {
return{
queryForm: {
value1: '',
value2: ''
},
enterTable: [
{
value1: 'xxxx-xxxx-xxx-xxx',
value2: '1000',
value3: '1000'
}
]
}
}
}
</script>
<style scoped lang="scss">
.enterBound{
display: flex;
justify-content: center;
.enterForm{
width: 96%;
}
.buttonRegion{
margin-top: 20px;
display: flex;
justify-content: space-between;
.button_rowBtn{
font-size: 17px;
width: 120px;
}
}
}
</style>
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