|
@@ -42,11 +42,10 @@ const totalWorkKeys: [string, string | undefined, string, string, number][] = [
|
|
|
'i-material-symbols:directions-car-outline-rounded text-sky',
|
|
'i-material-symbols:directions-car-outline-rounded text-sky',
|
|
|
2
|
|
2
|
|
|
],
|
|
],
|
|
|
- ['taici', undefined, '台次', 'i-material-symbols:check-circle-outline-rounded text-emerald', 0],
|
|
|
|
|
[
|
|
[
|
|
|
'cumulativeBridgePlug',
|
|
'cumulativeBridgePlug',
|
|
|
undefined,
|
|
undefined,
|
|
|
- '个数',
|
|
|
|
|
|
|
+ '桥塞',
|
|
|
'i-material-symbols:check-circle-outline-rounded text-emerald',
|
|
'i-material-symbols:check-circle-outline-rounded text-emerald',
|
|
|
0
|
|
0
|
|
|
],
|
|
],
|
|
@@ -74,10 +73,18 @@ const totalWorkKeys: [string, string | undefined, string, string, number][] = [
|
|
|
[
|
|
[
|
|
|
'cumulativeHourCount',
|
|
'cumulativeHourCount',
|
|
|
undefined,
|
|
undefined,
|
|
|
- 'H',
|
|
|
|
|
|
|
+ '小时(H)',
|
|
|
'i-material-symbols:nest-clock-farsight-analog-outline-rounded text-emerald',
|
|
'i-material-symbols:nest-clock-farsight-analog-outline-rounded text-emerald',
|
|
|
2
|
|
2
|
|
|
- ]
|
|
|
|
|
|
|
+ ],
|
|
|
|
|
+ [
|
|
|
|
|
+ 'cumulativeWaterVolume',
|
|
|
|
|
+ '方',
|
|
|
|
|
+ '水方量',
|
|
|
|
|
+ 'i-material-symbols:water-drop-outline-rounded text-sky',
|
|
|
|
|
+ 2
|
|
|
|
|
+ ],
|
|
|
|
|
+ ['taici', undefined, '台次', 'i-material-symbols:check-circle-outline-rounded text-emerald', 0]
|
|
|
]
|
|
]
|
|
|
|
|
|
|
|
const totalWork = ref({
|
|
const totalWork = ref({
|
|
@@ -87,7 +94,8 @@ const totalWork = ref({
|
|
|
cumulativeRunCount: 0,
|
|
cumulativeRunCount: 0,
|
|
|
cumulativeWorkingWell: 0,
|
|
cumulativeWorkingWell: 0,
|
|
|
cumulativeWorkingLayers: 0,
|
|
cumulativeWorkingLayers: 0,
|
|
|
- cumulativeHourCount: 0
|
|
|
|
|
|
|
+ cumulativeHourCount: 0,
|
|
|
|
|
+ cumulativeWaterVolume: 0
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
const totalLoading = ref(false)
|
|
const totalLoading = ref(false)
|
|
@@ -120,6 +128,7 @@ const getTotal = useDebounceFn(async () => {
|
|
|
cumulativeWorkingWell: res2.cumulativeWorkingWell || 0,
|
|
cumulativeWorkingWell: res2.cumulativeWorkingWell || 0,
|
|
|
cumulativeWorkingLayers: res2.cumulativeWorkingLayers || 0,
|
|
cumulativeWorkingLayers: res2.cumulativeWorkingLayers || 0,
|
|
|
cumulativeHourCount: res2.cumulativeHourCount || 0,
|
|
cumulativeHourCount: res2.cumulativeHourCount || 0,
|
|
|
|
|
+ cumulativeWaterVolume: res2.cumulativeWaterVolume || 0,
|
|
|
...res2,
|
|
...res2,
|
|
|
cumulativeFuels: (res2.cumulativeFuels || 0) / 10000
|
|
cumulativeFuels: (res2.cumulativeFuels || 0) / 10000
|
|
|
}
|
|
}
|
|
@@ -153,6 +162,10 @@ const columns = (type: string) => {
|
|
|
label: type === '2' ? '项目部' : '队伍',
|
|
label: type === '2' ? '项目部' : '队伍',
|
|
|
prop: 'name'
|
|
prop: 'name'
|
|
|
},
|
|
},
|
|
|
|
|
+ {
|
|
|
|
|
+ label: '油耗(万升)',
|
|
|
|
|
+ prop: 'totalDailyFuel'
|
|
|
|
|
+ },
|
|
|
{
|
|
{
|
|
|
label: '桥塞',
|
|
label: '桥塞',
|
|
|
prop: 'cumulativeBridgePlug'
|
|
prop: 'cumulativeBridgePlug'
|
|
@@ -166,20 +179,16 @@ const columns = (type: string) => {
|
|
|
prop: 'cumulativeWorkingWell'
|
|
prop: 'cumulativeWorkingWell'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- label: '小时(H)',
|
|
|
|
|
- prop: 'cumulativeHourCount'
|
|
|
|
|
|
|
+ label: '段数',
|
|
|
|
|
+ prop: 'cumulativeWorkingLayers'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- label: '油耗(万升)',
|
|
|
|
|
- prop: 'totalDailyFuel'
|
|
|
|
|
|
|
+ label: '小时(H)',
|
|
|
|
|
+ prop: 'cumulativeHourCount'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
label: '水方量(方)',
|
|
label: '水方量(方)',
|
|
|
prop: 'cumulativeWaterVolume'
|
|
prop: 'cumulativeWaterVolume'
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- label: '段数',
|
|
|
|
|
- prop: 'cumulativeWorkingLayers'
|
|
|
|
|
}
|
|
}
|
|
|
]
|
|
]
|
|
|
}
|
|
}
|
|
@@ -228,7 +237,7 @@ const tab = ref<'表格' | '看板'>('表格')
|
|
|
|
|
|
|
|
const currentTab = ref<'表格' | '看板'>('表格')
|
|
const currentTab = ref<'表格' | '看板'>('表格')
|
|
|
|
|
|
|
|
-const deptName = ref('瑞恒兴域')
|
|
|
|
|
|
|
+const deptName = ref('四川瑞都')
|
|
|
|
|
|
|
|
const direction = ref<'left' | 'right'>('right')
|
|
const direction = ref<'left' | 'right'>('right')
|
|
|
|
|
|
|
@@ -252,7 +261,7 @@ const legend = ref<string[][]>([
|
|
|
['个数', 'cumulativeBridgePlug'],
|
|
['个数', 'cumulativeBridgePlug'],
|
|
|
['井数', 'cumulativeWorkingWell'],
|
|
['井数', 'cumulativeWorkingWell'],
|
|
|
['小时 (H)', 'cumulativeHourCount'],
|
|
['小时 (H)', 'cumulativeHourCount'],
|
|
|
- ['油耗 (万升)', 'totalDailyFuel'],
|
|
|
|
|
|
|
+ ['油耗 (万升)', 'cumulativeFuels'],
|
|
|
['水方量 (方)', 'cumulativeWaterVolume'],
|
|
['水方量 (方)', 'cumulativeWaterVolume'],
|
|
|
['台次(泵车)', 'cumulativePumpTrips'],
|
|
['台次(泵车)', 'cumulativePumpTrips'],
|
|
|
['段数', 'cumulativeWorkingLayers'],
|
|
['段数', 'cumulativeWorkingLayers'],
|
|
@@ -279,7 +288,7 @@ const getChart = useDebounceFn(async () => {
|
|
|
cumulativeBridgePlug: res.map((item) => item.cumulativeBridgePlug || 0),
|
|
cumulativeBridgePlug: res.map((item) => item.cumulativeBridgePlug || 0),
|
|
|
cumulativeWorkingWell: res.map((item) => item.cumulativeWorkingWell || 0),
|
|
cumulativeWorkingWell: res.map((item) => item.cumulativeWorkingWell || 0),
|
|
|
cumulativeHourCount: res.map((item) => item.cumulativeHourCount || 0),
|
|
cumulativeHourCount: res.map((item) => item.cumulativeHourCount || 0),
|
|
|
- totalDailyFuel: res.map((item) => (item.totalDailyFuel || 0) / 10000),
|
|
|
|
|
|
|
+ cumulativeFuels: res.map((item) => (item.cumulativeFuels || 0) / 10000),
|
|
|
cumulativeWaterVolume: res.map((item) => item.cumulativeWaterVolume || 0),
|
|
cumulativeWaterVolume: res.map((item) => item.cumulativeWaterVolume || 0),
|
|
|
cumulativeWorkingLayers: res.map((item) => item.cumulativeWorkingLayers || 0),
|
|
cumulativeWorkingLayers: res.map((item) => item.cumulativeWorkingLayers || 0),
|
|
|
cumulativePumpTrips: res.map((item) => item.cumulativePumpTrips || 0),
|
|
cumulativePumpTrips: res.map((item) => item.cumulativePumpTrips || 0),
|
|
@@ -546,7 +555,7 @@ const tolist = (id: number) => {
|
|
|
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
|
|
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-form>
|
|
</el-form>
|
|
|
- <div class="grid grid-cols-7 gap-8">
|
|
|
|
|
|
|
+ <div class="grid grid-cols-8 gap-8">
|
|
|
<div
|
|
<div
|
|
|
v-for="info in totalWorkKeys"
|
|
v-for="info in totalWorkKeys"
|
|
|
:key="info[0]"
|
|
:key="info[0]"
|