diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 93c41522..afcd6894 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -46,7 +46,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
// axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc' // 邱平毅vpn本地
// axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
- // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
+ axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
// axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
// axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
@@ -79,7 +79,8 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发 huaxin 123456789
// axios.defaults.baseURL = 'http://139.9.66.234:7072/' //三江集团测试环境
// axios.defaults.baseURL = 'http://116.169.63.183:7070' //三江集团正式环境
- axios.defaults.baseURL = 'http://182.90.224.147:18170' //郭圣雄本地
+ // axios.defaults.baseURL = 'http://182.90.224.147:18170' //郭圣雄本地
+ // axios.defaults.baseURL = 'http://58.250.210.9:9090' //深汕线上
} else if (process.env.NODE_ENV == 'debug') {
axios.defaults.baseURL = 'https://www.ceshi.com'
diff --git a/src/views/projectAdmin/fourEngin/command/leftTwo.vue b/src/views/projectAdmin/fourEngin/command/leftTwo.vue
index 65131042..e9a42c0d 100644
--- a/src/views/projectAdmin/fourEngin/command/leftTwo.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftTwo.vue
@@ -20,11 +20,11 @@
安全
-
近零能耗建筑 绿建三星 LEED金级 WELL金级
-
省级智慧建造试点项目
-
AAA装配式建筑
-
鲁班奖
-
全国建设工程施工安全生产标准化工地
+
近零能耗建筑 绿建三星 LEED金级 WELL金级
+
省级智慧建造试点项目
+
AAA装配式建筑
+
鲁班奖
+
全国建设工程施工安全生产标准化工地
@@ -89,8 +89,9 @@ export default {
float: left;
margin-left: -20px;
&:not(:last-child) {
- margin-bottom: 12px;
+ // margin-bottom: 12px;
display: flow-root;
+ margin-top: -20px;
}
div {
@@ -122,41 +123,41 @@ export default {
}
}
.row1 {
- float: right;
- // margin: -203px 83px 0px 0px;
+ // float: right;
+ // // margin: -203px 83px 0px 0px;
font-size: 16px;
- &:not(:last-child) {
- margin-bottom: 12px;
- display: flow-root;
- // margin-right: 120px;
- }
+ // &:not(:last-child) {
+ // margin-bottom: 12px;
+ // display: flow-root;
+ // // margin-right: 120px;
+ // }
div {
- text-align: center;
+ // text-align: center;
- &:last-child {
- flex: 1;
- margin: 20px 0 0 0;
- }
-
- &:first-child {
- width: 100px;
- }
+ // &:last-child {
+ // flex: 1;
+ // margin: 20px 0 0 0;
+ // }
+ // &:first-child {
+ // width: 100px;
+ // }
+ // // &:nth-child(3) {
+ // // margin-left: -20px;
+ // // }
&:not(:last-child) {
- width: 320px;
+ width: 315px;
text-overflow: ellipsis;
-
overflow: hidden;
-
white-space: nowrap;
- margin: 20px 0 0 -40px;
+ margin: 20px 0 20px 0;
}
- img {
- width: 80px;
- height: 50px;
- }
+ // img {
+ // width: 80px;
+ // height: 50px;
+ // }
}
}
}
diff --git a/src/views/projectAdmin/fourEngin/sourse/rightTop.vue b/src/views/projectAdmin/fourEngin/sourse/rightTop.vue
index 296d0d9e..dff65ad7 100644
--- a/src/views/projectAdmin/fourEngin/sourse/rightTop.vue
+++ b/src/views/projectAdmin/fourEngin/sourse/rightTop.vue
@@ -87,10 +87,29 @@ export default {
}
],
legend: ['BIM模型用量', '实际用量', '偏差比例'],
- value1: '1',
- value2: '1',
+ // value1: '1',
+ // value2: '1',
grid: ['18%', '2%', '2%', '2%'],
+
xData: new Array(12).fill('破产倒闭').map((v, i) => i + 1 + '月'),
+ yAxis: [
+ {
+ type: 'value',
+ scale: true,
+ name: '偏差比例',
+ min: 0,
+ max: 250,
+ position: 'right',
+ axisLine: {
+ lineStyle: {
+ color: 'red'
+ }
+ },
+ axisLabel: {
+ formatter: '{value} ml'
+ }
+ }
+ ],
series: [
{
name: 'BIM模型用量',