From 1abf0641b04125f413ead8283819171dac186601 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期六, 29 六月 2024 15:39:18 +0800
Subject: [PATCH] Merge pull request #287 from 593496637/main
---
src/components/Crontab/year.vue | 10 +-
src/views/system/config/index.vue | 2
src/views/system/role/index.vue | 2
src/views/monitor/job/index.vue | 12 ++--
src/components/Crontab/hour.vue | 8 +-
src/components/DictTag/index.vue | 1
src/views/system/dept/index.vue | 2
src/views/system/post/index.vue | 2
src/components/Crontab/day.vue | 14 ++--
src/components/Crontab/min.vue | 8 +-
src/components/Crontab/month.vue | 8 +-
src/views/system/menu/index.vue | 18 +++---
src/views/system/user/index.vue | 2
src/views/tool/gen/genInfoForm.vue | 4
src/views/system/user/profile/userInfo.vue | 4
src/components/Crontab/week.vue | 12 ++--
src/views/system/dict/data.vue | 2
src/views/system/notice/index.vue | 2
src/views/system/dict/index.vue | 2
src/components/Crontab/second.vue | 8 +-
20 files changed, 62 insertions(+), 61 deletions(-)
diff --git a/src/components/Crontab/day.vue b/src/components/Crontab/day.vue
index 0d804ec..456686f 100644
--- a/src/components/Crontab/day.vue
+++ b/src/components/Crontab/day.vue
@@ -1,19 +1,19 @@
<template>
<el-form>
<el-form-item>
- <el-radio v-model='radioValue' :label="1">
+ <el-radio v-model='radioValue' :value="1">
鏃ワ紝鍏佽鐨勯�氶厤绗, - * ? / L W]
</el-radio>
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="2">
+ <el-radio v-model='radioValue' :value="2">
涓嶆寚瀹�
</el-radio>
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="3">
+ <el-radio v-model='radioValue' :value="3">
鍛ㄦ湡浠�
<el-input-number v-model='cycle01' :min="1" :max="30" /> -
<el-input-number v-model='cycle02' :min="cycle01 + 1" :max="31" /> 鏃�
@@ -21,7 +21,7 @@
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="4">
+ <el-radio v-model='radioValue' :value="4">
浠�
<el-input-number v-model='average01' :min="1" :max="30" /> 鍙峰紑濮嬶紝姣�
<el-input-number v-model='average02' :min="1" :max="31 - average01" /> 鏃ユ墽琛屼竴娆�
@@ -29,20 +29,20 @@
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="5">
+ <el-radio v-model='radioValue' :value="5">
姣忔湀
<el-input-number v-model='workday' :min="1" :max="31" /> 鍙锋渶杩戠殑閭ｄ釜宸ヤ綔鏃�
</el-radio>
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="6">
+ <el-radio v-model='radioValue' :value="6">
鏈湀鏈�鍚庝竴澶�
</el-radio>
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="7">
+ <el-radio v-model='radioValue' :value="7">
鎸囧畾
<el-select clearable v-model="checkboxList" placeholder="鍙閫�" multiple :multiple-limit="10">
<el-option v-for="item in 31" :key="item" :label="item" :value="item" />
diff --git a/src/components/Crontab/hour.vue b/src/components/Crontab/hour.vue
index a293b29..ad3fa67 100644
--- a/src/components/Crontab/hour.vue
+++ b/src/components/Crontab/hour.vue
@@ -1,13 +1,13 @@
<template>
<el-form>
<el-form-item>
- <el-radio v-model='radioValue' :label="1">
+ <el-radio v-model='radioValue' :value="1">
灏忔椂锛屽厑璁哥殑閫氶厤绗, - * /]
</el-radio>
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="2">
+ <el-radio v-model='radioValue' :value="2">
鍛ㄦ湡浠�
<el-input-number v-model='cycle01' :min="0" :max="22" /> -
<el-input-number v-model='cycle02' :min="cycle01 + 1" :max="23" /> 鏃�
@@ -15,7 +15,7 @@
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="3">
+ <el-radio v-model='radioValue' :value="3">
浠�
<el-input-number v-model='average01' :min="0" :max="22" /> 鏃跺紑濮嬶紝姣�
<el-input-number v-model='average02' :min="1" :max="23 - average01" /> 灏忔椂鎵ц涓�娆�
@@ -23,7 +23,7 @@
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="4">
+ <el-radio v-model='radioValue' :value="4">
鎸囧畾
<el-select clearable v-model="checkboxList" placeholder="鍙閫�" multiple :multiple-limit="10">
<el-option v-for="item in 24" :key="item" :label="item - 1" :value="item - 1" />
diff --git a/src/components/Crontab/min.vue b/src/components/Crontab/min.vue
index 567e1ec..33e9bec 100644
--- a/src/components/Crontab/min.vue
+++ b/src/components/Crontab/min.vue
@@ -1,13 +1,13 @@
<template>
<el-form>
<el-form-item>
- <el-radio v-model='radioValue' :label="1">
+ <el-radio v-model='radioValue' :value="1">
鍒嗛挓锛屽厑璁哥殑閫氶厤绗, - * /]
</el-radio>
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="2">
+ <el-radio v-model='radioValue' :value="2">
鍛ㄦ湡浠�
<el-input-number v-model='cycle01' :min="0" :max="58" /> -
<el-input-number v-model='cycle02' :min="cycle01 + 1" :max="59" /> 鍒嗛挓
@@ -15,7 +15,7 @@
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="3">
+ <el-radio v-model='radioValue' :value="3">
浠�
<el-input-number v-model='average01' :min="0" :max="58" /> 鍒嗛挓寮�濮嬶紝 姣�
<el-input-number v-model='average02' :min="1" :max="59 - average01" /> 鍒嗛挓鎵ц涓�娆�
@@ -23,7 +23,7 @@
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="4">
+ <el-radio v-model='radioValue' :value="4">
鎸囧畾
<el-select clearable v-model="checkboxList" placeholder="鍙閫�" multiple :multiple-limit="10">
<el-option v-for="item in 60" :key="item" :label="item - 1" :value="item - 1" />
diff --git a/src/components/Crontab/month.vue b/src/components/Crontab/month.vue
index 4bf33fd..542dd6f 100644
--- a/src/components/Crontab/month.vue
+++ b/src/components/Crontab/month.vue
@@ -1,13 +1,13 @@
<template>
<el-form>
<el-form-item>
- <el-radio v-model='radioValue' :label="1">
+ <el-radio v-model='radioValue' :value="1">
鏈堬紝鍏佽鐨勯�氶厤绗, - * /]
</el-radio>
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="2">
+ <el-radio v-model='radioValue' :value="2">
鍛ㄦ湡浠�
<el-input-number v-model='cycle01' :min="1" :max="11" /> -
<el-input-number v-model='cycle02' :min="cycle01 + 1" :max="12" /> 鏈�
@@ -15,7 +15,7 @@
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="3">
+ <el-radio v-model='radioValue' :value="3">
浠�
<el-input-number v-model='average01' :min="1" :max="11" /> 鏈堝紑濮嬶紝姣�
<el-input-number v-model='average02' :min="1" :max="12 - average01" /> 鏈堟湀鎵ц涓�娆�
@@ -23,7 +23,7 @@
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="4">
+ <el-radio v-model='radioValue' :value="4">
鎸囧畾
<el-select clearable v-model="checkboxList" placeholder="鍙閫�" multiple :multiple-limit="8">
<el-option v-for="item in monthList" :key="item.key" :label="item.value" :value="item.key" />
diff --git a/src/components/Crontab/second.vue b/src/components/Crontab/second.vue
index 0955a00..05e8855 100644
--- a/src/components/Crontab/second.vue
+++ b/src/components/Crontab/second.vue
@@ -1,13 +1,13 @@
<template>
<el-form>
<el-form-item>
- <el-radio v-model='radioValue' :label="1">
+ <el-radio v-model='radioValue' :value="1">
绉掞紝鍏佽鐨勯�氶厤绗, - * /]
</el-radio>
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="2">
+ <el-radio v-model='radioValue' :value="2">
鍛ㄦ湡浠�
<el-input-number v-model='cycle01' :min="0" :max="58" /> -
<el-input-number v-model='cycle02' :min="cycle01 + 1" :max="59" /> 绉�
@@ -15,7 +15,7 @@
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="3">
+ <el-radio v-model='radioValue' :value="3">
浠�
<el-input-number v-model='average01' :min="0" :max="58" /> 绉掑紑濮嬶紝姣�
<el-input-number v-model='average02' :min="1" :max="59 - average01" /> 绉掓墽琛屼竴娆�
@@ -23,7 +23,7 @@
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="4">
+ <el-radio v-model='radioValue' :value="4">
鎸囧畾
<el-select clearable v-model="checkboxList" placeholder="鍙閫�" multiple :multiple-limit="10">
<el-option v-for="item in 60" :key="item" :label="item - 1" :value="item - 1" />
diff --git a/src/components/Crontab/week.vue b/src/components/Crontab/week.vue
index 0309670..69a03b0 100644
--- a/src/components/Crontab/week.vue
+++ b/src/components/Crontab/week.vue
@@ -1,19 +1,19 @@
<template>
<el-form>
<el-form-item>
- <el-radio v-model='radioValue' :label="1">
+ <el-radio v-model='radioValue' :value="1">
鍛紝鍏佽鐨勯�氶厤绗, - * ? / L #]
</el-radio>
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="2">
+ <el-radio v-model='radioValue' :value="2">
涓嶆寚瀹�
</el-radio>
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="3">
+ <el-radio v-model='radioValue' :value="3">
鍛ㄦ湡浠�
<el-select clearable v-model="cycle01">
<el-option
@@ -38,7 +38,7 @@
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="4">
+ <el-radio v-model='radioValue' :value="4">
绗�
<el-input-number v-model='average01' :min="1" :max="4" /> 鍛ㄧ殑
<el-select clearable v-model="average02">
@@ -48,7 +48,7 @@
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="5">
+ <el-radio v-model='radioValue' :value="5">
鏈湀鏈�鍚庝竴涓�
<el-select clearable v-model="weekday">
<el-option v-for="item in weekList" :key="item.key" :label="item.value" :value="item.key" />
@@ -57,7 +57,7 @@
</el-form-item>
<el-form-item>
- <el-radio v-model='radioValue' :label="6">
+ <el-radio v-model='radioValue' :value="6">
鎸囧畾
<el-select class="multiselect" clearable v-model="checkboxList" placeholder="鍙閫�" multiple :multiple-limit="6">
<el-option v-for="item in weekList" :key="item.key" :label="item.value" :value="item.key" />
diff --git a/src/components/Crontab/year.vue b/src/components/Crontab/year.vue
index d5d1a78..c2bf2f0 100644
--- a/src/components/Crontab/year.vue
+++ b/src/components/Crontab/year.vue
@@ -1,19 +1,19 @@
<template>
<el-form>
<el-form-item>
- <el-radio :label="1" v-model='radioValue'>
+ <el-radio :value="1" v-model='radioValue'>
涓嶅～锛屽厑璁哥殑閫氶厤绗, - * /]
</el-radio>
</el-form-item>
<el-form-item>
- <el-radio :label="2" v-model='radioValue'>
+ <el-radio :value="2" v-model='radioValue'>
姣忓勾
</el-radio>
</el-form-item>
<el-form-item>
- <el-radio :label="3" v-model='radioValue'>
+ <el-radio :value="3" v-model='radioValue'>
鍛ㄦ湡浠�
<el-input-number v-model='cycle01' :min='fullYear' :max="2098"/> -
<el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : fullYear + 1" :max="2099"/>
@@ -21,7 +21,7 @@
</el-form-item>
<el-form-item>
- <el-radio :label="4" v-model='radioValue'>
+ <el-radio :value="4" v-model='radioValue'>
浠�
<el-input-number v-model='average01' :min='fullYear' :max="2098"/> 骞村紑濮嬶紝姣�
<el-input-number v-model='average02' :min="1" :max="2099 - average01 || fullYear"/> 骞存墽琛屼竴娆�
@@ -30,7 +30,7 @@
</el-form-item>
<el-form-item>
- <el-radio :label="5" v-model='radioValue'>
+ <el-radio :value="5" v-model='radioValue'>
鎸囧畾
<el-select clearable v-model="checkboxList" placeholder="鍙閫�" multiple :multiple-limit="8">
<el-option v-for="item in 9" :key="item" :value="item - 1 + fullYear" :label="item -1 + fullYear" />
diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index e29b276..737b635 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -10,6 +10,7 @@
>{{ item.label + " " }}</span>
<el-tag
v-else
+ type="primary"
:disable-transitions="true"
:key="item.value + ''"
:index="index"
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index 1f36520..77a472a 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -196,7 +196,7 @@
<el-radio
v-for="dict in sys_job_status"
:key="dict.value"
- :label="dict.value"
+ :value="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
@@ -204,17 +204,17 @@
<el-col :span="12">
<el-form-item label="鎵ц绛栫暐" prop="misfirePolicy">
<el-radio-group v-model="form.misfirePolicy">
- <el-radio-button label="1">绔嬪嵆鎵ц</el-radio-button>
- <el-radio-button label="2">鎵ц涓�娆�</el-radio-button>
- <el-radio-button label="3">鏀惧純鎵ц</el-radio-button>
+ <el-radio-button value="1">绔嬪嵆鎵ц</el-radio-button>
+ <el-radio-button value="2">鎵ц涓�娆�</el-radio-button>
+ <el-radio-button value="3">鏀惧純鎵ц</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鏄惁骞跺彂" prop="concurrent">
<el-radio-group v-model="form.concurrent">
- <el-radio-button label="0">鍏佽</el-radio-button>
- <el-radio-button label="1">绂佹</el-radio-button>
+ <el-radio-button value="0">鍏佽</el-radio-button>
+ <el-radio-button value="1">绂佹</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index f41b66c..bfdae6e 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -146,7 +146,7 @@
<el-radio
v-for="dict in sys_yes_no"
:key="dict.value"
- :label="dict.value"
+ :value="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index b483acd..a25e204 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -123,7 +123,7 @@
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
- :label="dict.value"
+ :value="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 3fcb9f6..eff8acc 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -157,7 +157,7 @@
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
- :label="dict.value"
+ :value="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 7bbd174..ead773b 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -153,7 +153,7 @@
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
- :label="dict.value"
+ :value="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 1df5fb9..036c085 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -102,9 +102,9 @@
<el-col :span="24">
<el-form-item label="鑿滃崟绫诲瀷" prop="menuType">
<el-radio-group v-model="form.menuType">
- <el-radio label="M">鐩綍</el-radio>
- <el-radio label="C">鑿滃崟</el-radio>
- <el-radio label="F">鎸夐挳</el-radio>
+ <el-radio value="M">鐩綍</el-radio>
+ <el-radio value="C">鑿滃崟</el-radio>
+ <el-radio value="F">鎸夐挳</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -152,8 +152,8 @@
</span>
</template>
<el-radio-group v-model="form.isFrame">
- <el-radio label="0">鏄�</el-radio>
- <el-radio label="1">鍚�</el-radio>
+ <el-radio value="0">鏄�</el-radio>
+ <el-radio value="1">鍚�</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -220,8 +220,8 @@
</span>
</template>
<el-radio-group v-model="form.isCache">
- <el-radio label="0">缂撳瓨</el-radio>
- <el-radio label="1">涓嶇紦瀛�</el-radio>
+ <el-radio value="0">缂撳瓨</el-radio>
+ <el-radio value="1">涓嶇紦瀛�</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -239,7 +239,7 @@
<el-radio
v-for="dict in sys_show_hide"
:key="dict.value"
- :label="dict.value"
+ :value="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
@@ -258,7 +258,7 @@
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
- :label="dict.value"
+ :value="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index fd74fcd..a0ea694 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -136,7 +136,7 @@
<el-radio
v-for="dict in sys_notice_status"
:key="dict.value"
- :label="dict.value"
+ :value="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 323c574..ce63043 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -126,7 +126,7 @@
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
- :label="dict.value"
+ :value="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 22a5fa4..01dd03a 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -164,7 +164,7 @@
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
- :label="dict.value"
+ :value="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 60754e8..aa2e13b 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -243,7 +243,7 @@
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
- :label="dict.value"
+ :value="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue
index 9fee4c9..2c15e86 100644
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -11,8 +11,8 @@
</el-form-item>
<el-form-item label="鎬у埆">
<el-radio-group v-model="form.sex">
- <el-radio label="0">鐢�</el-radio>
- <el-radio label="1">濂�</el-radio>
+ <el-radio value="0">鐢�</el-radio>
+ <el-radio value="1">濂�</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item>
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index 8f7db37..2e7ca45 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -78,8 +78,8 @@
<el-icon><question-filled /></el-icon>
</el-tooltip>
</template>
- <el-radio v-model="info.genType" label="0">zip鍘嬬缉鍖�</el-radio>
- <el-radio v-model="info.genType" label="1">鑷畾涔夎矾寰�</el-radio>
+ <el-radio v-model="info.genType" value="0">zip鍘嬬缉鍖�</el-radio>
+ <el-radio v-model="info.genType" value="1">鑷畾涔夎矾寰�</el-radio>
</el-form-item>
</el-col>
--
Gitblit v1.9.3