Pārlūkot izejas kodu

基础组件调整,部分组件微调

chenwen 2 gadi atpakaļ
vecāks
revīzija
7e82034567

+ 2 - 1
src/components/Header.vue

@@ -110,7 +110,7 @@
 	
 	const message=ref(2)
 	
-	const  { collapse } = storeToRefs(store)
+	const  { collapse,menuTabs} = storeToRefs(store)
 	
 	const collapseChage = () => {
 	  collapse.value=!collapse.value
@@ -144,6 +144,7 @@
 				type: 'warning'
 			}
 		).then(()=>{
+			menuTabs.value=[]
 			headerAPI.logout(app.takeSetting('token'))
 			app.clearSetting()
 			router.push("/login")

+ 2 - 2
src/components/Modifypwd.vue

@@ -2,7 +2,7 @@
 	<div class="edit-page">
 		<el-form :model="formModel" ref="formcomp"  label-position="right" label-width="auto" :inline="false" :rules="rules" :inline-message="true">
 		     
-			 <el-form-item label="密码" prop="oldpwd">
+			 <el-form-item label="密码" prop="oldpwd">
 			   <el-input v-model="formModel.oldpwd" type="password" autocomplete="off" placeholder="请输入旧密码" class="edit-form-item" clearable/>
 			 </el-form-item>
 			  
@@ -35,7 +35,7 @@
 	
 	const rules =reactive({
 		oldpwd:[
-			{required:true,message:'密码还未输入',trigger:'blur'},
+			{required:true,message:'密码还未输入',trigger:'blur'},
 			{ min: 1, max: 20, message: '密码长度应该为1-20', trigger: 'blur' }
 			],
 		newpwd:[

+ 2 - 1
src/components/crudtable/CrudTable.vue

@@ -6,6 +6,7 @@
 					<slot name="toolGroup"></slot>
 				</el-button-group>
 			</div>
+			<slot name="toolMid"></slot>
 			<div style="flex:1"></div>
 			<el-icon class="is-loading" v-show="isLoading"><loading/></el-icon>
 			<el-pagination
@@ -22,7 +23,7 @@
 		</div>
 		
 		<div class="tab-main">
-			<el-table :data="tableDatas" style="width: 100%;height:100%;"  border stripe highlight-current-row>
+			<el-table :data="tableDatas" style="width: 100%;height:100%;"  border stripe highlight-current-row v-bind="$attrs">
 			     <slot name="tabColumns" :index-generate="indexGenerate"></slot>
 			</el-table>
 		</div>

+ 11 - 5
src/pages/Home.vue

@@ -22,11 +22,12 @@
 	
 	import vHeader from "../components/Header.vue"
 	import vSidetree from "../components/Sidetree.vue"
-	import { storeToRefs } from 'pinia'
+	import { storeToRefs } from "pinia"
 	import { useHomeStore } from "../store/home.js"
-	import app from '../utils/app.js'
-	import {ElMessageBox,ElMessage} from 'element-plus'
+	import app from "../utils/app.js"
+	import {ElMessageBox,ElMessage} from "element-plus"
 	import loginAPI from "../api/login.js"
+	import { useRouter } from "vue-router"
    
     const store=useHomeStore()
     const  { collapse ,currentMenu,menuTabs,activeTab} = storeToRefs(store)
@@ -53,7 +54,7 @@
    
    const loadMenuPage=(val)=>import(/* @vite-ignore */`/src/pages/${val}`)
    
-   
+   const router = useRouter()
    
    watch(
 	  ()=>store.connStatus
@@ -61,7 +62,12 @@
    	   if(newVal!=401){
 		   return
 	   }
-	   openRelogin()
+	   //openRelogin()
+	   ElMessage.warning("登录已失效,即将重新登录")
+	   
+	   setTimeout(()=>{
+		   router.replace({path:'/login'})
+	   },1000)
    })
    
    const openRelogin=()=>{

+ 0 - 1
src/pages/auth/Menu.vue

@@ -51,7 +51,6 @@
 <script setup>
 	import {ref,reactive,toRefs,toRaw } from 'vue'
 	import headerAPI from "../../api/header.js"
-	import navmenuItem from "../../components/NavmenuItem.vue"
 	import {ElMessageBox,ElMessage} from 'element-plus'
 	import  menuAPI from "../../api/menu.js"