From c52758f5f9ababc1853a847e5b51ec08edbcc746 Mon Sep 17 00:00:00 2001
From: zccbbg <zccbbg@qq.com>
Date: Tue, 16 Jul 2024 10:57:54 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AFvue=E6=96=87=E4=BB=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0el-card?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .editorconfig                                 |   2 +-
 .../src/main/resources/vm/vue/index.vue.vm    | 268 +++++++++---------
 2 files changed, 139 insertions(+), 131 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 25b312e..cd26be1 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,7 +10,7 @@ end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{json,yml,yaml}]
+[*.{json,yml,yaml,vm}]
 indent_size = 2
 
 [*.md]
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index 7ceebd4..743a6ff 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -1,144 +1,152 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input" || $column.htmlType == "textarea")
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-input
-          v-model="queryParams.${column.javaField}"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-          <el-option
-            v-for="dict in ${dictType}"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+    <el-card>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
+  #foreach($column in $columns)
+  #if($column.query)
+  #set($dictType=$column.dictType)
+  #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+  #set($parentheseIndex=$column.columnComment.indexOf("（"))
+  #if($parentheseIndex != -1)
+  #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+  #else
+  #set($comment=$column.columnComment)
+  #end
+  #if($column.htmlType == "input" || $column.htmlType == "textarea")
+        <el-form-item label="${comment}" prop="${column.javaField}">
+          <el-input
+            v-model="queryParams.${column.javaField}"
+            placeholder="请输入${comment}"
+            clearable
+            @keyup.enter="handleQuery"
           />
-        </el-select>
-      </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-date-picker clearable
-          v-model="queryParams.${column.javaField}"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择${comment}">
-        </el-date-picker>
-      </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      <el-form-item label="${comment}" style="width: 308px">
-        <el-date-picker
-          v-model="daterange${AttrName}"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-        ></el-date-picker>
-      </el-form-item>
-#end
-#end
-#end
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-      </el-form-item>
-    </el-form>
+        </el-form-item>
+  #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+        <el-form-item label="${comment}" prop="${column.javaField}">
+          <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+            <el-option
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+  #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+        <el-form-item label="${comment}" prop="${column.javaField}">
+          <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+  #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+        <el-form-item label="${comment}" prop="${column.javaField}">
+          <el-date-picker clearable
+            v-model="queryParams.${column.javaField}"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择${comment}">
+          </el-date-picker>
+        </el-form-item>
+  #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+        <el-form-item label="${comment}" style="width: 308px">
+          <el-date-picker
+            v-model="daterange${AttrName}"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+          ></el-date-picker>
+        </el-form-item>
+  #end
+  #end
+  #end
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['${moduleName}:${businessName}:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['${moduleName}:${businessName}:export']"
-        >导出</el-button>
-      </el-col>
-    </el-row>
+    <el-card class="mt20">
 
-    <el-table v-loading="loading" :data="${businessName}List" border>
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
-      <el-table-column label="${comment}" prop="${javaField}" v-if="${column.list}"/>
-#elseif($column.list && $column.htmlType == "datetime")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+      <el-row :gutter="10" class="mb8" type="flex" justify="space-between">
+        <el-col :span="6"><span style="font-size: large">${functionName}</span></el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="Plus"
+            @click="handleAdd"
+            v-hasPermi="['${moduleName}:${businessName}:add']"
+          >新增</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="Download"
+            @click="handleExport"
+            v-hasPermi="['${moduleName}:${businessName}:export']"
+          >导出</el-button>
+        </el-col>
+      </el-row>
+
+      <el-table v-loading="loading" :data="${businessName}List" border class="mt20">
+  #foreach($column in $columns)
+  #set($javaField=$column.javaField)
+  #set($parentheseIndex=$column.columnComment.indexOf("（"))
+  #if($parentheseIndex != -1)
+  #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+  #else
+  #set($comment=$column.columnComment)
+  #end
+  #if($column.pk)
+        <el-table-column label="${comment}" prop="${javaField}" v-if="${column.list}"/>
+  #elseif($column.list && $column.htmlType == "datetime")
+        <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
           <template #default="scope">
-              <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+            <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
           </template>
-      </el-table-column>
-#elseif($column.list && $column.dictType && "" != $column.dictType)
-      <el-table-column label="${comment}" align="center" prop="${javaField}">
-        <template #default="scope">
-#if($column.htmlType == "checkbox")
-          <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
-          <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
-#end
-        </template>
-      </el-table-column>
-#elseif($column.list && "" != $javaField)
-      <el-table-column label="${comment}" prop="${javaField}" />
-#end
-#end
-      <el-table-column label="操作" align="right" class-name="small-padding fixed-width">
+        </el-table-column>
+  #elseif($column.list && $column.htmlType == "imageUpload")
+        <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+            <template #default="scope">
+                <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+            </template>
+        </el-table-column>
+  #elseif($column.list && $column.dictType && "" != $column.dictType)
+        <el-table-column label="${comment}" align="center" prop="${javaField}">
           <template #default="scope">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>
+  #if($column.htmlType == "checkbox")
+            <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+  #else
+            <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
+  #end
           </template>
-      </el-table-column>
-    </el-table>
+        </el-table-column>
+  #elseif($column.list && "" != $javaField)
+        <el-table-column label="${comment}" prop="${javaField}" />
+  #end
+  #end
+        <el-table-column label="操作" align="right" class-name="small-padding fixed-width">
+            <template #default="scope">
+                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>
+                <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>
+            </template>
+        </el-table-column>
+      </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <el-row>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-row>
 
+    </el-card>
     <!-- 添加或修改${functionName}对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">