现场测试bug修复

main
zhangqun 3 years ago
parent fbb41565ad
commit e39f49b890
  1. 4
      src/components/monitoring/electricity.vue
  2. 4
      src/components/monitoring/wall.vue
  3. 1
      src/views/garden/generalizePattern.vue
  4. 4
      vue.config.js

@ -73,7 +73,7 @@
<img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.warnStatus == 2" />
<img class="icon" src="../../../public/img/monitoring/electricity/bj.png" v-else />
<span class="message" :style="{ color: item.warnStatus == 2 ? 'white' : 'red' }"
v-text="item.equipName"></span>
v-text="item.name"></span>
</div>
<span class=""></span>
<!-- <span class="data" :style="{ color: item.status == 90001 ? '#9D9D9D' : 'red' }">{{ item.status == 90001 ?
@ -374,7 +374,6 @@ import {
mapUpdate,
mapViewerCamera,
setCameraStatus,
recoveryWarn,//
} from "../../util/bfHelper";
import * as commonValue from "../../util/commonValue";
import echarts from "./echarts1";
@ -393,6 +392,7 @@ import {
getTtElectricityRight, //
getElectricWarnList, //
getCancelWarn,//
recoveryWarn,//
} from "@/api/garden/monitoring";
import bfHelperState from "../../store/modules/bfHelperState";
export default {

@ -987,7 +987,7 @@ export default {
null,
this.getWallContent(
row.status,
row.status == 9000 ? "正常" : "离线",
row.status == 90000 ? "正常" : "离线",
row.name,
row.location,
row.warnContent ? row.warnContent : row.warnMsg,
@ -1021,7 +1021,7 @@ export default {
null,
this.getWallContent(
row.status,
row.status == 9000 ? "正常" : "离线",
row.status == 90000 ? "正常" : "离线",
row.name,
row.location,
row.warnContent ? row.warnContent : row.warnMsg,

@ -1330,6 +1330,7 @@ export default {
radius: ["40%", "55%"],
center: ["25%", "40%"],
label: {
show: false,
formatter: "{c}",
color: "rgba(255,255,255,0.5)",
textBorderWidth: 0,

@ -46,8 +46,8 @@ module.exports = {
// target: 'http://192.168.0.105:80',
// target: "http://192.168.43.35",
// target: 'http://192.168.1.106',
// target: "http://192.168.1.3",
target: "http://10.90.100.204",
target: "http://192.168.1.3",
// target: "http://10.90.100.204",
// target: "http://rsvz4t.natappfree.cc",
//远程演示服务地址,可用于直接启动项目
//target: 'https://saber.bladex.vip/api',

Loading…
Cancel
Save