From 355d7d39a67bc1fc27ed1e391799ff7fcc3b2aa7 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期二, 11 二月 2020 14:23:42 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs
---
src/views/Overview.vue | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/views/Overview.vue b/src/views/Overview.vue
index 1d1625c..ab7a7cd 100644
--- a/src/views/Overview.vue
+++ b/src/views/Overview.vue
@@ -9,7 +9,7 @@
</div>
- <div style="float: left; margin-left: 1%; width: 69%; height: 80vh; ">
+ <div style="float: left; margin-left: 1%; width: 69%; height: 70vh; ">
<div class="z_shadow" style="float: left; margin: 10px; margin-top: 0px; width: 46%; height: 43%; border: 1px solid #e4eef9;">
<div id="myChart" :style="{width: '100%', height: '100%'}"></div>
</div>
@@ -72,16 +72,7 @@
fileList: [],
task_itm: [
- {'id': "111_1", 'name': "绔嬮鏈嶅姟", desp: "鎻忚堪鐪嬪埌闈欏畨瀵�", 'state': "杩涜涓�"}, //
- {'id': "111_2", 'name': "鏂规寮�鍙戞湇鍔�", desp: "鎻忚堪鐪嬪埌闈欏畨瀵�", 'state': "杩涜涓�"},
- {'id': "111_2", 'name': "鏂规寮�鍙戞湇鍔�", desp: "鎻忚堪鐪嬪埌闈欏畨瀵�", 'state': "杩涜涓�"},
- {'id': "111_2", 'name': "鏂规寮�鍙戞湇鍔�", desp: "鎻忚堪鐪嬪埌闈欏畨瀵�", 'state': "杩涜涓�"},
- {'id': "111_2", 'name': "鏂规寮�鍙戞湇鍔�", desp: "鎻忚堪鐪嬪埌闈欏畨瀵�", 'state': "杩涜涓�"},
- {'id': "111_2", 'name': "鏂规寮�鍙戞湇鍔�", desp: "鎻忚堪鐪嬪埌闈欏畨瀵�", 'state': "杩涜涓�"},
- {'id': "111_2", 'name': "鏂规寮�鍙戞湇鍔�", desp: "鎻忚堪鐪嬪埌闈欏畨瀵�", 'state': "杩涜涓�"},
- {'id': "111_2", 'name': "鏂规寮�鍙戞湇鍔�", desp: "鎻忚堪鐪嬪埌闈欏畨瀵�", 'state': "杩涜涓�"},
- {'id': "111_2", 'name': "鏂规寮�鍙戞湇鍔�", desp: "鎻忚堪鐪嬪埌闈欏畨瀵�", 'state': "杩涜涓�"},
-
+
],
myChart: undefined,
userList: [],
@@ -231,8 +222,9 @@
}
return el;
});
+
me.fileList = result.paths;
- me.scheme = result.scheme;
+ me.task_itm = result.scheme;
me.deals = result.record;
}
}).catch(error => {
--
Gitblit v1.8.0