Guoxiaohuan 5 gadi atpakaļ
vecāks
revīzija
6604f4d6a5

+ 13 - 1
src/api/appeal/appeal.js

@@ -3,4 +3,16 @@ export function deleteFile({
     postParams
 }) {
     return httputils.postJson(`/image-service/common/files_delete?systemId=saas&secret=46f869eea8b31d14`, postParams)
-}
+}
+// 可申诉的未执行策略
+export function queryAppeals({ postParams }) {
+    return httputils.postJson(`/duoduo-service/transfer/chiller/command/query?projectId=Pj4419000005`, postParams)
+}
+// 审核完成、超时未申诉
+export function queryAuditCompleted({ postParams }) {
+    return httputils.postJson(`/duoduo-service/transfer/chiller/command/query?projectId=Pj4419000005`, postParams)
+}
+// 申诉中
+export function queryInAudit({ postParams }) {
+    return httputils.postJson(`/duoduo-service/workflow/work/query?projectId=Pj4419000005`, postParams)
+}

+ 7 - 6
src/views/appeal/appealDetail.vue

@@ -48,19 +48,20 @@ export default {
       headText: "申诉审核",
       options: [
         {
-          value: "选项1",
+          value: "0",
           label: "策略原因"
         },
         {
-          value: "选项2",
-          label: "策略原因"
+          value: "1",
+          label: "设备原因"
         },
         {
-          value: "选项3",
-          label: "策略原因"
+          value: "2",
+          label: "其他"
         }
       ],
-      value: ""
+      value: "",
+      souseArr: []
     };
   },
   components: {

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

@@ -75,10 +75,19 @@
 </template>
 <script>
 import Head from "../main/index";
+import {
+  queryAppeals,
+  queryAuditCompleted,
+  queryInAudit
+} from "@/api/appeal/appeal.js";
+
 export default {
   data() {
     return {
       headText: "申诉",
+      appealsArr: [],
+      InAuditArr: [],
+      auditCompletedArr: [],
       data: [
         {
           date: "20202.01.13",
@@ -186,9 +195,68 @@ export default {
   components: {
     Head
   },
+  mounted() {
+    this.init();
+  },
   methods: {
     menu() {
       this.$router.push("/appeal/appealDetail");
+    },
+    init() {
+      this.appealsIng();
+      this.auditCompletedIng();
+      this.InAuditIng();
+    },
+    appealsIng() {
+      let params = {
+        postParams: {
+          criteria: {
+            projectId: "Pj4419000005",
+            date: {
+              $gte: "20200216"
+            },
+            isExecuted: false,
+            appealStatus: [1, 5]
+          }
+        }
+      };
+
+      queryAppeals(params).then(res => {
+        this.appealsArr = res.content ? res.content : [];
+      });
+    },
+    auditCompletedIng() {
+      this.appealsArr = [];
+      let params = {
+        postParams: {
+          criteria: {
+            projectId: "Pj4419000005",
+            date: {
+              $gte: "20200216"
+            },
+            isExecuted: false,
+            appealStatus: [3, 4, 6]
+          }
+        }
+      };
+      queryAuditCompleted(params).then(res => {
+        this.auditCompletedArr = res.content ? res.content : [];
+      });
+    },
+    InAuditIng() {
+      let params = {
+        postParams: {
+          criteria: {
+            projectId: "Pj1101080002",
+            trackerId: 3,
+            status: 301
+          },
+          withColumns: ["customAttribute"]
+        }
+      };
+      queryInAudit(params).then(res => {
+        this.InAuditArr = res.content ? res.content : [];
+      });
     }
   }
 };

+ 10 - 2
src/views/audit/index.vue

@@ -99,11 +99,19 @@ export default {
       resonValue: "1",
       options: [
         {
+          value: "0",
+          label: "策略原因"
+        },
+        {
           value: "1",
-          label: "按未执行策略的时间"
+          label: "设备原因"
+        },
+        {
+          value: "2",
+          label: "其他"
         }
       ],
-      value: "1",
+      value: "0",
       data: [
         {
           date: "2020.01.12 昨天",