fix overlay

src/api/manage.js

@@ -9,11 +9,12 @@ import store from '../store'    //引用store.js
 var axios = Axios.create({
     // baseURL: 'http://101.200.219.190:88', // 后台默认地址
     // baseURL: 'http://10.72.143.2:88', //准东后台默认地址
-    //baseURL: 'http://11.72.128.68:88', // 一厂默认地址k
+    // baseURL: 'http://192.168.31.252:88', // 一厂默认地址k
+    baseURL: 'http://11.72.128.68:88', // 一厂默认地址k
    // baseURL: 'http://10.184.33.224:88', // 中石油默认地址
 
     // baseURL: 'http://10.72.143.2:88', // 数据公司后台默认地址
-    baseURL: 'http://192.168.31.252:88', // 线下默认地址
+    // baseURL: 'http://192.168.31.252:88', // 线下默认地址
     // baseURL: 'http://192.168.1.120:9005', // 许思睿默认地址
     // baseURL: 'http://192.168.1.119:9000', // 郭笑天默认地址
     //http://117.34.118.57:28888/job/microarch-fe-app/buildWithParameters?token=asdfwefasdfkljlkgff&tag_version=app2

src/api/publicUrl.js

@@ -40,8 +40,8 @@ let publicUrl = {
 	// solutionjh:'/centralbase/WellSource/searchWellsByOrgID',//模糊查询井号
 	solutionjh:'/data-authorize/WellSource/searchWellsByOrgID',//模糊查询井号
 	solutionyieldCurve:'/centralbase/view/yieldCurve',//更多工具-生产曲线
-	solutiontiled:'/production-calculation/aoidSinglegtYield/getCvrresultByTime',//更多工具-油井功图-功图平铺
-	solutionoverlay:'/production-calculation/aoidSinglegtYield/getOverlayPaging',//更多工具-油井功图-功图叠加
+	solutiontiled:'/dgns-diagnose/dgnsGtcvrresult/getCvrresultByTime',//更多工具-油井功图-功图平铺
+	solutionoverlay:'/dgns-diagnose/dgnsGtcvrresult/getOverlayPaging',//更多工具-油井功图-功图叠加
 	//solutionoverlay:'/centralbase/view/overlay',//更多工具-油井功图-功图叠加
 	solutionhistory:'/centralbase/view/historyMeasures',//更多工具-油井功图-历史措施
 	solutionloadCurve:'/centralbase/view/loadCurve',//更多工具-载荷曲线

src/components/overlay/overlay.vue

@@ -79,7 +79,7 @@
             size="small"
             type="primary"
             class="publicSmallBtn"
-            @click="getWorkDiagram"
+            @click="workDiagramChange"
         >查询
         </el-button>
         <el-checkbox
@@ -158,7 +158,7 @@ export default {
       pageSize: 6, //油井功图-功图平铺分页器参数
       total: 0, //油井功图-功图平铺分页器参数
       overlaycurrentPage: 1, //油井功图-功图叠加分页器参数
-      overlaypageSize: 6, //油井功图-功图叠加分页器参数
+      overlaypageSize: 8, //油井功图-功图叠加分页器参数
       overlaytotal: 0, //油井功图-功图平叠加页器参数
       checked: false, //油井功图-功图叠加判断值
       ConfirmLoading: false,
@@ -218,9 +218,12 @@ export default {
           this.total = res.data.data.total;
           let data = res.data.data.records
           data.forEach(x => {
+            console.log(x)
+            x.sgt = JSON.parse(x.sgt)
+            x.sgt.push(x.sgt[0])
             let optionsObj = {
               title: {
-                text: x.wellId + " " + title + " " + x.prodDate,
+                text: x.result2 + " " + x.wellId + " " + x.prodDateTime,
                 style: {
                   fontSize: "12px",
                   color: "#6B756C"
@@ -300,7 +303,7 @@ export default {
               series: [
                 {
                   name: "图",
-                  data: x.sgtUp,
+                  data: x.sgt,
                   marker: {
                     //线上数据点
                     radius: 0,
@@ -522,20 +525,20 @@ export default {
       getAction(publicUrl.solutionoverlay, obj).then(res => {
         if (res.data.data.total >= 0) {
           this.overlaytotal = res.data.data.total;
-          let data = res.data.data.data
+          let data = res.data.data.records
           data.forEach(x => {
-            let key = Object.keys(x);
-            let values = Object.values(x);
+            console.log(x)
             let optionsSeries = [];
-            values[0].forEach(z => {
+            for (let i=0;i<x.details.length;i++){
+              x.details[i].sgt.push(x.details[i].sgt[0])
               optionsSeries.push({
                 name: "图",
-                data: z
+                data: x.details[i].sgt
               });
-            })
+            }
             let optionsObj = {
               title: {
-                text: title + " " + key[0],
+                text: title + " " + x.day,
                 style: {
                   fontSize: "12px",
                   color: "#6B756C"

src/components/solution/solution.vue

@@ -605,7 +605,7 @@
           size="small"
           type="primary"
           class="publicSmallBtn"
-          @click="getWorkDiagram"
+          @click="workDiagramChange"
           >查询
         </el-button>
         <el-checkbox
@@ -1199,7 +1199,6 @@ export default {
   },
   methods: {
     setStandardGt(){
-      console.log(this.setStandardGtForm)
       getAction(publicUrl.setStandardGt,{
         wellId: this.pageData.wellId,
         prodDate: this.pageData.prodDateTime,
@@ -2103,7 +2102,6 @@ export default {
       this.getWorkDiagram();
     },
     getWorkDiagram() {
-      console.log("1111111111111")
       //查询油井功图数据
       this.workDiagramForm.beginTime = this.changeDate(
         this.workDiagramForm.beginTime
@@ -2136,6 +2134,7 @@ export default {
             res.data.data.records[i].processparam
           );
           let maxNum = res.data.data.records[i].processparam.ZDZH;
+
           let optionsObj = {
             title: {
               text:
@@ -2586,7 +2585,6 @@ export default {
       }
     },
     overlaytaskListPage(val) {
-      console.log(val)
       //油井功图-功图叠加分页器
       this.workDiagramForm.beginTime = this.changeDate(
         this.workDiagramForm.beginTime
@@ -3713,7 +3711,6 @@ export default {
       });
     },
     handleClick2(type) {
-      console.log(type)
       let _this = this;
       let obj2 = {
         id: type
@@ -3721,7 +3718,6 @@ export default {
       getAction(publicUrl.getDgnsCvrresultById, obj2).then(res => {
         if (res.data.status == 1) {
           _this.pageData = res.data.data;
-          console.log(res.data.data.id)
           _this.checkNeedDeal(res.data.data.id);
           _this.setCharts();
           _this.setGtSlope();