From 7a267fc8e5bc6bbe1d770c1aebb50bbed5461e22 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 07 二月 2025 17:45:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/index.vue | 84 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/src/views/index.vue b/src/views/index.vue
index 84694ad..e52db1b 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -73,7 +73,7 @@
/>
</div>
<el-card>
- <div style="display: flex;">
+ <div style="display: flex;min-height: 300px">
<div style="flex: 2;display: flex;flex-direction: column; justify-content: center;align-items: flex-start">
<div class="flex justify-between mb-[15px]" style="align-items: center;margin-bottom: 5px">
<div class="block mb-3 font-semibold fonts">娴佺▼鎺ㄨ繘鎯呭喌鎬昏</div>
@@ -250,48 +250,48 @@
pie: null,
pieData: {},
projectProcessData: [
- {
- name: '浜ら�氱被椤圭洰瀹℃壒娴佺▼(绠�鏄撶▼搴�)',
- num: '11/45'
- },
- {
- name: '浜ら�氱被椤圭洰瀹℃壒娴佺▼(涓�鑸啘鏉戝叕璺�)',
- num: '12/15'
- },
- {
- name: '浜ら�氱被椤圭洰瀹℃壒娴佺▼(閲嶈鍐滄潙鍏矾)',
- num: '16/30'
- },
- {
- name: '浜ら�氱被椤圭洰瀹℃壒娴佺▼(鍥界渷閬�)',
- num: '2/18'
- },
- {
- name: '绀句細鎶曡祫椤圭洰瀹℃壒娴佺▼',
- num: '9/16'
- },
+ // {
+ // name: '浜ら�氱被椤圭洰瀹℃壒娴佺▼(绠�鏄撶▼搴�)',
+ // num: '11/45'
+ // },
+ // {
+ // name: '浜ら�氱被椤圭洰瀹℃壒娴佺▼(涓�鑸啘鏉戝叕璺�)',
+ // num: '12/15'
+ // },
+ // {
+ // name: '浜ら�氱被椤圭洰瀹℃壒娴佺▼(閲嶈鍐滄潙鍏矾)',
+ // num: '16/30'
+ // },
+ // {
+ // name: '浜ら�氱被椤圭洰瀹℃壒娴佺▼(鍥界渷閬�)',
+ // num: '2/18'
+ // },
+ // {
+ // name: '绀句細鎶曡祫椤圭洰瀹℃壒娴佺▼',
+ // num: '9/16'
+ // },
],
projectProcessData1: [
- {
- name: '灏勬椽甯備汉姘戞斂搴�',
- content: '灏勬椽缁忓紑鍖虹豢鐒跺垢绂忓皬鍖烘梺宸ュ湴闀挎湡澶滈棿',
- time: '2025-01-06'
- },
- {
- name: '灏勬椽甯備汉姘戞斂搴�',
- content: '鍏充簬鍝ㄦゼ鏉戞媶杩� 鏂规鍜� 鎷嗚縼鍗忚鐨勭枒闂�',
- time: '2025-01-02'
- },
- {
- name: '灏勬椽甯備汉姘戞斂搴�',
- content: '灏勬椽鏁存不涓�涓嬪煄鍖烘苯杞﹂殢鎰忎贡楦ｇ瑳琛屼负',
- time: '2025-01-02'
- },
- {
- name: '灏勬椽甯備汉姘戞斂搴�',
- content: '缁村崱鍥介檯鍏寮�鍙戝晢鏈寜鏃跺姙鐞嗘埧浜ц瘉',
- time: '2025-01-01'
- }
+ // {
+ // name: '灏勬椽甯備汉姘戞斂搴�',
+ // content: '灏勬椽缁忓紑鍖虹豢鐒跺垢绂忓皬鍖烘梺宸ュ湴闀挎湡澶滈棿',
+ // time: '2025-01-06'
+ // },
+ // {
+ // name: '灏勬椽甯備汉姘戞斂搴�',
+ // content: '鍏充簬鍝ㄦゼ鏉戞媶杩� 鏂规鍜� 鎷嗚縼鍗忚鐨勭枒闂�',
+ // time: '2025-01-02'
+ // },
+ // {
+ // name: '灏勬椽甯備汉姘戞斂搴�',
+ // content: '灏勬椽鏁存不涓�涓嬪煄鍖烘苯杞﹂殢鎰忎贡楦ｇ瑳琛屼负',
+ // time: '2025-01-02'
+ // },
+ // {
+ // name: '灏勬椽甯備汉姘戞斂搴�',
+ // content: '缁村崱鍥介檯鍏寮�鍙戝晢鏈寜鏃跺姙鐞嗘埧浜ц瘉',
+ // time: '2025-01-01'
+ // }
],
queryParams: {},
timeMerge: [],
@@ -428,7 +428,7 @@
_this.$refs["mapRef"].makeAllMask(res.data);
}, 2000);
} else {
- _this.$message.error("鏈煡璇㈠埌瀵瑰簲椤圭洰");
+ // _this.$message.error("鏈煡璇㈠埌瀵瑰簲椤圭洰");
}
} else {
_this.$message.error(res.msg);
--
Gitblit v1.8.0