Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/zhxf_vue into dev

public/config.js

@@ -13,4 +13,5 @@ CONFIG.requestPath = 'http://10.20.72.44:8046'
 CONFIG.urlPath = 'http://10.20.72.44/'
 
 // BIM
-CONFIG.bimPath = 'http://10.20.2.98:8066/'
+// CONFIG.bimPath = 'http://10.20.2.98:8066/'
+CONFIG.bimPath = 'http://10.20.72.44:8066/'

src/pages/ol/kanban/index.vue

@@ -5,7 +5,7 @@ el-container(style="padding: 0px; height: 77.6vh")
   )
     span.title-bold
     el-select(v-model="mapId" size="mini"  @change="handleChange")
-      el-option(v-for="(item,index) in mapList" :key="index" :label="item.stationName +'-'+item.name" :value="item.id")
+      el-option(v-for="(item,index) in mapList" :key="index" :label="item.stationName=='全部'?item.stationName:item.stationName +' - '+item.name" :value="item.id")
   el-main.box_main
     el-row(:gutter="20")
       el-col(
@@ -131,6 +131,7 @@ export default {
           if (data && data.code === 0) {
             this.mapList = data.list
             console.log('111111---', this.mapList)
+            this.mapList.unshift({ name: '', id: '', stationName: '全部' })
             this.mapId = this.mapList[0].id
             console.log('222222---', this.mapId)
           }