Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

YaolongHan 4 years ago
parent
commit
6e6b2ac314
2 changed files with 5 additions and 3 deletions
  1. 4 2
      src/views/equipment/index.vue
  2. 1 1
      src/views/overview/index.vue

+ 4 - 2
src/views/equipment/index.vue

@@ -83,8 +83,10 @@ export default {
             categoryId: 'GDXT',
             systemName: '供电系统',
             floorInfo: {
-                gname: 'f1',
-                code: 'F1'
+                code: "F1",
+                gcode: "1F",
+                gname: "f1",
+                seq: 100
             },
             smsxt: '1001',
             dialogInfo: {},

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

@@ -102,7 +102,7 @@
                                 :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
                                 v-loading='loading'
                             >
-                                <el-table-column label='序号' width='45' type='index' align='left'></el-table-column>
+                                <el-table-column label='序号' width='50' type='index' align='left'></el-table-column>
                                 <el-table-column label='总包/分包' prop='type' width='80' align='center'>
                                     <template slot-scope='{row}'>{{row.type||'--'}}</template>
                                 </el-table-column>