|
|
@@ -296,12 +296,12 @@
|
|
|
interval: 0,
|
|
|
textStyle: {
|
|
|
color: "#fff",
|
|
|
- fontSize: 14
|
|
|
+ fontSize: 12
|
|
|
},
|
|
|
formatter: function(value) {
|
|
|
var res = value;
|
|
|
- if(res.length > 6) {
|
|
|
- res = res.substring(0, 5) + "..";
|
|
|
+ if(res.length > 10) {
|
|
|
+ res = res.substring(0, 10) + "..";
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
@@ -423,8 +423,8 @@
|
|
|
interval: 0,
|
|
|
formatter: function(value) {
|
|
|
var res = value;
|
|
|
- if(res.length > 6) {
|
|
|
- res = res.substring(0, 5) + "..";
|
|
|
+ if(res.length > 10) {
|
|
|
+ res = res.substring(0, 10) + "..";
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
@@ -730,12 +730,12 @@
|
|
|
interval: 0,
|
|
|
textStyle: {
|
|
|
color: "#fff",
|
|
|
- fontSize: 14
|
|
|
+ fontSize: 12
|
|
|
},
|
|
|
formatter: function(value) {
|
|
|
var res = value;
|
|
|
- if(res.length > 6) {
|
|
|
- res = res.substring(0, 5) + "..";
|
|
|
+ if(res.length > 10) {
|
|
|
+ res = res.substring(0, 10) + "..";
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
@@ -858,6 +858,7 @@
|
|
|
for (const t of tenders) {
|
|
|
calculateTender(t);
|
|
|
}
|
|
|
+ console.log(tenders);
|
|
|
setData(tenders);
|
|
|
});
|
|
|
|
|
|
@@ -888,7 +889,7 @@
|
|
|
return _.findIndex(item.category, {cid: daping06Set.cb, value: daping06Set.cb_value}) !== -1;
|
|
|
});
|
|
|
const sr_chart_option_data = {
|
|
|
- end_contract_tp: 0,
|
|
|
+ contract_price: 0,
|
|
|
end_gather_tp: 0,
|
|
|
end_yf_tp: 0,
|
|
|
end_sf_tp: 0,
|
|
|
@@ -896,20 +897,20 @@
|
|
|
};
|
|
|
const srmx_chart_option_name = [];
|
|
|
const srmx_chart_option_data = {
|
|
|
- end_contract_tp: [],
|
|
|
+ end_gather_tp: [],
|
|
|
end_yf_tp:[],
|
|
|
end_sf_tp:[],
|
|
|
};
|
|
|
const yingsf_option_data = [];
|
|
|
const yisf_option_data = [];
|
|
|
for (const sr of sr_tenders) {
|
|
|
- sr_chart_option_data.end_contract_tp = ZhCalc.add(sr_chart_option_data.end_contract_tp, sr.end_contract_tp);
|
|
|
+ sr_chart_option_data.contract_price = ZhCalc.add(sr_chart_option_data.contract_price, sr.contract_price);
|
|
|
sr_chart_option_data.end_gather_tp = ZhCalc.add(sr_chart_option_data.end_gather_tp, sr.end_gather_tp);
|
|
|
sr_chart_option_data.end_yf_tp = ZhCalc.add(sr_chart_option_data.end_yf_tp, sr.end_yf_tp);
|
|
|
sr_chart_option_data.end_sf_tp = ZhCalc.add(sr_chart_option_data.end_sf_tp, sr.end_sf_tp);
|
|
|
|
|
|
srmx_chart_option_name.push(sr.name);
|
|
|
- srmx_chart_option_data.end_contract_tp.push(sr.end_contract_tp ? sr.end_contract_tp : 0);
|
|
|
+ srmx_chart_option_data.end_gather_tp.push(sr.end_gather_tp ? sr.end_gather_tp : 0);
|
|
|
srmx_chart_option_data.end_yf_tp.push(sr.end_yf_tp ? sr.end_yf_tp : 0);
|
|
|
srmx_chart_option_data.end_sf_tp.push(sr.end_sf_tp ? sr.end_sf_tp : 0);
|
|
|
for (const s of sr.month_stage) {
|
|
|
@@ -942,7 +943,7 @@
|
|
|
gcsrmx_chart_option.dataZoom[0].start = 0;
|
|
|
gcsrmx_chart_option.dataZoom[0].end = computedPosition(sr_tenders.length);
|
|
|
gcsrmx_chart_option.xAxis[0].data = srmx_chart_option_name;
|
|
|
- gcsrmx_chart_option.series[0].data = srmx_chart_option_data.end_contract_tp;
|
|
|
+ gcsrmx_chart_option.series[0].data = srmx_chart_option_data.end_gather_tp;
|
|
|
gcsrmx_chart_option.series[1].data = srmx_chart_option_data.end_yf_tp;
|
|
|
gcsrmx_chart_option.series[2].data = srmx_chart_option_data.end_sf_tp;
|
|
|
if (sr_tenders.length >= 8) {
|
|
|
@@ -956,7 +957,7 @@
|
|
|
const gcsrqk_chart_option = gcsrqkChart.getOption();
|
|
|
gcsrqk_chart_option.dataZoom[0].start = 0;
|
|
|
gcsrqk_chart_option.dataZoom[0].end = computedPosition(sr_tenders.length);
|
|
|
- gcsrqk_chart_option.series[0].data = [sr_chart_option_data.end_ds_tp, sr_chart_option_data.end_sf_tp, sr_chart_option_data.end_yf_tp, sr_chart_option_data.end_gather_tp, sr_chart_option_data.end_contract_tp];
|
|
|
+ gcsrqk_chart_option.series[0].data = [sr_chart_option_data.end_ds_tp, sr_chart_option_data.end_sf_tp, sr_chart_option_data.end_yf_tp, sr_chart_option_data.end_gather_tp, sr_chart_option_data.contract_price];
|
|
|
if (sr_tenders.length >= 8) {
|
|
|
gcsrqk_chart_option.dataZoom[0].show = true;
|
|
|
} else {
|
|
|
@@ -965,7 +966,7 @@
|
|
|
gcsrqkChart.setOption(gcsrqk_chart_option);
|
|
|
|
|
|
const cb_chart_option_data = {
|
|
|
- end_contract_tp: 0,
|
|
|
+ // end_contract_tp: 0,
|
|
|
end_gather_tp: 0,
|
|
|
end_yf_tp: 0,
|
|
|
end_sf_tp: 0,
|
|
|
@@ -974,7 +975,7 @@
|
|
|
const cb_chart_option_name = [];
|
|
|
for (const cb of cb_tenders) {
|
|
|
cb_chart_option_name.push(cb.name);
|
|
|
- cb_chart_option_data.end_contract_tp = ZhCalc.add(cb_chart_option_data.end_contract_tp, cb.end_contract_tp);
|
|
|
+ // cb_chart_option_data.end_contract_tp = ZhCalc.add(cb_chart_option_data.end_contract_tp, cb.end_contract_tp);
|
|
|
cb_chart_option_data.end_gather_tp = ZhCalc.add(cb_chart_option_data.end_gather_tp, cb.end_gather_tp);
|
|
|
cb_chart_option_data.end_yf_tp = ZhCalc.add(cb_chart_option_data.end_yf_tp, cb.end_yf_tp);
|
|
|
cb_chart_option_data.end_sf_tp = ZhCalc.add(cb_chart_option_data.end_sf_tp, cb.end_sf_tp);
|
