提交前端代码
This commit is contained in:
lupeng_zz
parent
4aff2af250
commit
b951d518c3
|
|
@ -875,7 +875,7 @@
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@
|
|||
this.$data.pagesize = val;
|
||||
|
||||
var _this = this;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var objs;
|
||||
axios.post('/deescloud/getAuthHisPos', {
|
||||
opuser:localStorage.getItem("online_user"),
|
||||
|
|
|
|||
|
|
@ -455,7 +455,7 @@
|
|||
handleSizeChange(val) {
|
||||
//console.log(`每页 ${val} 条`);
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -455,7 +455,7 @@
|
|||
handleSizeChange(val) {
|
||||
//console.log(`每页 ${val} 条`);
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
2078
scripts/dev-en.js
2078
scripts/dev-en.js
File diff suppressed because it is too large
Load Diff
970
scripts/dev.js
970
scripts/dev.js
File diff suppressed because it is too large
Load Diff
|
|
@ -412,7 +412,7 @@
|
|||
handleSizeChange(val) {
|
||||
//console.log(`每页 ${val} 条`);
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var beginTime= '';
|
||||
var endTime = '';
|
||||
|
||||
|
|
|
|||
|
|
@ -414,7 +414,7 @@
|
|||
handleSizeChange(val) {
|
||||
//console.log(`每页 ${val} 条`);
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var beginTime= '';
|
||||
var endTime = '';
|
||||
|
||||
|
|
|
|||
|
|
@ -537,7 +537,7 @@
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -520,7 +520,7 @@
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -305,7 +305,7 @@ history.pushState(null, null, document.URL);
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
if (this.$data.begin_t != '' && this.$data.end_t != '' && this.$data.begin_t>this.$data.end_t) {
|
||||
this.$message({
|
||||
message: 'The end time must be after the start time!',
|
||||
|
|
|
|||
|
|
@ -339,7 +339,7 @@ history.pushState(null, null, document.URL);
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
if (this.$data.begin_t != '' && this.$data.end_t != '' && this.$data.begin_t>this.$data.end_t) {
|
||||
this.$message({
|
||||
message: '结束时间必须在开始时间之后!',
|
||||
|
|
|
|||
|
|
@ -481,7 +481,7 @@
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
if (this.$data.begin_t != '' && this.$data.end_t != '' && this.$data.begin_t>this.$data.end_t) {
|
||||
this.$message({
|
||||
message: 'The end time must be after the start time!',
|
||||
|
|
|
|||
|
|
@ -481,7 +481,7 @@
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
if (this.$data.begin_t != '' && this.$data.end_t != '' && this.$data.begin_t>this.$data.end_t) {
|
||||
this.$message({
|
||||
message: '结束时间必须在开始时间之后!',
|
||||
|
|
|
|||
|
|
@ -342,7 +342,7 @@ history.pushState(null, null, document.URL);
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
if (this.$data.begin_t != '' && this.$data.end_t != '' && this.$data.begin_t>this.$data.end_t) {
|
||||
this.$message({
|
||||
message: 'The end time must be after the start time!',
|
||||
|
|
|
|||
|
|
@ -564,7 +564,7 @@ history.pushState(null, null, document.URL);
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
if (this.$data.begin_t != '' && this.$data.end_t != '' && this.$data.begin_t>this.$data.end_t) {
|
||||
this.$message({
|
||||
message: '结束时间必须在开始时间之后!',
|
||||
|
|
|
|||
|
|
@ -283,7 +283,7 @@
|
|||
handleSizeChange(val) {
|
||||
var beginTime= '';
|
||||
var endTime = '';
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
if (this.$data.date_value != null && this.$data.date_value.length > 1) {
|
||||
console.log("len:",this.$data.date_value.length)
|
||||
console.log("date_value:",this.$data.date_value);
|
||||
|
|
|
|||
|
|
@ -283,7 +283,7 @@
|
|||
handleSizeChange(val) {
|
||||
var beginTime= '';
|
||||
var endTime = '';
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
if (this.$data.date_value != null && this.$data.date_value.length > 1) {
|
||||
console.log("len:",this.$data.date_value.length)
|
||||
console.log("date_value:",this.$data.date_value);
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@
|
|||
handleSizeChange(val) {
|
||||
//console.log(`每页 ${val} 条`);
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
if (this.$data.begin_t != '' && this.$data.end_t != '' && this.$data.begin_t>this.$data.end_t) {
|
||||
this.$message({
|
||||
message: 'The end time must be after the start time!',
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@
|
|||
handleSizeChange(val) {
|
||||
//console.log(`每页 ${val} 条`);
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
if (this.$data.begin_t != '' && this.$data.end_t != '' && this.$data.begin_t>this.$data.end_t) {
|
||||
this.$message({
|
||||
message: '结束时间必须在开始时间之后!',
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -78,8 +78,8 @@
|
|||
axios.post('/deescloud/get_well_cur_data', {
|
||||
opuser:localStorage.getItem("online_user"),
|
||||
opuser_uuid:localStorage.getItem("uuid"),
|
||||
Wellname: this.$data.curWellName,
|
||||
})
|
||||
Wellname: this.$data.curWellName,
|
||||
})
|
||||
.then(function (response) {
|
||||
console.log(response.data);
|
||||
let data = response.data;
|
||||
|
|
@ -128,7 +128,7 @@
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -577,7 +577,7 @@
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -575,7 +575,7 @@
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -358,7 +358,7 @@
|
|||
this.$data.pagesize = val;
|
||||
|
||||
var _this = this;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var objs;
|
||||
axios.post('/deescloud/getMss_en', {
|
||||
opuser:localStorage.getItem("online_user"),
|
||||
|
|
|
|||
|
|
@ -376,13 +376,14 @@
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
// 添加：重置到第一页
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
axios.post('/deescloud/getMss', {
|
||||
opuser:localStorage.getItem("online_user"),
|
||||
opuser_uuid:localStorage.getItem("uuid"),
|
||||
opuser:localStorage.getItem("online_user"),
|
||||
opuser_uuid:localStorage.getItem("uuid"),
|
||||
series:this.$data.series_v,
|
||||
instrument_id:this.$data.instrument_id_v,
|
||||
wellname: this.$data.value,
|
||||
|
|
|
|||
|
|
@ -1010,7 +1010,7 @@
|
|||
handleSizeChange(val) {
|
||||
//console.log(`每页 ${val} 条`);
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -1030,7 +1030,7 @@
|
|||
handleSizeChange(val) {
|
||||
//console.log(`每页 ${val} 条`);
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
style="margin-left: 10px"
|
||||
v-model="scope.row.pumpExport"
|
||||
@change="(value) => handlePumpExportChange(value, scope.row)">
|
||||
<span style="color: green">泵信息</span>
|
||||
<span style="color: #409EFF">泵信息</span>
|
||||
</el-checkbox>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -261,7 +261,7 @@
|
|||
handleSizeChange(val) {
|
||||
//console.log(`每页 ${val} 条`);
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -253,7 +253,7 @@
|
|||
handleSizeChange(val) {
|
||||
//console.log(`每页 ${val} 条`);
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -193,7 +193,7 @@ history.pushState(null, null, document.URL);
|
|||
},
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ history.pushState(null, null, document.URL);
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column
|
||||
label="Operation"
|
||||
width="260">
|
||||
width="160">
|
||||
<template slot-scope="scope">
|
||||
<div style="flex: 1;display: inline-flex;">
|
||||
<div v-if="!scope.row.tsw">
|
||||
|
|
@ -49,7 +49,6 @@
|
|||
</div>
|
||||
<el-button @click="show_pdf(scope.row)" type="text" size="medium">Report Detail</el-button>
|
||||
<el-button @click="export_pdf(scope.row)" type="text" size="medium">Export</el-button>
|
||||
<el-button @click="export_mess_pdf(scope.row)" type="text" size="medium">Export(Testing)</el-button>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
@ -196,7 +195,7 @@
|
|||
|
||||
export_mess_pdf(row) {
|
||||
var _this = this;
|
||||
axios.post('deescloud/get_tool_mess_pdf_en', {
|
||||
axios.post('deescloud/get_tool_warning_pdf_en', {
|
||||
opuser: localStorage.getItem("online_user"),
|
||||
opuser_uuid: localStorage.getItem("uuid"),
|
||||
wellname: row.wellNameSource
|
||||
|
|
@ -262,7 +261,7 @@
|
|||
handleSizeChange(val) {
|
||||
//console.log(`每页 ${val} 条`);
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ var toolscomponent = {
|
|||
export_mess_pdf(row) {
|
||||
var _this = this;
|
||||
|
||||
axios.post('deescloud/get_tool_mess_pdf', {
|
||||
axios.post('deescloud/get_tool_warning_pdf', {
|
||||
opuser: localStorage.getItem("online_user"),
|
||||
opuser_uuid: localStorage.getItem("uuid"),
|
||||
wellname: row.wellNameSource
|
||||
|
|
@ -243,7 +243,7 @@ var toolscomponent = {
|
|||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
var _this = this;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var objs;
|
||||
axios.post('/deescloud/get_well_tool', {
|
||||
opuser: localStorage.getItem("online_user"),
|
||||
|
|
|
|||
|
|
@ -261,7 +261,7 @@
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var beginTime= '';
|
||||
var endTime = '';
|
||||
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var beginTime= '';
|
||||
var endTime = '';
|
||||
|
||||
|
|
|
|||
|
|
@ -188,7 +188,7 @@
|
|||
handleSizeChange(val) {
|
||||
//console.log(`每页 ${val} 条`);
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -394,7 +394,7 @@
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -405,7 +405,7 @@
|
|||
handleSizeChange(val) {
|
||||
//console.log(`每页 ${val} 条`);
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -397,7 +397,7 @@
|
|||
handleSizeChange(val) {
|
||||
//console.log(`每页 ${val} 条`);
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -401,7 +401,7 @@
|
|||
handleSizeChange(val) {
|
||||
//console.log(`每页 ${val} 条`);
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var _this = this;
|
||||
|
||||
var objs;
|
||||
|
|
|
|||
|
|
@ -315,7 +315,7 @@
|
|||
handleSizeChange(val) {
|
||||
//console.log(`每页 ${val} 条`);
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
if (this.$data.begin_t != '' && this.$data.end_t != '' && this.$data.begin_t>this.$data.end_t) {
|
||||
this.$message({
|
||||
message: 'The end time must be later than start time!',
|
||||
|
|
|
|||
|
|
@ -1,165 +1,186 @@
|
|||
//组件
|
||||
var WellHistorycomponent = {
|
||||
template:`
|
||||
<div style="height: 100%;width: 100%;">
|
||||
<div v-show="if_show0">
|
||||
<div id="" style="display: inline-block;width: 100%;margin-top: 10px;">
|
||||
<div style="float: left;display: flex;background-color: #ECF5FF;">
|
||||
<el-input v-model="input" placeholder="请输入井名" clearable ></el-input>
|
||||
</div>
|
||||
<div style="float: left;display: flex;background-color: #ECF5FF;">
|
||||
<el-date-picker
|
||||
v-if="if_show_bt==1"
|
||||
v-model="begin_t"
|
||||
type="datetime"
|
||||
placeholder="开始时间"
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
<el-date-picker
|
||||
v-if="if_show_bt==2"
|
||||
v-model="begin_t"
|
||||
type="datetime"
|
||||
placeholder="开始时间"
|
||||
format="MM-dd-yyyy HH:mm:ss"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
<el-date-picker
|
||||
v-if="if_show_bt==3"
|
||||
v-model="begin_t"
|
||||
type="datetime"
|
||||
placeholder="开始时间"
|
||||
format="dd-MM-yyyy HH:mm:ss"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
</div>
|
||||
<div style="float: left;display: flex;background-color: #ECF5FF;">
|
||||
<el-date-picker
|
||||
v-if="if_show_bt==1"
|
||||
v-model="end_t"
|
||||
type="datetime"
|
||||
placeholder="结束时间"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
<el-date-picker
|
||||
v-if="if_show_bt==2"
|
||||
v-model="end_t"
|
||||
type="datetime"
|
||||
placeholder="结束时间"
|
||||
format="MM-dd-yyyy HH:mm:ss"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
<el-date-picker
|
||||
v-if="if_show_bt==3"
|
||||
v-model="end_t"
|
||||
type="datetime"
|
||||
placeholder="结束时间"
|
||||
format="dd-MM-yyyy HH:mm:ss"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
</div>
|
||||
<div style="float: left;margin-left: 5px;">
|
||||
<el-checkbox style="background-color: #ECF5FF;" v-model="checked" label="工程服务" border></el-checkbox>
|
||||
</div>
|
||||
<div style="float: left;margin-left: 5px;">
|
||||
<el-button id ="bt_serach" plain type="primary" icon="el-icon-search" @click="getWellEx(input)">搜索</el-button>
|
||||
</div>
|
||||
var WellHistorycomponent = {
|
||||
template:`
|
||||
<div style="height: 100%;width: 100%;">
|
||||
<div v-show="if_show0">
|
||||
<div id="" style="display: inline-block;width: 100%;margin-top: 10px;">
|
||||
<div style="float: left;display: flex;background-color: #ECF5FF;">
|
||||
<el-input v-model="input" placeholder="请输入井名" clearable style="width: 150px;"></el-input>
|
||||
</div>
|
||||
<div class="span">
|
||||
<el-table
|
||||
:data="tableData"
|
||||
:height="tHeight"
|
||||
style="font-size:14px;overflow-y: auto;"
|
||||
:cell-style="{background:'#304156'}"
|
||||
border
|
||||
>
|
||||
<el-table-column
|
||||
prop="wellNameSource"
|
||||
label="井名称"
|
||||
:width="150"
|
||||
:show-overflow-tooltip="true">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="wellstate"
|
||||
label="井状态"
|
||||
width="60">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="welltime"
|
||||
label="建井时间"
|
||||
:width="170">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
<div style="float: left;display: flex;background-color: #ECF5FF;">
|
||||
<el-date-picker
|
||||
v-if="if_show_bt==1"
|
||||
v-model="begin_t"
|
||||
type="datetime"
|
||||
placeholder="开始时间"
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
<el-date-picker
|
||||
v-if="if_show_bt==2"
|
||||
v-model="begin_t"
|
||||
type="datetime"
|
||||
placeholder="开始时间"
|
||||
format="MM-dd-yyyy HH:mm:ss"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
<el-date-picker
|
||||
v-if="if_show_bt==3"
|
||||
v-model="begin_t"
|
||||
type="datetime"
|
||||
placeholder="开始时间"
|
||||
format="dd-MM-yyyy HH:mm:ss"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
</div>
|
||||
<div style="float: left;display: flex;background-color: #ECF5FF;">
|
||||
<el-date-picker
|
||||
v-if="if_show_bt==1"
|
||||
v-model="end_t"
|
||||
type="datetime"
|
||||
placeholder="结束时间"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
<el-date-picker
|
||||
v-if="if_show_bt==2"
|
||||
v-model="end_t"
|
||||
type="datetime"
|
||||
placeholder="结束时间"
|
||||
format="MM-dd-yyyy HH:mm:ss"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
<el-date-picker
|
||||
v-if="if_show_bt==3"
|
||||
v-model="end_t"
|
||||
type="datetime"
|
||||
placeholder="结束时间"
|
||||
format="dd-MM-yyyy HH:mm:ss"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
</div>
|
||||
<!-- 新增：类型筛选下拉框（多选） -->
|
||||
<div style="float: left;display: flex;background-color: #ECF5FF;">
|
||||
<el-select
|
||||
v-model="selectedTypes"
|
||||
multiple
|
||||
collapse-tags
|
||||
placeholder="请选择井测试类型"
|
||||
clearable
|
||||
style="width: 220px;">
|
||||
<el-option
|
||||
v-for="item in typeOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div style="float: left;margin-left: 5px;">
|
||||
<el-checkbox style="background-color: #ECF5FF;" v-model="checked" label="工程服务" border></el-checkbox>
|
||||
</div>
|
||||
<div style="float: left;margin-left: 5px;">
|
||||
<el-button id ="bt_serach" plain type="primary" icon="el-icon-search" @click="getWellEx(input)">搜索</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="span">
|
||||
<el-table
|
||||
:data="tableData"
|
||||
:height="tHeight"
|
||||
style="font-size:14px;overflow-y: auto;"
|
||||
:cell-style="{background:'#304156'}"
|
||||
border
|
||||
>
|
||||
<el-table-column
|
||||
prop="wellNameSource"
|
||||
label="井名称"
|
||||
:width="150"
|
||||
:show-overflow-tooltip="true">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="wellstate"
|
||||
label="井状态"
|
||||
width="60">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="welltime"
|
||||
label="建井时间"
|
||||
:width="170">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="welloperator"
|
||||
label="操作用户"
|
||||
:width="150"
|
||||
:show-overflow-tooltip="true">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
width="140">
|
||||
<template slot-scope="scope">
|
||||
<div style="flex: 1;display: inline-flex;">
|
||||
<div v-if="!scope.row.rt_flag">
|
||||
<svg style="bottom: 5px;" t="1683783351758" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2560" width="8" height="8"><path d="M512 512m-469.333333 0a469.333333 469.333333 0 1 0 938.666666 0 469.333333 469.333333 0 1 0-938.666666 0Z" fill="#d81e06" p-id="2561"></path></svg>
|
||||
</div>
|
||||
<el-button @click="handleClick(scope.row)" type="text" size="medium">历史详情</el-button>
|
||||
<el-button @click="exportWellHis(scope.row)" type="text" size="medium">导出</el-button>
|
||||
|
||||
</div>
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-table-column>
|
||||
<!-- 修改：将井测试类型列改为普通文本列，以保持与其他列样式一致 -->
|
||||
<el-table-column
|
||||
prop="type_name"
|
||||
label="井测试类型"
|
||||
:width="200"
|
||||
:show-overflow-tooltip="true">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
width="140">
|
||||
<template slot-scope="scope">
|
||||
<div style="flex: 1;display: inline-flex;">
|
||||
<div v-if="!scope.row.rt_flag">
|
||||
<svg style="bottom: 5px;" t="1683783351758" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2560" width="8" height="8"><path d="M512 512m-469.333333 0a469.333333 469.333333 0 1 0 938.666666 0 469.333333 469.333333 0 1 0-938.666666 0Z" fill="#d81e06" p-id="2561"></path></svg>
|
||||
</div>
|
||||
<el-button @click="handleClick(scope.row)" type="text" size="medium">历史详情</el-button>
|
||||
<el-button @click="exportWellHis(scope.row)" type="text" size="medium">导出</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
|
||||
<div class="block">
|
||||
<span class="demonstration" style="background-color: #ECF5FF;"></span>
|
||||
<el-pagination
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange"
|
||||
:current-page="currentPage"
|
||||
:page-sizes="[50,100, 200, 300]"
|
||||
:page-size="pagesize"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
:total="recordTotal" style="background-color: #ECF5FF;">
|
||||
</el-pagination>
|
||||
</div>
|
||||
</div>
|
||||
<div v-show="if_show" style="text-align: center; width: 100%;;font-size: 14px;">
|
||||
<el-tag type="warning" style="width: 100%;height: 50px;font-size: 14px;">用户没有本菜单权限!</el-tag>
|
||||
</div>
|
||||
|
||||
<el-dialog
|
||||
title="解码参数单位"
|
||||
:visible.sync="dialogVisible"
|
||||
width="30%"
|
||||
>
|
||||
<template>
|
||||
<div class="text item">
|
||||
<span style="margin-right: 20px;">压力</span>
|
||||
<el-radio v-model="radio1" label="1" >Mpa</el-radio>
|
||||
<el-radio v-model="radio1" label="2" >psi</el-radio>
|
||||
</div>
|
||||
|
||||
<div class="block">
|
||||
<span class="demonstration" style="background-color: #ECF5FF;"></span>
|
||||
<el-pagination
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange"
|
||||
:current-page="currentPage"
|
||||
:page-sizes="[50,100, 200, 300]"
|
||||
:page-size="pagesize"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
:total="recordTotal" style="background-color: #ECF5FF;">
|
||||
</el-pagination>
|
||||
</div>
|
||||
</div>
|
||||
<div v-show="if_show" style="text-align: center; width: 100%;;font-size: 14px;">
|
||||
<el-tag type="warning" style="width: 100%;height: 50px;font-size: 14px;">用户没有本菜单权限!</el-tag>
|
||||
</div>
|
||||
|
||||
<el-dialog
|
||||
title="解码参数单位"
|
||||
:visible.sync="dialogVisible"
|
||||
width="30%"
|
||||
>
|
||||
<template>
|
||||
<div class="text item">
|
||||
<span style="margin-right: 20px;">压力</span>
|
||||
<el-radio v-model="radio1" label="1" >Mpa</el-radio>
|
||||
<el-radio v-model="radio1" label="2" >psi</el-radio>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<template>
|
||||
<div class="text item" style="margin-top: 20px;">
|
||||
<span style="margin-right: 20px;">温度</span>
|
||||
<el-radio v-model="radio2" label="1" >℃</el-radio>
|
||||
<el-radio v-model="radio2" label="2" >℉</el-radio>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="export_his">确 定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
|
||||
</div>
|
||||
`,
|
||||
</template>
|
||||
|
||||
<template>
|
||||
<div class="text item" style="margin-top: 20px;">
|
||||
<span style="margin-right: 20px;">温度</span>
|
||||
<el-radio v-model="radio2" label="1" >℃</el-radio>
|
||||
<el-radio v-model="radio2" label="2" >℉</el-radio>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="export_his">确 定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
|
||||
</div>
|
||||
`,
|
||||
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'
|
||||
},
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -408,7 +408,7 @@ export_pdf(row, is_memory = false) {
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var beginTime= '';
|
||||
var endTime = '';
|
||||
|
||||
|
|
|
|||
|
|
@ -76,11 +76,11 @@ var Welltypecomponent = {
|
|||
:show-overflow-tooltip="true">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
prop="well_create_time"
|
||||
label="井创建时间"
|
||||
:width="170">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="well_create_time"
|
||||
label="井创建时间"
|
||||
:width="170">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="操作" :width="180">
|
||||
<template slot-scope="scope">
|
||||
|
|
@ -390,7 +390,7 @@ var Welltypecomponent = {
|
|||
|
||||
handleSizeChange(val) {
|
||||
this.$data.pagesize = val;
|
||||
|
||||
this.$data.currentPage = 1;
|
||||
var beginTime= '';
|
||||
var endTime = '';
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue