From a5d01d5503750b6c95f9393d7cd4da880de6024c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 28 八月 2023 15:50:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/views/laboratory/measure/Add.vue | 1
src/layout/components/Navbar.vue | 83 ++++++++++++++++++++++-------------------
src/views/laboratory/role/index.vue | 12 +++---
src/router/index.js | 2
4 files changed, 52 insertions(+), 46 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 01ad010..0fe19aa 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -7,18 +7,18 @@
<div class="right-menu">
<div class="right-serves">
<!-- <i class="el-icon-setting" /> -->
-
+
<p @click="toMessage"><el-badge is-dot class="el-icon-bell message-icon"></el-badge></p>
<!-- <i class="el-icon-time" /> -->
</div>
<el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper">
- <a class="user-avatar">{{ user.name.slice(0,1) }}</a>
+ <a class="user-avatar">{{ user.name.slice(0, 1) }}</a>
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
- <el-dropdown-item >
- <p @click="dialogFormVisible = true">淇敼瀵嗙爜</p>
- </el-dropdown-item>
+ <el-dropdown-item>
+ <p @click="dialogFormVisible = true">淇敼瀵嗙爜</p>
+ </el-dropdown-item>
<el-dropdown-item divided @click.native="logout">
<span style="display:block;">閫�鍑虹櫥褰�</span>
</el-dropdown-item>
@@ -49,15 +49,15 @@
import { mapGetters } from 'vuex'
// import Breadcrumb from '@/components/Breadcrumb'
// import Hamburger from '@/components/Hamburger'
- import {
- get,
- post,
- wpost,
- postFile
- } from "@/api/util/requestUtil.js"
+import {
+ get,
+ post,
+ wpost,
+ postFile
+} from "@/api/util/requestUtil.js"
export default {
- data(){
+ data() {
return {
form: {
oldPwd: '',
@@ -65,15 +65,15 @@
confirmPwd: ''
},
user: {
- id: null,
- name: 'value'
- },
+ id: null,
+ name: 'value'
+ },
dialogFormVisible: false,
formLabelWidth: '120px',
- user: {
- id: null,
- name: 'value'
- }
+ user: {
+ id: null,
+ name: 'value'
+ }
}
},
components: {
@@ -86,20 +86,20 @@
'avatar'
])
},
- mounted() {
- this.getUser()
- },
+ mounted() {
+ this.getUser()
+ },
methods: {
- reset(){
+ reset() {
this.dialogFormVisible = false;
this.form.oldPwd = '';
this.form.newPwd = '';
this.form.confirmPwd = '';
},
- toMessage(){
+ toMessage() {
this.$router.push('/message/toDo');
},
- editPwd(){
+ editPwd() {
console.log(1);
},
toggleSideBar() {
@@ -112,13 +112,14 @@
this.$router.push(`/login?redirect=${this.$route.fullPath}`)
this.$router.replace({path: '/login'});
location.reload();
+
},
- getUser(){
- get(this.$url.info).then(res=>{
- this.user = res.data
- sessionStorage.setItem("user",JSON.stringify(res.data))
- })
- }
+ getUser() {
+ get(this.$url.info).then(res => {
+ this.user = res.data
+ sessionStorage.setItem("user", JSON.stringify(res.data))
+ })
+ }
}
}
</script>
@@ -131,21 +132,24 @@
background: #fff;
display: flex;
border-bottom: 1px solid #f0f2f5;
+
// box-shadow: 0 0 0.857143rem rgba(0, 0, 0, 0.12);
// box-shadow: 0 1px 4px rgba(0,21,41,.08);
- .message-icon{
+ .message-icon {
margin-right: 10px;
cursor: pointer;
}
- .v-modal{
+
+ .v-modal {
z-index: 8;
}
+
.hamburger-container {
line-height: 46px;
height: 100%;
cursor: pointer;
transition: background .3s;
- -webkit-tap-highlight-color:transparent;
+ -webkit-tap-highlight-color: transparent;
&:hover {
background: rgba(0, 0, 0, .025)
@@ -162,11 +166,13 @@
line-height: 50px;
display: flex;
justify-content: right;
- .right-serves{
+
+ .right-serves {
height: 100%;
display: flex;
align-items: center;
- >i{
+
+ >i {
display: inline-block;
margin: auto 10px;
font-size: 20px;
@@ -199,6 +205,7 @@
.avatar-container {
margin-right: 24px;
height: 100%;
+
.avatar-wrapper {
// margin-top: 5px;
width: 40px;
@@ -207,6 +214,7 @@
display: flex;
align-items: center;
justify-content: center;
+
.user-avatar {
cursor: pointer;
width: 30px;
@@ -230,5 +238,4 @@
}
}
}
-}
-</style>
+}</style>
diff --git a/src/router/index.js b/src/router/index.js
index e932803..3f4bca3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -528,7 +528,7 @@
function createRouter(Routees) {
if (JSON.parse(sessionStorage.getItem("user")) != undefined && JSON.parse(sessionStorage.getItem("user")) != null) {
let sessionLayerId=JSON.parse(sessionStorage.getItem("user")).sessionLayerId
- if(sessionLayerId!='c3284d0f94606de1fd2af172aba15bf3'){
+ if(sessionLayerId!='f5c8bcb7d5a0fd27e2323280f7e98cad'){
let role = JSON.parse(sessionStorage.getItem("user")).role
let menuFather = baseRouter
const dataMenuFather = fn3(menuFather)
diff --git a/src/views/laboratory/measure/Add.vue b/src/views/laboratory/measure/Add.vue
index bbc0fe9..0533251 100644
--- a/src/views/laboratory/measure/Add.vue
+++ b/src/views/laboratory/measure/Add.vue
@@ -140,7 +140,6 @@
res.data.instrumentList.forEach(item => {
this.insList.push({ label: item.equipmentName, value: item.id })
})
- console.log(this.insList);
},
methods: {
addcodePointsTable() {
diff --git a/src/views/laboratory/role/index.vue b/src/views/laboratory/role/index.vue
index c4f696c..26da055 100644
--- a/src/views/laboratory/role/index.vue
+++ b/src/views/laboratory/role/index.vue
@@ -2,14 +2,16 @@
<div>
<div class="content-main">
<div class="top-bar">
- <el-form ref="form" :inline="true" :model="searchData">
+ <el-form style="display: flex;align-items: center;" ref="form" :inline="true" :model="searchData">
<el-form-item label="瑙掕壊鍚嶇О锛�" class="sermargin">
<el-input v-model="searchData.roleName" class="input-form" placeholder="璇疯緭鍏ヨ鑹插悕绉�" style="width:250px">
</el-input>
</el-form-item>
<el-form-item class="rightBtn">
- <el-button type="primary" @click="searchRole">鏌ヨ</el-button>
- <el-button type="primary" plain>閲嶇疆</el-button>
+ <el-col>
+ <el-button type="primary" @click="searchRole">鏌ヨ</el-button>
+ <el-button type="primary" plain>閲嶇疆</el-button>
+ </el-col>
</el-form-item>
</el-form>
<el-form>
@@ -358,13 +360,11 @@
},
async upRole(scope) {
- console.log(scope);
this.updateRole.roleId = scope.row.roleId
this.updateRole.roleName = scope.row.roleName
this.updateRole.lastName = scope.row.roleName
let menuSelect = scope.row.roleMenuList
this.updateRole.lastMenuSelect = scope.row.roleMenuList
- console.log(menuSelect);
let res = await getMenusTree();
this.menuUpdateInfo = res.data
this.menuUpdateInfo.forEach(item => {
@@ -386,7 +386,6 @@
})
}
})
- console.log(this.menuUpdateInfo);
menuSelect.forEach(ms => {
this.menuUpdateInfo.forEach(item => {
if (ms.menuName === item.name) {
@@ -784,6 +783,7 @@
#selectRolecheck .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after {
border-color: #fff !important;
}
+
#selectRoleCheck .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
background-color: #409EFF;
border-color: #409EFF;
--
Gitblit v1.9.3