|
|
@@ -185,7 +185,7 @@ const columns = (type: string) => {
|
|
|
},
|
|
|
{
|
|
|
label: '平均时效(%)',
|
|
|
- prop: 'transitTime'
|
|
|
+ prop: 'hourUtilizationRate'
|
|
|
},
|
|
|
{
|
|
|
label: '非生产时效(%)',
|
|
|
@@ -250,7 +250,8 @@ const getList = useDebounceFn(async () => {
|
|
|
cumulativeWaterInjection: ((other.cumulativeWaterInjection || 0) / 10000).toFixed(2),
|
|
|
cumulativePowerConsumption: ((other.cumulativePowerConsumption || 0) / 1000).toFixed(2),
|
|
|
cumulativeFuelConsumption: (other.cumulativeFuelConsumption || 0).toFixed(2),
|
|
|
- utilizationRate: other.utilizationRate || 0
|
|
|
+ utilizationRate: other.utilizationRate || 0,
|
|
|
+ hourUtilizationRate: ((other.hourUtilizationRate || 0) * 100).toFixed(2) + '%'
|
|
|
}
|
|
|
}
|
|
|
)
|
|
|
@@ -648,7 +649,7 @@ watch(
|
|
|
props.query.createTime?.[0],
|
|
|
props.query.createTime?.[1]
|
|
|
],
|
|
|
- (val) => {
|
|
|
+ () => {
|
|
|
if (!props.query.createTime) {
|
|
|
totalWork.value.totalCount = 0
|
|
|
totalWork.value.notReported = 0
|
|
|
@@ -750,8 +751,7 @@ const { ZmTable, ZmTableColumn } = useTableComponents()
|
|
|
</div>
|
|
|
</template>
|
|
|
<div
|
|
|
- class="bg-white dark:bg-[#1d1e1f] rounded-lg shadow p-1 flex flex-col items-center justify-center gap-1"
|
|
|
- >
|
|
|
+ class="bg-white dark:bg-[#1d1e1f] rounded-lg shadow p-1 flex flex-col items-center justify-center gap-1">
|
|
|
<div class="size-7.5" :class="info[3]"></div>
|
|
|
|
|
|
<count-to
|
|
|
@@ -760,8 +760,7 @@ const { ZmTable, ZmTableColumn } = useTableComponents()
|
|
|
:start-val="0"
|
|
|
:end-val="totalWork[info[0]]"
|
|
|
:decimals="info[4]"
|
|
|
- @click="info[2] === '未填报' ? openUnfilledDialog() : ''"
|
|
|
- >
|
|
|
+ @click="info[2] === '未填报' ? openUnfilledDialog() : ''">
|
|
|
<span class="text-xs leading-8 text-[var(--el-text-color-regular)]">暂无数据</span>
|
|
|
</count-to>
|
|
|
|
|
|
@@ -799,8 +798,7 @@ const { ZmTable, ZmTableColumn } = useTableComponents()
|
|
|
as="div"
|
|
|
:style="{ position: 'relative', overflow: 'hidden' }"
|
|
|
:animate="{ height: `${height}px`, width: `100%` }"
|
|
|
- :transition="{ type: 'spring', stiffness: 200, damping: 25, duration: 0.3 }"
|
|
|
- >
|
|
|
+ :transition="{ type: 'spring', stiffness: 200, damping: 25, duration: 0.3 }">
|
|
|
<AnimatePresence :initial="false" mode="sync">
|
|
|
<Motion
|
|
|
:key="currentTab"
|
|
|
@@ -809,29 +807,25 @@ const { ZmTable, ZmTableColumn } = useTableComponents()
|
|
|
:animate="{ x: '0%', opacity: 1 }"
|
|
|
:exit="{ x: direction === 'left' ? '50%' : '-50%', opacity: 0 }"
|
|
|
:transition="{ type: 'tween', stiffness: 300, damping: 30, duration: 0.3 }"
|
|
|
- :style="{ position: 'absolute', left: 0, right: 0, top: 0 }"
|
|
|
- >
|
|
|
+ :style="{ position: 'absolute', left: 0, right: 0, top: 0 }">
|
|
|
<div :style="{ width: `100%`, height: `${height}px` }">
|
|
|
<zm-table
|
|
|
v-if="currentTab === '表格'"
|
|
|
:loading="listLoading"
|
|
|
:data="list"
|
|
|
:height="height"
|
|
|
- show-border
|
|
|
- >
|
|
|
+ show-border>
|
|
|
<template v-for="item in columns(type)" :key="item.prop">
|
|
|
<zm-table-column
|
|
|
v-if="item.prop !== 'name' && item.prop !== 'nonProductiveTime'"
|
|
|
:label="item.label"
|
|
|
:prop="item.prop"
|
|
|
:formatter="formatter"
|
|
|
- :action="item.action"
|
|
|
- />
|
|
|
+ :action="item.action" />
|
|
|
<zm-table-column
|
|
|
v-else-if="item.prop === 'name'"
|
|
|
:label="item.label"
|
|
|
- :prop="item.prop"
|
|
|
- >
|
|
|
+ :prop="item.prop">
|
|
|
<template #default="{ row }">
|
|
|
<el-button text type="primary" @click.prevent="tolist(row.id)">{{
|
|
|
row.name
|
|
|
@@ -844,8 +838,7 @@ const { ZmTable, ZmTableColumn } = useTableComponents()
|
|
|
v-if="row.nonProductiveTime > 0"
|
|
|
text
|
|
|
type="primary"
|
|
|
- @click.prevent="tolist(row.id, true)"
|
|
|
- >
|
|
|
+ @click.prevent="tolist(row.id, true)">
|
|
|
{{ (Number(row.nonProductiveTime ?? 0) * 100).toFixed(2) + '%' }}
|
|
|
</el-button>
|
|
|
<span v-else>
|
|
|
@@ -859,8 +852,7 @@ const { ZmTable, ZmTableColumn } = useTableComponents()
|
|
|
ref="chartRef"
|
|
|
v-loading="chartLoading"
|
|
|
v-else
|
|
|
- :style="{ width: `100%`, height: `${height}px` }"
|
|
|
- >
|
|
|
+ :style="{ width: `100%`, height: `${height}px` }">
|
|
|
</div>
|
|
|
</div>
|
|
|
</Motion>
|