From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-vue/src/views/modelconfiguration/calculationformula/calculationFormula.vue | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/zhitan-vue/src/views/modelconfiguration/calculationformula/calculationFormula.vue b/zhitan-vue/src/views/modelconfiguration/calculationformula/calculationFormula.vue
index 4035a00..5488048 100644
--- a/zhitan-vue/src/views/modelconfiguration/calculationformula/calculationFormula.vue
+++ b/zhitan-vue/src/views/modelconfiguration/calculationformula/calculationFormula.vue
@@ -9,28 +9,33 @@
<el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
<el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
+ <!-- <el-form-item style="float: right">
+ <el-button type="primary" icon="plus" @click="handleAdd">鏂板</el-button>
+ </el-form-item> -->
</el-form>
</div>
- <div class="table-box">
- <el-table :data="tableData" style="width: 100%">
- <el-table-column prop="funcName" label="鍑芥暟鍚�" show-overflow-tooltip align="center"> </el-table-column>
- <el-table-column prop="funcText" label="鍑芥暟鏂囨湰" show-overflow-tooltip align="center"> </el-table-column>
- <el-table-column prop="info" label="浠嬬粛" show-overflow-tooltip align="center"> </el-table-column>
- <!-- <el-table-column prop="prop" label="鎿嶄綔" width="150" align="center">
+ <div class="table-bg-style">
+ <div class="table-box">
+ <el-table :data="tableData" style="width: 100%">
+ <el-table-column prop="funcName" label="鍑芥暟鍚�" show-overflow-tooltip align="center"> </el-table-column>
+ <el-table-column prop="funcText" label="鍑芥暟鏂囨湰" show-overflow-tooltip align="center"> </el-table-column>
+ <el-table-column prop="info" label="浠嬬粛" show-overflow-tooltip align="center"> </el-table-column>
+ <!-- <el-table-column prop="prop" label="鎿嶄綔" width="150" align="center">
<template #default="scope">
<el-button link type="primary" icon="Delete" @click="handleDel(scope.row)">
鍒犻櫎
</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-table>
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ v-model:page="queryParams.pageNum"
+ v-model:limit="queryParams.pageSize"
+ @pagination="getList"
+ />
+ </div>
</div>
</div>
</template>
--
Gitblit v1.9.3