Browse Source

申诉详情

zhulizhen 5 years ago
parent
commit
60abadbf5f

+ 2 - 1
src/components/todayStrategy.vue

@@ -111,9 +111,10 @@ export default {
         })
     },
       dumpAduit(row){
+        console.log(row)
         this.$router.push({
         path: "/appeal/appealDetail",
-        query: { item: JSON.stringify(row) }
+        query: { id:row.id }
       });
       }
     }

+ 35 - 23
src/views/appeal/appealDetail.vue

@@ -5,7 +5,7 @@
       <el-button type="info" plain size="mini" @click="back">返回</el-button>
       <el-button type="primary" @click="submission" size="mini">提交</el-button>
     </div>
-    <div class="detailContainer">
+    <div class="detailContainer" v-if="Object.keys(detailObj).length>0">
       <div class="title Micbold">未执行申诉单</div>
       <div class="nav MicrYaHei">
         <span>项目名称:{{localName}}</span>
@@ -58,8 +58,6 @@ import {
   queryChillerExecuteInfo
 } from "@/api/appeal/appeal.js";
 import { updateWorkflow } from "@/api/audit/audit.js";
-// import {  } from "@/api/appeal/appeal.js";
-
 export default {
   data() {
     return {
@@ -87,7 +85,8 @@ export default {
       tableList: [],
       dateNow: "",
       applyUser: "",
-      localName: ""
+      localName: "",
+      id:""
     };
   },
   components: {
@@ -96,6 +95,33 @@ export default {
     UploadImg
   },
   methods: {
+    queryExecute(id) {
+      let params = {
+        postParams: {
+          criteria: {
+            id: id
+          }
+        }
+      };
+      queryChillerExecuteInfo(params).then(res => {
+        console.log(res)
+         this.detailObj = res.data[0]
+         this.dateNow = moment()
+          .locale("zh-cn")
+          .format("YYYY.MM.DD");
+        if (Object.keys(this.detailObj).length > 0) {
+          console.log(this.detailObj);
+          this.quertName(this.detailObj.applyUser);
+          let projects = this.$store.state.projects.projects;
+          projects.forEach(el => {
+            if (this.detailObj.projectId == el.id) {
+              this.localName = el.localName;
+            }
+          });
+        }
+        // console.log(this.appealsArr);
+      });
+    },
     formatterStr(str) {
       if (str) {
         return (
@@ -129,11 +155,7 @@ export default {
         }
       };
       queryChillerExecuteInfo(params).then(res => {
-        const list = res.data || [{}, {}, {}];
-        this.tableList = Object.values(list[0]).map(i => i || {});
-        this.tableList[0].title = "当前运行状态";
-        this.tableList[1].title = "推送策略";
-        this.tableList[2].title = "执行策略";
+        console.log(res)
       });
     },
     submission() {
@@ -163,20 +185,10 @@ export default {
     }
   },
   mounted() {
-    this.detailObj = JSON.parse(this.$route.query.item);
-    this.dateNow = moment()
-      .locale("zh-cn")
-      .format("YYYY.MM.DD");
-    if (Object.keys(this.detailObj).length > 0) {
-      console.log(this.detailObj);
-      this.quertName(this.detailObj.applyUser);
-      let projects = this.$store.state.projects.projects;
-      projects.forEach(el => {
-        if (this.detailObj.projectId == el.id) {
-          this.localName = el.localName;
-        }
-      });
-    }
+    this.id = this.$route.query.id
+    console.log(this.id)
+    this.queryExecute(this.id)
+   
   }
 };
 </script>

+ 2 - 1
src/views/appeal/index.vue

@@ -194,9 +194,10 @@ export default {
       }
     },
     menu(item) {
+      console.log(item)
       this.$router.push({
         path: "/appeal/appealDetail",
-        query: { item: JSON.stringify(item) }
+        query: {id:item.id }
       });
     },
     init() {

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

@@ -238,7 +238,7 @@ export default {
 .an-content {
   .snapshotss-center2 {
     padding: 20px 0;
-    margin-bottom: 44px;
+    margin-bottom: 20px;
     display: flex;
     align-items: center;
     overflow: hidden;

+ 4 - 2
src/views/strategy/bomBox.vue

@@ -12,7 +12,7 @@
       <div id="circleEcharts" style="width:104px;height:104px"></div>
     </div>
     <div class="bomb-right">
-      <water-unit :data="data"></water-unit>
+      <water-unit :data="data" :type=2></water-unit>
       <div class="snapshotss-center2">
         <div class="snapshotss-cont2-box1 MicrYaHei">
           <span>数据传输情况</span>
@@ -135,6 +135,7 @@ export default {
   display: flex;
   align-items: center;
   padding: 20px 0;
+  border-left:8px solid #34C724;
   .close {
     cursor: pointer;
     margin-left: 10px;
@@ -159,9 +160,10 @@ export default {
   }
   .bomb-right {
     flex: 1;
+    margin-right:20px;
     .snapshotss-center2 {
       padding: 20px 0;
-      margin-bottom: 44px;
+      margin-bottom: 20px;
       display: flex;
       align-items: center;
       justify-content: space-between;

+ 1 - 1
src/views/strategy/index.vue

@@ -30,7 +30,7 @@
       </div>
       <div class="starte-right">
         <p class="strate-right-title">当前状态</p>
-        <water-unit :data="chillerOrg "></water-unit>
+        <water-unit :data="chillerOrg " :type=1></water-unit>
         <animation-box
           v-if="chillerHourList.length>0"
           :data="chillerCommand"

+ 19 - 10
src/views/strategy/waterUnit.vue

@@ -1,7 +1,7 @@
 <template>
        <div class="water-unit">
-          <div class="strate-right-box-1">
-            <div class="starte-right-box-1-title">冷水机组</div>
+          <div class="strate-right-box-1"  :class='type==2?"content1":""'>
+            <div class="starte-right-box-1-title" :class='type==2?"title1":""'>冷水机组</div>
             <div class="starte-right-box-1-content1">
               <p>{{data.chillerNumSetL || 0}}</p>
               <p>{{data.chillerNumSetS || 0}}</p>
@@ -13,9 +13,9 @@
               <p>温度</p>
             </div>
           </div>
-           <div class="strate-right-box-1">
-            <div class="starte-right-box-1-title">冷冻水泵</div>
-            <div class="starte-right-box-1-content1">
+           <div class="strate-right-box-1"  :class='type==2?"content1":""'>
+            <div class="starte-right-box-1-title" :class='type==2?"title1":""'>冷冻水泵</div>
+            <div class="starte-right-box-1-content1" >
               <p>{{data.coolPumpNumSetL || 0}}</p>
               <p>{{data.coolPumpNumSetS || 0}}</p>
               <p>{{data.coolPumpFreqSet || 0}} HZ</p>
@@ -26,8 +26,8 @@
               <p>设定频率</p>
             </div>
           </div>
-           <div class="strate-right-box-1">
-            <div class="starte-right-box-1-title">冷却水泵</div>
+           <div class="strate-right-box-1"  :class='type==2?"content1":""'>
+            <div class="starte-right-box-1-title" :class='type==2?"title1":""'>冷却水泵</div>
             <div class="starte-right-box-1-content1">
               <p>{{data.chillPumpNumSetL || 0}}</p>
               <p>{{data.chillPumpNumSetS || 0}}</p>
@@ -39,8 +39,8 @@
               <p>设定频率</p>
             </div>
           </div>
-           <div class="strate-right-box-1">
-            <div class="starte-right-box-1-title">冷却塔</div>
+           <div class="strate-right-box-1"  :class='type==2?"content1":""'>
+            <div class="starte-right-box-1-title" :class='type==2?"title1":""'>冷却塔</div>
             <div class="starte-right-box-1-content1">
               <p>{{data.coolTowerNumSetL || 0}}</p>
               <p>{{data.coolTowerNumSetS || 0}}</p>
@@ -61,7 +61,7 @@ export default {
 data(){
   return{}
 },
-props:['data']
+props:['data','type']
 }
 </script>
 
@@ -69,6 +69,10 @@ props:['data']
 .water-unit{
       display: flex;
       justify-content: space-between;
+       .content1{
+          background:rgba(0,145,255,1);
+          color:#fff;
+        }
       .strate-right-box-1{
         flex:1;
         border-radius:6px;
@@ -85,6 +89,11 @@ props:['data']
           background:rgba(248,249,250,1);
           color: #1F2429;
         }
+        .title1{
+          color:#fff;
+          background:rgba(0,124,219,1);
+        }
+        
         p{
           padding: 0;
           margin:0;