|
@@ -4,7 +4,7 @@
|
|
|
<s-header :name="sys ? sys.title : $t('device.managementCenter')" :noback="true"></s-header>
|
|
|
<div class="listBox">
|
|
|
<van-list v-model:loading="loading" v-model:error="error" :error-text="$t('public.requestFailed')"
|
|
|
- :finished="finished" :finished-text="$t('public.noMore')" offset="300" :immediate-check="false" @load="onLoad">
|
|
|
+ :finished="finished" :finished-text="$t('public.noMore')" :offset="300" :immediate-check="false" @load="onLoad">
|
|
|
<div class="deviceBox1 flex-col">
|
|
|
<div class="searchRow flex-row justify-between">
|
|
|
<div class="flex-col">
|
|
@@ -151,8 +151,6 @@
|
|
|
<a class="clickable-link o-ptb-7" @click="viewPosiClk(item)">{{ item.fullName }}</a>
|
|
|
</span>
|
|
|
</div>
|
|
|
-
|
|
|
-
|
|
|
<van-row class="layer5 o-ptb-7 kBordBott" justify="space-between"
|
|
|
v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'POP320'">
|
|
|
<van-col class="word5">{{ $t("device.furnaceHeadTemperature") }}:{{
|
|
@@ -206,7 +204,8 @@
|
|
|
<span class="txt5 o-ptb-7 kBordBott l-flex-RC"><span>{{ $t("device.oneKeyFeed") }}:</span>
|
|
|
<!-- <van-button @click="replenishmentClk(item)" type="primary">{{ $t("device.replenishment") }}
|
|
|
</van-button> -->
|
|
|
- <a class="replenishment o-ptb-7" @click="replenishmentClk(item)">{{ $t("device.replenishment") }}</a>
|
|
|
+ <a class="replenishment o-ptb-7" @click="replenishmentClk(item)">{{ $t("device.replenishment")
|
|
|
+ }}</a>
|
|
|
</span>
|
|
|
</template>
|
|
|
<span class="info1 o-ptb-7 kBordBott">{{ $t("device.lastRefreshTime") }}:{{
|
|
@@ -255,6 +254,7 @@
|
|
|
<deviceOper ref="oprRef" @operfinish="operFinish"></deviceOper>
|
|
|
<!-- 搜索弹出框 -->
|
|
|
<deviceSearch ref="searchRef" @search="search($event)"></deviceSearch>
|
|
|
+ <div style="height: 50px;"></div>
|
|
|
<nav-bar></nav-bar>
|
|
|
</div>
|
|
|
</template>
|
|
@@ -264,7 +264,7 @@
|
|
|
import {
|
|
|
Api_postMachineNum,
|
|
|
} from "../../service/home";
|
|
|
-import { onMounted, reactive, toRefs, ref } from "vue";
|
|
|
+import { onMounted, reactive, toRefs, ref, onActivated } from "vue";
|
|
|
import { Toast, Dialog } from "vant";
|
|
|
import navBar from "../../components/NavBar";
|
|
|
import sHeader from "../../components/SimpleHeader";
|
|
@@ -277,9 +277,10 @@ import {
|
|
|
} from "../../service/device/index";
|
|
|
import deviceSearch from "./deviceSearch";
|
|
|
import deviceOper from "./deviceOper";
|
|
|
-import { useRouter } from "vue-router";
|
|
|
+import { onBeforeRouteLeave, useRouter } from "vue-router";
|
|
|
import dateUtil from "../../utils/dateUtil";
|
|
|
import { useI18n } from "vue-i18n";
|
|
|
+import { onBeforeUnmount } from "vue";
|
|
|
|
|
|
export default {
|
|
|
name: "device",
|
|
@@ -295,6 +296,38 @@ export default {
|
|
|
const router = useRouter();
|
|
|
const sys = ref(null);
|
|
|
const user = getLoginUser();
|
|
|
+ const verticalScrollPosition = ref(0);
|
|
|
+
|
|
|
+ onActivated(() => {
|
|
|
+ // 当组件被激活时,可能是从 keep-alive 缓存中激活的
|
|
|
+ // 这时重新添加滚动事件监听器
|
|
|
+ document.documentElement.scrollTop = verticalScrollPosition.value;
|
|
|
+ console.log("进入时的位置", document.documentElement.scrollTop);
|
|
|
+ // window.addEventListener('scroll', handleScroll);
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
+ onBeforeRouteLeave(() => {
|
|
|
+ console.log("离开时的位置", document.documentElement.scrollTop);
|
|
|
+ verticalScrollPosition.value = document.documentElement.scrollTop || 0;
|
|
|
+ })
|
|
|
+
|
|
|
+ // 在组件卸载前清除定时器
|
|
|
+ onBeforeUnmount(() => {
|
|
|
+ clearInterval(updateDataInterval);
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
+ const updateDataInterval = () => {
|
|
|
+ // 每隔3分钟更新数据
|
|
|
+ setInterval(() => {
|
|
|
+ init();
|
|
|
+ if (oprRef.value) {
|
|
|
+ oprRef.value.closeOper();
|
|
|
+ }
|
|
|
+ verticalScrollPosition.value = 0;
|
|
|
+ }, 5 * 60 * 1000); // 3分钟的毫秒数
|
|
|
+ };
|
|
|
//控制睡眠描述的显示隐藏
|
|
|
const sleepDescBoxShow = ref(true);
|
|
|
// 页面列表查询参数
|
|
@@ -308,6 +341,8 @@ export default {
|
|
|
// 初始化页面获取列表
|
|
|
onMounted(() => {
|
|
|
init();
|
|
|
+ updateDataInterval();
|
|
|
+ // window.addEventListener('scroll', handleScroll);
|
|
|
// 加载样式
|
|
|
// styleUrl('device');
|
|
|
});
|
|
@@ -361,6 +396,7 @@ export default {
|
|
|
// 滚动加载
|
|
|
const onLoad = () => {
|
|
|
if (!finished.value) {
|
|
|
+ // console.log("滚动加载")
|
|
|
searchParams.current = searchParams.current + 1;
|
|
|
getList();
|
|
|
}
|