6/16代码提交
This commit is contained in:
parent
bea2c99871
commit
050b7e27ef
|
@ -14,7 +14,7 @@
|
||||||
"less": "^4.2.0",
|
"less": "^4.2.0",
|
||||||
"moment": "^2.30.1",
|
"moment": "^2.30.1",
|
||||||
"three": "^0.164.1",
|
"three": "^0.164.1",
|
||||||
"uuid": "^11.0.4",
|
"uuid": "^11.0.5",
|
||||||
"vue": "^3.3.4",
|
"vue": "^3.3.4",
|
||||||
"vue-router": "^4.2.5"
|
"vue-router": "^4.2.5"
|
||||||
},
|
},
|
||||||
|
@ -1392,9 +1392,9 @@
|
||||||
"integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
|
"integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
|
||||||
},
|
},
|
||||||
"node_modules/uuid": {
|
"node_modules/uuid": {
|
||||||
"version": "11.0.4",
|
"version": "11.0.5",
|
||||||
"resolved": "https://registry.npmmirror.com/uuid/-/uuid-11.0.4.tgz",
|
"resolved": "https://registry.npmmirror.com/uuid/-/uuid-11.0.5.tgz",
|
||||||
"integrity": "sha512-IzL6VtTTYcAhA/oghbFJ1Dkmqev+FpQWnCBaKq/gUluLxliWvO8DPFWfIviRmYbtaavtSQe4WBL++rFjdcGWEg==",
|
"integrity": "sha512-508e6IcKLrhxKdBbcA2b4KQZlLVp2+J5UwQ6F7Drckkc5N9ZJwFa4TgWtsww9UG8fGHbm6gbV19TdM5pQ4GaIA==",
|
||||||
"funding": [
|
"funding": [
|
||||||
"https://github.com/sponsors/broofa",
|
"https://github.com/sponsors/broofa",
|
||||||
"https://github.com/sponsors/ctavan"
|
"https://github.com/sponsors/ctavan"
|
||||||
|
@ -2388,9 +2388,9 @@
|
||||||
"integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
|
"integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
|
||||||
},
|
},
|
||||||
"uuid": {
|
"uuid": {
|
||||||
"version": "11.0.4",
|
"version": "11.0.5",
|
||||||
"resolved": "https://registry.npmmirror.com/uuid/-/uuid-11.0.4.tgz",
|
"resolved": "https://registry.npmmirror.com/uuid/-/uuid-11.0.5.tgz",
|
||||||
"integrity": "sha512-IzL6VtTTYcAhA/oghbFJ1Dkmqev+FpQWnCBaKq/gUluLxliWvO8DPFWfIviRmYbtaavtSQe4WBL++rFjdcGWEg=="
|
"integrity": "sha512-508e6IcKLrhxKdBbcA2b4KQZlLVp2+J5UwQ6F7Drckkc5N9ZJwFa4TgWtsww9UG8fGHbm6gbV19TdM5pQ4GaIA=="
|
||||||
},
|
},
|
||||||
"vite": {
|
"vite": {
|
||||||
"version": "4.4.11",
|
"version": "4.4.11",
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
"less": "^4.2.0",
|
"less": "^4.2.0",
|
||||||
"moment": "^2.30.1",
|
"moment": "^2.30.1",
|
||||||
"three": "^0.164.1",
|
"three": "^0.164.1",
|
||||||
"uuid": "^11.0.4",
|
"uuid": "^11.0.5",
|
||||||
"vue": "^3.3.4",
|
"vue": "^3.3.4",
|
||||||
"vue-router": "^4.2.5"
|
"vue-router": "^4.2.5"
|
||||||
},
|
},
|
||||||
|
|
|
@ -801,19 +801,20 @@ function getKeywordData() {
|
||||||
}
|
}
|
||||||
// 上一页
|
// 上一页
|
||||||
function preClick() {
|
function preClick() {
|
||||||
scheduleIndex.value--;
|
|
||||||
if (scheduleIndex.value < 0) {
|
if (scheduleIndex.value == 0) {
|
||||||
// scheduleIndex.value = schedule.value.length - 1;
|
// scheduleIndex.value = schedule.value.length - 1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
scheduleIndex.value--;
|
||||||
xVal.value = -(100 / 3) * scheduleIndex.value + "%";
|
xVal.value = -(100 / 3) * scheduleIndex.value + "%";
|
||||||
}
|
}
|
||||||
// 下一页
|
// 下一页
|
||||||
function nextClick() {
|
function nextClick() {
|
||||||
scheduleIndex.value++;
|
if (scheduleIndex.value === schedule.value.length - 1) {
|
||||||
if (scheduleIndex.value === schedule.value.length) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
scheduleIndex.value++;
|
||||||
xVal.value = -(100 / 3) * scheduleIndex.value + "%";
|
xVal.value = -(100 / 3) * scheduleIndex.value + "%";
|
||||||
}
|
}
|
||||||
// 定时器
|
// 定时器
|
||||||
|
@ -825,6 +826,7 @@ const handleTimer = reactive({
|
||||||
timer5: null,
|
timer5: null,
|
||||||
});
|
});
|
||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
|
console.log('onUnmounted');
|
||||||
// 清除定时器
|
// 清除定时器
|
||||||
clearTimeout(handleTimer.timer1);
|
clearTimeout(handleTimer.timer1);
|
||||||
clearTimeout(handleTimer.timer2);
|
clearTimeout(handleTimer.timer2);
|
||||||
|
|
|
@ -31,7 +31,8 @@ export default defineConfig({
|
||||||
rewrite: (path) => path.replace('/api', '')
|
rewrite: (path) => path.replace('/api', '')
|
||||||
},
|
},
|
||||||
'/aps': {
|
'/aps': {
|
||||||
target: 'http://192.168.17.4:8001/',
|
// target: 'http://192.168.17.4:8001/',
|
||||||
|
target: 'http://172.16.1.253:8111',
|
||||||
changeOrigin: true, //是否跨域
|
changeOrigin: true, //是否跨域
|
||||||
rewrite: (path) => path.replace('/aps', '')
|
rewrite: (path) => path.replace('/aps', '')
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue