diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index cda5175..70f4159 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,6 +1,6 @@
const project = {
// title: '供水管理系统'
- title: '场区能源管理系统'
+ title: '生产及办公能耗管理系统'
}
export function getProject() {
return project
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index cda5175..70f4159 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,6 +1,6 @@
const project = {
// title: '供水管理系统'
- title: '场区能源管理系统'
+ title: '生产及办公能耗管理系统'
}
export function getProject() {
return project
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3234e3d..1e0de1a 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -17,7 +17,7 @@
{{ title }}
-
——海洋石油工程(青岛)有限公司
+
@@ -160,7 +160,7 @@
showKaptcha: false, // 是否显示验证码
// bgUrl: require('../../assets/login_images/theme0/bg.png'), // 背景图片
bgUrl: "",
- leftUrl: require("../../assets/login_images/theme0/left.jpg"), // 左边图片
+ leftUrl: require("../../assets/login_images/theme0/left2.jpg"), // 左边图片
};
},
watch: {
@@ -328,7 +328,7 @@
}
.title {
// color: $light_gray;
- color: #333333;
+ color: #eee;
font-size: 24px;
font-weight: 400;
}
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index cda5175..70f4159 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,6 +1,6 @@
const project = {
// title: '供水管理系统'
- title: '场区能源管理系统'
+ title: '生产及办公能耗管理系统'
}
export function getProject() {
return project
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3234e3d..1e0de1a 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -17,7 +17,7 @@
{{ title }}
-
——海洋石油工程(青岛)有限公司
+
@@ -160,7 +160,7 @@
showKaptcha: false, // 是否显示验证码
// bgUrl: require('../../assets/login_images/theme0/bg.png'), // 背景图片
bgUrl: "",
- leftUrl: require("../../assets/login_images/theme0/left.jpg"), // 左边图片
+ leftUrl: require("../../assets/login_images/theme0/left2.jpg"), // 左边图片
};
},
watch: {
@@ -328,7 +328,7 @@
}
.title {
// color: $light_gray;
- color: #333333;
+ color: #eee;
font-size: 24px;
font-weight: 400;
}
diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index bd7d9bc..e2afcd8 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -280,6 +280,8 @@
url: '../static/model/m1/m1.gltf',
scale: 1,
heading: 18.8,
+ allowPicking: false,
+ allowDrillPick: true,
opacity: this.alpha / 100
}
})
@@ -300,6 +302,7 @@
[120.23674459992945, 35.99390089905266, 0],
[120.2370464785011, 35.993805678199415, 0]
],
+ allowDrillPick: true,
style: {
color: '#ff9933',
opacity: 0.5
@@ -317,6 +320,7 @@
[120.2415915389704, 35.985298052771505, 0],
[120.23602620739703, 35.98677100966999, 0]
],
+ allowDrillPick: true,
style: {
color: '#8f33ff',
opacity: 0.5
@@ -330,6 +334,7 @@
[120.24252741479629, 35.98690709889674, 0],
[120.23687618438156, 35.9884998821015, 0]
],
+ allowDrillPick: true,
style: {
color: '#55c72d',
opacity: 0.5
@@ -343,6 +348,7 @@
[120.24352679510174, 35.987402619668444, 0],
[120.24328788012271, 35.98683994889791, 0]
],
+ allowDrillPick: true,
style: {
color: '#0c17eb',
opacity: 0.5
@@ -356,6 +362,7 @@
[120.24577211359146, 35.998282134347484, 0],
[120.24549888093004, 35.99833997613365, 0]
],
+ allowDrillPick: true,
style: {
color: '#eb0c70',
opacity: 0.5
@@ -369,6 +376,7 @@
[120.24218683667716, 35.99071055705772, 0],
[120.23792720384584, 35.99189441176851, 0]
],
+ allowDrillPick: true,
style: {
color: '#0ce4eb',
opacity: 0.5
@@ -382,6 +390,7 @@
[120.24545689336689, 35.998322668532914, 0],
[120.24091735461728, 35.99912170992487, 0]
],
+ allowDrillPick: true,
style: {
color: '#fff100',
opacity: 0.5
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index cda5175..70f4159 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,6 +1,6 @@
const project = {
// title: '供水管理系统'
- title: '场区能源管理系统'
+ title: '生产及办公能耗管理系统'
}
export function getProject() {
return project
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3234e3d..1e0de1a 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -17,7 +17,7 @@
{{ title }}
-
——海洋石油工程(青岛)有限公司
+
@@ -160,7 +160,7 @@
showKaptcha: false, // 是否显示验证码
// bgUrl: require('../../assets/login_images/theme0/bg.png'), // 背景图片
bgUrl: "",
- leftUrl: require("../../assets/login_images/theme0/left.jpg"), // 左边图片
+ leftUrl: require("../../assets/login_images/theme0/left2.jpg"), // 左边图片
};
},
watch: {
@@ -328,7 +328,7 @@
}
.title {
// color: $light_gray;
- color: #333333;
+ color: #eee;
font-size: 24px;
font-weight: 400;
}
diff --git a/src/views/overview/overviewSimple.vue b/src/views/overview/overviewSimple.vue
index bd7d9bc..e2afcd8 100644
--- a/src/views/overview/overviewSimple.vue
+++ b/src/views/overview/overviewSimple.vue
@@ -280,6 +280,8 @@
url: '../static/model/m1/m1.gltf',
scale: 1,
heading: 18.8,
+ allowPicking: false,
+ allowDrillPick: true,
opacity: this.alpha / 100
}
})
@@ -300,6 +302,7 @@
[120.23674459992945, 35.99390089905266, 0],
[120.2370464785011, 35.993805678199415, 0]
],
+ allowDrillPick: true,
style: {
color: '#ff9933',
opacity: 0.5
@@ -317,6 +320,7 @@
[120.2415915389704, 35.985298052771505, 0],
[120.23602620739703, 35.98677100966999, 0]
],
+ allowDrillPick: true,
style: {
color: '#8f33ff',
opacity: 0.5
@@ -330,6 +334,7 @@
[120.24252741479629, 35.98690709889674, 0],
[120.23687618438156, 35.9884998821015, 0]
],
+ allowDrillPick: true,
style: {
color: '#55c72d',
opacity: 0.5
@@ -343,6 +348,7 @@
[120.24352679510174, 35.987402619668444, 0],
[120.24328788012271, 35.98683994889791, 0]
],
+ allowDrillPick: true,
style: {
color: '#0c17eb',
opacity: 0.5
@@ -356,6 +362,7 @@
[120.24577211359146, 35.998282134347484, 0],
[120.24549888093004, 35.99833997613365, 0]
],
+ allowDrillPick: true,
style: {
color: '#eb0c70',
opacity: 0.5
@@ -369,6 +376,7 @@
[120.24218683667716, 35.99071055705772, 0],
[120.23792720384584, 35.99189441176851, 0]
],
+ allowDrillPick: true,
style: {
color: '#0ce4eb',
opacity: 0.5
@@ -382,6 +390,7 @@
[120.24545689336689, 35.998322668532914, 0],
[120.24091735461728, 35.99912170992487, 0]
],
+ allowDrillPick: true,
style: {
color: '#fff100',
opacity: 0.5
diff --git a/static/project.config.json b/static/project.config.json
index 7b9a3c3..0215df1 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -1,5 +1,5 @@
{
- "title": "场区能源管理系统",
+ "title": "生产及办公能耗管理系统",
"baseUrl": "http://111.198.10.15:20104/",
"mainPage": "http://111.198.10.15:11404/dcms/#",
"singleSys": true,