zhulizhen 5 лет назад
Родитель
Сommit
caae2d0217
3 измененных файлов с 72 добавлено и 19 удалено
  1. 7 3
      src/views/appeal/appealDetail.vue
  2. 58 13
      src/views/audit/auditTable.vue
  3. 7 3
      src/views/audit/index.vue

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

@@ -14,7 +14,7 @@
       </div>
       <div class="cont1 MicrYaHei">申诉未执行指令:2020.01.13 14:30 推送策略未执行</div>
       <div class="cont2">
-        <audit-table></audit-table>
+        <audit-table :tableList='tableList'></audit-table>
       </div>
       <div class="cont3">
         <span class="Micbold">策略评价</span>
@@ -71,7 +71,8 @@ export default {
       value: "",
       souseArr: ["1576036336333_image.jpg", "1576036135588_image.jpg"],
       appealId: "",
-      commandId: ""
+      commandId: "",
+      tableList:[]
     };
   },
   components: {
@@ -91,7 +92,10 @@ export default {
           }
         }
       };
-      queryChillerExecuteInfo(params).then(res => {});
+      queryChillerExecuteInfo(params).then(res => {
+        const list = res.data || [{}]
+        this.tableList = Object.values(list[0])
+      });
     },
     submission() {
       let params = {

+ 58 - 13
src/views/audit/auditTable.vue

@@ -1,18 +1,62 @@
 <template>
   <div class="detailTable">
-    <el-table :data="list" border height="180">
+    <el-table :data="tableList" border height="180">
       <el-table-column prop="title" label width="105"></el-table-column>
-      <el-table-column prop="name" label="冷机开启台数" align="center" width="55"></el-table-column>
-      <el-table-column prop="province" label="冷机出水温度" align="center" width="55"></el-table-column>
-      <el-table-column prop="city" label="冷冻泵台数" align="center" width></el-table-column>
-      <el-table-column prop="address" label="冷冻泵频率" align="center" width="65"></el-table-column>
-      <el-table-column prop="zip" label="冷却泵台数" align="center" width></el-table-column>
-      <el-table-column prop="zip" label="冷却泵频率" align="center" width="65"></el-table-column>
-      <el-table-column prop="zip" label="冷却塔台数" align="center" width></el-table-column>
-      <el-table-column prop="zip" label="冷却塔频率" align="center" width="65"></el-table-column>
-      <el-table-column prop="zip" label="室内平均温度" align="center" width="55"></el-table-column>
-      <el-table-column prop="hign" label="室内最高温度" align="center" width></el-table-column>
-      <el-table-column prop="load" label="冷机负载率" align="center" width="55"></el-table-column>
+      <el-table-column prop="" label="冷机开启台数" align="center" width="55">
+        <template slot-scope="{row}">
+          {{row.chillerNumSetL?(row.chillerNumSetL + row.chillerNumSetS):'--'}}
+        </template>
+      </el-table-column>
+      <el-table-column prop="" label="冷机出水温度" align="center" width="55">
+         <template slot-scope="{row}">
+          {{row.chillWaterOutTempSet}} ℃
+        </template>
+      </el-table-column>
+      <el-table-column prop="" label="冷冻泵台数" align="center" width>
+         <template slot-scope="{row}">
+          {{row.coolPumpNumSetL}} 大 {{row.coolPumpNumSetS}} 小
+        </template>
+      </el-table-column>
+      <el-table-column prop="" label="冷冻泵频率" align="center" width="65">
+         <template slot-scope="{row}">
+          {{row.coolPumpFreqSet}} HZ
+        </template>
+      </el-table-column>
+      <el-table-column prop="" label="冷却泵台数" align="center" width>
+         <template slot-scope="{row}">
+          {{row.chillPumpNumSetL + row.chillPumpNumSetS || '--'}} 
+        </template>
+      </el-table-column>
+      <el-table-column prop="" label="冷却泵频率" align="center" width="65">
+         <template slot-scope="{row}">
+          {{row.chillPumpFreqSet || '--'}} HZ
+        </template>
+      </el-table-column>
+      <el-table-column prop="" label="冷却塔台数" align="center" width>
+         <template slot-scope="{row}">
+          {{(row.coolTowerNumSetS + row.coolTowerNumSetL) || '--'}} 
+        </template>
+      </el-table-column>
+      <el-table-column prop="zip" label="冷却塔频率" align="center" width="65">
+        <template slot-scope="{row}">
+          {{row.coolTowerFreqSet || '--'}} HZ
+        </template>
+      </el-table-column>
+      <el-table-column prop="" label="室内平均温度" align="center" width="55">
+         <template slot-scope="{row}">
+          {{row.meanTindoor || '--'}} ℃
+        </template>
+      </el-table-column>
+      <el-table-column prop="" label="室内最高温度" align="center" width>
+         <template slot-scope="{row}">
+          {{row.maxTindoor || '--'}} ℃
+        </template>
+      </el-table-column>
+      <el-table-column prop="" label="冷机负载率" align="center" width="55">
+         <template slot-scope="{row}">
+          {{row.plrAllOrg || '--'}} HZ
+        </template>
+      </el-table-column>
     </el-table>
   </div>
 </template>
@@ -54,7 +98,8 @@ export default {
         }
       ]
     };
-  }
+  },
+  props:['tableList']
 };
 </script>
 

+ 7 - 3
src/views/audit/index.vue

@@ -51,7 +51,7 @@
             </div>
             <div class="cont1 MicrYaHei">申诉未执行指令:{{auditObj.title||'--'}}</div>
             <div class="cont2">
-              <audit-table></audit-table>
+              <audit-table :tableList='tableList'></audit-table>
             </div>
             <div class="cont3">
               <span class="Micbold">策略评价</span>
@@ -137,7 +137,8 @@ export default {
       auditObj: {},
       value: "0",
       comment: "",
-      souseArr: []
+      souseArr: [],
+      tableList:[]
     };
   },
   components: {
@@ -187,7 +188,10 @@ export default {
           }
         }
       };
-      queryChillerExecuteInfo(params).then(res => {});
+      queryChillerExecuteInfo(params).then(res => {
+        const list = res.data || [{}, {}, {}]
+        this.tableList = Object.values(list[0]).map(i => i || {})
+      });
     },
     query() {
       let params = {