diff --git a/src/views/bigScreen/cesiumtest.vue b/src/views/bigScreen/cesiumtest.vue
index 1e291ccd..90350101 100644
--- a/src/views/bigScreen/cesiumtest.vue
+++ b/src/views/bigScreen/cesiumtest.vue
@@ -383,13 +383,26 @@ export default {
{
type: "line",
encode: { y: "运行状态", seriesName: ["运行状态"] },
+ lineStyle: {
+ color: function (params) {
+ // 自定义每个数据点的颜色
+ console.log(params.value);
+ if (params.value > 0 && params.value < 15) {
+ return "#21a51f";
+ } else if (value > 15 && value < 45) {
+ return "#ff8608";
+ } else {
+ return "c7c7c7";
+ }
+ },
+ },
itemStyle: {
normal: {
color: function (params) {
var value = params.value;
- if (value < 15) {
+ if (value > 0 && value < 15) {
return "#21a51f";
- } else if (value >= 15 && value < 45) {
+ } else if (value > 15 && value < 45) {
return "#ff8608";
} else {
return "c7c7c7";
@@ -401,13 +414,21 @@ export default {
],
},
modelPosition: [
- { lng: 88.64154268696439, lat: 42.721977308996635 },
- { lng: 88.64217853109109, lat: 42.721910071501945 },
- { lng: 88.64628960011686, lat: 42.72184710482201 },
- { lng: 88.64619581826986, lat: 42.7215414346846 },
- { lng: 88.64013560274894, lat: 42.72268219734449 },
- { lng: 88.64035358529543, lat: 42.72266224153806 },
- { lng: 88.64013259837789, lat: 42.722622240941305 },
+ {
+ lng: 119.42828291697619,
+ lat: 40.97419456450223,
+ height: 37.725744652917264,
+ },
+ {
+ lng: 119.4295249200144,
+ lat: 40.97458969709657,
+ height: 44.263260612448,
+ },
+ {
+ lng: 119.42920127023919,
+ lat: 40.97442752133717,
+ height: 69.07964676765597,
+ },
],
};
},
@@ -462,17 +483,11 @@ export default {
viewer.scene.globe.enableLighting = true;
viewer._cesiumWidget._creditContainer.style.display = "none";
//*****cesium加载.glb格式的文件*****//
- var url = "photon_tree.glb";
+ var url = "ly.glb";
var height = 0;
viewer.entities.removeAll(); //加载之前先清楚所有entity
- var position = Cesium.Cartesian3.fromDegrees(
- 88.64349,
- 42.72285,
- // 88.69159,
- // 42.73185,
- height
- );
- var heading = Cesium.Math.toRadians(191); //310度转弧度
+ var position = Cesium.Cartesian3.fromDegrees(119.4295, 40.974, height);
+ var heading = Cesium.Math.toRadians(132); //310度转弧度
var pitch = Cesium.Math.toRadians(0);
var roll = Cesium.Math.toRadians(0);
var hpr = new Cesium.HeadingPitchRoll(heading, pitch, roll);
@@ -480,7 +495,7 @@ export default {
position,
hpr
);
- var modelScale = 2.3; // 假设模型原始单位是厘米，需要转换为米
+ var modelScale = 40; // 假设模型原始单位是厘米，需要转换为米
var modelEntity = viewer.entities.add({
name: "photon",
position: position,
@@ -495,12 +510,12 @@ export default {
},
});
var destination_tree = Cesium.Cartesian3.fromDegrees(
- 88.64355,
- 42.715,
+ 119.43,
+ 40.965,
500
);
var heading_tree = Cesium.Math.toRadians(1); // 指定航向角度
- var pitch_tree = Cesium.Math.toRadians(-30); // 俯仰角度
+ var pitch_tree = Cesium.Math.toRadians(-25); // 俯仰角度
var roll_tree = Cesium.Math.toRadians(0); // 指定滚转角度
var orientation_camer = new Cesium.HeadingPitchRoll(
@@ -598,7 +613,7 @@ export default {
// 使用刚指定的配置项和数据显示图表。
// myChart.setOption(option)
this.$API.bi.dataset.exec.req("enp_edata2", params).then((res) => {
- console.log(res);
+ console.log("newOption.dataset", res);
let newOption = Object.assign({}, this.basicOption);
newOption.dataset.source = res.data.ds0;
myChart.setOption(newOption);
@@ -1010,7 +1025,7 @@ export default {
}
.greenIcon,
.greenIcon > .radio-ico {
- color: #1ca50a;
+ color: #faed1f;
}
.orangeIcon,
.orangeIcon > .radio-ico {
diff --git a/src/views/enm_limestone/handoverLog.vue b/src/views/enm_limestone/handoverLog.vue
index a0ffc9a8..0aaec9a4 100644
--- a/src/views/enm_limestone/handoverLog.vue
+++ b/src/views/enm_limestone/handoverLog.vue
@@ -106,8 +106,6 @@
type="primary"
>编辑
-
-
-
-
-
diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue
index 532dfa9f..dc15245d 100644
--- a/src/views/inm/mioitem_check.vue
+++ b/src/views/inm/mioitem_check.vue
@@ -607,7 +607,7 @@
@@ -804,7 +804,7 @@ export default {
console.log("objitem", that.objitem);
that.form.material_name = that.objitem.material_name;
that.form.batch = that.objitem.batch;
- that.form.count_bag = that.objitem.count_bag;
+ that.form.count = that.objitem.count;
}
if (
(that.type == "do_in" && that.cate == "halfgood") ||
@@ -871,11 +871,11 @@ export default {
},
addWeight() {
this.weight_kgs.push({ value: 0 });
- this.form.weight_kgs_count = this.weight_kgs.length;
+ this.form.count_sampling = this.weight_kgs.length;
},
delWeight(index) {
this.weight_kgs.splice(index, 1);
- this.form.weight_kgs_count = this.weight_kgs.length;
+ this.form.count_sampling = this.weight_kgs.length;
},
countSun() {
let that = this;
@@ -885,7 +885,7 @@ export default {
sum = sum + item.value;
});
that.form.count_bag_weight_all =
- (sum / that.weight_kgs.length) * that.form.count_bag;
+ (sum / that.weight_kgs.length) * that.form.count;
},
countChange() {},
countNotOkSun() {
@@ -997,7 +997,7 @@ export default {
let obj = {};
obj.test_date = that.form.test_date;
obj.test_user = that.form.test_user;
- obj.count_bag = that.objitem.count_bag;
+ obj.count = that.objitem.count;
obj.weight_kgs = arr;
obj.is_testok = that.form.is_testok;
console.log(obj);
@@ -1033,10 +1033,10 @@ export default {
Object.assign(that.form, data);
// that.form.test_group = that.form.split(',');
that.weight_kgs = [];
- console.log(data.count_bag);
+ console.log(data.count);
console.log(data.weight_kgs);
if (data.weight_kgs.length > 0) {
- that.form.weight_kgs_count = data.weight_kgs.length;
+ that.form.count_sampling = data.weight_kgs.length;
let sum = 0;
data.weight_kgs.forEach((item) => {
sum = sum + item;
@@ -1045,7 +1045,7 @@ export default {
that.weight_kgs.push(obj);
});
that.form.count_bag_weight_all =
- (sum / data.weight_kgs.length) * data.count_bag;
+ (sum / data.weight_kgs.length) * data.count;
}
},
//设置过滤项