Web/daimp-front
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
姚俊旭 2025-05-27 09:39:31 +08:00
commit 1cc5f6bb0a
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/micro/app.js
View File

@ -21,7 +21,7 @@ export const leftApps = [
name: 'sub-app', name: 'sub-app',
entry: VITE_APP_SUB_GAS, entry: VITE_APP_SUB_GAS,
activeRule: '/sub-app', activeRule: '/sub-app',
title: 'APP', title: 'APP2',
icon: 'images/platform/icon-app.png', icon: 'images/platform/icon-app.png',
}, },
{ {
@ -52,7 +52,7 @@ export const rightApps = [
name: 'sub-app', name: 'sub-app',
entry: VITE_APP_SUB_GAS, entry: VITE_APP_SUB_GAS,
activeRule: '/sub-app', activeRule: '/sub-app',
title: 'APP', title: 'APP1',
icon: 'images/platform/icon-app.png', icon: 'images/platform/icon-app.png',
}, },
{ {

8
main/src/views/index.vue
View File

@ -36,7 +36,13 @@ import { getAssetsFile } from '@/utils';
const gotoPage = (row) => { const gotoPage = (row) => {
// window.history.pushState({}, row.name, row.activeRule); // window.history.pushState({}, row.name, row.activeRule);
window.location.href = row.activeRule; if (row.title == 'APP1') {
window.location.href = 'https://www.pgyer.com/MXd3uUrO';
} else if (row.title == 'APP2') {
window.location.href = 'https://www.pgyer.com/4SVVtpob';
} else {
window.location.href = row.activeRule;
}
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

1
new-digital-agriculture-screen/components.d.ts vendored
View File

@ -12,7 +12,6 @@ declare module 'vue' {
'CenterMap copy': typeof import('./src/components/centerMap copy.vue')['default'] 'CenterMap copy': typeof import('./src/components/centerMap copy.vue')['default']
CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default'] CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default']
Components: typeof import('./src/components/index.js')['default'] Components: typeof import('./src/components/index.js')['default']
copy: typeof import('./src/components/centerMap copy.vue')['default']
CurrentTime: typeof import('./src/components/currentTime.vue')['default'] CurrentTime: typeof import('./src/components/currentTime.vue')['default']
CustomBack: typeof import('./src/components/customBack.vue')['default'] CustomBack: typeof import('./src/components/customBack.vue')['default']
CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default'] CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default']

1
sub-operation-service/components.d.ts vendored
View File

@ -9,7 +9,6 @@ declare module 'vue' {
export interface GlobalComponents { export interface GlobalComponents {
CenterMap: typeof import('./src/components/centerMap.vue')['default'] CenterMap: typeof import('./src/components/centerMap.vue')['default']
CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default'] CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default']
copy: typeof import('./src/components/custom-scroll-title copy/index.vue')['default']
CostomImg: typeof import('./src/components/costomImg.vue')['default'] CostomImg: typeof import('./src/components/costomImg.vue')['default']
CustomBack: typeof import('./src/components/customBack.vue')['default'] CustomBack: typeof import('./src/components/customBack.vue')['default']
CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default'] CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default']