Merge branch 'master' of http://39.106.8.246:3003/fugy/ibms-demo

src/test/zhulz/alarmCode.vue

@@ -20,7 +20,8 @@
                 <el-table-column
                 prop="code"
                 align="center"
-                label="报警条目编码">                
+                label="报警条目编码"
+                width="130">                
                 </el-table-column>
                 <el-table-column
                 header-align="center"
@@ -29,7 +30,7 @@
                 </el-table-column>
                 <el-table-column
                 type="selection"
-                width="55">
+                >
                 </el-table-column>
             </el-table>
         </div>

src/test/zhulz/manageNote.vue

@@ -20,7 +20,7 @@
             <span v-else>{{scope.row.email}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center">
+        <el-table-column label="操作" width="150" align="center">
           <template slot-scope="scope">
             <p v-if="scope.row.edit">
               <el-button type="text" size="small" @click="save(scope.row)">保存</el-button>