소스 검색

Merge branch 'master' of http://39.106.8.246:3003/sagacloud/sagacloud-cwc-pages

zhulizhen 5 년 전
부모
커밋
b1f4bd93ff

+ 4 - 0
src/api/audit/audit.js

@@ -0,0 +1,4 @@
+import httputils from '@/api/httputils'
+export function updateWorkflow({ postParams }) {
+    return httputils.postJson(`/duoduo-service/workflow/work/update`, postParams)
+}

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

@@ -252,7 +252,6 @@ export default {
       };
 
       queryWorkflow(params).then(res => {
-        console.log(res);
         let appealsArr = [],
           arr = [];
         appealsArr = res.content ? res.content : [];
@@ -260,7 +259,6 @@ export default {
           appealsArr.forEach(item => {
             arr.push(item.commandId);
           });
-          console.log(arr);
           this.queryExecute(arr);
         }
       });

+ 144 - 94
src/views/audit/index.vue

@@ -14,21 +14,26 @@
             ></el-option>
           </el-select>
         </div>
-        <div class="appeal-left-box" v-for="(item,index) in data" :key="index">
-          <p class="date MicrYaHei">{{item.date}}</p>
+        <div class="appeal-left-box">
+          <p class="date MicrYaHei">{{'--'}}</p>
           <div class="appeal-card">
-            <div class="appeal-left-div" v-for="(eve,index) in item.value" :key="index">
+            <div
+              class="appeal-left-div"
+              v-for="(item,index) in auditArr"
+              :key="index"
+              @click="appealClick(item)"
+            >
               <div class="time">
-                <span>{{eve.time}}{{eve.title}}</span>
+                <span>{{item.pushTime?formatter(item.pushTime):'--'}} {{item.title||'--'}}</span>
                 <span>
                   <img src="../../assets/tp.png" alt />
-                  {{eve.files}}
+                  {{item.pics.length}}
                 </span>
               </div>
               <div class="content">
-                <span>申请人:{{eve.name}}</span>
-                <span>申请时间:{{eve.appealTime}}</span>
-                <span>申请原因:{{eve.reson}}</span>
+                <span>申请人:{{'--'}}</span>
+                <span>申请时间:{{item.updateTime||'--'}}</span>
+                <span>申请原因:{{item.reasonType||'--'}}</span>
               </div>
             </div>
           </div>
@@ -38,22 +43,22 @@
         <div class="detailContainer">
           <div class="title Micbold">未执行申诉单</div>
           <div class="nav MicrYaHei">
-            <span>项目名称:大连万达广场</span>
-            <span>申请人:张三</span>
-            <span>申请时间:2020.01.13</span>
+            <span>项目名称:{{'--'}}</span>
+            <span>申请人:{{auditObj.applyUser||'--'}}</span>
+            <span>申请时间:{{'--'}}</span>
           </div>
-          <div class="cont1 MicrYaHei">申诉未执行指令:2020.01.13 14:30 推送策略未执行</div>
+          <div class="cont1 MicrYaHei">申诉未执行指令:{{auditObj.title||'--'}}</div>
           <div class="cont2">
             <audit-table></audit-table>
           </div>
           <div class="cont3">
             <span class="Micbold">策略评价</span>
-            <span class="MicrYaHei">执行策略的评价,判断项目执行策略的好坏,执行策略的评价,判断项目执行策略的好最多50个字</span>
+            <span class="MicrYaHei">{{auditObj.judgement||'--'}}</span>
           </div>
           <div class="cont4">
             <span class="Micbold">申请原因</span>
             <span>
-              <el-select size="mini" v-model="value" placeholder="请选择">
+              <el-select size="mini" v-model="auditObj.reasonType" placeholder="请选择">
                 <el-option
                   v-for="item in options"
                   :key="item.value"
@@ -63,11 +68,11 @@
               </el-select>
             </span>
             <span>
-              <textarea placeholder="填写申请原因"></textarea>
+              <textarea placeholder="填写申请原因" v-model="auditObj.reason"></textarea>
             </span>
           </div>
           <div class="foot">
-            <upload-img></upload-img>
+            <upload-img :souseArr="auditObj.pics"></upload-img>
           </div>
         </div>
         <div class="opinion">
@@ -86,6 +91,10 @@
 import Head from "../main/index";
 import AuditTable from "./auditTable";
 import uploadImg from "../../components/uploadImg";
+import { queryWorkflow, queryChillerExecuteInfo } from "@/api/appeal/appeal.js";
+var moment = require("moment");
+import "moment/locale/zh-cn";
+
 export default {
   data() {
     return {
@@ -111,80 +120,82 @@ export default {
           label: "其他"
         }
       ],
+      auditArr: [],
+      auditObj: {},
       value: "0",
-      data: [
-        {
-          date: "2020.01.12 昨天",
-          value: [
-            {
-              time: "2020.01.12 08:30",
-              title: "策略未执行申诉",
-              name: "张三",
-              appealTime: "2020.01.12 12:45",
-              reson: "策略原因",
-              files: 5
-            },
-            {
-              time: "2020.01.12 08:30",
-              title: "策略未执行申诉",
-              name: "张三",
-              appealTime: "2020.01.12 12:45",
-              reson: "策略原因",
-              files: 5
-            },
-            {
-              time: "2020.01.12 08:30",
-              title: "策略未执行申诉",
-              name: "张三",
-              appealTime: "2020.01.12 12:45",
-              reson: "策略原因",
-              files: 5
-            },
-            {
-              time: "2020.01.12 08:30",
-              title: "策略未执行申诉",
-              name: "张三",
-              appealTime: "2020.01.12 12:45",
-              reson: "策略原因",
-              files: 5
-            }
-          ]
-        },
-        {
-          date: "2020.01.12 昨天",
-          value: [
-            {
-              time: "2020.01.12 08:30",
-              title: "策略未执行申诉",
-              name: "张三",
-              appealTime: "2020.01.12 12:45",
-              reson: "策略原因",
-              files: 5
-            },
-            {
-              time: "2020.01.12 08:30",
-              title: "策略未执行申诉",
-              name: "张三",
-              appealTime: "2020.01.12 12:45",
-              reson: "策略原因",
-              files: 5
-            }
-          ]
-        },
-        {
-          date: "2020.01.12 昨天",
-          value: [
-            {
-              time: "2020.01.12 08:30",
-              title: "策略未执行申诉",
-              name: "张三",
-              appealTime: "2020.01.12 12:45",
-              reson: "策略原因",
-              files: 5
-            }
-          ]
-        }
-      ],
+      // data: [
+      //   {
+      //     date: "2020.01.12 昨天",
+      //     value: [
+      //       {
+      //         time: "2020.01.12 08:30",
+      //         title: "策略未执行申诉",
+      //         name: "张三",
+      //         appealTime: "2020.01.12 12:45",
+      //         reson: "策略原因",
+      //         files: 5
+      //       },
+      //       {
+      //         time: "2020.01.12 08:30",
+      //         title: "策略未执行申诉",
+      //         name: "张三",
+      //         appealTime: "2020.01.12 12:45",
+      //         reson: "策略原因",
+      //         files: 5
+      //       },
+      //       {
+      //         time: "2020.01.12 08:30",
+      //         title: "策略未执行申诉",
+      //         name: "张三",
+      //         appealTime: "2020.01.12 12:45",
+      //         reson: "策略原因",
+      //         files: 5
+      //       },
+      //       {
+      //         time: "2020.01.12 08:30",
+      //         title: "策略未执行申诉",
+      //         name: "张三",
+      //         appealTime: "2020.01.12 12:45",
+      //         reson: "策略原因",
+      //         files: 5
+      //       }
+      //     ]
+      //   },
+      //   {
+      //     date: "2020.01.12 昨天",
+      //     value: [
+      //       {
+      //         time: "2020.01.12 08:30",
+      //         title: "策略未执行申诉",
+      //         name: "张三",
+      //         appealTime: "2020.01.12 12:45",
+      //         reson: "策略原因",
+      //         files: 5
+      //       },
+      //       {
+      //         time: "2020.01.12 08:30",
+      //         title: "策略未执行申诉",
+      //         name: "张三",
+      //         appealTime: "2020.01.12 12:45",
+      //         reson: "策略原因",
+      //         files: 5
+      //       }
+      //     ]
+      //   },
+      //   {
+      //     date: "2020.01.12 昨天",
+      //     value: [
+      //       {
+      //         time: "2020.01.12 08:30",
+      //         title: "策略未执行申诉",
+      //         name: "张三",
+      //         appealTime: "2020.01.12 12:45",
+      //         reson: "策略原因",
+      //         files: 5
+      //       }
+      //     ]
+      //   }
+      // ],
       souseArr: []
     };
   },
@@ -192,6 +203,45 @@ export default {
     Head,
     AuditTable,
     uploadImg
+  },
+  mounted() {
+    this.query();
+  },
+  methods: {
+    formatter(date) {
+      return moment.unix(date / 1000).format("YYYY.MM.DD hh:mm");
+    },
+    appealClick(item) {
+      this.auditObj = item;
+      console.log(item);
+      let params = {
+        postParams: {
+          criteria: {
+            id: item.commandId
+          }
+        }
+      };
+      queryChillerExecuteInfo(params).then(res => {
+        console.log(res);
+      });
+    },
+    query() {
+      let params = {
+        postParams: {
+          criteria: {
+            projectId: "Pj1101080002",
+            trackerId: 3,
+            status: 302
+          },
+          withColumns: ["customAttribute"]
+        }
+      };
+      queryWorkflow(params).then(res => {
+        this.auditArr = res.content;
+
+        console.log("审核中", this.auditArr);
+      });
+    }
   }
 };
 </script>
@@ -202,8 +252,8 @@ export default {
   border-top: 1px solid #e4e5e7;
   margin-top: 5px;
   .appeal-left {
-    max-width: 360px;
-    min-width: 330px;
+    max-width: 460px;
+    min-width: 350px;
     padding: 16px 24px;
     overflow: auto;
     height: 670px;
@@ -367,9 +417,9 @@ export default {
         }
       }
       .foot {
-        width: 112px;
-        height: 112px;
-        background: rgba(248, 249, 250, 1);
+        // width: 112px;
+        // height: 112px;
+        // background: rgba(248, 249, 250, 1);
       }
     }
     .opinion {

+ 2 - 1
src/views/evaluate/evEnergySavingRate.vue

@@ -9,8 +9,9 @@ export default {
     return {};
   },
   mounted() {
-    this.pie(85.7, "#box3", ["#00D6B9", "#D5F6F2"]);
+    this.pie(this.energySavingRate, "#box3", ["#00D6B9", "#D5F6F2"]);
   },
+  props: ["energySavingRate"],
   methods: {
     pie(pieData, box, colors) {
       const that = this;

+ 2 - 1
src/views/evaluate/evImplementationRate.vue

@@ -8,8 +8,9 @@ export default {
   data() {
     return {};
   },
+  props: ["chillerExecuteRate"],
   mounted() {
-    this.pie(28.5, "#box2", ["#FFBA6B", "#FEE9D2"]);
+    this.pie(this.chillerExecuteRate, "#box2", ["#FFBA6B", "#FEE9D2"]);
   },
   methods: {
     pie(pieData, box, colors) {

+ 2 - 1
src/views/evaluate/evSatisfactionRate.vue

@@ -8,8 +8,9 @@ export default {
   data() {
     return {};
   },
+  props: ["tindoorFillRate"],
   mounted() {
-    this.pie(85.3, "#box1", ["#0091FF", "#E1F2FF"]);
+    this.pie(this.tindoorFillRate, "#box1", ["#0091FF", "#E1F2FF"]);
   },
   methods: {
     pie(pieData, box, colors) {

+ 36 - 10
src/views/evaluate/index.vue

@@ -27,17 +27,17 @@
           <p class="ev-top Micbold">室内温度满足率</p>
           <div class="ev-bottom">
             <div class="ev-bottom-left">
-              <ev-satisfaction-rate></ev-satisfaction-rate>
+              <ev-satisfaction-rate :tindoorFillRate="tindoorFillRate"></ev-satisfaction-rate>
             </div>
             <div class="ev-bottom-right MicrYaHei">
               <p>
                 <span>超限时长</span>
-                <span>0.3</span>
+                <span>{{'--'}}</span>
                 <span>h/日</span>
               </p>
               <p>
                 <span>超限程度</span>
-                <span>12</span>
+                <span>{{tindoorOverrunDegree}}</span>
                 <span>°C</span>
               </p>
             </div>
@@ -47,12 +47,12 @@
           <p class="ev-top">节能率</p>
           <div class="ev-bottom">
             <div class="ev-bottom-left">
-              <ev-energy-saving-rate></ev-energy-saving-rate>
+              <ev-energy-saving-rate :energySavingRate="energySavingRate"></ev-energy-saving-rate>
             </div>
             <div class="ev-bottom-right">
               <p>
                 <span>节能量</span>
-                <span>3869</span>
+                <span>{{energySaving}}</span>
                 <span>kW</span>
               </p>
             </div>
@@ -62,17 +62,17 @@
           <p class="ev-top">策略执行率</p>
           <div class="ev-bottom">
             <div class="ev-bottom-left">
-              <ev-implementation-rate></ev-implementation-rate>
+              <ev-implementation-rate :chillerExecuteRate="chillerExecuteRate"></ev-implementation-rate>
             </div>
             <div class="ev-bottom-right">
               <p>
                 <span>执行数量</span>
-                <span>90</span>
+                <span>{{isExecutedNum}}</span>
                 <span>条</span>
               </p>
               <p>
                 <span>已发策略</span>
-                <span>108</span>
+                <span>{{allReceivedNum}}</span>
                 <span>条</span>
               </p>
             </div>
@@ -91,6 +91,8 @@ import EvEnergySavingRate from "./evEnergySavingRate";
 import EvImplementationRate from "./evImplementationRate";
 import EvSatisfactionRate from "./evSatisfactionRate";
 import EvIndoorTemperature from "./evIndoorTemperature";
+import { runDataQury } from "@/api/evaluate/evaluate.js";
+
 var moment = require("moment");
 import "moment/locale/zh-cn";
 
@@ -100,7 +102,14 @@ export default {
       headText: "运行评价",
       date: "2",
       pickerVal2: "",
-      radio: "1"
+      radio: "1",
+      tindoorFillRate: "", //室内温度满足率
+      energySavingRate: "", //节能率
+      chillerExecuteRate: "", //略执行率
+      energySaving: "", //节能量
+      isExecutedNum: "", //已执行数量
+      allReceivedNum: "", //共收到数量
+      tindoorOverrunDegree: "" //超限程度
     };
   },
   components: {
@@ -110,10 +119,27 @@ export default {
     EvSatisfactionRate,
     EvIndoorTemperature
   },
+  mounted() {
+    this.query();
+  },
   methods: {
     formatter(date) {
       return moment.unix(date / 1000).format("YYYYMMDD");
     },
+    query() {
+      this.runDataQuryArr = [];
+      runDataQury({}).then(res => {
+        if (res.result == "success") {
+          this.tindoorFillRate = res.tindoorFillRate; //室内温度满足率
+          this.energySavingRate = res.energySavingRate; //节能率
+          this.chillerExecuteRate = res.chillerExecuteRate; //略执行率
+          this.energySaving = res.energySaving; //节能量
+          this.isExecutedNum = res.isExecutedNum; //已执行数量
+          this.allReceivedNum = res.allReceivedNum; //共收到数量
+          this.tindoorOverrunDegree = res.tindoorOverrunDegree; //超限程度
+        }
+      });
+    },
     daterangeLeft() {
       if (this.pickerVal2.length > 0) {
         let dateTime = new Date(this.pickerVal2[0]);
@@ -203,7 +229,7 @@ export default {
       border-radius: 6px;
       border: 1px solid rgba(238, 238, 238, 1);
       margin-right: 12px;
-      flex:1;
+      flex: 1;
       .ev-top {
         margin: 0;
         height: 24px;