From 06d52deb60040d968c3f69d625f9cd52ecbdac4c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 22 四月 2025 11:48:56 +0800
Subject: [PATCH] 优化代码
---
src/components/Crontab/year.vue | 32 ++++++---------
src/views/login.vue | 1
src/assets/styles/sidebar.scss | 2
src/views/tool/build/RightPanel.vue | 24 +++---------
src/components/TopNav/index.vue | 2
src/layout/components/AppMain.vue | 2
src/utils/generator/html.js | 4 +-
src/components/HeaderSearch/index.vue | 1
8 files changed, 26 insertions(+), 42 deletions(-)
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 89820d1..d35e656 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -23,7 +23,7 @@
z-index: 1001;
overflow: hidden;
-webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
- box-shadow: 2px 0 6px rgba(0,21,41,.35);
+ box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
// reset element-ui css
.horizontal-collapse-transition {
diff --git a/src/components/Crontab/year.vue b/src/components/Crontab/year.vue
index c2bf2f0..01b58f3 100644
--- a/src/components/Crontab/year.vue
+++ b/src/components/Crontab/year.vue
@@ -61,22 +61,24 @@
}
}
})
-const fullYear = ref(0)
-const maxFullYear = ref(0)
+
+const fullYear = Number(new Date().getFullYear())
+const maxFullYear = fullYear + 10
const radioValue = ref(1)
-const cycle01 = ref(0)
-const cycle02 = ref(0)
-const average01 = ref(0)
+const cycle01 = ref(fullYear)
+const cycle02 = ref(fullYear + 1)
+const average01 = ref(fullYear)
const average02 = ref(1)
const checkboxList = ref([])
-const checkCopy = ref([])
+const checkCopy = ref([fullYear])
+
const cycleTotal = computed(() => {
- cycle01.value = props.check(cycle01.value, fullYear.value, maxFullYear.value - 1)
- cycle02.value = props.check(cycle02.value, cycle01.value + 1, maxFullYear.value)
+ cycle01.value = props.check(cycle01.value, fullYear, maxFullYear - 1)
+ cycle02.value = props.check(cycle02.value, cycle01.value + 1, maxFullYear)
return cycle01.value + '-' + cycle02.value
})
const averageTotal = computed(() => {
- average01.value = props.check(average01.value, fullYear.value, maxFullYear.value - 1)
+ average01.value = props.check(average01.value, fullYear, maxFullYear - 1)
average02.value = props.check(average02.value, 1, 10)
return average01.value + '/' + average02.value
})
@@ -97,8 +99,8 @@
radioValue.value = 3
} else if (value.indexOf("/") > -1) {
const indexArr = value.split('/')
- average01.value = Number(indexArr[1])
- average02.value = Number(indexArr[0])
+ average01.value = Number(indexArr[0])
+ average02.value = Number(indexArr[1])
radioValue.value = 4
} else {
checkboxList.value = [...new Set(value.split(',').map(item => Number(item)))]
@@ -129,14 +131,6 @@
break
}
}
-onMounted(() => {
- fullYear.value = Number(new Date().getFullYear())
- maxFullYear.value = fullYear.value + 10
- cycle01.value = fullYear.value
- cycle02.value = cycle01.value + 1
- average01.value = fullYear.value
- checkCopy.value = [fullYear.value]
-})
</script>
<style lang="scss" scoped>
diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue
index 89a9478..b57fe69 100644
--- a/src/components/HeaderSearch/index.vue
+++ b/src/components/HeaderSearch/index.vue
@@ -15,6 +15,7 @@
@input="querySearch"
prefix-icon="Search"
placeholder="鑿滃崟鎼滅储锛屾敮鎸佹爣棰樸�乁RL妯＄硦鏌ヨ"
+ clearable
>
</el-input>
diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue
index 05fe2ad..15dee7e 100644
--- a/src/components/TopNav/index.vue
+++ b/src/components/TopNav/index.vue
@@ -63,7 +63,7 @@
routers.value.map((menu) => {
if (menu.hidden !== true) {
// 鍏煎椤堕儴鏍忎竴绾ц彍鍗曞唴閮ㄨ烦杞�
- if (menu.path === "/") {
+ if (menu.path === '/' && menu.children) {
topMenus.push(menu.children[0]);
} else {
topMenus.push(menu);
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index cdd6a6f..442c185 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -22,7 +22,7 @@
addIframe()
})
-watch((route) => {
+watchEffect(() => {
addIframe()
})
diff --git a/src/utils/generator/html.js b/src/utils/generator/html.js
index bf2e40a..4b29841 100644
--- a/src/utils/generator/html.js
+++ b/src/utils/generator/html.js
@@ -318,7 +318,7 @@
if (conf.options && conf.options.length) {
const tag = conf.optionType === 'button' ? 'el-radio-button' : 'el-radio'
const border = conf.border ? 'border' : ''
- children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}</${tag}>`)
+ children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :value="item.value" :disabled="item.disabled" ${border}>{{item.label}}</${tag}>`)
}
return children.join('\n')
}
@@ -328,7 +328,7 @@
if (conf.options && conf.options.length) {
const tag = conf.optionType === 'button' ? 'el-checkbox-button' : 'el-checkbox'
const border = conf.border ? 'border' : ''
- children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}</${tag}>`)
+ children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :value="item.label" :disabled="item.disabled" ${border} />`)
}
return children.join('\n')
}
diff --git a/src/views/login.vue b/src/views/login.vue
index 25c4dab..e6856a0 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -183,6 +183,7 @@
background: #ffffff;
width: 400px;
padding: 25px 25px 5px 25px;
+ z-index: 1;
.el-input {
height: 40px;
input {
diff --git a/src/views/tool/build/RightPanel.vue b/src/views/tool/build/RightPanel.vue
index 9729da3..5fe80fb 100644
--- a/src/views/tool/build/RightPanel.vue
+++ b/src/views/tool/build/RightPanel.vue
@@ -427,28 +427,16 @@
</el-form-item>
<el-form-item label="琛ㄥ崟灏哄">
<el-radio-group v-model="formConf.size">
- <el-radio-button label="large">
- 杈冨ぇ
- </el-radio-button>
- <el-radio-button label="default">
- 榛樿
- </el-radio-button>
- <el-radio-button label="small">
- 杈冨皬
- </el-radio-button>
+ <el-radio-button label="large" value="杈冨ぇ" />
+ <el-radio-button label="default" value="榛樿" />
+ <el-radio-button label="small" value="杈冨皬" />
</el-radio-group>
</el-form-item>
<el-form-item label="鏍囩瀵归綈">
<el-radio-group v-model="formConf.labelPosition">
- <el-radio-button label="left">
- 宸﹀榻�
- </el-radio-button>
- <el-radio-button label="right">
- 鍙冲榻�
- </el-radio-button>
- <el-radio-button label="top">
- 椤堕儴瀵归綈
- </el-radio-button>
+ <el-radio-button label="left" value="宸﹀榻�" />
+ <el-radio-button label="right" value="鍙冲榻�" />
+ <el-radio-button label="top" value="椤堕儴瀵归綈" />
</el-radio-group>
</el-form-item>
<el-form-item label="鏍囩瀹藉害">
--
Gitblit v1.9.3