Skip to content

K
kd_control
Commit 2ee435f7 authored by zhanglw's avatar zhanglw
Browse files
Options

后台链接调整

parent 46e4421d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
.env.production
View file @ 2ee435f7
...@@ -4,7 +4,7 @@ ENV = 'production' ...@@ -4,7 +4,7 @@ ENV = 'production'
# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
VUE_APP_BASE_API = 'https://el-admin.xin' VUE_APP_BASE_API = 'https://el-admin.xin'
# 如果接口是 http 形式， wss 需要改为 ws # 如果接口是 http 形式， wss 需要改为 ws
VUE_APP_WS_API = 'ws://8.143.203.103:9092/webSocket' VUE_APP_WS_API = 'ws://39.164.225.220:5000/webSocket'
VUE_APP_LOCAL_API = '/' VUE_APP_LOCAL_API = '/'
VUE_APP_LOCAL_API2 = '/' VUE_APP_LOCAL_API2 = '/'
src/views/MLargeScreen/index.vue
View file @ 2ee435f7
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</div> </div>
<!-- 嵌入三维地图页面 --> <!-- 嵌入三维地图页面 -->
<!-- <iframe :src="url" frameborder="0" class="mapcontainer1"></iframe>--> <!-- <iframe :src="url" frameborder="0" class="mapcontainer1"></iframe>-->
<iframe ref="iframe" src="http://192.168.3.60:18041//#/Index" frameborder="0" class="mapcontainer1"></iframe> <iframe ref="iframe" src="http://39.164.225.220:5001//#/Index" frameborder="0" class="mapcontainer1"></iframe>
<!-- <iframe ref="iframe" src="http://192.168.3.38:3002/#/Index" frameborder="0" class="mapcontainer1"></iframe>--> <!-- <iframe ref="iframe" src="http://192.168.3.38:3002/#/Index" frameborder="0" class="mapcontainer1"></iframe>-->
<!-- 单个车辆视频监控 --> <!-- 单个车辆视频监控 -->
......
src/views/productionPlanManagement/enterpriseInfo/index.vue
View file @ 2ee435f7
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="ctin-box"> <div class="ctin-box">
<div class="content-within"> <div class="content-within">
<div class="content-fix"> <div class="content-fix">
<div class="toolbar"> <div class="toolbar" style="display: flex;justify-content: space-between;">
<div style="line-height:30px">企业基本信息</div> <div style="line-height:30px">企业基本信息</div>
<div> <div>
<el-button size="mini" :type="readonly?'primary':''" :icon="readonly?'el-icon-edit':'el-icon-close'" @click="editInfo()">{{readonly?'编辑信息':'取消编辑'}}</el-button> <el-button size="mini" :type="readonly?'primary':''" :icon="readonly?'el-icon-edit':'el-icon-close'" @click="editInfo()">{{readonly?'编辑信息':'取消编辑'}}</el-button>
...@@ -841,8 +841,4 @@ export default { ...@@ -841,8 +841,4 @@ export default {
content: ''; content: '';
} }
.toolbar {
display: flex;
justify-content: space-between;
}
</style> </style>
src/views/slopeMonitoring/surfaceDisplacementLog/index.vue
View file @ 2ee435f7
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
<el-table-column prop="dispX" label="x变化量" align="center"></el-table-column> <el-table-column prop="dispX" label="x变化量" align="center"></el-table-column>
<el-table-column prop="dispY" label="y变化量" align="center"></el-table-column> <el-table-column prop="dispY" label="y变化量" align="center"></el-table-column>
<el-table-column prop="dispH" label="z变化量" align="center"></el-table-column> <el-table-column prop="dispH" label="z变化量" align="center"></el-table-column>
<el-table-column prop="star" label="卫星数量" align="center"></el-table-column>
<el-table-column prop="state" label="是否报警" align="center"> <el-table-column prop="state" label="是否报警" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.state?'报警':'正常'}}</span> <span>{{ scope.row.state?'报警':'正常'}}</span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment