From b5c789a2670558453821dbaff039529681c13a5b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 26 五月 2020 18:22:53 +0800
Subject: [PATCH] 防止空路由出现的警告，设置默认path=/
---
ruoyi/src/main/resources/vm/vue/index.vue.vm | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/ruoyi/src/main/resources/vm/vue/index.vue.vm b/ruoyi/src/main/resources/vm/vue/index.vue.vm
index 3fc7d8a..7c19a3a 100644
--- a/ruoyi/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi/src/main/resources/vm/vue/index.vue.vm
@@ -22,7 +22,7 @@
/>
</el-form-item>
#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
+ <el-form-item label="${comment}" prop="${column.javaField}">
<el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable size="small">
<el-option
v-for="dict in ${column.javaField}Options"
@@ -33,7 +33,7 @@
</el-select>
</el-form-item>
#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
+ <el-form-item label="${comment}" prop="${column.javaField}">
<el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable size="small">
<el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
</el-select>
@@ -47,10 +47,10 @@
placeholder="閫夋嫨${comment}">
</el-date-picker>
</el-form-item>
+#end
+#end
+#end
<el-form-item>
-#end
-#end
-#end
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
@@ -112,7 +112,7 @@
#elseif($column.list && $column.htmlType == "datetime")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.${javaField}) }}</span>
+ <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
#elseif($column.list && "" != $column.dictType)
@@ -150,7 +150,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀�${functionName}瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px">
+ <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
#foreach($column in $columns)
#set($field=$column.javaField)
@@ -174,7 +174,8 @@
v-for="dict in ${field}Options"
:key="dict.dictValue"
:label="dict.dictLabel"
- :value="dict.dictValue"
+ #if($column.javaType == "Integer"):value="parseInt(dict.dictValue)"#else:value="dict.dictValue"#end
+
></el-option>
</el-select>
</el-form-item>
@@ -190,7 +191,8 @@
<el-radio
v-for="dict in ${field}Options"
:key="dict.dictValue"
- :label="dict.dictValue"
+ #if($column.javaType == "Integer"):label="parseInt(dict.dictValue)"#else:label="dict.dictValue"#end
+
>{{dict.dictLabel}}</el-radio>
</el-radio-group>
</el-form-item>
@@ -230,6 +232,7 @@
import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";
export default {
+ name: "${BusinessName}",
data() {
return {
// 閬僵灞�
@@ -257,8 +260,7 @@
#end
#if(${column.dictType} != '')
// $comment瀛楀吀
- ${column.javaField}Options: []#if($velocityCount != $columns.size()),#end
-
+ ${column.javaField}Options: [],
#end
#end
// 鏌ヨ鍙傛暟
@@ -288,6 +290,7 @@
$column.javaField: [
{ required: true, message: "$comment涓嶈兘涓虹┖", trigger: "blur" }
]#if($velocityCount != $columns.size()),#end
+
#end
#end
}
--
Gitblit v1.9.3