0/1
+ singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
+ waitTime: 100, // 单步运动停止的时间(默认值1000ms)
+ };
+ },
+ },
mounted() {
- this.$nextTick(() => {
- this.rollUp();
- });
+ // this.$nextTick(() => {
+ // this.rollUp();
+ // });
},
beforeDestroy() {
this.timer = null;
- clearInterval(this.timer);
+ // clearInterval(this.timer);
},
created() {
this.elementId = new Date().getTime();
},
methods: {
- rollUp() {
- let ul1 = document.getElementById("publishMain1" + this.elementId);
- let ul2 = document.getElementById("publishMain2" + this.elementId);
- let box = document.getElementById("publishMain" + this.elementId);
- ul2.innerHTML = ul1.innerHTML;
- box.scrollTop = 0;
- function rollStart() {
- if (box.scrollTop >= ul1.scrollHeight) {
- box.scrollTop = 0;
- } else {
- box.scrollTop++;
- }
- }
- this.timer = setInterval(rollStart, 100);
- },
+ // rollUp() {
+ // let ul1 = document.getElementById("publishMain1" + this.elementId);
+ // let ul2 = document.getElementById("publishMain2" + this.elementId);
+ // let box = document.getElementById("publishMain" + this.elementId);
+ // ul2.innerHTML = ul1.innerHTML;
+ // box.scrollTop = 0;
+ // function rollStart() {
+ // if (box.scrollTop >= ul1.scrollHeight) {
+ // box.scrollTop = 0;
+ // } else {
+ // box.scrollTop++;
+ // }
+ // }
+ // this.timer = setInterval(rollStart, 100);
+ // },
},
};
@@ -212,11 +286,6 @@ export default {
}
}
}
-
- .b_scroll {
- -webkit-animation: 10s scrollTop linear infinite normal;
- animation: 10s scrollTop linear infinite normal;
- }
}
}
}
diff --git a/src/components/Cards/ENavCardBigScreen.vue b/src/components/Cards/ENavCardBigScreen.vue
new file mode 100644
index 00000000..25f2667a
--- /dev/null
+++ b/src/components/Cards/ENavCardBigScreen.vue
@@ -0,0 +1,150 @@
+
+
+
+
+
+
diff --git a/src/views/bigScreen/v3/profile/echartsLineT.vue b/src/components/Echarts/EEchartsLine.vue
similarity index 89%
rename from src/views/bigScreen/v3/profile/echartsLineT.vue
rename to src/components/Echarts/EEchartsLine.vue
index 43dbb383..65c5fb46 100644
--- a/src/views/bigScreen/v3/profile/echartsLineT.vue
+++ b/src/components/Echarts/EEchartsLine.vue
@@ -1,12 +1,12 @@
-
+
diff --git a/src/config/env.js b/src/config/env.js
index a8edbabb..1f18f04b 100644
--- a/src/config/env.js
+++ b/src/config/env.js
@@ -9,6 +9,8 @@ let sysWebSocket = 'ws://'
let prodApi = window.dasConfig.ip || '/prod-api';
let wsProtocol = 'ws://';
let iotWebSocketAlarmBaseUrl = ''
+let bigWebSocketUrl = ''
+let port = '8899'
window.dasConfig = {
ip: 'http://192.168.10.241:32024'
@@ -24,7 +26,7 @@ let httpProtocol = 'http';
if (env.NODE_ENV == 'development') {
flowIotUrl = 'http://127.0.0.1:1880/#flow/'
- hrefHost = "192.168.18.139"
+ hrefHost = "192.168.18.140"
} else if(env.NODE_ENV == 'production') {
// if (hrefHost.indexOf('.gkiiot.com') >= 0) {
// iotHost = 'iot.gkiiot.com'
@@ -35,9 +37,11 @@ if (env.NODE_ENV == 'development') {
if (window.dasConfig.ip) {
hrefHost = window.dasConfig.ip
}
+ port = window.dasConfig.port
} else if(env.NODE_ENV == 'test') {
}
iotWebSocketAlarmBaseUrl = sysWebSocket + hrefHost + ':8899/ws/alarm/live'
+bigWebSocketUrl = sysWebSocket + hrefHost + ( port ? ':'+ port :'') + '/ws/dev/readData'
sysWebSocket = sysWebSocket + hrefHost + prodApi;
iotWebSocketBaseUrl = sysWebSocket + '/ws/dev/up/'
devLiveWebSocketBaseUrl = sysWebSocket + '/ws/dev/live/'
@@ -49,5 +53,6 @@ export {
iotWebSocketBaseUrl,
iotWebSocketAlarmBaseUrl,
devLiveWebSocketBaseUrl,
- prodApi
+ prodApi,
+ bigWebSocketUrl
}
diff --git a/src/utils/request.js b/src/utils/request.js
index c0af4fa0..e7e3cf12 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -9,7 +9,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
// 创建axios实例
const service = axios.create({
// axios中请求配置有baseURL选项，表示请求URL公共部分
- baseURL: process.env.NODE_ENV === "production" ? `${window.dasConfig.protocol}${window.dasConfig.ip}:${window.dasConfig.port}` : process.env.VUE_APP_BASE_API,
+ baseURL: process.env.NODE_ENV === "production" ? `${window.dasConfig.protocol}${window.dasConfig.ip}${window.dasConfig.port ? ':'+window.dasConfig.port : ''}` : process.env.VUE_APP_BASE_API,
// 超时
timeout: 10000
})
diff --git a/src/views/bigScreen/v3/index.vue b/src/views/bigScreen/v3/index.vue
index 5622d9ee..9e2145aa 100644
--- a/src/views/bigScreen/v3/index.vue
+++ b/src/views/bigScreen/v3/index.vue
@@ -11,18 +11,18 @@
}"
>
-
+ />
-
+ :countNum="(projectStatInfo['coal'] / 1000).toFixed(2) || 0"
+ >
-
+ :countNum="
+ (projectStatInfo['ELECTRICITY_METER'] / 10000).toFixed(2) || 0
+ "
+ >
-
+
-