|
@@ -53,7 +53,7 @@ export default {
|
|
|
switch() {
|
|
|
this.flag = !this.flag;
|
|
|
},
|
|
|
- setDatas(){
|
|
|
+ setDatas() {
|
|
|
this.$refs.gdbh_ref.setData({ id: this.params.id });
|
|
|
this.$refs.gdbh_ref.setData({ id: this.params.id });
|
|
|
this.$refs.wpjg_ref.setData(this.params);
|
|
@@ -66,8 +66,8 @@ export default {
|
|
|
async hysyq(address) {
|
|
|
// 选中xzqh查询
|
|
|
let obj = {
|
|
|
- beginTime: '20240101',
|
|
|
- endTime: '20240501',
|
|
|
+ beginTime: store.state.cockpit_date[0],
|
|
|
+ endTime: store.state.cockpit_date[1],
|
|
|
jscType: 'jsc_hysyq_ztsh',
|
|
|
id: address
|
|
|
};
|
|
@@ -75,17 +75,16 @@ export default {
|
|
|
|
|
|
let obg_text = {
|
|
|
xzqhdm_number: data.data[0].xzqhdm_number,
|
|
|
- zhmj: data.data[0].zhmj,
|
|
|
+ zhmj: data.data[0].zhmj == undefined ? 0 : data.data[0].zhmj,
|
|
|
|
|
|
}
|
|
|
- console.log(obg_text, "obg_echart");
|
|
|
-
|
|
|
+ obg_text.zhmj == null ? 0 : obg_text.zhmj;
|
|
|
store.setCockpitHysyText(obg_text);
|
|
|
|
|
|
// 图表数据
|
|
|
let obj_echart = {
|
|
|
- beginTime: '20240101',
|
|
|
- endTime: '20240501',
|
|
|
+ beginTime: store.state.cockpit_date[0],
|
|
|
+ endTime: store.state.cockpit_date[1],
|
|
|
jscType: 'jsc_hysyq_yelx',
|
|
|
id: address
|
|
|
};
|
|
@@ -96,6 +95,12 @@ export default {
|
|
|
bar: data_echart.data.map(item => item.zhmj)
|
|
|
|
|
|
}
|
|
|
+ console.log(obg_echart.x.length == 0, "obg_echart.x.length");
|
|
|
+
|
|
|
+ obg_echart.x.length == 0 ? obg_echart.x = ['渔业基础设施用海', '开放式养殖用海', '旅游基础设施用海', '浴场用海',
|
|
|
+ '游乐场用海'] : obg_echart.x = obg_echart.x;
|
|
|
+
|
|
|
+ obg_echart.bar.length == 0 ? obg_echart.bar = [0, 0, 0, 0, 0,] : obg_echart.bar = obg_echart.bar;
|
|
|
|
|
|
store.setCockpitHysyEchart(obg_echart);
|
|
|
|
|
@@ -262,9 +267,9 @@ export default {
|
|
|
material: Cesium.Color.fromCssColorString(that.xzqh_color),
|
|
|
height: 100,
|
|
|
extrudedHeight: 450,
|
|
|
- outline : true,
|
|
|
+ outline: true,
|
|
|
// outlineColor : Cesium.Color.BLACK
|
|
|
- outlineColor : Cesium.Color.fromCssColorString('#55A1E3')
|
|
|
+ outlineColor: Cesium.Color.fromCssColorString('#55A1E3')
|
|
|
}
|
|
|
});
|
|
|
|