From 2ffb110afafd3374c458cea74e41bc1da9ccb739 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期二, 27 二月 2024 09:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/data-comparison.vue | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/src/components/view/data-comparison.vue b/src/components/view/data-comparison.vue
index dfe4142..3571fca 100644
--- a/src/components/view/data-comparison.vue
+++ b/src/components/view/data-comparison.vue
@@ -58,7 +58,7 @@
<div class="search_label">鐧昏鏃ユ湡锛�</div>
<div class="search_input">
<el-date-picker size="small" v-model="componentData.entity.createTime" type="date" placeholder="閫夋嫨鏃ユ湡"
- value-format="yyyy-MM-dd" clearable></el-date-picker>
+ value-format="yyyy-MM-dd" :clearable="false" :editable="false"></el-date-picker>
</div>
</div>
<div class="search_thing" style="padding-left: 30px;">
@@ -118,42 +118,29 @@
mm = "0" + mm;
}
this.componentData.entity.createTime = `${yyyy}-${mm}-${dd} 00:00:00`
+ this.componentData.entity.name = localStorage.getItem('data_com_name')==undefined?null:localStorage.getItem('data_com_name')
},
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
- // this.selectDataComparisonDtoPageList()
},
methods: {
refreshTable() {
if (this.componentData.entity.name == null || this.componentData.entity.name == '') {
- this.$message.error('璐︽埛鍚嶇О鏄繀濉」')
+ this.$message.error('涓昏处鎴峰悕绉版槸蹇呭～椤�')
} else if (this.componentData.entity.comparisonName == null || this.componentData.entity.comparisonName == '') {
- this.$message.error('瀵规瘮鐨勮处鎴峰悕绉版槸蹇呭～椤�')
+ this.$message.error('瀛愯处鎴峰悕绉版槸蹇呭～椤�')
} else if (this.componentData.entity.createTime == null) {
this.$message.error('鐧昏鏃堕棿鏄繀濉」')
} else if (this.componentData.entity.name === this.componentData.entity.comparisonName) {
this.$message.error('瀵规瘮鐨勮处鎴蜂笉鑳介噸澶�')
} else {
+ localStorage.setItem('data_com_name', this.componentData.entity.name)
this.$refs['ValueTable'].selectList()
}
},
refresh() {
this.componentData.entity = this.HaveJson(this.entityCopy)
this.upIndex++
- },
- selectDataComparisonDtoPageList() {
- this.$axios.post(this.$api.dataReporting.selectDataComparisonDtoPageList, {
- headers: {
- 'Content-Type': 'application/json'
- }
- }).then(res => {
- res.data.forEach(a => {
- a.isClick = false
- a.look = false
- })
- this.menu = res.data
- this.menuCopy = this.HaveJson(res.data)
- })
}
}
}
--
Gitblit v1.9.3