From 36bbb746731b65d401cbe49853227e316d5e8c32 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 25 十一月 2024 16:46:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/wel/homeConfig.vue | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/wel/homeConfig.vue b/Source/plt-web/plt-web-ui/src/views/wel/homeConfig.vue
index d7efc03..58316cc 100644
--- a/Source/plt-web/plt-web-ui/src/views/wel/homeConfig.vue
+++ b/Source/plt-web/plt-web-ui/src/views/wel/homeConfig.vue
@@ -1,10 +1,9 @@
<template>
<basic-container>
<avue-crud
- ref="useCrud"
+ ref="crud"
:data="data"
:option="option"
- :page.sync="page"
:table-loading="loading"
@selection-change="selectChange"
@row-click="rowClickHandler"
@@ -37,16 +36,16 @@
width="500px"
@close="visibleCloseHandler"
>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px" size="small">
+ <el-form ref="form" :model="form" :rules="rules" label-width="90px" size="small">
<el-row>
<el-col :span="24">
- <el-form-item label="鍚嶇О锛�" prop="id">
- <el-input v-model="form.id"></el-input>
+ <el-form-item label="缁勪欢锛�" prop="id">
+ <avue-select v-model="form.id" placeholder="璇烽�夋嫨缁勪欢" type="tree" :dic="dic"></avue-select>
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="鏍囩锛�" prop="name">
- <el-input v-model="form.name"></el-input>
+ <el-form-item label="鍗犳嵁鍒楁暟锛�" prop="span">
+ <avue-input-number v-model="form.span" precision="0" style="width: 100%" :max="24" :min="1" controls-position="" tip="鎬诲垪鏁颁负24锛屽鍗犳弧鏁磋璇疯緭鍏�24"></avue-input-number>
</el-form-item>
</el-col>
<el-col :span="24">
@@ -91,13 +90,12 @@
calcHeight: -60,
column: [
{
- label: '鍚嶇О',
+ label: '缁勪欢',
prop: 'id',
- sortable: true,
},
{
- label: '鍥炬爣',
- prop: 'icon'
+ label: '鍗犳嵁鍒楁暟',
+ prop: 'span'
},
{
label: '鏍囩',
@@ -118,18 +116,19 @@
},
rules: {
id: [
- {required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur'},
+ {required: true, message: '璇烽�夋嫨缁勪欢', trigger: 'blur'},
]
},
+ dic:[{
+ label:'寰呭姙浠诲姟',
+ value:'UndoTaskPortlet'
+ },{
+ label:'閫夐」2',
+ value:1
+ }],
visible: false,
selectList: [],
- lastIndex: null,
- page: {
- currentPage: 1,
- pageSize: 15,
- total: 0,
- pageSizes: [15, 30, 50, 100],
- },
+ lastIndex: null
}
},
created() {
--
Gitblit v1.9.3