Guoxiaohuan пре 5 година
родитељ
комит
744adca69d
5 измењених фајлова са 124 додато и 78 уклоњено
  1. 11 30
      package-lock.json
  2. 24 2
      src/views/appeal/appealDetail.vue
  3. 71 39
      src/views/appeal/index.vue
  4. 2 4
      src/views/audit/index.vue
  5. 16 3
      src/views/main/index.vue

+ 11 - 30
package-lock.json

@@ -4500,8 +4500,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4522,14 +4521,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4544,20 +4541,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4674,8 +4668,7 @@
         "inherits": {
           "version": "2.0.4",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4687,7 +4680,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4702,7 +4694,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4710,14 +4701,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.9.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -4736,7 +4725,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4826,8 +4814,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4839,7 +4826,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4925,8 +4911,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4962,7 +4947,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4982,7 +4966,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5026,14 +5009,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },

+ 24 - 2
src/views/appeal/appealDetail.vue

@@ -42,6 +42,8 @@
 import Head from "../main/index";
 import AuditTable from "../audit/auditTable";
 import UploadImg from "../../components/uploadImg";
+import { queryWorkflow, queryChillerExecuteInfo } from "@/api/appeal/appeal.js";
+
 export default {
   data() {
     return {
@@ -61,7 +63,8 @@ export default {
         }
       ],
       value: "",
-      souseArr: ["1576036336333_image.jpg", "1576036135588_image.jpg"]
+      souseArr: ["1576036336333_image.jpg", "1576036135588_image.jpg"],
+      commandId: ""
     };
   },
   components: {
@@ -69,7 +72,26 @@ export default {
     AuditTable,
     UploadImg
   },
-  methods: {}
+  methods: {
+    queryDetail(commandId) {
+      let params = {
+        postParams: {
+          criteria: {
+            id: commandId
+          }
+        }
+      };
+      queryChillerExecuteInfo(params).then(res => {
+        console.log("1111111", res);
+      });
+    }
+  },
+  mounted() {
+    this.commandId = this.$route.query.id;
+    if (this.commandId) {
+      this.queryDetail(this.commandId);
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

+ 71 - 39
src/views/appeal/index.vue

@@ -5,9 +5,9 @@
       <div class="left">
         <div class="title">
           <span class="Micbold">可申诉的未执行策略</span>
-          <span>{{data.length}}</span>
+          <span v-if="appealsArr.length>0">{{appealsArr.length}}</span>
         </div>
-        <div class="execute" v-for="(item,index) in data" :key="index" @click="menu">
+        <div class="execute" v-for="(item,index) in data" :key="index">
           <p class="date MicrYaHei">{{item.date}}</p>
           <div class="card-box">
             <div class="card" v-for="(item2,index) in item.info" :key="index+'i'">
@@ -38,35 +38,46 @@
       <div class="center">
         <div class="title">
           <span class="Micbold">审核中</span>
-          <span>{{review.length}}</span>
+          <span v-if="InAuditArr.length>0">{{InAuditArr.length}}</span>
         </div>
-        <div class="card" v-for="(item,index) in review" :key="index" @click="menu">
+        <div class="card" v-for="(item,index) in InAuditArr" :key="index">
           <div class="time">
-            {{item.date}} {{item.title}}
+            <span class="time-box">
+              <span>{{item.pushTime?formatter(item.pushTime):'--'}}</span>
+              <span>{{item.title||'--'}}</span>
+            </span>
             <span class="backout">
               <img src="../../assets/backout.png" />撤销申请
             </span>
           </div>
-          <div class="remark">申请原因:{{item.reason}}</div>
-          <div class="remark">{{item.advice}}</div>
+          <div class="remark">申请原因:{{item.reasonType||'--'}}</div>
+          <div class="remark">{{item.reason||'--'}}</div>
         </div>
       </div>
       <div class="right">
         <div class="title Micbold">审核完成/超时未申诉</div>
-        <div class="card" v-for="(item,index) in complete" :key="index" @click="menu">
+        <div
+          class="card"
+          v-for="(item,index) in auditCompletedArr"
+          :key="index"
+          @click="menu(item)"
+        >
           <div class="remark">
-            <div class="remark-left">审批时间:{{item.time}}</div>
+            <div class="remark-left">审批时间:{{item.updateTime?formatter1(item.updateTime):'--'}}</div>
             <div class="remark-right Micbold">
-              <span :class="item.sign>5?'backout':(item.sign>2?'backout1':'backout2')">
-                <img :src="item.img" />
-                {{item.text}}
+              <span
+                :class="item.status=='303'?'backout':(item.status=='304'?'backout1':'backout2')"
+              >
+                <img
+                  :src="item.status=='303'?require('../../assets/completed.png'):(item.status=='304'?require('../../assets/gray.png'):require('../../assets/error.png'))"
+                />
+                {{item.status=='303'?'申诉成功':(item.status=='304'?'未申诉':'申诉失败')}}
               </span>
             </div>
           </div>
           <div class="time">
-            <span>{{item.time}}</span>
-            <span>{{item.date}}</span>
-            <span>{{item.title}}</span>
+            <span>{{item.pushTime?formatter(item.pushTime):'--'}}</span>
+            <span>{{item.title||'--'}}</span>
           </div>
         </div>
       </div>
@@ -76,11 +87,13 @@
 <script>
 import Head from "../main/index";
 import { queryWorkflow, queryChillerExecuteInfo } from "@/api/appeal/appeal.js";
+var moment = require("moment");
+import "moment/locale/zh-cn";
 
 export default {
   data() {
     return {
-      headText: "申诉",
+      headText: "未执行申诉",
       appealsArr: [],
       InAuditArr: [],
       auditCompletedArr: [],
@@ -146,20 +159,20 @@ export default {
           ]
         }
       ],
-      review: [
-        {
-          date: "2020.02.12 08:30",
-          title: "策略未执行申诉",
-          reason: "策略原因",
-          advice: "冷水温度过高,没有及时按策略执行"
-        },
-        {
-          date: "2020.02.12 08:30",
-          title: "策略未执行申诉",
-          reason: "策略原因",
-          advice: "冷水温度过高,没有及时按策略执行"
-        }
-      ],
+      // review: [
+      //   {
+      //     date: "2020.02.12 08:30",
+      //     title: "策略未执行申诉",
+      //     reason: "策略原因",
+      //     advice: "冷水温度过高,没有及时按策略执行"
+      //   },
+      //   {
+      //     date: "2020.02.12 08:30",
+      //     title: "策略未执行申诉",
+      //     reason: "策略原因",
+      //     advice: "冷水温度过高,没有及时按策略执行"
+      //   }
+      // ],
       complete: [
         {
           date: "08:30",
@@ -195,21 +208,29 @@ export default {
     this.init();
   },
   methods: {
-    menu() {
-      this.$router.push("/appeal/appealDetail");
+    formatter(date) {
+      return moment.unix(date / 1000).format("YYYY.MM.DD hh:mm");
+    },
+    formatter1(date) {
+      return moment.unix(date / 1000).format("YYYY.MM.DD");
+    },
+    menu(item) {
+      this.$router.push({
+        path: "/appeal/appealDetail",
+        query: { id: item.commandId }
+      });
     },
     init() {
       this.appealsIng();
-      // this.auditCompletedIng();
-      // this.InAuditIng();
+      this.auditCompletedIng();
+      this.InAuditIng();
     },
     // 可申诉的未执行策略
     appealsIng() {
-      this.appealsArr = [];
       let params = {
         postParams: {
           criteria: {
-            projectId: "Pj1101080002",
+            projectId: "Pj4413030001",
             trackerId: 3, //固定为3
             status: [301, 305] //固定为未申诉和已驳回
           },
@@ -226,11 +247,13 @@ export default {
           appealsArr.forEach(item => {
             arr.push(item.commandId);
           });
+          console.log(arr);
           this.queryExecute(arr);
         }
       });
     },
     queryExecute(id) {
+      this.appealsArr = [];
       let params = {
         postParams: {
           criteria: {
@@ -239,12 +262,12 @@ export default {
         }
       };
       queryChillerExecuteInfo(params).then(res => {
-        console.log(res);
+        console.log("可申诉的未执行策略", res);
+        this.appealsArr = res.data ? res.data : [];
       });
     },
     // 审核完成、超时未申诉
     auditCompletedIng() {
-      this.appealsArr = [];
       let params = {
         postParams: {
           criteria: {
@@ -259,11 +282,12 @@ export default {
         }
       };
       queryWorkflow(params).then(res => {
+        console.log("审核完成、超时未申诉", res);
         this.auditCompletedArr = res.content ? res.content : [];
       });
     },
 
-    // 申诉
+    // 审核
     InAuditIng() {
       let params = {
         postParams: {
@@ -276,6 +300,7 @@ export default {
         }
       };
       queryWorkflow(params).then(res => {
+        console.log("审核中", res);
         this.InAuditArr = res.content ? res.content : [];
       });
     }
@@ -454,6 +479,13 @@ export default {
         font-weight: 400;
         color: rgba(31, 36, 41, 1);
         line-height: 22px;
+        .time-box {
+          display: flex;
+          align-items: center;
+          span:nth-of-type(1) {
+            width: 140px;
+          }
+        }
         .backout {
           display: flex;
           align-items: center;

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

@@ -285,7 +285,6 @@ export default {
   .appeal-right {
     flex: 1;
     position: relative;
-    padding-right:20px;
     .detailContainer {
       min-width: 762px;
       padding: 0 100px;
@@ -359,7 +358,7 @@ export default {
         }
         span:nth-of-type(3) {
           textarea {
-            width:100%;
+            width: 762px;
             height: 64px;
             border-radius: 4px;
             border: 1px solid rgba(195, 199, 203, 1);
@@ -380,7 +379,6 @@ export default {
       position: absolute;
       bottom: 0px;
       padding: 16px 32px;
-      box-sizing: border-box;
       .opinion-title {
         height: 24px;
         font-size: 16px;
@@ -393,7 +391,7 @@ export default {
         display: flex;
         align-items: center;
         input {
-          width: 70%;
+          width: 697px;
           height: 32px;
           background: rgba(255, 255, 255, 1);
           border-radius: 4px;

+ 16 - 3
src/views/main/index.vue

@@ -70,8 +70,11 @@
     </div>
     <div class="mainContainerTop"></div>
     <div id="nav" class="nav">
-      <div @click="navNone" class="nav-bth">
-        <span v-for="(item,index) in 3" :key="index"></span>
+      <div class="nav-box">
+        <div @click="navNone" class="nav-bth">
+          <span v-for="(item,index) in 3" :key="index"></span>
+        </div>
+        <div class="nav-top">冷站智控</div>
       </div>
       <p v-for="(item,index) in menuList" :key="index" class="nav-title">
         <router-link :to="item.path">{{item.name}}</router-link>
@@ -98,7 +101,7 @@ export default {
           path: "/evaluate"
         },
         {
-          name: "申诉",
+          name: "未执行申诉",
           path: "/appeal"
         },
         {
@@ -328,10 +331,20 @@ export default {
         margin: 5px auto;
       }
     }
+    .nav-box {
+      display: flex;
+      align-items: center;
+      padding-right: 24px;
+      .nav-top {
+        color: #fff;
+      }
+    }
+
     .nav-title {
       padding: 0 24px;
       a {
         color: #fff;
+        opacity: 0.9;
         font-size: 16px;
         line-height: 24px;
       }