2 Commits dfbf992b18 ... 4a145982d2

Author SHA1 Message Date
  xsr 4a145982d2 Merge remote-tracking branch 'origin/yichang' into yichang 4 months ago
  xsr ab0fd2f7c3 commit local 4 months ago
2 changed files with 78 additions and 38 deletions
  1. 3 0
      src/api/publicUrl.js
  2. 75 38
      src/components/workSolution/workSolution.vue

+ 3 - 0
src/api/publicUrl.js

@@ -230,6 +230,9 @@ let publicUrl = {
230 230
 	//低压测试
231 231
 	uploadCheckDvhCard: '/centralbase/lpt/history/upload/sgt',
232 232
 	getCheckRTUCard: '/centralbase/lpt/history/get/sgt',
233
+	//gtly new
234
+	getLastUpdateTime: '/centralbase/cbPcProWellboreStatusDaily/getLastUpdateTime',
235
+
233 236
 	updateCompareResult: '/centralbase/lpt/history/result/save',
234 237
 
235 238
 

+ 75 - 38
src/components/workSolution/workSolution.vue

@@ -146,36 +146,26 @@
146 146
         </el-table-column>
147 147
         <el-table-column prop="frequence" label="冲次" align="center">
148 148
         </el-table-column>
149
-        <el-table-column prop="bj" label="泵径" align="center">
150
-        </el-table-column>
151
-        <el-table-column prop="bs" label="泵深" align="center">
152
-        </el-table-column>
153
-<!--        <el-table-column prop="dym" label="动液面" align="center">-->
154
-<!--        </el-table-column>-->
155
-        <el-table-column prop="a2_dym" width="100" label="日志动液面" align="center">
156
-        </el-table-column>
157
-        <el-table-column prop="cmd" label="沉没度" align="center">
158
-        </el-table-column>
159 149
         <el-table-column
160
-          prop="eczdjg"
161
-          label="诊断结果"
162
-          align="center"
163
-          width="120"
150
+            prop="eczdjg"
151
+            label="诊断结果"
152
+            align="center"
153
+            width="120"
164 154
         >
165 155
           <template slot-scope="scope">
166 156
             <el-tooltip
167
-              class="item"
168
-              effect="light"
169
-              :content="scope.row.eczdjg"
170
-              placement="bottom-start"
171
-              v-if="
157
+                class="item"
158
+                effect="light"
159
+                :content="scope.row.eczdjg"
160
+                placement="bottom-start"
161
+                v-if="
172 162
                 scope.row.eczdjg != undefined && scope.row.eczdjg.length > 5
173 163
               "
174 164
             >
175 165
               <p>{{ scope.row.eczdjg.substring(0, 5) }}...</p>
176 166
             </el-tooltip>
177 167
             <p
178
-              v-if="
168
+                v-if="
179 169
                 scope.row.eczdjg == undefined || scope.row.eczdjg.length <= 5
180 170
               "
181 171
             >
@@ -186,18 +176,18 @@
186 176
         <el-table-column prop="remark" label="备注" align="left" width="120">
187 177
           <template slot-scope="scope">
188 178
             <el-tooltip
189
-              class="item"
190
-              effect="light"
191
-              :content="scope.row.remark"
192
-              placement="bottom-start"
193
-              v-if="
179
+                class="item"
180
+                effect="light"
181
+                :content="scope.row.remark"
182
+                placement="bottom-start"
183
+                v-if="
194 184
                 scope.row.remark != undefined && scope.row.remark.length > 5
195 185
               "
196 186
             >
197 187
               <p>{{ scope.row.remark.substring(0, 5) }}...</p>
198 188
             </el-tooltip>
199 189
             <p
200
-              v-if="
190
+                v-if="
201 191
                 scope.row.remark == undefined || scope.row.remark.length <= 5
202 192
               "
203 193
             >
@@ -205,6 +195,17 @@
205 195
             </p>
206 196
           </template>
207 197
         </el-table-column>
198
+        <el-table-column prop="bj" label="泵径" align="center">
199
+        </el-table-column>
200
+        <el-table-column prop="bs" label="泵深" align="center">
201
+        </el-table-column>
202
+<!--        <el-table-column prop="dym" label="动液面" align="center">-->
203
+<!--        </el-table-column>-->
204
+        <el-table-column prop="a2_dym" width="100" label="日志动液面" align="center">
205
+        </el-table-column>
206
+        <el-table-column prop="cmd" label="沉没度" align="center">
207
+        </el-table-column>
208
+
208 209
       </el-table>
209 210
 
210 211
       <!-- 产液量曲线 -->
@@ -270,13 +271,28 @@
270 271
 
271 272
           <td class="tabletitle tabletitle2">冲程<br />(m)</td>
272 273
           <td class="tabletitle tabletitle2">冲次<br />(r/min)</td>
273
-          <td class="tabletitle tabletitle2">泵径<br />(mm)</td>
274
-          <td class="tabletitle tabletitle2">泵深<br />(m)</td>
275
-          <td class="tabletitle tabletitle2">动液面<br />(m)</td>
274
+          <td class="tabletitle tabletitle2">泵径
275
+            <el-tooltip :content="lptVersion.dataNearlyTime.bj"  placement="top"> >
276
+              <el-icon class="el-icon-search" />
277
+            </el-tooltip>
278
+            <br />(mm)
279
+          </td>
280
+          <td class="tabletitle tabletitle2">泵深
281
+            <el-tooltip :content="lptVersion.dataNearlyTime.bs"  placement="top"> >
282
+              <el-icon class="el-icon-search" />
283
+            </el-tooltip>
284
+            <br />(m)
285
+          </td>
286
+          <td class="tabletitle tabletitle2">动液面
287
+            <el-tooltip :content="lptVersion.dataNearlyTime.dym"  placement="top"> >
288
+              <el-icon class="el-icon-search" />
289
+            </el-tooltip>
290
+            <br />(m)
291
+          </td>
276 292
 
277
-          <td class="tabletitle tabletitle2">日产水量<br />(t)</td>
278
-          <td class="tabletitle tabletitle2">日产气量<br />(m³)</td>
279
-          <td class="tabletitle tabletitle2">气油比<br />&nbsp;</td>
293
+<!--          <td class="tabletitle tabletitle2">日产水量<br />(t)</td>-->
294
+<!--          <td class="tabletitle tabletitle2">日产气量<br />(m³)</td>-->
295
+<!--          <td class="tabletitle tabletitle2">气油比<br />&nbsp;</td>-->
280 296
 
281 297
           <!-- 	<td class="tabletitle tabletitle2">水比重</td> -->
282 298
           <td class="tabletitle tabletitle2">油比重<br />&nbsp;</td>
@@ -298,9 +314,9 @@
298 314
 
299 315
           <td>{{ tableInfo2.status.pumpDepth }}</td>
300 316
           <td>{{ tableInfo2.status.startPumpLiqLevel }}</td>
301
-          <td>{{ tableInfo2.vol.waterProdDaily }}</td>
302
-          <td>{{ tableInfo2.vol.gasProdDaily }}</td>
303
-          <td>{{ tableInfo2.vol.gasOilRatio }}</td>
317
+<!--          <td>{{ tableInfo2.vol.waterProdDaily }}</td>-->
318
+<!--          <td>{{ tableInfo2.vol.gasProdDaily }}</td>-->
319
+<!--          <td>{{ tableInfo2.vol.gasOilRatio }}</td>-->
304 320
 
305 321
           <td>{{ tableInfo2.vol.surfaceCrudeOilDensity }}</td>
306 322
 
@@ -323,9 +339,9 @@
323 339
           <td>{{ tableInfo.bj }}</td>
324 340
           <td>{{ tableInfo.bs }}</td>
325 341
           <td>{{ tableInfo.dym }}</td>
326
-          <td>{{ tableInfo.waterProdDaily }}</td>
327
-          <td>{{ tableInfo.gasProdDaily }}</td>
328
-          <td>{{ tableInfo.qyb }}</td>
342
+<!--          <td>{{ tableInfo.waterProdDaily }}</td>-->
343
+<!--          <td>{{ tableInfo.gasProdDaily }}</td>-->
344
+<!--          <td>{{ tableInfo.qyb }}</td>-->
329 345
           <td>{{ tableInfo.ymd }}</td>
330 346
           <td>{{ tableInfo.cmd }}</td>
331 347
           <td v-bind:title="tableInfo.bz" style="cursor: pointer;">
@@ -480,6 +496,13 @@ export default {
480 496
   name: 'denglu',
481 497
   data() {
482 498
     return {
499
+      lptVersion:{
500
+        dataNearlyTime:{
501
+          bs: '',
502
+          bj: '',
503
+          dym: '',
504
+        }
505
+      },
483 506
       chartsTableHeight:'300px',
484 507
       scrollTop:'',
485 508
       isFirstEnter: false, //
@@ -520,6 +543,19 @@ export default {
520 543
     }
521 544
   },
522 545
   methods: {
546
+    getLastUpdateTime() {
547
+      getAction(publicUrl.getLastUpdateTime,{
548
+        wellId: this.form.name3,
549
+        limitDate: this.form.name4
550
+      }).then(res => {
551
+        this.lptVersion.dataNearlyTime.dym = res.data.data.dymUpdateTime;
552
+        this.lptVersion.dataNearlyTime.dym ='最近更新时间: '+ this.lptVersion.dataNearlyTime.dym.substring(0,10)+' '+this.lptVersion.dataNearlyTime.dym.substring(11)
553
+        this.lptVersion.dataNearlyTime.bs = res.data.data.bsUpdateTime;
554
+        this.lptVersion.dataNearlyTime.bs = '最近更新时间: '+this.lptVersion.dataNearlyTime.bs.substring(0,10)+' '+this.lptVersion.dataNearlyTime.bs.substring(11)
555
+        this.lptVersion.dataNearlyTime.bj = res.data.data.bjUpdateTime;
556
+        this.lptVersion.dataNearlyTime.bj = '最近更新时间: '+this.lptVersion.dataNearlyTime.bj.substring(0,10)+' '+this.lptVersion.dataNearlyTime.bj.substring(11)
557
+      })
558
+    },
523 559
     getDate() {//获取当前日期
524 560
       let dateTime = ''
525 561
       let yy = new Date().getFullYear()
@@ -608,6 +644,7 @@ export default {
608 644
           _this.getwellBoreStatusDaily()
609 645
           _this.getMechDaily()
610 646
           _this.getDayInfoTable()
647
+          _this.getLastUpdateTime()
611 648
         } else {
612 649
           _this.$message({
613 650
             message: "该井不存在或无权限访问",