This commit is contained in:
23688nl 2022-07-26 15:07:36 +08:00
parent 45157e2ee9
commit 133043bf97
3 changed files with 7 additions and 7 deletions

View File

@ -9,7 +9,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
// 创建axios实例 // 创建axios实例
const service = axios.create({ const service = axios.create({
// axios中请求配置有baseURL选项表示请求URL公共部分 // axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: process.env.NODE_ENV === "production" ? `${window.dasConfig.protocol}${window.dasConfig.ip}:${window.dasConfig.port}/${window.dasConfig.prodApi}` : process.env.VUE_APP_BASE_API, baseURL: process.env.NODE_ENV === "production" ? `${window.dasConfig.protocol}${window.dasConfig.ip}:${window.dasConfig.port}${window.dasConfig.prodApi}` : process.env.VUE_APP_BASE_API,
// 超时 // 超时
timeout: 10000 timeout: 10000
}) })

View File

@ -60,12 +60,12 @@
<el-table-column label="建筑类型" align="center" prop="buildingType" :formatter="statusFormat" /> <el-table-column label="建筑类型" align="center" prop="buildingType" :formatter="statusFormat" />
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-search" icon="el-icon-search"
@click="handleDetails(scope.row)" @click="handleDetails(scope.row)"
>建筑设备</el-button> --> >建筑设备</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button> <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
<el-button <el-button
size="mini" size="mini"

View File

@ -10,7 +10,7 @@
<el-tab-pane label="区域空间" name="space"> <el-tab-pane label="区域空间" name="space">
<div class="tabs-body"> <div class="tabs-body">
<space v-if="activeName === 'space'" :infoData="infoData"></space> <building-space v-if="activeName === 'space' && infoData" :infoData="infoData"></building-space>
</div> </div>
</el-tab-pane> </el-tab-pane>
@ -34,13 +34,13 @@ import {
getRegion getRegion
} from "@/api/iot/region"; } from "@/api/iot/region";
import Info from './Info' import Info from './Info'
import Space from './Space' import BuildingSpace from './BuildingSpace'
export default { export default {
name: 'DetailsWrap', name: 'DetailsWrap',
props: ['sourceKey'], props: ['sourceKey'],
components: { components: {
Info, Info,
Space BuildingSpace
}, },
data() { data() {
return { return {
@ -50,7 +50,7 @@ export default {
}, },
created() { created() {
this.getInfoByProjectId() this.getInfoByProjectId()
this.activeName = 'info' this.activeName = 'space'
}, },
methods: { methods: {
getInfoByProjectId() { getInfoByProjectId() {