commit local

src/api/publicUrl.js

@@ -230,7 +230,10 @@ let publicUrl = {
 	//低压测试
 	uploadCheckDvhCard: '/centralbase/lpt/history/upload/sgt',
 	getCheckRTUCard: '/centralbase/lpt/history/get/sgt',
-	updateCompareResult: '/centralbase/lpt/history/result/save'
+	updateCompareResult: '/centralbase/lpt/history/result/save',
+	//gtly new
+	getLastUpdateTime: '/centralbase/cbPcProWellboreStatusDaily/getLastUpdateTime',
+
 
 }
 export default publicUrl

src/components/workSolution/workSolution.vue

@@ -146,36 +146,26 @@
         </el-table-column>
         <el-table-column prop="frequence" label="冲次" align="center">
         </el-table-column>
-        <el-table-column prop="bj" label="泵径" align="center">
-        </el-table-column>
-        <el-table-column prop="bs" label="泵深" align="center">
-        </el-table-column>
-<!--        <el-table-column prop="dym" label="动液面" align="center">-->
-<!--        </el-table-column>-->
-        <el-table-column prop="a2_dym" width="100" label="日志动液面" align="center">
-        </el-table-column>
-        <el-table-column prop="cmd" label="沉没度" align="center">
-        </el-table-column>
         <el-table-column
-          prop="eczdjg"
-          label="诊断结果"
-          align="center"
-          width="120"
+            prop="eczdjg"
+            label="诊断结果"
+            align="center"
+            width="120"
         >
           <template slot-scope="scope">
             <el-tooltip
-              class="item"
-              effect="light"
-              :content="scope.row.eczdjg"
-              placement="bottom-start"
-              v-if="
+                class="item"
+                effect="light"
+                :content="scope.row.eczdjg"
+                placement="bottom-start"
+                v-if="
                 scope.row.eczdjg != undefined && scope.row.eczdjg.length > 5
               "
             >
               <p>{{ scope.row.eczdjg.substring(0, 5) }}...</p>
             </el-tooltip>
             <p
-              v-if="
+                v-if="
                 scope.row.eczdjg == undefined || scope.row.eczdjg.length <= 5
               "
             >
@@ -186,18 +176,18 @@
         <el-table-column prop="remark" label="备注" align="left" width="120">
           <template slot-scope="scope">
             <el-tooltip
-              class="item"
-              effect="light"
-              :content="scope.row.remark"
-              placement="bottom-start"
-              v-if="
+                class="item"
+                effect="light"
+                :content="scope.row.remark"
+                placement="bottom-start"
+                v-if="
                 scope.row.remark != undefined && scope.row.remark.length > 5
               "
             >
               <p>{{ scope.row.remark.substring(0, 5) }}...</p>
             </el-tooltip>
             <p
-              v-if="
+                v-if="
                 scope.row.remark == undefined || scope.row.remark.length <= 5
               "
             >
@@ -205,6 +195,17 @@
             </p>
           </template>
         </el-table-column>
+        <el-table-column prop="bj" label="泵径" align="center">
+        </el-table-column>
+        <el-table-column prop="bs" label="泵深" align="center">
+        </el-table-column>
+<!--        <el-table-column prop="dym" label="动液面" align="center">-->
+<!--        </el-table-column>-->
+        <el-table-column prop="a2_dym" width="100" label="日志动液面" align="center">
+        </el-table-column>
+        <el-table-column prop="cmd" label="沉没度" align="center">
+        </el-table-column>
+
       </el-table>
 
       <!-- 产液量曲线 -->
@@ -270,13 +271,28 @@
 
           <td class="tabletitle tabletitle2">冲程<br />(m)</td>
           <td class="tabletitle tabletitle2">冲次<br />(r/min)</td>
-          <td class="tabletitle tabletitle2">泵径<br />(mm)</td>
-          <td class="tabletitle tabletitle2">泵深<br />(m)</td>
-          <td class="tabletitle tabletitle2">动液面<br />(m)</td>
+          <td class="tabletitle tabletitle2">泵径
+            <el-tooltip :content="lptVersion.dataNearlyTime.bj"  placement="top"> >
+              <el-icon class="el-icon-search" />
+            </el-tooltip>
+            <br />(mm)
+          </td>
+          <td class="tabletitle tabletitle2">泵深
+            <el-tooltip :content="lptVersion.dataNearlyTime.bs"  placement="top"> >
+              <el-icon class="el-icon-search" />
+            </el-tooltip>
+            <br />(m)
+          </td>
+          <td class="tabletitle tabletitle2">动液面
+            <el-tooltip :content="lptVersion.dataNearlyTime.dym"  placement="top"> >
+              <el-icon class="el-icon-search" />
+            </el-tooltip>
+            <br />(m)
+          </td>
 
-          <td class="tabletitle tabletitle2">日产水量<br />(t)</td>
-          <td class="tabletitle tabletitle2">日产气量<br />(m³)</td>
-          <td class="tabletitle tabletitle2">气油比<br />&nbsp;</td>
+<!--          <td class="tabletitle tabletitle2">日产水量<br />(t)</td>-->
+<!--          <td class="tabletitle tabletitle2">日产气量<br />(m³)</td>-->
+<!--          <td class="tabletitle tabletitle2">气油比<br />&nbsp;</td>-->
 
           <!-- 	<td class="tabletitle tabletitle2">水比重</td> -->
           <td class="tabletitle tabletitle2">油比重<br />&nbsp;</td>
@@ -298,9 +314,9 @@
 
           <td>{{ tableInfo2.status.pumpDepth }}</td>
           <td>{{ tableInfo2.status.startPumpLiqLevel }}</td>
-          <td>{{ tableInfo2.vol.waterProdDaily }}</td>
-          <td>{{ tableInfo2.vol.gasProdDaily }}</td>
-          <td>{{ tableInfo2.vol.gasOilRatio }}</td>
+<!--          <td>{{ tableInfo2.vol.waterProdDaily }}</td>-->
+<!--          <td>{{ tableInfo2.vol.gasProdDaily }}</td>-->
+<!--          <td>{{ tableInfo2.vol.gasOilRatio }}</td>-->
 
           <td>{{ tableInfo2.vol.surfaceCrudeOilDensity }}</td>
 
@@ -323,9 +339,9 @@
           <td>{{ tableInfo.bj }}</td>
           <td>{{ tableInfo.bs }}</td>
           <td>{{ tableInfo.dym }}</td>
-          <td>{{ tableInfo.waterProdDaily }}</td>
-          <td>{{ tableInfo.gasProdDaily }}</td>
-          <td>{{ tableInfo.qyb }}</td>
+<!--          <td>{{ tableInfo.waterProdDaily }}</td>-->
+<!--          <td>{{ tableInfo.gasProdDaily }}</td>-->
+<!--          <td>{{ tableInfo.qyb }}</td>-->
           <td>{{ tableInfo.ymd }}</td>
           <td>{{ tableInfo.cmd }}</td>
           <td v-bind:title="tableInfo.bz" style="cursor: pointer;">
@@ -480,6 +496,13 @@ export default {
   name: 'denglu',
   data() {
     return {
+      lptVersion:{
+        dataNearlyTime:{
+          bs: '',
+          bj: '',
+          dym: '',
+        }
+      },
       chartsTableHeight:'300px',
       scrollTop:'',
       isFirstEnter: false, //
@@ -520,6 +543,19 @@ export default {
     }
   },
   methods: {
+    getLastUpdateTime() {
+      getAction(publicUrl.getLastUpdateTime,{
+        wellId: this.form.name3,
+        limitDate: this.form.name4
+      }).then(res => {
+        this.lptVersion.dataNearlyTime.dym = res.data.data.dymUpdateTime;
+        this.lptVersion.dataNearlyTime.dym ='最近更新时间: '+ this.lptVersion.dataNearlyTime.dym.substring(0,10)+' '+this.lptVersion.dataNearlyTime.dym.substring(11)
+        this.lptVersion.dataNearlyTime.bs = res.data.data.bsUpdateTime;
+        this.lptVersion.dataNearlyTime.bs = '最近更新时间: '+this.lptVersion.dataNearlyTime.bs.substring(0,10)+' '+this.lptVersion.dataNearlyTime.bs.substring(11)
+        this.lptVersion.dataNearlyTime.bj = res.data.data.bjUpdateTime;
+        this.lptVersion.dataNearlyTime.bj = '最近更新时间: '+this.lptVersion.dataNearlyTime.bj.substring(0,10)+' '+this.lptVersion.dataNearlyTime.bj.substring(11)
+      })
+    },
     getDate() {//获取当前日期
       let dateTime = ''
       let yy = new Date().getFullYear()
@@ -608,6 +644,7 @@ export default {
           _this.getwellBoreStatusDaily()
           _this.getMechDaily()
           _this.getDayInfoTable()
+          _this.getLastUpdateTime()
         } else {
           _this.$message({
             message: "该井不存在或无权限访问",