From 4cdb79b66c656cfe52bcccdf338f5a655f2b965b Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 17 四月 2025 10:47:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/mainPlan/weldSeamEcharts/index.vue | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/views/mainPlan/weldSeamEcharts/index.vue b/src/views/mainPlan/weldSeamEcharts/index.vue
index 6320f18..d38a984 100644
--- a/src/views/mainPlan/weldSeamEcharts/index.vue
+++ b/src/views/mainPlan/weldSeamEcharts/index.vue
@@ -31,7 +31,9 @@
</el-form>
</el-col>
<el-col>
- <div ref="chartRef" v-show="showSearch" :style="{ width:width,height:height }"></div>
+ <div ref="chartRef" :style="{ width:width,height:height,border: '1px solid #ccc' }" v-loading="loading">
+ <div style="text-align: center;margin-top: 50px;color: #999;">鏆傛棤鏁版嵁</div>
+ </div>
</el-col>
</el-row>
</div>
@@ -55,6 +57,7 @@
const width = ref(document.documentElement.clientWidth - 240 + "px");
const showSearch = ref(false);
+ const loading = ref(false);
/* const dataList = [
['product', '鍗楅��-璁㈠崟-绠¤矾', '鍗楅��-璁㈠崟-姘旀煖', '鍗楅��-棰勬祴-绠¤矾', '鍗楅��-棰勬祴-姘旀煖', '鍗楅��-棰勬祴-绠¤矾1', '鍗楅��-棰勬祴-姘旀煖1', '鍗楅��-棰勬祴-绠¤矾2', '鍗楅��-棰勬祴-姘旀煖2', '鍗楅��-棰勬祴-绠¤矾3', '鍗楅��-棰勬祴-姘旀煖3', '鍗楅��-棰勬祴-绠¤矾4', '鍗楅��-棰勬祴-姘旀煖4'],
@@ -113,6 +116,7 @@
// 浣跨敤閰嶇疆椤规樉绀哄浘琛�
myChart.setOption(option);
+ loading.value = false;
};
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -130,9 +134,10 @@
}
function getList() {
+ loading.value = true;
clearChart();
queryParams.value.params = {};
- if (null != totalDay && '' != totalDay) {
+ if (null != totalDay.value && '' != totalDay.value) {
queryParams.value.params["startDay"] = totalDay.value[0];
queryParams.value.params["endDay"] = totalDay.value[1];
}
@@ -157,6 +162,7 @@
if (myChart) {
myChart.dispose();
myChart = null;
+ chartRef.value.innerHTML = '<div style="text-align: center;margin-top: 50px;color: #999;">鏆傛棤鏁版嵁</div>';
}
}
</script>
\ No newline at end of file
--
Gitblit v1.9.3