reactor:工单受理调整;

package-lock.json

@@ -3044,6 +3044,8 @@
 		},
 		"node_modules/pinia-plugin-persist": {
 			"version": "1.0.0",
+			"resolved": "https://registry.npmmirror.com/pinia-plugin-persist/-/pinia-plugin-persist-1.0.0.tgz",
+			"integrity": "sha512-M4hBBd8fz/GgNmUPaaUsC29y1M09lqbXrMAHcusVoU8xlQi1TqgkWnnhvMikZwr7Le/hVyMx8KUcumGGrR6GVw==",
 			"dependencies": {
 				"vue-demi": "^0.12.1"
 			},
@@ -6162,6 +6164,8 @@
 		},
 		"pinia-plugin-persist": {
 			"version": "1.0.0",
+			"resolved": "https://registry.npmmirror.com/pinia-plugin-persist/-/pinia-plugin-persist-1.0.0.tgz",
+			"integrity": "sha512-M4hBBd8fz/GgNmUPaaUsC29y1M09lqbXrMAHcusVoU8xlQi1TqgkWnnhvMikZwr7Le/hVyMx8KUcumGGrR6GVw==",
 			"requires": {
 				"vue-demi": "^0.12.1"
 			},

src/App.vue

@@ -39,7 +39,7 @@ const { tagsViewRoutes } = storeToRefs(storesTagsViewRoutes);
 const setLockScreen = computed(() => {
 	// 防止锁屏后，刷新出现不相关界面
 	// https://gitee.com/lyt-top/vue-next-admin/issues/I6AF8P
-	return themeConfig.value.isLockScreen ? themeConfig.value.lockScreenTime > 1 : themeConfig.value.lockScreenTime >= 0;
+	return !themeConfig.value.isLockScreen;
 });
 
 // 可同时显示的消息最大数量

src/components/Pagination/index.vue

@@ -84,8 +84,8 @@ const handleCurrentChange = (val: any) => {
 }
 onMounted(() => {
   // 监听布局大小 改变分页的大小
-  let themeConfig = Local.get('themeConfig');
-  small.value = themeConfig.globalComponentSize == 'small';
+  // let themeConfig = Local.get('themeConfig');
+  // small.value = themeConfig.globalComponentSize == 'small';
 })
 </script>
 <style scoped>

src/layout/lockScreen/index.vue

@@ -27,9 +27,6 @@
 			<transition name="el-zoom-in-center">
 				<div v-show="state.isShowLoockLogin" class="layout-lock-screen-login">
 					<div class="layout-lock-screen-login-box">
-						<!-- <div class="layout-lock-screen-login-box-img">
-							<img src="https://img2.baidu.com/it/u=1978192862,2048448374&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500" />
-						</div> -->
 						<div class="layout-lock-screen-login-box-name">{{ themeConfig.watermarkText }}</div>
 						<div class="layout-lock-screen-login-box-value">
 							<el-input
@@ -166,18 +163,8 @@ const initSetTime = () => {
 };
 // 锁屏时间定时器
 const initLockScreen = () => {
-	if (themeConfig.value.isLockScreen) {
-		state.isShowLockScreenIntervalTime = window.setInterval(() => {
-			if (themeConfig.value.lockScreenTime <= 1) {
-				state.isShowLockScreen = true;
-				setLocalThemeConfig();
-				return false;
-			}
-			themeConfig.value.lockScreenTime--;
-		}, 1000);
-	} else {
-		clearInterval(state.isShowLockScreenIntervalTime);
-	}
+  state.isShowLockScreen = true;
+  setLocalThemeConfig();
 };
 // 存储布局配置
 const setLocalThemeConfig = () => {
@@ -194,7 +181,6 @@ const onLockScreenSubmit = () => {
 		return;
 	}
 	themeConfig.value.isLockScreen = false;
-	themeConfig.value.lockScreenTime = 30;
 	setLocalThemeConfig();
 };
 const fogetPwd = () => {
@@ -208,7 +194,6 @@ const fogetPwd = () => {
 	})
 		.then(() => {
 			themeConfig.value.isLockScreen = false;
-			themeConfig.value.lockScreenTime = 30;
 			setLocalThemeConfig();
 			// 清除缓存/token等
 			Session.clear();
@@ -251,7 +236,7 @@ onUnmounted(() => {
 
 .layout-lock-screen-img {
 	@extend .layout-lock-screen-fixed;
-	background-image: url('https://img-blog.csdnimg.cn/afa9c317667f47d5bea34b85af45979e.png');
+	background-image: url(https://i.hd-r.cn/e4a19d84364f185266666765ac21a5db.jpg);
 	background-size: 100% 100%;
 	z-index: 99;
 }

src/layout/navBars/breadcrumb/index.vue

@@ -109,7 +109,7 @@ onUnmounted(() => {
 
 <style scoped lang="scss">
 .layout-navbars-breadcrumb-index {
-	height: 90px;
+	height: 80px;
 	display: flex;
 	align-items: center;
 	background: var(--hotline-bg-topBar);

src/layout/navBars/breadcrumb/setings.vue

@@ -170,7 +170,7 @@
 							:min="1"
 							:max="9999"
 							@change="setLocalThemeConfig"
-							
+
 							style="width: 90px"
 						>
 						</el-input-number>

src/layout/navBars/breadcrumb/telControl.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="phoneControls" v-loading="state.loading">
 		<div class="infos">
-			<div class="pt10" :class="state.talkTime ? '' : 'mt8'"><span>分机号：</span>{{ telStatusInfo.telsNo }}</div>
+			<div class="pt5" :class="state.talkTime ? '' : 'mt8'"><span>分机号：</span>{{ telStatusInfo.telsNo }}</div>
 			<div class="pt5" :class="state.talkTime ? '' : 'mt8'">
 				<span>状态：</span><b class="dutyOn_status">{{ currentStatusText }}</b>
 			</div>
@@ -775,7 +775,7 @@ const onRest = async () => {
 	//  重置表单
 	restFormRef.value?.resetFields();
 	// 查询小休原因
-	const response: any = await commonList({ typecode: commonEnum.RestReason });
+	const response: any = await commonList({ commonType: commonEnum.RestReason });
 	state.restReasonOptions = response.result;
 	state.restDialogVisible = true;
 };
@@ -1082,7 +1082,7 @@ onBeforeMount(() => {
 			img {
 				display: block;
 				margin: 0 auto;
-				padding-top: 15px;
+				padding-top: 10px;
 			}
 
 			span {

src/layout/navBars/breadcrumb/user.vue

@@ -1,15 +1,15 @@
 <template>
 	<!--  :style="{ flex: layoutUserFlexNum }" -->
-	<div class="layout-navbars-breadcrumb-user">
-		<!-- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
+	<div class="layout-navbars-breadcrumb-user pr15">
+<!--		 <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
 			<div class="layout-navbars-breadcrumb-user-icon"  title="组件大小">
 				<i class="iconfont icon-ziti"></i>
 			</div>
 			<template #dropdown>
 				<el-dropdown-menu>
-					<el-dropdown-item command="large" :disabled="disabledSize === 'large'">大型</el-dropdown-item>
-					<el-dropdown-item command="default" :disabled="disabledSize === 'default'">默认</el-dropdown-item>
-					<el-dropdown-item command="small" :disabled="disabledSize === 'small'">小型</el-dropdown-item>
+					<el-dropdown-item command="large" :disabled="state.disabledSize === 'large'">大型</el-dropdown-item>
+					<el-dropdown-item command="default" :disabled="state.disabledSize === 'default'">默认</el-dropdown-item>
+					<el-dropdown-item command="small" :disabled="state.disabledSize === 'small'">小型</el-dropdown-item>
 				</el-dropdown-menu>
 			</template>
 		</el-dropdown>
@@ -20,8 +20,8 @@
 		</div>
 		<div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick" title="布局配置">
 			<i class="icon-skin iconfont"></i>
-		</div> -->
-		 <div class="layout-navbars-breadcrumb-user-icon">
+		</div>-->
+		 <div class="layout-navbars-breadcrumb-user-icon mr10">
 			<el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
 				<template #reference>
 					<el-badge :value="12">
@@ -42,14 +42,13 @@
 		<el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
 			<div class="layout-navbars-breadcrumb-user-link" :title="userInfos.name">
 				<div class="layout-navbars-breadcrumb-user-link-photoBox">
-					<el-avatar :src="userInfos.photo" :size="28" class="layout-navbars-breadcrumb-user-link-photo">
+					<el-avatar :src="userInfos.photo" :size="24" class="layout-navbars-breadcrumb-user-link-photo">
 						<SvgIcon name="ele-UserFilled" color="var(--el-color-primary)" />
 					</el-avatar>
+          <span class="text-no-wrap layout-navbars-breadcrumb-user-link-photoBox-name">{{ userInfos.name ? userInfos.name : '' }}</span>
+          <SvgIcon name="ele-ArrowDown" class="ml3"/>
 				</div>
-				<div class="mt10 text-no-wrap">{{ userInfos.name ? userInfos.name : '' }}</div>
-				<!-- <el-icon class="el-icon--right">
-					<ele-ArrowDown />
-				</el-icon> -->
+
 			</div>
 			<template #dropdown>
 				<el-dropdown-menu>
@@ -390,13 +389,13 @@ const onSearchClick = () => {
 	searchRef.value.openSearch();
 };
 // 组件大小改变
-// const onComponentSizeChange = (size: string) => {
-// 	Local.remove('themeConfig');
-// 	themeConfig.value.globalComponentSize = size;
-// 	Local.set('themeConfig', themeConfig.value);
-// 	initComponentSize();
-// 	window.location.reload();
-// };
+const onComponentSizeChange = (size: string) => {
+	Local.remove('themeConfig');
+	themeConfig.value.globalComponentSize = size;
+	Local.set('themeConfig', themeConfig.value);
+	initComponentSize();
+	window.location.reload();
+};
 // 初始化全局组件大小
 const initComponentSize = () => {
 	switch (Local.get('themeConfig').globalComponentSize) {
@@ -475,10 +474,12 @@ onMounted(() => {
 
 <style scoped lang="scss">
 .layout-navbars-breadcrumb-user {
-	width: 150px;
-	overflow: hidden;
+
+  height: 100%;
   display: flex;
   align-items: center;
+  justify-content: flex-end;
+
 	&-link {
 		height: 100%;
 		white-space: nowrap;
@@ -487,11 +488,16 @@ onMounted(() => {
 		&-photo {
 			background-color: var(--hotline-bg-main-color);
 			border: 2px solid var(--el-color-primary);
+      margin-right: 5px;
 		}
 		&-photoBox {
-			width: 100%;
 			display: flex;
 			justify-content: center;
+      align-items: center;
+      &-name{
+        max-width: 150px;
+        overflow: hidden;
+      }
 		}
 	}
 

src/stores/themeConfig.ts

@@ -66,8 +66,6 @@ export const useThemeConfig = defineStore('themeConfig', {
 			isClassicSplitMenu: false,
 			// 是否开启自动锁屏
 			isLockScreen: false,
-			// 开启自动锁屏倒计时(s/秒)
-			lockScreenTime: 30,
 
 			/**
 			 * 界面显示

src/types/pinia.d.ts

@@ -64,7 +64,6 @@ declare interface ThemeConfigState {
 	isFixedHeaderChange: boolean;
 	isClassicSplitMenu: boolean;
 	isLockScreen: boolean;
-	lockScreenTime: number;
 	isShowLogo: boolean;
 	isShowLogoChange: boolean;
 	isBreadcrumb: boolean;

src/views/forgetPwd/index.vue

@@ -45,9 +45,11 @@ const getThemeConfig = computed(() => {
 onMounted(async () => {
 	NextLoading.done();
 	Watermark.del(); // 清除水印
-	themeConfig.value.isWatermark = false;
-	themeConfig.value.watermarkText = '';
-	Local.set('themeConfig', themeConfig.value);
+  // storesThemeConfig.setThemeConfig({
+  //   ...themeConfig.value,
+  //   isWatermark:false,
+  //   watermarkText:''
+  // });
 });
 </script>
 

src/views/home/index.vue

@@ -52,7 +52,7 @@
                 </div>
                 <div class="statistics-number-item">
                   <p class="statistics-number-item-number"><b>730</b></p>
-                  <p class="statistics-number-item-tips">今日直办工单里</p>
+                  <p class="statistics-number-item-tips">今日直办工单量</p>
                 </div>
               </div>
 						</el-card>

src/views/resetPwd/index.vue

@@ -40,9 +40,11 @@ const backToLogin = () => {
 onMounted(() => {
 	NextLoading.done();
 	Watermark.del(); // 清除水印
-	themeConfig.value.isWatermark = false;
-	themeConfig.value.watermarkText = '';
-	Local.set('themeConfig', themeConfig.value);
+  // storesThemeConfig.setThemeConfig({
+  //   ...themeConfig.value,
+  //   isWatermark:false,
+  //   watermarkText:''
+  // });
 });
 </script>