From b848a5cbbcc80c994aaf6156c365ce725867ad57 Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期四, 13 十月 2022 17:57:58 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/components/solveProblem/index.vue | 37 +++++++++++++++----------------------
1 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/src/components/solveProblem/index.vue b/src/components/solveProblem/index.vue
index 3480c30..f9f9be8 100644
--- a/src/components/solveProblem/index.vue
+++ b/src/components/solveProblem/index.vue
@@ -1,32 +1,18 @@
<template>
<div class="sovle-problem">
<div class="sovle-header">
- <div class="sovle-limit">澶勭悊鏃堕檺:1宸ヤ綔鏃�</div>
+ <div class="sovle-limit">澶勭悊鏃堕檺:{{}}</div>
<div class="sovle-limit">鍓╀綑鏃堕棿:23灏忔椂</div>
</div>
<div class="sovle-timeline">
<el-timeline>
- <el-timeline-item :color="mycolor">
+ <el-timeline-item :color="mycolor" v-for="item in list" :key="item.id">
<div class="title">
- <div class="title-left">銆愭淳閬ｃ�戞淳閬ｅ憳:xxx</div>
- <div class="title-right">22.09.06 16:40</div>
+ <div class="title-left">銆恵{item.name}}銆憑{item.name === '娲鹃仯' ? '娲鹃仯鍛�':item.name === '澶勭悊' ? '澶勭悊浜�':'璇勫畾浜�'}}:{{item.disposeRecords.length !==0 ? item.disposeRecords[0].handleId : ''}}</div>
+ <div class="title-right">{{item.disposeRecords.length !==0 ? item.disposeRecords[0].endTime:''}}</div>
</div>
- <div class="message">銆愭淳閬ｆ剰瑙併�戣鐩稿叧鎵ф硶闃熷憳鍙婃椂鍓嶅線鐜板満杩涜澶勭疆</div>
- </el-timeline-item>
- <el-timeline-item :color="mycolor">
- <div class="title">
- <div class="title-left">銆愬鐞嗐�戝鐞嗕汉:xxx</div>
- <div class="title-right">22.09.06 16:40</div>
- </div>
- <div class="message">銆愬鐞嗙粨鏋溿�戣鐩稿叧鎵ф硶闃熷憳鍙婃椂鍓嶅線鐜板満杩涜澶勭疆</div>
- </el-timeline-item>
- <el-timeline-item :color="mycolor">
- <div class="title">
- <div class="title-left">銆愯瘎瀹氥�戣瘎瀹氫汉:xxx</div>
- <div class="title-right">22.09.06 16:40</div>
- </div>
- <div class="message">銆愯瘎瀹氱粨鏋溿�戣鐩稿叧鎵ф硶闃熷憳鍙婃椂鍓嶅線鐜板満杩涜澶勭疆</div>
- </el-timeline-item>
+ <div class="message">銆恵{item.name === '娲鹃仯' ? '娲鹃仯鎰忚':item.name === '澶勭悊' ? '澶勭悊缁撴灉':'璇勫畾缁撴灉'}}銆戣鐩稿叧鎵ф硶闃熷憳鍙婃椂鍓嶅線鐜板満杩涜澶勭疆</div>
+ </el-timeline-item>
</el-timeline>
</div>
</div>
@@ -35,9 +21,16 @@
export default{
data(){
return{
- mycolor:'#02a7f0'
+ mycolor:'#02a7f0',
+ list:[]
}
- }
+ },
+ props:['problemProVo'],
+ created(){
+ const {problemProVo:{workflowConfigSteps:mylist}} = this;
+ console.log(mylist);
+ this.list = mylist;
+ }
}
</script>
<style lang="scss" scoped>
--
Gitblit v1.8.0