英文界面修改
This commit is contained in:
parent
00a5f4a3bd
commit
f7203aa7b9
|
|
@ -24,7 +24,7 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="welltime"
|
prop="welltime"
|
||||||
label="Upload Time"
|
label="Create Time"
|
||||||
:width="170">
|
:width="170">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -140,6 +140,16 @@ var devcomponent_en = {
|
||||||
:width="150"
|
:width="150"
|
||||||
:show-overflow-tooltip="true">
|
:show-overflow-tooltip="true">
|
||||||
</el-table-column>
|
</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
|
<el-table-column
|
||||||
prop="in_time"
|
prop="in_time"
|
||||||
label="In-hole 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 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 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 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, {
|
return Object.assign({}, item, {
|
||||||
sid: sid,
|
sid: sid,
|
||||||
iid: iid,
|
iid: iid,
|
||||||
duration_current: durationCurrent,
|
duration_current: durationCurrent,
|
||||||
duration_total: durationTotal,
|
duration_total: durationTotal,
|
||||||
instrument_name: instrumentName
|
instrument_name: instrumentName,
|
||||||
|
pInTime: pInTime,
|
||||||
|
pOutTime: pOutTime
|
||||||
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
_this.$data.devRecordTotal = response.data.total || 0;
|
_this.$data.devRecordTotal = response.data.total || 0;
|
||||||
|
|
|
||||||
|
|
@ -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-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-option v-for="item in devWellnameOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
|
||||||
</el-select>
|
</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-option v-for="item in devSidOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
<el-select v-model="devSearchForm.iid" placeholder="请输入编号" filterable clearable multiple collapse-tags style="width: 180px; max-width: 320px; margin-left: 5px;">
|
<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-option v-for="item in devIidOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
|
||||||
</el-select>
|
</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-option v-for="item in devEngineerOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
<el-button style="margin-left: 5px;" plain type="primary" icon="el-icon-search" @click="getDevList()">搜索</el-button>
|
<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"
|
:width="150"
|
||||||
:show-overflow-tooltip="true">
|
:show-overflow-tooltip="true">
|
||||||
</el-table-column>
|
</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
|
<el-table-column
|
||||||
prop="in_time"
|
prop="in_time"
|
||||||
label="入井时间"
|
label="仪器入井时间"
|
||||||
width="160">
|
width="160">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="out_time"
|
prop="out_time"
|
||||||
label="出井时间"
|
label="仪器出井时间"
|
||||||
width="160">
|
width="160">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
|
@ -155,13 +165,13 @@ var devcomponent = {
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="duration_current"
|
prop="duration_current"
|
||||||
label="本次时长(h)"
|
label="仪器本次使用时长(h)"
|
||||||
width="120">
|
width="160">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="duration_total"
|
prop="duration_total"
|
||||||
label="累计时长(h)"
|
label="仪器出厂累计时长(h)"
|
||||||
width="120">
|
width="160">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="location"
|
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 : '');
|
var durationTotal = item.duration_total != null ? item.duration_total : (item.total_work_time != null ? item.total_work_time : '');
|
||||||
// 兼容 product_name 到 instrument_name
|
// 兼容 product_name 到 instrument_name
|
||||||
var instrumentName = item.instrument_name != null ? item.instrument_name : (item.product_name != null ? item.product_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, {
|
return Object.assign({}, item, {
|
||||||
sid: sid,
|
sid: sid,
|
||||||
iid: iid,
|
iid: iid,
|
||||||
duration_current: durationCurrent,
|
duration_current: durationCurrent,
|
||||||
duration_total: durationTotal,
|
duration_total: durationTotal,
|
||||||
instrument_name: instrumentName
|
instrument_name: instrumentName,
|
||||||
|
pInTime: pInTime,
|
||||||
|
pOutTime: pOutTime
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
_this.$data.devRecordTotal = response.data.total || 0;
|
_this.$data.devRecordTotal = response.data.total || 0;
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="welltime"
|
prop="welltime"
|
||||||
label="Upload Time"
|
label="Create Time"
|
||||||
:width="170">
|
:width="170">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="wellCreateTime"
|
prop="wellCreateTime"
|
||||||
label="Upload Time"
|
label="Create Time"
|
||||||
:width="170">
|
:width="170">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="welltime"
|
prop="welltime"
|
||||||
label="Upload Time"
|
label="Create Time"
|
||||||
:width="170">
|
:width="170">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -614,7 +614,9 @@
|
||||||
series_id: "",
|
series_id: "",
|
||||||
num: "",
|
num: "",
|
||||||
index: this.$data.currentPage,
|
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) {
|
.then(function (response) {
|
||||||
console.log(response.data);
|
console.log(response.data);
|
||||||
|
|
@ -1012,7 +1014,9 @@
|
||||||
series_id: _this.$data.series_id_v,
|
series_id: _this.$data.series_id_v,
|
||||||
num: _this.$data.num_v,
|
num: _this.$data.num_v,
|
||||||
index: this.$data.currentPage,
|
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) {
|
.then(function (response) {
|
||||||
console.log(response.data);
|
console.log(response.data);
|
||||||
|
|
@ -1038,7 +1042,9 @@
|
||||||
series_id: _this.$data.series_id_v,
|
series_id: _this.$data.series_id_v,
|
||||||
num: _this.$data.num_v,
|
num: _this.$data.num_v,
|
||||||
index: this.$data.currentPage,
|
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) {
|
.then(function (response) {
|
||||||
console.log(response.data);
|
console.log(response.data);
|
||||||
|
|
@ -1062,7 +1068,9 @@
|
||||||
series_id: _this.$data.series_id_v,
|
series_id: _this.$data.series_id_v,
|
||||||
num: _this.$data.num_v,
|
num: _this.$data.num_v,
|
||||||
index: this.$data.currentPage,
|
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) {
|
.then(function (response) {
|
||||||
console.log(response.data);
|
console.log(response.data);
|
||||||
|
|
|
||||||
|
|
@ -542,7 +542,9 @@
|
||||||
axios.post('/deescloud/get_b_life', {
|
axios.post('/deescloud/get_b_life', {
|
||||||
b_code:this.$data.b_code_v_1,
|
b_code:this.$data.b_code_v_1,
|
||||||
index: this.$data.currentPage1,
|
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) {
|
.then(function (response) {
|
||||||
console.log(response.data);
|
console.log(response.data);
|
||||||
|
|
@ -744,7 +746,9 @@
|
||||||
b_id: this.$data.b_id_v,
|
b_id: this.$data.b_id_v,
|
||||||
b_code:this.$data.b_code_v,
|
b_code:this.$data.b_code_v,
|
||||||
index: this.$data.currentPage,
|
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) {
|
.then(function (response) {
|
||||||
console.log(response.data);
|
console.log(response.data);
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="welltime"
|
prop="welltime"
|
||||||
label="Upload Time"
|
label="Create Time"
|
||||||
:width="170">
|
:width="170">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="welltime"
|
prop="welltime"
|
||||||
label="Upload Time"
|
label="Create Time"
|
||||||
:width="170">
|
:width="170">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="welltime"
|
prop="welltime"
|
||||||
label="Upload Time"
|
label="Create Time"
|
||||||
:width="170">
|
:width="170">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="welltime"
|
prop="welltime"
|
||||||
label="Upload Time"
|
label="Create Time"
|
||||||
:width="170">
|
:width="170">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@
|
||||||
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="well_create_time"
|
prop="well_create_time"
|
||||||
label="Upload Time"
|
label="Create Time"
|
||||||
:width="170">
|
:width="170">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue