Browse Source

表格数据更新

zhulizhen 5 years ago
parent
commit
397f8ef7de
2 changed files with 19 additions and 114 deletions
  1. 18 113
      src/components/todayStrategy.vue
  2. 1 1
      src/views/strategy/index.vue

+ 18 - 113
src/components/todayStrategy.vue

@@ -1,6 +1,6 @@
 <template>
     <el-table
-    :data="list"
+    :data="data"
     border
     style="width: 100%">
     <el-table-column
@@ -9,40 +9,32 @@
       label="序号">
     </el-table-column>
     <el-table-column
-      prop="name"
+      prop="pushTime"
       label="策略推送时间"
       >
     </el-table-column>
     <el-table-column
-      prop="province"
+      prop="executeTime"
       label="策略执行时间"
       >
     </el-table-column>
-    <el-table-column
-      prop="city"
-      label="冷水机组开启台数"
-      >
+    <el-table-column prop label='冷水机组开启台数'  align='center'>
+        <template slot-scope='{row}'>{{row.chillerNumSetL+row.chillerNumSetS}}</template>
     </el-table-column>
     <el-table-column
-      prop="address"
+      prop="chillWaterOutTempSet"
       label="出水温度设定值"
-      width="300">
-    </el-table-column>
-    <el-table-column
-      prop="zip"
-      label="冷冻泵开启台数"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="zip"
-      label="冷却泵开启台数"
       >
     </el-table-column>
-    <el-table-column
-      prop="zip"
-      label="冷却塔开启组数"
-      >
+     <el-table-column prop label='冷冻泵开启台数' align='center'>
+        <template slot-scope='{row}'>{{row.coolPumpNumSetL+'大'+row.coolPumpNumSetS+'小'}}</template>
     </el-table-column>
+     <el-table-column prop label='冷却泵开启台数' min-width='120' align='center'>
+          <template slot-scope='{row}'>{{row.chillPumpNumSetL+row.chillPumpNumSetS}}</template>
+      </el-table-column>
+    <el-table-column prop label='冷却塔开启组数' min-width='120' align='center'>
+          <template slot-scope='{row}'>{{row.coolTowerNumSetL+row.coolTowerNumSetS}}</template>
+      </el-table-column>
     <el-table-column
       prop="zip"
       label="通风策略"
@@ -52,6 +44,7 @@
       prop="zip"
       label="执行情况"
       >
+      <template slot-scope="{row}"> {{row.isExecuted==0?'未执行':'已执行'}}</template>
     </el-table-column>
     <el-table-column
       label="操作"
@@ -68,98 +61,10 @@
 export default {
     data() {
         return {
-            list: [
-                    {
-                        date: '2016-05-02',
-                        name: '王小虎',
-                        province: '上海',
-                        city: '普陀区',
-                        address: '上海市普陀区金沙江路 1518 弄',
-                        zip: 200333
-                    },
-                    {
-                        date: '2016-05-02',
-                        name: '王小虎',
-                        province: '上海',
-                        city: '普陀区',
-                        address: '上海市普陀区金沙江路 1518 弄',
-                        zip: 200333
-                    },
-                    {
-                        date: '2016-05-02',
-                        name: '王小虎',
-                        province: '上海',
-                        city: '普陀区',
-                        address: '上海市普陀区金沙江路 1518 弄',
-                        zip: 200333
-                    },
-                    {
-                        date: '2016-05-02',
-                        name: '王小虎',
-                        province: '上海',
-                        city: '普陀区',
-                        address: '上海市普陀区金沙江路 1518 弄',
-                        zip: 200333
-                    },
-                    {
-                        date: '2016-05-02',
-                        name: '王小虎',
-                        province: '上海',
-                        city: '普陀区',
-                        address: '上海市普陀区金沙江路 1518 弄',
-                        zip: 200333
-                    },
-                    {
-                        date: '2016-05-02',
-                        name: '王小虎',
-                        province: '上海',
-                        city: '普陀区',
-                        address: '上海市普陀区金沙江路 1518 弄',
-                        zip: 200333
-                    },
-                    {
-                        date: '2016-05-02',
-                        name: '王小虎',
-                        province: '上海',
-                        city: '普陀区',
-                        address: '上海市普陀区金沙江路 1518 弄',
-                        zip: 200333
-                    },
-                    {
-                        date: '2016-05-02',
-                        name: '王小虎',
-                        province: '上海',
-                        city: '普陀区',
-                        address: '上海市普陀区金沙江路 1518 弄',
-                        zip: 200333
-                    },
-                    {
-                        date: '2016-05-02',
-                        name: '王小虎',
-                        province: '上海',
-                        city: '普陀区',
-                        address: '上海市普陀区金沙江路 1518 弄',
-                        zip: 200333
-                    },
-                    {
-                        date: '2016-05-02',
-                        name: '王小虎',
-                        province: '上海',
-                        city: '普陀区',
-                        address: '上海市普陀区金沙江路 1518 弄',
-                        zip: 200333
-                    },
-                    {
-                        date: '2016-05-02',
-                        name: '王小虎',
-                        province: '上海',
-                        city: '普陀区',
-                        address: '上海市普陀区金沙江路 1518 弄',
-                        zip: 200333
-                    }
-            ]
+           
         }
-    }
+    },
+    props:['data']
 }
 </script>
 

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

@@ -28,7 +28,7 @@
       </div>
     </div>
     <el-dialog title="提示" :visible.sync="showTodayStrategy" width="1260px">
-      <today-strategy></today-strategy>
+      <today-strategy :data='data'></today-strategy>
     </el-dialog>
   </div>
 </template>