From 21d976db1dcdf9ea4b6c300c159a654a7cd62b63 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 14 十一月 2023 17:51:51 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/common/param-mergeTemplate.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/common/param-mergeTemplate.vue b/src/views/common/param-mergeTemplate.vue
index 03b521b..d8a0cb7 100644
--- a/src/views/common/param-mergeTemplate.vue
+++ b/src/views/common/param-mergeTemplate.vue
@@ -3,7 +3,7 @@
<avue-crud
ref="crud"
class="l-mes"
- rowKey="oneId"
+ rowKey="id"
:data="tableData"
:option="option"
:span-method="spanMethod"
@@ -190,7 +190,7 @@
this.rowCalc()
setTimeout(()=>{
this.loading = false
- },3000)
+ },1000)
},
data(){
return {
@@ -278,6 +278,9 @@
</script>
<style>
+.avue-crud_menu{
+ display: none;
+}
.avue-crud .el-table th {
word-break: break-word;
color: rgba(102,102,102,1);
--
Gitblit v1.9.3