Guoxiaohuan 5 éve
szülő
commit
8c1df64ada
3 módosított fájl, 79 hozzáadás és 43 törlés
  1. 69 32
      src/views/appeal/index.vue
  2. 9 10
      src/views/audit/index.vue
  3. 1 1
      src/views/evaluate/index.vue

+ 69 - 32
src/views/appeal/index.vue

@@ -10,35 +10,38 @@
             <span class="Micbold">可申诉的未执行策略</span>
             <span v-if="appealsArr.length>0">{{appealsArr.length}}</span>
           </div>
-          <p class="date MicrYaHei">{{appealsDate?formatterStr(appealsDate):'--'}}</p>
           <div class="left">
-            <div class="execute">
-              <div class="card" v-for="(item,index) in appealsArr" :key="index+'i'">
-                <div class="time">执行时间:{{item.recommend?formatterStr2(item.recommend.time):'--'}}</div>
-                <div class="advice MicrYaHei">
-                  <span>策略建议</span>
-                  <span>冷机台数</span>
-                  <span>{{item.recommend.chillerNumSetL||'--'}}大{{item.recommend.chillerNumSetS||'--'}}小</span>
-                  <span>冷机出水温度</span>
-                  <span>{{item.recommend.chillWaterOutTempSet||'--'}}°C</span>
-                </div>
-                <div class="advice">
-                  <span>实际执行</span>
-                  <span>冷机台数</span>
-                  <span>{{item.real?item.real.chillerNumSetLOrg:'--'}}大{{item.real?item.real.chillerNumSetSOrg:'--'}}小</span>
-                  <span>冷机出水温度</span>
-                  <span>{{item.real?item.real.chillWaterOutTempSetOrg:'--'}}°C</span>
-                </div>
-                <div class="remark">备注:{{item.remarks||'--'}}</div>
-                <div class="refuteBox">
-                  <div class="refute" v-if="item.status=='305'">
-                    <img src="../../assets/error.png" alt />
-                    <span>已驳回</span>
+            <div style="margin-bottom:24px" v-for="(item2,index) in appealsArr1" :key="index">
+              <p class="date MicrYaHei">{{item2.date?formatterStr(item2.date):'--'}}</p>
+
+              <div class="execute">
+                <div class="card" v-for="(item,index) in item2.children" :key="index+'i'">
+                  <div class="time">执行时间:{{item.recommend?formatterStr2(item.recommend.time):'--'}}</div>
+                  <div class="advice MicrYaHei">
+                    <span>策略建议</span>
+                    <span>冷机台数</span>
+                    <span>{{item.recommend.chillerNumSetL||'--'}}大{{item.recommend.chillerNumSetS||'--'}}小</span>
+                    <span>冷机出水温度</span>
+                    <span>{{item.recommend.chillWaterOutTempSet||'--'}}°C</span>
+                  </div>
+                  <div class="advice">
+                    <span>实际执行</span>
+                    <span>冷机台数</span>
+                    <span>{{item.real?item.real.chillerNumSetLOrg:'--'}}大{{item.real?item.real.chillerNumSetSOrg:'--'}}小</span>
+                    <span>冷机出水温度</span>
+                    <span>{{item.real?item.real.chillWaterOutTempSetOrg:'--'}}°C</span>
                   </div>
-                  <div v-else class="refute2"></div>
-                  <div class="btn">
-                    <el-button size="mini" @click="viewSnapshots = true">查看快照</el-button>
-                    <el-button size="mini" type="primary" @click="menu(item)">申诉</el-button>
+                  <div class="remark">备注:{{item.remarks||'--'}}</div>
+                  <div class="refuteBox">
+                    <div class="refute" v-if="item.status=='305'">
+                      <img src="../../assets/error.png" alt />
+                      <span>已驳回</span>
+                    </div>
+                    <div v-else class="refute2"></div>
+                    <div class="btn">
+                      <el-button size="mini" @click="viewSnapshots = true">查看快照</el-button>
+                      <el-button size="mini" type="primary" @click="menu(item)">申诉</el-button>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -111,7 +114,7 @@
         :close-on-click-modal="false"
         width="1260px"
       >
-        <ev-snapshots-dialog :appealsDate='appealsDate'></ev-snapshots-dialog>
+        <ev-snapshots-dialog :appealsDate="appealsDate"></ev-snapshots-dialog>
       </el-dialog>
     </div>
   </div>
@@ -133,7 +136,8 @@ export default {
   data() {
     return {
       headText: "未执行申诉",
-      appealsArr: [], //可申诉的未执行策略
+      appealsArr: [], //可申诉的未执行策,
+      appealsArr1: [],
       InAuditArr: [], //审核中
       auditCompletedArr: [], //审核完成,超时未申诉
       appealsDate: "",
@@ -194,7 +198,6 @@ export default {
       }
     },
     menu(item) {
-      console.log(item);
       this.$router.push({
         path: "/appeal/appealDetail",
         query: { item: JSON.stringify(item) }
@@ -225,6 +228,7 @@ export default {
             arr.push(item.commandId);
             this.newArr.push(item);
           });
+          console.log(this.newArr);
           this.queryExecute(arr);
         }
       });
@@ -240,7 +244,8 @@ export default {
       };
       queryChillerExecuteInfo(params).then(res => {
         let arr1 = [],
-          arr2 = [];
+          arr2 = [],
+          arr3 = [];
         arr1 = res.data ? res.data : [];
         if (arr1.length > 0) {
           arr1.forEach(item => {
@@ -252,10 +257,42 @@ export default {
               }
             });
           });
+          if (this.appealsArr.length > 0) {
+            this.appealsArr.forEach(el => {
+              arr3.push(el.recommend.date);
+            });
+          }
+          let arrNew = this.unique(arr3);
+          arrNew.forEach(item => {
+            let obj1 = {
+              date: item,
+              children: []
+            };
+            this.appealsArr1.push(obj1);
+          });
+          this.appealsArr1.forEach(item1 => {
+            this.appealsArr.forEach(item2 => {
+              if (item1.date == item2.recommend.date) {
+                item1.children.push(item2);
+              }
+            });
+          });
         }
-        // console.log(this.appealsArr);
       });
     },
+    unique(array) {
+      var res = [];
+      for (var i = 0, len = array.length; i < len; i++) {
+        var current = array[i];
+        if (res.indexOf(current) === -1) {
+          res.push(current);
+        }
+      }
+      return res;
+    },
+    formatt(str) {
+      return str.moment().format("d");
+    },
     // 审核完成、超时未申诉
     auditCompletedIng(flag) {
       let params = {

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

@@ -30,7 +30,7 @@
                 <span>{{item.pushTime?formatter(item.pushTime):'--'}} {{item.title||'--'}}</span>
                 <span>
                   <img src="../../assets/tp.png" alt />
-                  {{item.pics.length}}
+                  <span v-if="item.pics">{{item.pics.length}}</span>
                 </span>
               </div>
               <div class="content">
@@ -162,7 +162,7 @@ export default {
           commit: type,
           comment: this.comment,
           roles: [1002],
-          updateUser: "594e95e50abc4b6c9bdda985d313c1b9"
+          updateUser: item.updateUser
         }
       };
       updateWorkflow(params).then(res => {
@@ -182,7 +182,7 @@ export default {
     },
     appealClick(item, index) {
       this.auditObj = item;
-      this.quertName(item.applyUser);
+      this.quertName(item.updateUser);
       this.isactive = index;
       let params = {
         postParams: {
@@ -192,11 +192,11 @@ 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 = '执行策略'
+        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 = "执行策略";
       });
     },
     query() {
@@ -215,7 +215,7 @@ export default {
         if (this.auditArr.length > 0) {
           this.auditObj = this.auditArr[0];
           this.quertName(this.auditObj.applyUser);
-          this.appealClick(this.auditObj,0)
+          this.appealClick(this.auditObj, 0);
         }
       });
     }
@@ -367,7 +367,6 @@ export default {
           }
           .cont2 {
             margin-bottom: 24px;
-            
           }
           .cont3 {
             margin-bottom: 24px;

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

@@ -381,7 +381,7 @@ export default {
     padding-right: 5px;
   }
   .el-date-editor .el-range-input {
-    width: 45%;
+    width: 65%;
   }
   .el-date-editor .el-range-separator {
     line-height: 18px;