From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整
---
north-glass-erp/northglass-erp/src/layout/MainErpView.vue | 79 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 23 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/layout/MainErpView.vue b/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
index 650259f..412d37e 100644
--- a/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
+++ b/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
@@ -6,6 +6,7 @@
import {onMounted, reactive, ref, watch} from "vue"
import deepClone from "@/utils/deepClone"
import userInfo from '@/stores/userInfo'
+
import {Close, Grid, Histogram, MessageBox, SwitchButton} from "@element-plus/icons-vue"
import { useI18n } from 'vue-i18n'
import i18n from "@/lang/index"
@@ -16,12 +17,15 @@
const router = useRouter()
const userStore = useUserInfoStore()
-const user = userStore.user.userName
+const user = userStore.user?.userName
+
+
+//鐩戝惉寮傛杩斿洖浠ｇ爜
watch(()=>userStore.responseCode,(newVal) => {
switch (newVal){
case 401:{
if(userStore.msg.split('.')[1] === 'search'){
- router.push({path:'/main/order/notPermission'});
+ router.push({path:'/main/user/notPermission'});
}else{
ElMessage.warning(t('error.Code_401'))
}
@@ -33,6 +37,10 @@
router.push("/login")
break
}
+ /*case 500:{
+ ElMessage.warning(t('main.connectErr'))
+ break
+ }*/
default:{
break
}
@@ -40,7 +48,9 @@
}
)
-store.createWebSocket();
+//store.createWebSocket();
+
+// 閫�鍑虹櫥褰�
function quit(){
userStore.$patch({
user:null
@@ -57,13 +67,16 @@
//鎻愬彇妯″潡鍒楄〃
let menuList=$ref([])
-onMounted(()=>{
- request.get(`/menu/getMenu/${lang}`).then((res) => {
-
+onMounted(async ()=>{
+ await request.get(`/menu/getMenu/${lang}`).then((res) => {
if(res.code==200){
menuList= deepClone(res.data)
}
})
+
+ if(userStore.user.address!==null){
+ router.push({path:'/main/reportingWorks/addReportingWork'})
+ }
})
@@ -92,9 +105,7 @@
{deep:true}
)
-router.beforeEach((to, from) => {
- //return false
-})
+
let openFlag = $ref(null)
@@ -112,7 +123,7 @@
<template>
<div>
- <el-container>
+ <el-container id="el-container1">
<el-header >
<div style="height: 100%;width: 100%;display: flex">
<img src="../assets/northGlass.ico" alt="" style="max-width: 100%;max-height: 100%">
@@ -125,7 +136,7 @@
</span>
</div>
</el-header>
- <el-container >
+ <el-container id="el-container2">
<el-aside width="160px" style="height: 97%; " >
<!-- <el-menu
style=" border-radius:0.5rem;border: 0.01rem solid #409EFF;margin-bottom: 0.5rem"
@@ -159,19 +170,36 @@
</el-menu>-->
<div class="menu" >
<div v-for="items in menuList">
- <div class='menu_title' @click="openMenu(items.id)" >{{items.menuName}}<span class='indicator' >鈻�</span></div>
+ <el-tooltip
+ class="box-item"
+ effect="dark"
+ :content="$t('menu.'+items.id)"
+ placement="right"
+ show-after="500"
+ >
+ <div class='menu_title' @click="openMenu(items.id)" >{{$t('menu.'+items.id)}}<span class='indicator' >鈻�</span></div>
+ </el-tooltip>
<ul class='enter-x-left' v-show="openFlag==items.id">
-
- <li v-for="menuItem in menuItemList"
- v-show="items.id==menuItem.menuID"
- style="margin-bottom: 2px"
+ <el-tooltip
+ v-for="menuItem in menuItemList"
+ class="box-item"
+ effect="dark"
+ :content="$t('menu.'+menuItem.menu)"
+ placement="right"
+ show-after="500"
>
- <router-link
- :to="{path:menuItem.url}">
- {{ menuItem.itemName}}
- </router-link>
+ <li
+ v-show="items.id==menuItem.menuID"
+ style="margin-bottom: 2px"
+ >
- </li>
+ <router-link
+ :to="{path:menuItem.url}">
+ {{ $t('menu.'+menuItem.menu)}}
+ </router-link>
+
+ </li>
+ </el-tooltip>
</ul>
</div>
</div>
@@ -189,9 +217,14 @@
</template>
<style scoped>
-.el-container{
+
+#el-container1{
height: 100vh;
- width: 100vw
+ width: 100vw;
+}
+#el-container2{
+ height:calc(100% - 60px);
+ width: 100vw;
}
*{
--
Gitblit v1.8.0