From f7203aa7b98d0690e12a8ebf1e7f611ebab0d2ce Mon Sep 17 00:00:00 2001
From: lupeng_zz <1486083023@qq.com>
Date: Mon, 15 Jun 2026 08:12:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=95=8C=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/cmp-en.js         |  2 +-
 scripts/dev-en.js         | 18 +++++++++++++++++-
 scripts/dev.js            | 32 +++++++++++++++++++++++---------
 scripts/eservice-en.js    |  2 +-
 scripts/mh-en.js          |  2 +-
 scripts/mhs-en.js         |  2 +-
 scripts/nb.js             | 16 ++++++++++++----
 scripts/nbs.js            |  8 ++++++--
 scripts/srr_en.js         |  2 +-
 scripts/tools-en.js       |  2 +-
 scripts/welldata-en.js    |  2 +-
 scripts/wellhistory-en.js |  2 +-
 scripts/welltype-en.js    |  2 +-
 13 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/scripts/cmp-en.js b/scripts/cmp-en.js
index 86dc944..6d44d8a 100644
--- a/scripts/cmp-en.js
+++ b/scripts/cmp-en.js
@@ -24,7 +24,7 @@
 				    </el-table-column>
 				    <el-table-column
 				      prop="welltime"
-				      label="Upload Time"
+				      label="Create Time"
 				     :width="170">
 				    </el-table-column>
 				    
diff --git a/scripts/dev-en.js b/scripts/dev-en.js
index c91fa5c..d63e572 100644
--- a/scripts/dev-en.js
+++ b/scripts/dev-en.js
@@ -140,6 +140,16 @@ var devcomponent_en = {
 					  :width="150"
 					  :show-overflow-tooltip="true">
 					</el-table-column>
+                    <el-table-column
+						prop="pInTime"
+						label="Person On-Site Time"
+						width="200">
+						</el-table-column>
+					<el-table-column
+						prop="pOutTime"
+						label="Person Out-Site Time"
+						width="200">
+                    </el-table-column>
 					<el-table-column
 					      prop="in_time"
 					      label="In-hole Time"
@@ -757,12 +767,18 @@ var devcomponent_en = {
                         var durationCurrent = item.duration_current != null ? item.duration_current : (item.current_work_time != null ? item.current_work_time : '');
                         var durationTotal = item.duration_total != null ? item.duration_total : (item.total_work_time != null ? item.total_work_time : '');
                         var instrumentName = item.instrument_name != null ? item.instrument_name : (item.product_name != null ? item.product_name : '');
+                       	var pInTime = item.p_in_time != null ? item.p_in_time : (item.p_in_time != null ? item.p_in_time : '');
+                	    var pOutTime = item.p_out_time != null ? item.p_out_time : (item.p_out_time != null ? item.p_out_time : '');
+			
                         return Object.assign({}, item, {
                             sid: sid,
                             iid: iid,
                             duration_current: durationCurrent,
                             duration_total: durationTotal,
-                            instrument_name: instrumentName
+                            instrument_name: instrumentName,
+                            pInTime: pInTime,
+                            pOutTime: pOutTime
+
                         });
                     });
                     _this.$data.devRecordTotal = response.data.total || 0;
diff --git a/scripts/dev.js b/scripts/dev.js
index d633ad5..c7492d1 100644
--- a/scripts/dev.js
+++ b/scripts/dev.js
@@ -38,13 +38,13 @@ var devcomponent = {
 					<el-select v-model="devSearchForm.wellnameList" placeholder="请输入井名称" filterable clearable multiple collapse-tags style="width: 240px; max-width: 380px; margin-left: 0px;">
 						<el-option v-for="item in devWellnameOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
 					</el-select>
-					<el-select v-model="devSearchForm.sid" placeholder="请输入系列号" filterable clearable multiple collapse-tags style="width: 180px; max-width: 320px; margin-left: 5px;">
+					<el-select v-model="devSearchForm.sid" placeholder="请输入系列号" filterable clearable multiple collapse-tags style="width: 220px; max-width: 320px; margin-left: 5px;">
 						<el-option v-for="item in devSidOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
 					</el-select>
 					<el-select v-model="devSearchForm.iid" placeholder="请输入编号" filterable clearable multiple collapse-tags style="width: 180px; max-width: 320px; margin-left: 5px;">
 						<el-option v-for="item in devIidOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
 					</el-select>
-					<el-select v-model="devSearchForm.engineerList" placeholder="请输入仪器工程师" filterable clearable multiple collapse-tags style="width: 200px; max-width: 320px; margin-left: 5px;">
+					<el-select v-model="devSearchForm.engineerList" placeholder="请输入仪器工程师" filterable clearable multiple collapse-tags style="width: 170px; max-width: 320px; margin-left: 5px;">
 						<el-option v-for="item in devEngineerOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
 					</el-select>
 					<el-button style="margin-left: 5px;" plain type="primary" icon="el-icon-search" @click="getDevList()">搜索</el-button>
@@ -138,14 +138,24 @@ var devcomponent = {
 					  :width="150"
 					  :show-overflow-tooltip="true">
 					</el-table-column>
+					  <el-table-column
+						prop="pInTime"
+						label="人员上井时间"
+						width="160">
+						</el-table-column>
+					<el-table-column
+						prop="pOutTime"
+						label="人员离井时间"
+						width="160">
+						</el-table-column>
 					<el-table-column
 					      prop="in_time"
-					      label="入井时间"
+					      label="仪器入井时间"
 					      width="160">
 					    </el-table-column>
 					<el-table-column
 					      prop="out_time"
-					      label="出井时间"
+					      label="仪器出井时间"
 					      width="160">
 					    </el-table-column>
 					<el-table-column
@@ -155,13 +165,13 @@ var devcomponent = {
 					    </el-table-column>
 					<el-table-column
 					      prop="duration_current"
-					      label="本次时长(h)"
-					      width="120">
+					      label="仪器本次使用时长(h)"
+					      width="160">
 					    </el-table-column>
 					<el-table-column
 					      prop="duration_total"
-					      label="累计时长(h)"
-					      width="120">
+					      label="仪器出厂累计时长(h)"
+					      width="160">
 					    </el-table-column>
 					<el-table-column
 					      prop="location"
@@ -773,12 +783,16 @@ var devcomponent = {
 					var durationTotal = item.duration_total != null ? item.duration_total : (item.total_work_time != null ? item.total_work_time : '');
 					// 兼容 product_name 到 instrument_name
 					var instrumentName = item.instrument_name != null ? item.instrument_name : (item.product_name != null ? item.product_name : '');
+					var pInTime = item.p_in_time != null ? item.p_in_time : (item.p_in_time != null ? item.p_in_time : '');
+                	var pOutTime = item.p_out_time != null ? item.p_out_time : (item.p_out_time != null ? item.p_out_time : '');
 					return Object.assign({}, item, {
 						sid: sid,
 						iid: iid,
 						duration_current: durationCurrent,
 						duration_total: durationTotal,
-						instrument_name: instrumentName
+						instrument_name: instrumentName,
+						pInTime: pInTime,
+						pOutTime: pOutTime
 					});
 				});
 				_this.$data.devRecordTotal = response.data.total || 0;
diff --git a/scripts/eservice-en.js b/scripts/eservice-en.js
index a546f27..e6ff846 100644
--- a/scripts/eservice-en.js
+++ b/scripts/eservice-en.js
@@ -65,7 +65,7 @@
 				    </el-table-column>
 				    <el-table-column
 				      prop="welltime"
-				      label="Upload Time"
+				      label="Create Time"
 				     :width="170">
 				    </el-table-column>
 				    
diff --git a/scripts/mh-en.js b/scripts/mh-en.js
index 5d216d3..b4d4dd8 100644
--- a/scripts/mh-en.js
+++ b/scripts/mh-en.js
@@ -83,7 +83,7 @@
 						</el-table-column>
 						<el-table-column
 							prop="wellCreateTime"
-							label="Upload Time"
+							label="Create Time"
 							:width="170">
 						</el-table-column>
 						<el-table-column
diff --git a/scripts/mhs-en.js b/scripts/mhs-en.js
index add1649..eb133aa 100644
--- a/scripts/mhs-en.js
+++ b/scripts/mhs-en.js
@@ -80,7 +80,7 @@
 				    </el-table-column>
 				    <el-table-column
 				      prop="welltime"
-				      label="Upload Time"
+				      label="Create Time"
 				     :width="170">
 				    </el-table-column>
 				    
diff --git a/scripts/nb.js b/scripts/nb.js
index 4ac2a12..dbfc82a 100644
--- a/scripts/nb.js
+++ b/scripts/nb.js
@@ -614,7 +614,9 @@
 			series_id: "",
 			num: "",
 		    index: this.$data.currentPage,
-		    count: this.$data.pagesize
+		    count: this.$data.pagesize,
+			opuser:localStorage.getItem("online_user"),
+				opuser_uuid:localStorage.getItem("uuid")
 		  })
 		  .then(function (response) {
 		    console.log(response.data);
@@ -1012,7 +1014,9 @@
 				series_id: _this.$data.series_id_v,
 				num: _this.$data.num_v,
 			    index: this.$data.currentPage,
-			    count: this.$data.pagesize
+			    count: this.$data.pagesize,
+				opuser:localStorage.getItem("online_user"),
+				opuser_uuid:localStorage.getItem("uuid")
 			  })
 			  .then(function (response) {
 			    console.log(response.data);
@@ -1038,7 +1042,9 @@
 					series_id: _this.$data.series_id_v,
 					num: _this.$data.num_v,
 					index: this.$data.currentPage,
-					count: this.$data.pagesize
+					count: this.$data.pagesize,
+					opuser:localStorage.getItem("online_user"),
+				opuser_uuid:localStorage.getItem("uuid")
 				})
 				.then(function (response) {
 				  console.log(response.data);
@@ -1062,7 +1068,9 @@
 					series_id: _this.$data.series_id_v,
 					num: _this.$data.num_v,
 					index: this.$data.currentPage,
-					count: this.$data.pagesize
+					count: this.$data.pagesize,
+					opuser:localStorage.getItem("online_user"),
+				opuser_uuid:localStorage.getItem("uuid")
 				})
 				.then(function (response) {
 				  console.log(response.data);
diff --git a/scripts/nbs.js b/scripts/nbs.js
index 15a9de3..4b45510 100644
--- a/scripts/nbs.js
+++ b/scripts/nbs.js
@@ -542,7 +542,9 @@
 			axios.post('/deescloud/get_b_life', {
 				b_code:this.$data.b_code_v_1,
 			    index: this.$data.currentPage1,
-			    count: this.$data.pagesize1
+			    count: this.$data.pagesize1,
+				opuser:localStorage.getItem("online_user"),
+				opuser_uuid:localStorage.getItem("uuid")
 			  })
 			  .then(function (response) {
 			    console.log(response.data);
@@ -744,7 +746,9 @@
 				b_id: this.$data.b_id_v,
 				b_code:this.$data.b_code_v,
 			    index: this.$data.currentPage,
-			    count: this.$data.pagesize
+			    count: this.$data.pagesize,
+				opuser:localStorage.getItem("online_user"),
+				opuser_uuid:localStorage.getItem("uuid")
 			  })
 			  .then(function (response) {
 			    console.log(response.data);
diff --git a/scripts/srr_en.js b/scripts/srr_en.js
index d551e78..703f05b 100644
--- a/scripts/srr_en.js
+++ b/scripts/srr_en.js
@@ -22,7 +22,7 @@
 				    </el-table-column>
 				    <el-table-column
 				      prop="welltime"
-				      label="Upload Time"
+				      label="Create Time"
 				     :width="170">
 				    </el-table-column>
 				    
diff --git a/scripts/tools-en.js b/scripts/tools-en.js
index db2886f..43ee63c 100644
--- a/scripts/tools-en.js
+++ b/scripts/tools-en.js
@@ -23,7 +23,7 @@
 				    </el-table-column>
 				    <el-table-column
 				      prop="welltime"
-				      label="Upload Time"
+				      label="Create Time"
 				     :width="170">
 				    </el-table-column>
 				    
diff --git a/scripts/welldata-en.js b/scripts/welldata-en.js
index 1eece21..f0cff33 100644
--- a/scripts/welldata-en.js
+++ b/scripts/welldata-en.js
@@ -50,7 +50,7 @@
 				    </el-table-column>
 				    <el-table-column
 				      prop="welltime"
-				      label="Upload Time"
+				      label="Create Time"
 				     :width="170">
 				    </el-table-column>
 				    
diff --git a/scripts/wellhistory-en.js b/scripts/wellhistory-en.js
index 3786bae..e4e1e64 100644
--- a/scripts/wellhistory-en.js
+++ b/scripts/wellhistory-en.js
@@ -85,7 +85,7 @@
 				    </el-table-column>
 				    <el-table-column
 				      prop="welltime"
-				      label="Upload Time"
+				      label="Create Time"
 				     :width="170">
 				    </el-table-column>
 				    
diff --git a/scripts/welltype-en.js b/scripts/welltype-en.js
index b33f1fd..6d4b86c 100644
--- a/scripts/welltype-en.js
+++ b/scripts/welltype-en.js
@@ -77,7 +77,7 @@
 							  
 							  <el-table-column
 							    prop="well_create_time"
-							    label="Upload Time"
+							    label="Create Time"
 							    :width="170">
 							  </el-table-column>
 							        <el-table-column