|
@@ -79,7 +79,7 @@
|
79
|
79
|
size="small"
|
80
|
80
|
type="primary"
|
81
|
81
|
class="publicSmallBtn"
|
82
|
|
- @click="getWorkDiagram"
|
|
82
|
+ @click="workDiagramChange"
|
83
|
83
|
>查询
|
84
|
84
|
</el-button>
|
85
|
85
|
<el-checkbox
|
|
@@ -158,7 +158,7 @@ export default {
|
158
|
158
|
pageSize: 6, //油井功图-功图平铺分页器参数
|
159
|
159
|
total: 0, //油井功图-功图平铺分页器参数
|
160
|
160
|
overlaycurrentPage: 1, //油井功图-功图叠加分页器参数
|
161
|
|
- overlaypageSize: 6, //油井功图-功图叠加分页器参数
|
|
161
|
+ overlaypageSize: 8, //油井功图-功图叠加分页器参数
|
162
|
162
|
overlaytotal: 0, //油井功图-功图平叠加页器参数
|
163
|
163
|
checked: false, //油井功图-功图叠加判断值
|
164
|
164
|
ConfirmLoading: false,
|
|
@@ -218,9 +218,12 @@ export default {
|
218
|
218
|
this.total = res.data.data.total;
|
219
|
219
|
let data = res.data.data.records
|
220
|
220
|
data.forEach(x => {
|
|
221
|
+ console.log(x)
|
|
222
|
+ x.sgt = JSON.parse(x.sgt)
|
|
223
|
+ x.sgt.push(x.sgt[0])
|
221
|
224
|
let optionsObj = {
|
222
|
225
|
title: {
|
223
|
|
- text: x.wellId + " " + title + " " + x.prodDate,
|
|
226
|
+ text: x.result2 + " " + x.wellId + " " + x.prodDateTime,
|
224
|
227
|
style: {
|
225
|
228
|
fontSize: "12px",
|
226
|
229
|
color: "#6B756C"
|
|
@@ -300,7 +303,7 @@ export default {
|
300
|
303
|
series: [
|
301
|
304
|
{
|
302
|
305
|
name: "图",
|
303
|
|
- data: x.sgtUp,
|
|
306
|
+ data: x.sgt,
|
304
|
307
|
marker: {
|
305
|
308
|
//线上数据点
|
306
|
309
|
radius: 0,
|
|
@@ -522,20 +525,20 @@ export default {
|
522
|
525
|
getAction(publicUrl.solutionoverlay, obj).then(res => {
|
523
|
526
|
if (res.data.data.total >= 0) {
|
524
|
527
|
this.overlaytotal = res.data.data.total;
|
525
|
|
- let data = res.data.data.data
|
|
528
|
+ let data = res.data.data.records
|
526
|
529
|
data.forEach(x => {
|
527
|
|
- let key = Object.keys(x);
|
528
|
|
- let values = Object.values(x);
|
|
530
|
+ console.log(x)
|
529
|
531
|
let optionsSeries = [];
|
530
|
|
- values[0].forEach(z => {
|
|
532
|
+ for (let i=0;i<x.details.length;i++){
|
|
533
|
+ x.details[i].sgt.push(x.details[i].sgt[0])
|
531
|
534
|
optionsSeries.push({
|
532
|
535
|
name: "图",
|
533
|
|
- data: z
|
|
536
|
+ data: x.details[i].sgt
|
534
|
537
|
});
|
535
|
|
- })
|
|
538
|
+ }
|
536
|
539
|
let optionsObj = {
|
537
|
540
|
title: {
|
538
|
|
- text: title + " " + key[0],
|
|
541
|
+ text: title + " " + x.day,
|
539
|
542
|
style: {
|
540
|
543
|
fontSize: "12px",
|
541
|
544
|
color: "#6B756C"
|