|
|
@@ -27,6 +27,7 @@
|
|
|
<div >
|
|
|
<!-- <p>从第一行和第二例开始合并</p>-->
|
|
|
<!-- <pre>tableMergeElement(data, { range: { row: 1, col: 2 } })</pre>-->
|
|
|
+ <el-button type="text" @click="dialogTableVisible = true">显示更多内容</el-button>
|
|
|
<el-table style="width: 100%;" :data="data1" :span-method="tableMergeElement(data1, { range: { row: [0, 11],col:[0,30] } })" border>
|
|
|
<!-- <el-table-column v-for="col in columns" :key="col.prop" v-bind="col" />-->
|
|
|
<el-table-column prop="id" label="序号" align='center' ></el-table-column>
|
|
|
@@ -130,6 +131,7 @@
|
|
|
<!-- <el-table-column prop="hex_temp_diff" label="温差" align='center'></el-table-column>-->
|
|
|
<!-- </el-table-column>-->
|
|
|
</el-table>
|
|
|
+
|
|
|
<el-pagination
|
|
|
@size-change="handleSizeChange"
|
|
|
@current-change="handleCurrentChange"
|
|
|
@@ -141,6 +143,41 @@
|
|
|
align="right"
|
|
|
>
|
|
|
</el-pagination>
|
|
|
+
|
|
|
+ <!-- Table -->
|
|
|
+ <el-button type="text" @click="dialogTableVisible = true">更多数据</el-button>
|
|
|
+
|
|
|
+ <el-dialog title="新风机控制器" :visible.sync="dialogTableVisible">
|
|
|
+ <el-table :data="data2">
|
|
|
+ <el-table-column prop="nt_order" label="编号" align='center'></el-table-column>
|
|
|
+ <el-table-column prop="nt_connect_status" label="通讯状态" align='center'></el-table-column>
|
|
|
+ <el-table-column prop="nt_fault" label="故障" align='center'></el-table-column>
|
|
|
+ <el-table-column prop="nt_in_temp" label="送风温度(℃)" align='center'></el-table-column>
|
|
|
+ <el-table-column prop="nt_in_humidity" label="送风湿度(%)" align='center'></el-table-column>
|
|
|
+ <el-table-column prop="nt_dew_point" label="露点(℃)" align='center'></el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </el-dialog>
|
|
|
+
|
|
|
+ <!-- Form -->
|
|
|
+ <el-button type="text" @click="dialogFormVisible = true">修改阈值</el-button>
|
|
|
+
|
|
|
+ <el-dialog title="修改阈值" :visible.sync="dialogFormVisible">
|
|
|
+ <el-form :model="form">
|
|
|
+ <el-form-item label="供水水温" :label-width="formLabelWidth">
|
|
|
+ <el-input v-model="form.name" autocomplete="off">19</el-input>
|
|
|
+ </el-form-item>
|
|
|
+<!-- <el-form-item label="活动区域" :label-width="formLabelWidth">-->
|
|
|
+<!-- <el-select v-model="form.region" placeholder="请选择活动区域">-->
|
|
|
+<!-- <el-option label="区域一" value="shanghai"></el-option>-->
|
|
|
+<!-- <el-option label="区域二" value="beijing"></el-option>-->
|
|
|
+<!-- </el-select>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+ </el-form>
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="dialogFormVisible = false">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
<!-- <div class="box">-->
|
|
|
<!-- <p>多行合并</p>-->
|
|
|
@@ -238,6 +275,36 @@ import tableMergeElement from '@table-merge/element-ui';
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
+ gridData: [{
|
|
|
+ date: '2016-05-02',
|
|
|
+ name: '王小虎',
|
|
|
+ address: '上海市普陀区金沙江路 1518 弄'
|
|
|
+ }, {
|
|
|
+ date: '2016-05-04',
|
|
|
+ name: '王小虎',
|
|
|
+ address: '上海市普陀区金沙江路 1518 弄'
|
|
|
+ }, {
|
|
|
+ date: '2016-05-01',
|
|
|
+ name: '王小虎',
|
|
|
+ address: '上海市普陀区金沙江路 1518 弄'
|
|
|
+ }, {
|
|
|
+ date: '2016-05-03',
|
|
|
+ name: '王小虎',
|
|
|
+ address: '上海市普陀区金沙江路 1518 弄'
|
|
|
+ }],
|
|
|
+ dialogTableVisible: false,
|
|
|
+ dialogFormVisible: false,
|
|
|
+ form: {
|
|
|
+ name: '',
|
|
|
+ region: '',
|
|
|
+ date1: '',
|
|
|
+ date2: '',
|
|
|
+ delivery: false,
|
|
|
+ type: [],
|
|
|
+ resource: '',
|
|
|
+ desc: ''
|
|
|
+ },
|
|
|
+ formLabelWidth: '120px',
|
|
|
online: '',
|
|
|
onlineOptions: [
|
|
|
{
|
|
|
@@ -286,8 +353,22 @@ export default {
|
|
|
data1: [
|
|
|
{ id: 1, projectName: '铂睿思雨花展厅', boxName: '展厅一', onlineStatus: '在线', runMode: '制冷' ,host_order:1,host_connect_status:'正常',host_fault:'有',host_su_temp:11.1,host_re_temp:18.1,host_temp_diff:1,nt_order:1,nt_connect_status:'异常',nt_fault:'有',nt_in_temp:19.8,nt_in_humidity:68.7,nt_dew_point:16.1},
|
|
|
{ id: 2, projectName: '铂睿思雨花展厅', boxName: '展厅一', onlineStatus: '离线', runMode: '采暖' ,host_order:2,host_connect_status:'异常',host_fault:'无',host_su_temp:11.2,host_re_temp:18.2,host_temp_diff:2,nt_order:2,nt_connect_status:'正常',nt_fault:'无',nt_in_temp:19,nt_in_humidity:68,nt_dew_point:16.2},
|
|
|
- { id: 3, projectName: '铂睿思雨花展厅', boxName: '展厅一', onlineStatus: '在线', runMode: '制冷' ,host_order:3,host_connect_status:'正常',host_fault:'有',host_su_temp:11.3,host_re_temp:18.3,host_temp_diff:1,nt_order:2,nt_connect_status:'正常',nt_fault:'无',nt_in_temp:19,nt_in_humidity:68,nt_dew_point:16.2},
|
|
|
- { id: 4, projectName: '铂睿思雨花展厅', boxName: '展厅一', onlineStatus: '离线', runMode: '采暖' ,host_order:4,host_connect_status:'异常',host_fault:'无',host_su_temp:11.4,host_re_temp:18.4,host_temp_diff:2,nt_order:2,nt_connect_status:'正常',nt_fault:'无',nt_in_temp:19,nt_in_humidity:68,nt_dew_point:16.2},
|
|
|
+ // { id: 3, projectName: '铂睿思雨花展厅', boxName: '展厅一', onlineStatus: '在线', runMode: '制冷' ,host_order:3,host_connect_status:'正常',host_fault:'有',host_su_temp:11.3,host_re_temp:18.3,host_temp_diff:1,nt_order:2,nt_connect_status:'正常',nt_fault:'无',nt_in_temp:19,nt_in_humidity:68,nt_dew_point:16.2},
|
|
|
+ // { id: 4, projectName: '铂睿思雨花展厅', boxName: '展厅一', onlineStatus: '离线', runMode: '采暖' ,host_order:4,host_connect_status:'异常',host_fault:'无',host_su_temp:11.4,host_re_temp:18.4,host_temp_diff:2,nt_order:2,nt_connect_status:'正常',nt_fault:'无',nt_in_temp:19,nt_in_humidity:68,nt_dew_point:16.2},
|
|
|
+ { id: 5, projectName: '铂睿思雨花展厅', boxName: '展厅二', onlineStatus: '在线', runMode: '除湿' ,host_order:2,host_connect_status:'正常',host_fault:'有',host_su_temp:11.5,host_re_temp:18.5,host_temp_diff:1,nt_order:1,nt_connect_status:'异常',nt_fault:'有',nt_in_temp:19.1,nt_in_humidity:78,nt_dew_point:16.3},
|
|
|
+ { id: 6, projectName: '北京中粮祥云', boxName: '祥云一', onlineStatus: '离线', runMode: '预热' ,host_order:1,host_connect_status:'异常',host_fault:'无',host_su_temp:11.6,host_re_temp:18.6,host_temp_diff:3,nt_order:3,nt_connect_status:'正常',nt_fault:'无',nt_in_temp:19.2,nt_in_humidity:88,nt_dew_point:16.4},
|
|
|
+ { id: 7, projectName: '北京中粮祥云', boxName: '祥云二', onlineStatus: '在线', runMode: '通风' ,host_order:2,host_connect_status:'正常',host_fault:'有',host_su_temp:11.7,host_re_temp:18.7,host_temp_diff:1,nt_order:2,nt_connect_status:'异常',nt_fault:'有',nt_in_temp:19.3,nt_in_humidity:79,nt_dew_point:16.5},
|
|
|
+ { id: 8, projectName: '天津温莎堡展厅', boxName: '温莎堡展厅', onlineStatus: '离线', runMode: '制冷' ,host_order:3,host_connect_status:'异常',host_fault:'无',host_su_temp:11.8,host_re_temp:18.8,host_temp_diff:3,nt_order:3,nt_connect_status:'正常',nt_fault:'无',nt_in_temp:19.4,nt_in_humidity:68,nt_dew_point:16.6},
|
|
|
+ { id: 9, projectName: '御江金城2-107', boxName: '金城107', onlineStatus: '在线', runMode: '采暖' ,host_order:1,host_connect_status:'正常',host_fault:'有',host_su_temp:11.9,host_re_temp:18.9,host_temp_diff:2,nt_order:1,nt_connect_status:'异常',nt_fault:'有',nt_in_temp:19.5,nt_in_humidity:78,nt_dew_point:16.7},
|
|
|
+ { id: 10, projectName: '国华印象15-102', boxName: '国华102', onlineStatus: '离线', runMode: '除湿' ,host_order:2,host_connect_status:'异常',host_fault:'无',host_su_temp:12.0,host_re_temp:19.0,host_temp_diff:3,nt_order:2,nt_connect_status:'正常',nt_fault:'无',nt_in_temp:19.6,nt_in_humidity:88,nt_dew_point:16.8},
|
|
|
+ { id: 11, projectName: '无庶3-102', boxName: '无庶102', onlineStatus: '在线', runMode: '预热' ,host_order:3,host_connect_status:'正常',host_fault:'有',host_su_temp:12.1,host_re_temp:19.1,host_temp_diff:1,nt_order:3,nt_connect_status:'异常',nt_fault:'有',nt_in_temp:19.7,nt_in_humidity:58,nt_dew_point:16.9},
|
|
|
+ { id: 12, projectName: '揽江府1-14-6', boxName: '揽江府6', onlineStatus: '离线', runMode: '通风' ,host_order:4,host_connect_status:'异常',host_fault:'无',host_su_temp:12.2,host_re_temp:19.2,host_temp_diff:3,nt_order:4,nt_connect_status:'正常',nt_fault:'无',nt_in_temp:19.8,nt_in_humidity:88,nt_dew_point:16.1}
|
|
|
+ ],
|
|
|
+ data2: [
|
|
|
+ { id: 1, projectName: '铂睿思雨花展厅', boxName: '展厅一', onlineStatus: '在线', runMode: '制冷' ,host_order:1,host_connect_status:'正常',host_fault:'有',host_su_temp:11.1,host_re_temp:18.1,host_temp_diff:1,nt_order:1,nt_connect_status:'异常',nt_fault:'有',nt_in_temp:19.8,nt_in_humidity:68.7,nt_dew_point:16.1},
|
|
|
+ { id: 2, projectName: '铂睿思雨花展厅', boxName: '展厅一', onlineStatus: '离线', runMode: '采暖' ,host_order:2,host_connect_status:'异常',host_fault:'无',host_su_temp:11.2,host_re_temp:18.2,host_temp_diff:2,nt_order:2,nt_connect_status:'正常',nt_fault:'无',nt_in_temp:19,nt_in_humidity:68,nt_dew_point:16.2},
|
|
|
+ // { id: 3, projectName: '铂睿思雨花展厅', boxName: '展厅一', onlineStatus: '在线', runMode: '制冷' ,host_order:3,host_connect_status:'正常',host_fault:'有',host_su_temp:11.3,host_re_temp:18.3,host_temp_diff:1,nt_order:2,nt_connect_status:'正常',nt_fault:'无',nt_in_temp:19,nt_in_humidity:68,nt_dew_point:16.2},
|
|
|
+ // { id: 4, projectName: '铂睿思雨花展厅', boxName: '展厅一', onlineStatus: '离线', runMode: '采暖' ,host_order:4,host_connect_status:'异常',host_fault:'无',host_su_temp:11.4,host_re_temp:18.4,host_temp_diff:2,nt_order:2,nt_connect_status:'正常',nt_fault:'无',nt_in_temp:19,nt_in_humidity:68,nt_dew_point:16.2},
|
|
|
{ id: 5, projectName: '铂睿思雨花展厅', boxName: '展厅二', onlineStatus: '在线', runMode: '除湿' ,host_order:2,host_connect_status:'正常',host_fault:'有',host_su_temp:11.5,host_re_temp:18.5,host_temp_diff:1,nt_order:1,nt_connect_status:'异常',nt_fault:'有',nt_in_temp:19.1,nt_in_humidity:78,nt_dew_point:16.3},
|
|
|
{ id: 6, projectName: '北京中粮祥云', boxName: '祥云一', onlineStatus: '离线', runMode: '预热' ,host_order:1,host_connect_status:'异常',host_fault:'无',host_su_temp:11.6,host_re_temp:18.6,host_temp_diff:3,nt_order:3,nt_connect_status:'正常',nt_fault:'无',nt_in_temp:19.2,nt_in_humidity:88,nt_dew_point:16.4},
|
|
|
{ id: 7, projectName: '北京中粮祥云', boxName: '祥云二', onlineStatus: '在线', runMode: '通风' ,host_order:2,host_connect_status:'正常',host_fault:'有',host_su_temp:11.7,host_re_temp:18.7,host_temp_diff:1,nt_order:2,nt_connect_status:'异常',nt_fault:'有',nt_in_temp:19.3,nt_in_humidity:79,nt_dew_point:16.5},
|
