Skip to content

W
web-project
Commit 890795eb authored by 裴文涛's avatar 裴文涛
Browse files
Options

天气工况，风力配置描述输入调整，年度参数增加输入限制

parent f7c2bbac
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 224 additions and 83 deletions
src/views/SchedulingPage/PhenomenonPage.vue
View file @ 890795eb
...@@ -12,12 +12,25 @@ const addWindowOpen = ref(false) ...@@ -12,12 +12,25 @@ const addWindowOpen = ref(false)
const reviseForm = ref({}) // 修改表单 const reviseForm = ref({}) // 修改表单
const addForm = ref({}) // 新增表单 const addForm = ref({}) // 新增表单
const addSaveBtnLoading = ref(false) const addSaveBtnLoading = ref(false)
const labelPosition = ref('top')
const formRef = ref() const formRef = ref()
//校验规则 //校验规则
const rules = reactive({ const rules = reactive({
phenomenonName: [
{
required: true,
message: '请选择天气名称',
trigger: 'blur'
}
],
phenomenonDesc: [
{
required: true,
message: '请输入描述',
trigger: 'blur'
}
],
phenomenonTemp: [ phenomenonTemp: [
{required: true, message: '请输入正确的对应温度', trigger: 'blur'}, {required: true, message: '请输入正确的对应温度', trigger: 'blur'},
{pattern: /^(-?\d{1,11})(\.[0-9]{1,4})?$/, message: "请输入正确的对应温度", trigger: "blur"} {pattern: /^(-?\d{1,11})(\.[0-9]{1,4})?$/, message: "请输入正确的对应温度", trigger: "blur"}
...@@ -95,7 +108,6 @@ function onReviseSubmit() { ...@@ -95,7 +108,6 @@ function onReviseSubmit() {
message: '对应温度不能大于45度或小于-30度', message: '对应温度不能大于45度或小于-30度',
type: 'error', type: 'error',
}) })
reviseSaveBtnLoading.value = false
return return
} }
if (reviseForm.value.phenomenonName === '晴天') { if (reviseForm.value.phenomenonName === '晴天') {
...@@ -243,11 +255,13 @@ function customSort(a, b) { ...@@ -243,11 +255,13 @@ function customSort(a, b) {
<el-row first> <el-row first>
<el-col :span="8" col-label class="energy-type-class">名称：</el-col> <el-col :span="8" col-label class="energy-type-class">名称：</el-col>
<el-col :span="16" col-value> <el-col :span="16" col-value>
<el-select placeholder="" size="small" v-model="reviseForm.phenomenonName" style="width: 290px"> <el-form-item prop="phenomenonName" style="padding: 0;margin: 0;">
<el-option value="晴天" label="晴天"/> <el-select placeholder="" size="small" v-model="reviseForm.phenomenonName" style="width: 290px">
<el-option value="多云" label="多云"/> <el-option value="晴天" label="晴天"/>
<el-option value="阴天" label="阴天"/> <el-option value="多云" label="多云"/>
</el-select> <el-option value="阴天" label="阴天"/>
</el-select>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
...@@ -258,10 +272,18 @@ function customSort(a, b) { ...@@ -258,10 +272,18 @@ function customSort(a, b) {
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row id="phenomenonDesc">
<el-col :span="8" col-label>描述：</el-col> <el-col :span="8" col-label>描述：</el-col>
<el-col :span="16" col-value> <el-col :span="16" col-value>
<el-input maxlength="10" v-model="reviseForm.phenomenonDesc" placeholder="" style="width: 290px"/> <el-form-item prop="phenomenonDesc" style="padding: 0;margin: 0;">
<el-input
type="textarea"
v-model="reviseForm.phenomenonDesc"
maxlength="200"
show-word-limit
style="width: 290px"
autosize/>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -280,11 +302,13 @@ function customSort(a, b) { ...@@ -280,11 +302,13 @@ function customSort(a, b) {
<el-row first> <el-row first>
<el-col :span="8" col-label class="energy-type-class">名称:</el-col> <el-col :span="8" col-label class="energy-type-class">名称:</el-col>
<el-col :span="16" col-value> <el-col :span="16" col-value>
<el-select placeholder="" size="small" v-model="addForm.phenomenonName" style="width: 290px"> <el-form-item prop="phenomenonName" style="padding: 0;margin: 0;">
<el-option value="晴天" label="晴天"/> <el-select placeholder="" size="small" v-model="addForm.phenomenonName" style="width: 290px">
<el-option value="多云" label="多云"/> <el-option value="晴天" label="晴天"/>
<el-option value="阴天" label="阴天"/> <el-option value="多云" label="多云"/>
</el-select> <el-option value="阴天" label="阴天"/>
</el-select>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
...@@ -295,10 +319,18 @@ function customSort(a, b) { ...@@ -295,10 +319,18 @@ function customSort(a, b) {
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row id="phenomenonDesc">
<el-col :span="8" col-label>描述：</el-col> <el-col :span="8" col-label>描述：</el-col>
<el-col :span="16" col-value> <el-col :span="16" col-value>
<el-input maxlength="10" v-model="addForm.phenomenonDesc" placeholder="" style="width: 290px"/> <el-form-item prop="phenomenonDesc" style="padding: 0;margin: 0;">
<el-input
type="textarea"
v-model="addForm.phenomenonDesc"
maxlength="200"
show-word-limit
style="width: 290px"
autosize/>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -399,6 +431,10 @@ function customSort(a, b) { ...@@ -399,6 +431,10 @@ function customSort(a, b) {
padding-left: 5px; padding-left: 5px;
} }
#phenomenonDesc{
height: 100%;
}
.el-input { .el-input {
color: black; color: black;
height: 24px; height: 24px;
......
src/views/SchedulingPage/WindManagePage.vue
View file @ 890795eb
...@@ -37,6 +37,13 @@ const formRef = ref() ...@@ -37,6 +37,13 @@ const formRef = ref()
//校验规则 //校验规则
const rules = reactive({ const rules = reactive({
windLevel: [
{
required: true,
message: '请选择风力级数',
trigger: "blur"
},
],
windTemp: [ windTemp: [
{ {
required: true, required: true,
...@@ -48,6 +55,13 @@ const rules = reactive({ ...@@ -48,6 +55,13 @@ const rules = reactive({
message: "请输入正确的对应温度", message: "请输入正确的对应温度",
trigger: "blur" trigger: "blur"
} }
],
windDesc: [
{
required: true,
message: '请输入描述',
trigger: "blur"
}
] ]
}); });
...@@ -258,9 +272,11 @@ function customSort(a, b) { ...@@ -258,9 +272,11 @@ function customSort(a, b) {
<el-row first> <el-row first>
<el-col :span="8" col-label class="energy-type-class">级数：</el-col> <el-col :span="8" col-label class="energy-type-class">级数：</el-col>
<el-col :span="16" col-value> <el-col :span="16" col-value>
<el-select placeholder="" size="small" v-model="reviseForm.windLevel" style="width: 290px"> <el-form-item prop="windLevel" style="padding: 0; margin: 0;">
<el-option v-for="(item, index) in 14" :key="index" :value="item" :label="item + '级风'" /> <el-select placeholder="" size="small" v-model="reviseForm.windLevel" style="width: 290px">
</el-select> <el-option v-for="(item, index) in 14" :key="index" :value="item" :label="item + '级风'" />
</el-select>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
...@@ -271,10 +287,18 @@ function customSort(a, b) { ...@@ -271,10 +287,18 @@ function customSort(a, b) {
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row id="windDesc">
<el-col :span="8" col-label>描述：</el-col> <el-col :span="8" col-label>描述：</el-col>
<el-col :span="16" col-value> <el-col :span="16" col-value>
<el-input maxlength="10" v-model="reviseForm.windDesc" placeholder="" style="width: 290px" /> <el-form-item prop="windDesc" style="padding: 0; margin: 0;">
<el-input
type="textarea"
v-model="reviseForm.windDesc"
maxlength="200"
show-word-limit
style="width: 290px"
autosize/>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -294,9 +318,11 @@ function customSort(a, b) { ...@@ -294,9 +318,11 @@ function customSort(a, b) {
<el-row first> <el-row first>
<el-col :span="8" col-label class="energy-type-class">级数：</el-col> <el-col :span="8" col-label class="energy-type-class">级数：</el-col>
<el-col :span="16" col-value> <el-col :span="16" col-value>
<el-select placeholder="" size="small" v-model="addForm.windLevel" style="width: 290px"> <el-form-item prop="windLevel" style="padding: 0; margin: 0;">
<el-option v-for="(item, index) in 14" :key="index" :value="item" :label="item + '级风'" /> <el-select placeholder="" size="small" v-model="addForm.windLevel" style="width: 290px">
</el-select> <el-option v-for="(item, index) in 14" :key="index" :value="item" :label="item + '级风'" />
</el-select>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
...@@ -307,10 +333,18 @@ function customSort(a, b) { ...@@ -307,10 +333,18 @@ function customSort(a, b) {
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row id="windDesc">
<el-col :span="8" col-label>描述：</el-col> <el-col :span="8" col-label>描述：</el-col>
<el-col :span="16" col-value> <el-col :span="16" col-value>
<el-input maxlength="10" v-model="addForm.windDesc" placeholder="" style="width: 290px" /> <el-form-item prop="windDesc" style="padding: 0; margin: 0;">
<el-input
type="textarea"
v-model="addForm.windDesc"
maxlength="200"
show-word-limit
style="width: 290px"
autosize/>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -368,7 +402,9 @@ function customSort(a, b) { ...@@ -368,7 +402,9 @@ function customSort(a, b) {
font-size: 12px; font-size: 12px;
color: black; color: black;
} }
.dialog-window{
height: 500px;
}
.table-operate-column { .table-operate-column {
display: flex; display: flex;
justify-content: center; justify-content: center;
...@@ -414,6 +450,10 @@ function customSort(a, b) { ...@@ -414,6 +450,10 @@ function customSort(a, b) {
padding-left: 5px; padding-left: 5px;
} }
#windDesc{
height: 100%;
}
.el-input { .el-input {
color: black; color: black;
height: 24px; height: 24px;
......
src/views/SchedulingPage/weatherManageSub/AddWindow.vue
View file @ 890795eb
...@@ -210,7 +210,7 @@ const rules = reactive({ ...@@ -210,7 +210,7 @@ const rules = reactive({
<el-col :span="8" class="content-col-label">风速：</el-col> <el-col :span="8" class="content-col-label">风速：</el-col>
<el-col :span="16" class="content-col-value"> <el-col :span="16" class="content-col-value">
<el-form-item prop="wind" style="padding: 0;margin: 0;"> <el-form-item prop="wind" style="padding: 0;margin: 0;">
<el-input :input-style="inputStyle" maxlength="10" v-model="addData.wind" style="width: 510px" /> <el-input v-float-number :input-style="inputStyle" maxlength="10" v-model="addData.wind" style="width: 510px" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -218,7 +218,7 @@ const rules = reactive({ ...@@ -218,7 +218,7 @@ const rules = reactive({
<el-col :span="8" class="content-col-label">光照：</el-col> <el-col :span="8" class="content-col-label">光照：</el-col>
<el-col :span="16" class="content-col-value"> <el-col :span="16" class="content-col-value">
<el-form-item prop="illumination" style="padding: 0;margin: 0;"> <el-form-item prop="illumination" style="padding: 0;margin: 0;">
<el-input :input-style="inputStyle" maxlength="10" v-model="addData.illumination" <el-input v-float-number :input-style="inputStyle" maxlength="10" v-model="addData.illumination"
style="width: 510px" /> style="width: 510px" />
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -228,7 +228,7 @@ const rules = reactive({ ...@@ -228,7 +228,7 @@ const rules = reactive({
<el-col :span="8" class="content-col-label">排序：</el-col> <el-col :span="8" class="content-col-label">排序：</el-col>
<el-col :span="16" class="content-col-value"> <el-col :span="16" class="content-col-value">
<el-form-item prop="sort" style="padding: 0;margin: 0;"> <el-form-item prop="sort" style="padding: 0;margin: 0;">
<el-input :input-style="inputStyle" maxlength="10" v-model="addData.sort" style="width: 510px" /> <el-input v-float-number :input-style="inputStyle" maxlength="10" v-model="addData.sort" style="width: 510px" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
src/views/SchedulingPage/weatherManageSub/ReviseWindow.vue
View file @ 890795eb
...@@ -168,11 +168,7 @@ function handleConfirm() { ...@@ -168,11 +168,7 @@ function handleConfirm() {
) )
} }
} }
formRef.value.validate(valid => { emit('onConfirm', reviseData.value)
if (valid) {
emit('onConfirm', reviseData.value)
}
})
} }
} }
}) })
...@@ -221,7 +217,8 @@ function onClose() { ...@@ -221,7 +217,8 @@ function onClose() {
<el-col :span="8" class="content-col-label">风速：</el-col> <el-col :span="8" class="content-col-label">风速：</el-col>
<el-col :span="16" class="content-col-value"> <el-col :span="16" class="content-col-value">
<el-form-item prop="wind" style="padding: 0;margin: 0;"> <el-form-item prop="wind" style="padding: 0;margin: 0;">
<el-input :input-style="inputStyle" maxlength="10" v-model="reviseData.wind" style="width: 510px"/> <el-input v-float-number :input-style="inputStyle" maxlength="10" v-model="reviseData.wind"
style="width: 510px"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -229,7 +226,7 @@ function onClose() { ...@@ -229,7 +226,7 @@ function onClose() {
<el-col :span="8" class="content-col-label">光照：</el-col> <el-col :span="8" class="content-col-label">光照：</el-col>
<el-col :span="16" class="content-col-value"> <el-col :span="16" class="content-col-value">
<el-form-item prop="illumination" style="padding: 0;margin: 0;"> <el-form-item prop="illumination" style="padding: 0;margin: 0;">
<el-input :input-style="inputStyle" maxlength="10" v-model="reviseData.illumination" <el-input v-float-number :input-style="inputStyle" maxlength="10" v-model="reviseData.illumination"
style="width: 510px"/> style="width: 510px"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -238,7 +235,8 @@ function onClose() { ...@@ -238,7 +235,8 @@ function onClose() {
<el-col :span="8" class="content-col-label">排序：</el-col> <el-col :span="8" class="content-col-label">排序：</el-col>
<el-col :span="16" class="content-col-value"> <el-col :span="16" class="content-col-value">
<el-form-item prop="sort" style="padding: 0;margin: 0;"> <el-form-item prop="sort" style="padding: 0;margin: 0;">
<el-input :input-style="inputStyle" maxlength="10" v-model="reviseData.sort" style="width: 510px"/> <el-input v-float-number :input-style="inputStyle" maxlength="10" v-model="reviseData.sort"
style="width: 510px"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment