-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
-
+var WellHistorycomponent = {
+ template:`
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 用户没有本菜单权限!
+
+
+
+
+
+ 压力
+ Mpa
+ psi
-
-
-
-
-
-
-
-
- 用户没有本菜单权限!
-
-
-
-
-
- 压力
- Mpa
- psi
-
-
-
-
-
- 温度
- ℃
- ℉
-
-
-
-
-
-
-
- `,
+
+
+
+
+ 温度
+ ℃
+ ℉
+
+
+
+
+
+
+
+ `,
data(){
// 获取当前屏幕的分辨率
let screenW = window.screen.width;
@@ -189,6 +210,19 @@
if_show_et:false,
checked:false,
+
+ // 新增：类型筛选相关
+ selectedTypes: [], // 选中的类型值数组，如 [0, 2, 5]
+ typeOptions: [
+ { value: 0, label: '测斜' },
+ { value: 1, label: '近钻头' },
+ { value: 2, label: '电阻率' },
+ { value: 3, label: '探管式方位伽马' },
+ { value: 4, label: '钻铤式方位伽马' },
+ { value: 5, label: '自然伽马' },
+ { value: 6, label: '工程参数' },
+ { value: 7, label: '振动粘滑' }
+ ]
}
},
mounted() {
@@ -223,26 +257,50 @@
console.log(error);
});
- var objs;
- axios.post('/deescloud/get_well_history', {
- opuser:localStorage.getItem("online_user"),
- opuser_uuid:localStorage.getItem("uuid"),
- index: this.$data.currentPage,
- count: this.$data.pagesize,
- checked:this.$data.checked
- })
- .then(function (response) {
- console.log(response.data);
- objs = response.data.data;
- rcnt = response.data.total;
- _this.$data.tableData = objs;
- _this.$data.recordTotal = rcnt;
- })
- .catch(function (error) {
- console.log(error);
- });
+ // 初始化加载数据
+ this.fetchData();
},
- methods: {
+ methods: {
+ // 新增：将选中的类型数组转换为位掩码
+ getTypeMask() {
+ let mask = 0;
+ if (this.selectedTypes && this.selectedTypes.length > 0) {
+ this.selectedTypes.forEach(val => {
+ mask |= (1 << val);
+ });
+ }
+ return mask;
+ },
+
+ // 新增：统一的查询数据方法
+ fetchData() {
+ var _this = this;
+
+ // 获取类型位掩码
+ const typeMask = this.getTypeMask();
+
+ axios.post('/deescloud/get_well_history', {
+ opuser: localStorage.getItem("online_user"),
+ opuser_uuid: localStorage.getItem("uuid"),
+ Wellname: this.input,
+ index: this.currentPage,
+ count: this.pagesize,
+ BeginTime: this.begin_t,
+ EndTime: this.end_t,
+ checked: this.checked,
+ type: typeMask // 新增：传递类型筛选参数
+ })
+ .then(function (response) {
+ console.log(response.data);
+ _this.tableData = response.data.data || [];
+ _this.recordTotal = response.data.total || 0;
+ })
+ .catch(function (error) {
+ console.log(error);
+ _this.$message.error('查询失败，请稍后重试');
+ });
+ },
+
export_his(){
this.$data.dialogVisible=false;
@@ -279,9 +337,9 @@
document.getElementById("bt_serach").blur();
- this.$data.currentPage=1;
+ this.currentPage = 1;
- if (this.$data.begin_t != '' && this.$data.end_t != '' && this.$data.begin_t>this.$data.end_t) {
+ if (this.begin_t != '' && this.end_t != '' && this.begin_t > this.end_t) {
this.$message({
message: '结束时间必须在开始时间之后!',
type: 'warning',
@@ -290,105 +348,39 @@
return;
}
- var _this = this;
-
- var objs;
- axios.post('/deescloud/get_well_history', {
- opuser:localStorage.getItem("online_user"),
- opuser_uuid:localStorage.getItem("uuid"),
- Wellname: _search_name,
- index: this.$data.currentPage,
- count: this.$data.pagesize,
- BeginTime:this.$data.begin_t,
- EndTime:this.$data.end_t,
- checked:this.$data.checked
- })
- .then(function (response) {
- console.log(response.data);
- objs = response.data.data;
- rcnt = response.data.total;
- _this.$data.tableData = objs;
- _this.$data.recordTotal = rcnt;
- })
- .catch(function (error) {
- console.log(error);
- });
-
+ // 调用统一的查询方法
+ this.fetchData();
},
handleSizeChange(val) {
- //console.log(`每页 ${val} 条`);
- this.$data.pagesize = val;
-
- if (this.$data.begin_t != '' && this.$data.end_t != '' && this.$data.begin_t>this.$data.end_t) {
- this.$message({
- message: '结束时间必须在开始时间之后!',
- type: 'warning',
- duration: 1500
- });
- return;
- }
-
- var _this = this;
-
- var objs;
- axios.post('/deescloud/get_well_history', {
- opuser:localStorage.getItem("online_user"),
- opuser_uuid:localStorage.getItem("uuid"),
- Wellname: this.$data.input,
- index: this.$data.currentPage,
- count: this.$data.pagesize,
- BeginTime:this.$data.begin_t,
- EndTime:this.$data.end_t,
- checked:this.$data.checked
- })
- .then(function (response) {
- console.log(response.data);
- objs = response.data.data;
- rcnt = response.data.total;
- _this.$data.tableData = objs;
- _this.$data.recordTotal = rcnt;
- })
- .catch(function (error) {
- console.log(error);
+ this.pagesize = val;
+ this.currentPage = 1;
+
+ if (this.begin_t != '' && this.end_t != '' && this.begin_t > this.end_t) {
+ this.$message({
+ message: '结束时间必须在开始时间之后!',
+ type: 'warning',
+ duration: 1500
});
+ return;
+ }
+
+ this.fetchData();
},
+
handleCurrentChange(val) {
- //console.log(`当前页: ${val}`);
- this.$data.currentPage = val;
-
- if (this.$data.begin_t != '' && this.$data.end_t != '' && this.$data.begin_t>this.$data.end_t) {
- this.$message({
- message: '结束时间必须在开始时间之后!',
- type: 'warning',
- duration: 1500
- });
- return;
- }
-
- var _this = this;
-
- var objs;
- axios.post('/deescloud/get_well_history', {
- opuser:localStorage.getItem("online_user"),
- opuser_uuid:localStorage.getItem("uuid"),
- Wellname: this.$data.input,
- index: this.$data.currentPage,
- count: this.$data.pagesize,
- BeginTime:this.$data.begin_t,
- EndTime:this.$data.end_t,
- checked:this.$data.checked
- })
- .then(function (response) {
- console.log(response.data);
- objs = response.data.data;
- rcnt = response.data.total;
- _this.$data.tableData = objs;
- _this.$data.recordTotal = rcnt;
- })
- .catch(function (error) {
- console.log(error);
+ this.currentPage = val;
+
+ if (this.begin_t != '' && this.end_t != '' && this.begin_t > this.end_t) {
+ this.$message({
+ message: '结束时间必须在开始时间之后!',
+ type: 'warning',
+ duration: 1500
});
+ return;
+ }
+
+ this.fetchData();
},
handleClick(row){
@@ -478,6 +470,5 @@
console.log("max_flex_width:",max_flex_width);
return max_flex_width + 'px'
},
-
}
- }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/scripts/welltype-en.js b/scripts/welltype-en.js
index e07deb0..b33f1fd 100644
--- a/scripts/welltype-en.js
+++ b/scripts/welltype-en.js
@@ -408,7 +408,7 @@ export_pdf(row, is_memory = false) {
handleSizeChange(val) {
this.$data.pagesize = val;
-
+ this.$data.currentPage = 1;
var beginTime= '';
var endTime = '';
diff --git a/scripts/welltype.js b/scripts/welltype.js
index 7615cd9..621792d 100644
--- a/scripts/welltype.js
+++ b/scripts/welltype.js
@@ -76,11 +76,11 @@ var Welltypecomponent = {
:show-overflow-tooltip="true">
-
-
+
+
@@ -390,7 +390,7 @@ var Welltypecomponent = {
handleSizeChange(val) {
this.$data.pagesize = val;
-
+ this.$data.currentPage = 1;
var beginTime= '';
var endTime = '';