zhulizhen 6 years ago
parent
commit
b0b9626dfb
1 changed files with 22 additions and 14 deletions
  1. 22 14
      src/test/zhulz/index.vue

+ 22 - 14
src/test/zhulz/index.vue

@@ -42,7 +42,9 @@
                 :value="item.value">
                 </el-option>
             </el-select>
-             <el-button type="primary" size="small" style="width:200px" @click="alarmDialogVisible = true">报警条目</el-button>
+            <div class="btn-al">
+                 <el-button type="primary" size="small" style="width:200px" @click="alarmDialogVisible = true">报警条目</el-button>
+            </div>
         </div>
         <div class="sg-table">
             <el-radio-group v-model="notes" size="small" class="item">
@@ -65,17 +67,16 @@
                 width="55">
                 </el-table-column>
                 <el-table-column
-                prop="type"
-                label="报警分类"
                 align="center"
-                width="120">
-                <template slot-scope="scope">{{ scope.row.date }}</template>
+                prop="classify"
+                label="报警分类"
+                width="130">
                 </el-table-column>
                 <el-table-column
                 prop="name"
                 header-align="center"
                 label="适用对象实例"
-                width="120">
+                >
                 </el-table-column>
                 <el-table-column
                 prop="alarm"
@@ -87,15 +88,17 @@
                 prop="code"
                 label="报警条目编码"
                 align="center"
+                width="130"
                 >
                 </el-table-column>
                 <el-table-column
                 prop="level"
                 label="严重程度"
                 align="center"
+                width="80"
                >
                 </el-table-column>
-                <el-table-column label="通知人员"  align="center">
+                <el-table-column label="通知人员" width="80" align="center">
                     <el-button
                     size="small"
                     type="text"
@@ -295,43 +298,43 @@ export default {
             notes: "alarm",
             checked: false,
             tableData: [{
-                type: '',
+                classify: '--',
                 name: '1#冷冻水泵 - HJWK-6号楼-B2-KT-ZYZL-LDSB-001',
                 alarm: '冷冻水泵电源电压过高',
                 code:'1024',
                 level:'A'
                 }, {
-                type: '',
+                classify: '环境报警',
                 name: '2#冷冻水泵 - HJWK-6号楼-B2-KT-ZYZL-LDSB-002',
                 alarm: '冷冻水泵电源电压过高',
                 code:'1024',
                 level:'A'
                 }, {
-                type: '',
+                classify: '环境报警',
                 name: '3#冷冻水泵 - HJWK-6号楼-B2-KT-ZYZL-LDSB-003',
                 alarm: '冷冻水泵电源电压过高',
                 code:'1024',
                 level:'A'
                 }, {
-                type: '',
+                classify: '环境报警',
                 name: 'B1F-5#变压器房 - B1-BDS-7',
                 alarm: '室温过高',
                 code:'1055',
                 level:'B'
                 }, {
-                type: '',
+                classify: '环境报警',
                 name: 'B2F-8#排风机房 - B2-PFJF-8',
                 alarm: '室温过高',
                 code:'1055',
                 level:'B'
                 }, {
-                type: '',
+                classify: '--',
                 name: 'B2F-5#排风机房 - B2-PFJF-5',
                 alarm: '室温过高',
                 code:'1055',
                 level:'B'
                 }, {
-                type: '',
+                classify: '安全报警',
                 name: 'B2F-7#排风机房 - B2-PFJF-7',
                 alarm: '室温过高',
                 code:'1055',
@@ -388,6 +391,11 @@ export default {
         .item{
             margin-top: 20px;
             margin-right: 5px;
+        }
+        .btn-al{
+           margin-top: 20px;
+           margin-right: 5px;
+           display: inline-block; 
         }  
     }
     .sg-table{