From f3d0bf6c2697d8a79059bbba5eb9af7e92d7208d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 13 五月 2020 21:11:14 +0800
Subject: [PATCH] 更换IP地址查询接口
---
ruoyi/src/main/resources/vm/vue/index-tree.vue.vm | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
index 280417a..1a74fca 100644
--- a/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
@@ -88,7 +88,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)
@@ -118,7 +118,7 @@
</el-table>
<!-- 添加或修改${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)
@@ -146,7 +146,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>
@@ -162,7 +163,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>
@@ -227,8 +229,7 @@
#end
#if(${column.dictType} != '')
// $comment字典
- ${column.javaField}Options: []#if($velocityCount != $columns.size()),#end
-
+ ${column.javaField}Options: [],
#end
#end
// 查询参数
--
Gitblit v1.9.2