@@ -340,9 +340,9 @@ export default {
SMData: [],
IMData: [],
factoryName: "",
- initialAlpha: -Math.PI / 4.5,
- initialBeta: Math.PI / 2,
- initialRadius: 2.5,
+ initialAlpha: 2.73,
+ initialBeta: 1.24,
+ initialRadius: 8,
initialTarget: null,
resizeTimeout: null,
loadedPercent: 0,
@@ -378,11 +378,11 @@ export default {
new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
- color: "rgb(128, 255, 165)",
+ color: "rgb(255, 255, 0)",
},
{
offset: 1,
- color: "rgb(1, 191, 236)",
+ color: "rgb(255, 255, 0)",
},
]),
@@ -399,7 +399,7 @@ export default {
new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
- color: "rgb(55, 162, 255)",
+ color: "rgb(255, 162, 255)",
},
{
offset: 1,
@@ -467,7 +467,7 @@ export default {
tableData: [],
tezhongData: [],
option: {
- color: ["#80FFA5", "#00DDFF", "#37A2FF", "#FF0087", "#FFBF00"],
+ // color: ["#80FFA5", "#00DDFF", "#37A2FF", "#FF0087", "#FFBF00"],
tooltip: {
trigger: "axis",
axisPointer: {
@@ -476,6 +476,10 @@ export default {
backgroundColor: "#6a7985",
},
},
+ textStyle: {
+ color: "#02f5f2",
+ },
+ backgroundColor: "rgba(255,255,255,0.3)",
},
legend: {
icon: "stack",
@@ -758,11 +762,14 @@ export default {
};
return this.$API.enm.enstat.req(query);
}).then((response) => {
+ let maxId;
response.forEach((item) => {
let ind = item.day_s - 1;
+ maxId = ind;
seriesData2[ind] = item.total_production || 0;
});
// 更新图表数据
+ option1.color = ['#FFFF00','#CC00FF', '#FFBF00']
option1.legend.data = [
{
name: "熟料",
@@ -781,7 +788,7 @@ export default {
},
borderRadius: 2,
itemStyle: {
- color: that.linearGradientColors[1],
+ color: that.linearGradientColors[2],
},
},
{
@@ -791,7 +798,7 @@ export default {
},
borderRadius: 2,
itemStyle: {
- color: that.linearGradientColors[2],
+ color: that.linearGradientColors[4],
},
},
];
@@ -801,7 +808,7 @@ export default {
type: "line",
smooth: true,
lineStyle: {
- width: 0,
+ width: 0,
},
showSymbol: false,
areaStyle: {
@@ -823,7 +830,7 @@ export default {
showSymbol: false,
areaStyle: {
opacity: 0.8,
- color: that.linearGradientColors[1],
+ color: that.linearGradientColors[2],
},
emphasis: {
focus: "series",
@@ -840,7 +847,7 @@ export default {
showSymbol: false,
areaStyle: {
opacity: 0.8,
- color: that.linearGradientColors[2],
+ color: that.linearGradientColors[4],
},
emphasis: {
focus: "series",
@@ -849,8 +856,31 @@ export default {
},
];
myChart.setOption(option1);
+ let index2 = 0;
+ intervalId = setInterval(function () {
+ if (index2 <= maxId) {
+ myChart.dispatchAction({
+ type: "downplay",
+ seriesIndex: 0,
+ });
+ myChart.dispatchAction({
+ type: "highlight",
+ seriesIndex: 0,
+ dataIndex: index2,
+ });
+ myChart.dispatchAction({
+ type: "showTip",
+ seriesIndex: 0,
+ dataIndex: index2,
+ });
+ index2++;
+ } else {
+ index2 = 0;
+ clearInterval(intervalId);
+ }
+ }, 1000);
});
- },
+ },
getMonthData() {
// 获取回转窑数据
let that = this;
@@ -969,6 +999,7 @@ export default {
}
});
// 更新图表数据
+ option3.color = ['#FFBF00','#6495ED', '#CC00FF']
option3.legend.data = [
{
name: "原料车间用水",
@@ -1005,18 +1036,27 @@ export default {
{
name: '原料车间用水',
type: 'line',
- data: seriesData1
+ data: seriesData1,
+ lineStyle: {
+ color: that.linearGradientColors[0],
+ },
},
{
name: '烧成车间用水',
type: 'line',
- data: seriesData3
+ data: seriesData3,
+ lineStyle: {
+ color: that.linearGradientColors[1],
+ },
},
{
name: '水泥车间用水',
type: 'line',
- data: seriesData5
- }
+ data: seriesData5,
+ lineStyle: {
+ color: that.linearGradientColors[2]
+ },
+ },
]
myChart.setOption(option3); // 设置更新后的图表
});
@@ -1061,7 +1101,7 @@ export default {
});
});
},
- //余热发电&环保数据
+ //&环保数据
generation() {
let that = this;
this.$API.mtm.mgroup.list
@@ -1191,7 +1231,7 @@ export default {
radarChart.setOption(that.radarOption);
});
},
- //质量分析---待定
+ //质量分析
qualAnalys() {
let that = this;
// 初始化option2和图表
@@ -1238,6 +1278,7 @@ export default {
}
});
// 更新图表数据
+ option5.color = ["#80FFA5", "#00DDFF", "#37A2FF", "#FF0087", "#FFBF00"],
option5.legend.data = [
{
name: "f-CaO",
@@ -1246,7 +1287,7 @@ export default {
},
borderRadius: 2,
itemStyle: {
- color: that.linearGradientColors[0],
+ color: "#80FFA5",
},
},
{
@@ -1256,7 +1297,7 @@ export default {
},
borderRadius: 2,
itemStyle: {
- color: that.linearGradientColors[1],
+ color: "#00DDFF",
},
},
{
@@ -1266,7 +1307,7 @@ export default {
},
borderRadius: 2,
itemStyle: {
- color: that.linearGradientColors[2],
+ color: "#37A2FF",
},
},
{
@@ -1276,7 +1317,7 @@ export default {
},
borderRadius: 2,
itemStyle: {
- color: that.linearGradientColors[3],
+ color: "#FF0087",
},
},
{
@@ -1286,7 +1327,7 @@ export default {
},
borderRadius: 2,
itemStyle: {
- color: that.linearGradientColors[4],
+ color: "#FFBF00",
},
},
];
@@ -1527,7 +1568,7 @@ export default {
that.initialAlpha,
that.initialBeta,
that.initialRadius,
- new BABYLON.Vector3(0, 0, 1.2)
+ new BABYLON.Vector3(-0.45, 1.588, 1.93)
);
that.camera = camera;
that.initialTarget = camera.getTarget();
@@ -1692,6 +1733,10 @@ export default {
dataView.isVisible = false;
}
}
+ console.log("Camera Alpha:", camera.alpha);
+ console.log("Camera Beta:", camera.beta);
+ console.log("Camera Radius:", camera.radius);
+ console.log("Camera Radius:", camera.target);
});
control_main.addControl(checkbox1);
var header1 = new BABYLON_GUI.TextBlock();
diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue
index 217eeba0..55f512b5 100644
--- a/src/views/em/equipment.vue
+++ b/src/views/em/equipment.vue
@@ -26,13 +26,13 @@
-
+
-
+
@@ -70,7 +70,7 @@
{{ scope.row.place }}
-
+
{{ scope.row.description }}
@@ -93,8 +93,9 @@
+
+ @closed="dialog.check = false">
-
-
+
+
diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue
index 28cf02ad..596eae91 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -100,10 +100,11 @@
-
-
-
+
+
+
+
+
@@ -153,8 +154,8 @@
-
-
+
+
@@ -263,6 +264,18 @@ export default {
value: 40,
label: '禁用'
}],
+ importace: [
+ {
+ value: 10,
+ label: 'A'
+ },{
+ value: 20,
+ label: 'B'
+ },{
+ value: 30,
+ label: 'C'
+ },
+ ],
parameter_json: [
{ key: '', value: '' }
],
diff --git a/src/views/enm_base/search.vue b/src/views/enm_base/search.vue
index 62d400b2..18367230 100644
--- a/src/views/enm_base/search.vue
+++ b/src/views/enm_base/search.vue
@@ -65,7 +65,7 @@
{{ item.elec_consume_unit }} |
{{ item.celec_consume_unit }} |
{{ item.coal_consume_unit }} |
- {{ item.en_consume_unit }} |
+ {{ item.cen_consume_unit }} |