From ecd4be909222faa66fa174e3ea6f0855edf1fe23 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期二, 17 三月 2020 09:27:46 +0800
Subject: [PATCH] 提交
---
src/views/Overview.vue | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/src/views/Overview.vue b/src/views/Overview.vue
index 505dcdd..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>
@@ -23,7 +23,9 @@
</div>
<div class="z_shadow" style="float: left; margin: 10px; width: 46%; height: 43%; border: 1px solid #e4eef9;">
<el-row :gutter="20">
- <el-col :span="6" v-for="(user, index) in userList" :key="index">111</el-col>
+ <el-col :span="6" v-for="(oneUser, index) in userList" :key="index"><div class="grid-content bg-purple">
+ <i class="el-icon-user-solid"></i>
+ <span>{{oneUser.name}}</span></div></el-col>
</el-row>
</div>
<div class="z_shadow" style="float: left; margin: 10px; padding: 10px; box-sizing: border-box; width: 46%; height: 43%; border: 1px solid #e4eef9;">
@@ -44,11 +46,16 @@
</div>
</div>
</div>
- <div class="z_shadow" style="float: right; margin-right: 1%; width: 28%; height: 70vh; border: 1px solid #e4eef9;"></div>
-
-
-
-
+ <div class="z_shadow" style="float: right; margin-right: 1%; padding: 10px; box-sizing: border-box; width: 28%; height: 70vh; border: 1px solid #e4eef9; overflow: auto;">
+ <h3 style="margin: 0px;">椤圭洰姒傝</h3>
+ <div v-for="(type_itm, k_) in task_itm" :key="k_">
+ <h3>{{k_+1}}銆亄{type_itm.name}} <span style="font-size: 12px; color: #409EFF;">{{type_itm.state}} </span></h3>
+ <div>
+ <span>{{type_itm.desp}}</span>
+ </div>
+ </div>
+ </div>
+
</div>
</template>
@@ -63,6 +70,10 @@
dialog_1: false,
fileLevel: 0,
fileList: [],
+
+ task_itm: [
+
+ ],
myChart: undefined,
userList: [],
grandPa:"",
@@ -192,15 +203,28 @@
result.record = result.record.map(el => {
var imoment = this.$moment(el.createTime);
// 鏍煎紡鍖栨垚锛屽勾鏈堟棩
- let iformat = imoment.format('YYYY-MM-DD');
+ let iformat = imoment.format('YYYY-MM-DD HH:mm:ss');
el.createTime = iformat;
if(!el.desp) {
el.desp = "鏆傛棤鎻忚堪";
}
return el;
});
+ result.scheme = result.scheme.map(el => {
+ if(el.finish) {
+ el.state="宸茬粨鏉�";
+ }else if(el.delay) {
+ el.state="宸插欢鏈�";
+ }else if(el.edit) {
+ el.state="寰呭惎鍔�";
+ }else {
+ el.state="杩涜涓�";
+ }
+ 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