Browse Source

评论的判断

zhulizhen 5 years ago
parent
commit
2e78bc9da8
2 changed files with 41 additions and 12 deletions
  1. 41 11
      src/views/evaluate/evCard.vue
  2. 0 1
      src/views/strategy/animationBox.vue

+ 41 - 11
src/views/evaluate/evCard.vue

@@ -18,19 +18,20 @@
       </div>
       <div class="card-div4">备注:{{item.h||'--'}}</div>
       <div class="card-div5">
-        <span class="card-div7" v-if="item.recommend.isExecuted==true">
+        <span class="card-div7" v-if="item.recommend.isExecuted">
           <img src="../../assets/completed.png" alt />
           已按策略执行
         </span>
-        <span class="card-div6" v-else>
-          <img src="../../assets/error.png" alt />
-          未按策略执行
+        <span v-else v-for="(item1,index) in titles" :key='"l"+index'>
+          <span class="card-div6" v-if='item1.id==item.recommend.AppealId && item1.status==301'>
+            <img src="../../assets/error.png" alt />
+            未按策略执行
+          </span>
+          <span class="card-div8" v-if='item1.id==item.recommend.AppealId && item1.status==302'>
+            <img src="../../assets/processing.png" alt />
+            申诉中
+          </span>
         </span>
-        <!-- <span class="card-div8">
-          <img src="../../assets/processing.png" alt />
-          申诉中
-        </span>-->
-
         <span class="MicrYaHei" @click="viewSnapshots = true">查看快照</span>
       </div>
     </div>
@@ -48,10 +49,15 @@
 </template>
 <script>
 import EvSnapshotsDialog from "./evSnapshotsDialog";
+import {
+  queryWorkflow
+} from "@/api/appeal/appeal.js";
 export default {
   data() {
     return {
-      viewSnapshots: false
+      viewSnapshots: false,
+      ids:[],
+      titles:[]
     };
   },
   props: ["cardList"],
@@ -63,7 +69,29 @@ export default {
       if (str) {
         return str.substring(0, 2) + ":" + str.substring(2, 4);
       }
-    }
+    },
+    queryFlow(){
+      let postParams = {
+        crireria:{
+          id:this.ids
+        }
+      }
+      queryWorkflow({postParams}).then(res=>{
+        this.titles = res.content
+      })
+    },
+    getAppealId(){
+      this.cardList.forEach(el=>{
+        console.log(el)
+        if(el.recommend.isExecuted){
+          this.ids.push(el.recommend.getAppealId)
+        }
+      })
+      this.queryFlow()
+    },
+  },
+  mounted(){
+    this.getAppealId()
   }
 };
 </script>
@@ -163,6 +191,7 @@ export default {
           width: 14px;
           height: 14px;
           margin-right: 4px;
+          vertical-align: middle;
         }
         padding: 0 12px;
         display: flex;
@@ -193,6 +222,7 @@ export default {
       background: rgba(217, 245, 214, 1);
     }
     .card-div8 {
+      border-radius:12px;
       color: rgba(0, 145, 255, 1);
       background: rgba(225, 242, 255, 1);
     }

+ 0 - 1
src/views/strategy/animationBox.vue

@@ -83,7 +83,6 @@ export default {
         this.dataY1.push(el.tout);
         this.dataY2.push(el.meanTindoor);
         this.dataY3.push(el.maxTindoor);
-        console.log(this.dataY3)
         this.loadY1.push(el.nowPlantLoad?(el.nowPlantLoad=='-9999'?0:el.nowPlantLoad):0);
         this.loadY2.push(el.predictedLoadUpLimit?el.predictedLoadUpLimit:0);
         this.loadY3.push(el.redictedLoadDownLimit?el.redictedLoadDownLimit:0);