From 2b0c4acfa12a00c0df3398e5f523980bca45cd40 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 12 八月 2021 13:53:58 +0800 Subject: [PATCH] add 增加 admin 监控客户端开关 --- ruoyi-generator/src/main/resources/vm/vue/index.vue.vm | 81 ++++++++++------------------------------ 1 files changed, 21 insertions(+), 60 deletions(-) diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index b384ba5..97e52de 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -134,7 +134,7 @@ <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span> </template> </el-table-column> -#elseif($column.list && "" != $column.dictType) +#elseif($column.list && $column.dictType && "" != $column.dictType) <el-table-column label="${comment}" align="center" prop="${javaField}" :formatter="${javaField}Format" /> #elseif($column.list && "" != $javaField) <el-table-column label="${comment}" align="center" prop="${javaField}" /> @@ -174,7 +174,6 @@ #foreach($column in $columns) #set($field=$column.javaField) #if($column.insert && !$column.pk) -#if(($column.usableColumn) || (!$column.superColumn)) #set($parentheseIndex=$column.columnComment.indexOf("锛�")) #if($parentheseIndex != -1) #set($comment=$column.columnComment.substring(0, $parentheseIndex)) @@ -266,7 +265,6 @@ #end #end #end -#end #if($table.sub) <el-divider content-position="center">${subTable.functionName}淇℃伅</el-divider> <el-row :gutter="10" class="mb8"> @@ -301,7 +299,7 @@ #end </el-form> <div slot="footer" class="dialog-footer"> - <el-button type="primary" @click="submitForm">纭� 瀹�</el-button> + <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button> <el-button @click="cancel">鍙� 娑�</el-button> </div> </el-dialog> @@ -309,50 +307,15 @@ </template> <script> -import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}"; -#foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload") -import ImageUpload from '@/components/ImageUpload'; -#break -#end -#end -#foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload") -import FileUpload from '@/components/FileUpload'; -#break -#end -#end -#foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor") -import Editor from '@/components/Editor'; -#break -#end -#end +import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"; +import { downLoadExcel } from "@/utils/download"; export default { name: "${BusinessName}", - components: { -#foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload") - ImageUpload, -#break -#end -#end -#foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload") - FileUpload, -#break -#end -#end -#foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor") - Editor, -#break -#end -#end - }, data() { return { + // 鎸夐挳loading + buttonLoading: false, // 閬僵灞� loading: true, // 瀵煎嚭閬僵灞� @@ -388,7 +351,7 @@ #else #set($comment=$column.columnComment) #end -#if(${column.dictType} != '') +#if(${column.dictType} && ${column.dictType} != '') // $comment瀛楀吀 ${column.javaField}Options: [], #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN") @@ -432,7 +395,7 @@ created() { this.getList(); #foreach ($column in $columns) -#if(${column.dictType} != '') +#if(${column.dictType} && ${column.dictType} != '') this.getDicts("${column.dictType}").then(response => { this.${column.javaField}Options = response.data; }); @@ -465,7 +428,7 @@ }); }, #foreach ($column in $columns) -#if(${column.dictType} != '') +#if(${column.dictType} && ${column.dictType} != '') #set($parentheseIndex=$column.columnComment.indexOf("锛�")) #if($parentheseIndex != -1) #set($comment=$column.columnComment.substring(0, $parentheseIndex)) @@ -534,9 +497,11 @@ }, /** 淇敼鎸夐挳鎿嶄綔 */ handleUpdate(row) { + this.loading = true; this.reset(); const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids get${BusinessName}(${pkColumn.javaField}).then(response => { + this.loading = false; this.form = response.data; #foreach ($column in $columns) #if($column.htmlType == "checkbox") @@ -554,6 +519,7 @@ submitForm() { this.#[[$]]#refs["form"].validate(valid => { if (valid) { + this.buttonLoading = true; #foreach ($column in $columns) #if($column.htmlType == "checkbox") this.form.$column.javaField = this.form.${column.javaField}.join(","); @@ -567,12 +533,16 @@ this.msgSuccess("淇敼鎴愬姛"); this.open = false; this.getList(); + }).finally(() => { + this.buttonLoading = false; }); } else { add${BusinessName}(this.form).then(response => { this.msgSuccess("鏂板鎴愬姛"); this.open = false; this.getList(); + }).finally(() => { + this.buttonLoading = false; }); } } @@ -585,12 +555,14 @@ confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", type: "warning" - }).then(function() { + }).then(() => { + this.loading = true; return del${BusinessName}(${pkColumn.javaField}s); }).then(() => { + this.loading = false; this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }) + }).catch(() => {}); }, #if($table.sub) /** ${subTable.functionName}搴忓彿 */ @@ -628,18 +600,7 @@ #end /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { - const queryParams = this.queryParams; - this.$confirm('鏄惁纭瀵煎嚭鎵�鏈�${functionName}鏁版嵁椤�?', "璀﹀憡", { - confirmButtonText: "纭畾", - cancelButtonText: "鍙栨秷", - type: "warning" - }).then(() => { - this.exportLoading = true; - return export${BusinessName}(queryParams); - }).then(response => { - this.download(response.msg); - this.exportLoading = false; - }) + downLoadExcel('/${moduleName}/${businessName}/export', this.queryParams); } } }; -- Gitblit v1.9.3