|
|
@@ -157,7 +157,7 @@ export default {
|
|
|
const dataTypeUnit={
|
|
|
'Length':'米',
|
|
|
'Weight':'吨',
|
|
|
- 'price':'元/米',
|
|
|
+ 'price':'元',
|
|
|
'electricity':'kwh',
|
|
|
'steam':'GJ',
|
|
|
'water':'m³',
|
|
|
@@ -210,7 +210,7 @@ export default {
|
|
|
DataFull.GetFacData()
|
|
|
}, 60*1000);
|
|
|
api.GetFacData().then((res)=>{
|
|
|
- if(window.CurrentTargetType!='FAC') return;
|
|
|
+ if(window.CurrentTargetType!='FAC') return;
|
|
|
FacStockData = res||{};
|
|
|
if (res == null || player.Native==null || window.CurrentTargetType!='FAC') {
|
|
|
return
|
|
|
@@ -253,7 +253,7 @@ export default {
|
|
|
//全局厂房最佳视图
|
|
|
function backMasterViewByFac(){
|
|
|
// player.Native.Camera.moveTo([235.678127000173, 13.38107286701451, 74.13573809425804], [-1248.3191825020908, -262.59031050373517, -409.93944372657353], [-0.30023176822741604, -0.055832565112502126, 0.9522308596238611], 1);
|
|
|
- player.Native.Camera.moveTo([132.11876502209185, -440.46670198759625, 492.25734718993556],
|
|
|
+ player.Native.Camera.moveTo([132.11876502209185, -440.46670198759625, 492.25734718993556],
|
|
|
[-640.8528070063287, 2116.1462138868947, -2471.4015229045867],
|
|
|
[-0.2149817792494004, 0.7110548607426664, 0.6694653236762824], 1);
|
|
|
// 使用异步函数
|
|
|
@@ -408,12 +408,12 @@ export default {
|
|
|
let data = deviceStatData.value.prodTrade;
|
|
|
//生产趋势
|
|
|
//获取数据中weight、aweight、bweight
|
|
|
- var t = echarts_sc_qushi.value;
|
|
|
+ var t = echarts_sc_qushi.value;
|
|
|
var week_aefficiency = [];
|
|
|
var week_befficiency = [];
|
|
|
var times = [];
|
|
|
var v_series = [];
|
|
|
- for (var i = 0; i < data.length; i++) {
|
|
|
+ for (var i = 0; i < data.length; i++) {
|
|
|
var tv = data[i]['date'];
|
|
|
times.push([tv,data[i].tips]);
|
|
|
if(dataType=='Length'){
|
|
|
@@ -556,7 +556,7 @@ export default {
|
|
|
if (week_aefficiency.length> 0) {
|
|
|
v_series.push({
|
|
|
name: "经编", type: 'line', //symbol: 'none',
|
|
|
- data: week_aefficiency,
|
|
|
+ data: week_aefficiency,
|
|
|
symbol: 'circle', // 使用圆作为折点标记
|
|
|
symbolSize: 6,
|
|
|
itemStyle: {
|
|
|
@@ -572,7 +572,7 @@ export default {
|
|
|
if(week_befficiency.length>0){
|
|
|
v_series.push({
|
|
|
name: "染整", type: 'line', //symbol: 'none',
|
|
|
- data: week_befficiency,
|
|
|
+ data: week_befficiency,
|
|
|
symbol: 'circle', // 使用圆作为折点标记
|
|
|
symbolSize: 6,
|
|
|
itemStyle: {
|
|
|
@@ -670,7 +670,7 @@ export default {
|
|
|
if(echartsEleIns_0!=null){
|
|
|
echartsEleIns_0.dispose();
|
|
|
}
|
|
|
- echartsEleIns_0 = echarts.init(t);
|
|
|
+ echartsEleIns_0 = echarts.init(t);
|
|
|
echartsEleIns_0.setOption(opt);
|
|
|
}
|
|
|
function LoadJBPie(){
|
|
|
@@ -728,7 +728,7 @@ export default {
|
|
|
fontSize: 14,
|
|
|
show:false,
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
data: [
|
|
|
{
|
|
|
value: deviceStatData.value.currYield.jb.jdl, // 初始进度值
|
|
|
@@ -741,9 +741,9 @@ export default {
|
|
|
detail: {
|
|
|
valueAnimation: true,
|
|
|
offsetCenter: [0, 10],
|
|
|
- formatter: '{value}%',
|
|
|
- color: '#27e6ff', // 文字颜色
|
|
|
- fontSize: 24*BODY_H_RATE // 文字大小
|
|
|
+ formatter: '{value}%',
|
|
|
+ color: '#27e6ff', // 文字颜色
|
|
|
+ fontSize: 24*BODY_H_RATE // 文字大小
|
|
|
},
|
|
|
}
|
|
|
]
|
|
|
@@ -757,7 +757,7 @@ export default {
|
|
|
show:false,
|
|
|
},
|
|
|
itemStyle: {
|
|
|
- normal: {
|
|
|
+ normal: {
|
|
|
shadowBlur: 20,
|
|
|
shadowColor: 'rgba(0, 255, 255,.3)',
|
|
|
color: '#008596',
|
|
|
@@ -824,7 +824,7 @@ export default {
|
|
|
fontSize: 14,
|
|
|
show:false,
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
data: [
|
|
|
{
|
|
|
value: deviceStatData.value.currYield.jb.openRatio, // 初始进度值
|
|
|
@@ -837,9 +837,9 @@ export default {
|
|
|
detail: {
|
|
|
valueAnimation: true,
|
|
|
offsetCenter: [0, 10],
|
|
|
- formatter: '{value}%',
|
|
|
- color: '#27e6ff', // 文字颜色
|
|
|
- fontSize: 24*BODY_H_RATE // 文字大小
|
|
|
+ formatter: '{value}%',
|
|
|
+ color: '#27e6ff', // 文字颜色
|
|
|
+ fontSize: 24*BODY_H_RATE // 文字大小
|
|
|
},
|
|
|
}
|
|
|
]
|
|
|
@@ -853,7 +853,7 @@ export default {
|
|
|
show:false,
|
|
|
},
|
|
|
itemStyle: {
|
|
|
- normal: {
|
|
|
+ normal: {
|
|
|
shadowBlur: 20,
|
|
|
shadowColor: 'rgba(0, 255, 255,.3)',
|
|
|
color: '#008596',
|
|
|
@@ -881,7 +881,7 @@ export default {
|
|
|
show:false,
|
|
|
},
|
|
|
tooltip: {
|
|
|
- formatter: function(a){
|
|
|
+ formatter: function(a){
|
|
|
return a.seriesName+'<br>'+a.name+" : "+a.value/100*deviceStatData.value.currYield.rz.maxLine+'条';
|
|
|
}
|
|
|
},
|
|
|
@@ -926,7 +926,7 @@ export default {
|
|
|
fontSize: 14,
|
|
|
show:false,
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
data: [
|
|
|
{
|
|
|
value: deviceStatData.value.currYield.rz.openLine/deviceStatData.value.currYield.rz.maxLine*100, // 初始进度值
|
|
|
@@ -942,8 +942,8 @@ export default {
|
|
|
formatter:function(v){
|
|
|
return v/100*deviceStatData.value.currYield.rz.maxLine+'条'
|
|
|
},
|
|
|
- color: '#27e6ff', // 文字颜色
|
|
|
- fontSize: 24*BODY_H_RATE // 文字大小
|
|
|
+ color: '#27e6ff', // 文字颜色
|
|
|
+ fontSize: 24*BODY_H_RATE // 文字大小
|
|
|
},
|
|
|
}
|
|
|
]
|
|
|
@@ -957,7 +957,7 @@ export default {
|
|
|
show:false,
|
|
|
},
|
|
|
itemStyle: {
|
|
|
- normal: {
|
|
|
+ normal: {
|
|
|
shadowBlur: 20,
|
|
|
shadowColor: 'rgba(0, 255, 255,.3)',
|
|
|
color: '#008596',
|
|
|
@@ -1024,7 +1024,7 @@ export default {
|
|
|
fontSize: 14,
|
|
|
show:false,
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
data: [
|
|
|
{
|
|
|
value: deviceStatData.value.currYield.rz.openRatio, // 初始进度值
|
|
|
@@ -1037,9 +1037,9 @@ export default {
|
|
|
detail: {
|
|
|
valueAnimation: true,
|
|
|
offsetCenter: [0, 10],
|
|
|
- formatter: '{value}%',
|
|
|
- color: '#27e6ff', // 文字颜色
|
|
|
- fontSize: 24*BODY_H_RATE // 文字大小
|
|
|
+ formatter: '{value}%',
|
|
|
+ color: '#27e6ff', // 文字颜色
|
|
|
+ fontSize: 24*BODY_H_RATE // 文字大小
|
|
|
},
|
|
|
}
|
|
|
]
|
|
|
@@ -1053,7 +1053,7 @@ export default {
|
|
|
show:false,
|
|
|
},
|
|
|
itemStyle: {
|
|
|
- normal: {
|
|
|
+ normal: {
|
|
|
shadowBlur: 20,
|
|
|
shadowColor: 'rgba(0, 255, 255,.3)',
|
|
|
color: '#008596',
|
|
|
@@ -1092,7 +1092,7 @@ export default {
|
|
|
clearTimeout(getDataTimer2);
|
|
|
clearTimeout(getDataTimer3);
|
|
|
clearTimeout(getDataTimer4);
|
|
|
- DataFull.GetFacData();
|
|
|
+ DataFull.GetFacData();
|
|
|
DataFull.GetDeviceStat();
|
|
|
backMasterViewByFac();
|
|
|
});
|
|
|
@@ -1109,7 +1109,7 @@ export default {
|
|
|
if(marklst==null) return;
|
|
|
for(var i=0;i<marklst.length;i++){
|
|
|
if(player!=null && player.Native!=null)player.Native.GisMarker.destroy(marklst[i].id)
|
|
|
- }
|
|
|
+ }
|
|
|
})();
|
|
|
|
|
|
});
|
|
|
@@ -1161,8 +1161,8 @@ export default {
|
|
|
/*
|
|
|
background:url('../../assets/image//bg.png');
|
|
|
-webkit-mask-image:radial-gradient(circle, transparent 26%, #95afc5 54%);
|
|
|
-
|
|
|
- background:
|
|
|
+
|
|
|
+ background:
|
|
|
repeating-linear-gradient(
|
|
|
45deg,
|
|
|
#ccc 0, #ccc 10px,
|
|
|
@@ -1178,12 +1178,12 @@ export default {
|
|
|
}
|
|
|
.tools{
|
|
|
display: flex;
|
|
|
- justify-content: center;
|
|
|
- flex-flow: row;
|
|
|
+ justify-content: center;
|
|
|
+ flex-flow: row;
|
|
|
top: calc(80px * var(--hRate)) !important;
|
|
|
width: 98.2%;
|
|
|
z-index: 11;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
.tools .btn{
|
|
|
width: 100px !important;
|
|
|
@@ -1220,15 +1220,15 @@ export default {
|
|
|
width: 11%;
|
|
|
color: #fff;
|
|
|
font-size: 14px;
|
|
|
- z-index: 2;
|
|
|
+ z-index: 2;
|
|
|
filter: blur(0px);
|
|
|
backdrop-filter: blur(5px);
|
|
|
/*border: 1px solid #b4a9e6;*/
|
|
|
/*background: #1d476c1c;*/
|
|
|
border-radius: 5px;
|
|
|
- box-shadow: 0px 0px 10px #c1cce587;
|
|
|
+ box-shadow: 0px 0px 10px #c1cce587;
|
|
|
/*transform: rotateZ(0deg) rotateX(20deg) rotateY(-58deg) skew(2deg);*/
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
.productionPanel .content{
|
|
|
background: transparent;padding: 5px;
|
|
|
@@ -1247,4 +1247,4 @@ export default {
|
|
|
font-size: 19px;
|
|
|
margin: 10px 29%;
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|
