diff --git a/core/core-frontend/public/images/code.png b/core/core-frontend/public/images/code.png new file mode 100644 index 0000000..33e52dd Binary files /dev/null and b/core/core-frontend/public/images/code.png differ diff --git a/core/core-frontend/public/images/loginbg.png b/core/core-frontend/public/images/loginbg.png new file mode 100644 index 0000000..2ca363b Binary files /dev/null and b/core/core-frontend/public/images/loginbg.png differ diff --git a/core/core-frontend/public/images/loginbtn.png b/core/core-frontend/public/images/loginbtn.png new file mode 100644 index 0000000..8f3104a Binary files /dev/null and b/core/core-frontend/public/images/loginbtn.png differ diff --git a/core/core-frontend/public/images/loginform.png b/core/core-frontend/public/images/loginform.png new file mode 100644 index 0000000..143299e Binary files /dev/null and b/core/core-frontend/public/images/loginform.png differ diff --git a/core/core-frontend/public/images/password.png b/core/core-frontend/public/images/password.png new file mode 100644 index 0000000..9f03c83 Binary files /dev/null and b/core/core-frontend/public/images/password.png differ diff --git a/core/core-frontend/public/images/splitline1.png b/core/core-frontend/public/images/splitline1.png new file mode 100644 index 0000000..2279ef5 Binary files /dev/null and b/core/core-frontend/public/images/splitline1.png differ diff --git a/core/core-frontend/public/images/splitline2.png b/core/core-frontend/public/images/splitline2.png new file mode 100644 index 0000000..a757106 Binary files /dev/null and b/core/core-frontend/public/images/splitline2.png differ diff --git a/core/core-frontend/public/images/titleline.png b/core/core-frontend/public/images/titleline.png new file mode 100644 index 0000000..68928bc Binary files /dev/null and b/core/core-frontend/public/images/titleline.png differ diff --git a/core/core-frontend/public/images/username.png b/core/core-frontend/public/images/username.png new file mode 100644 index 0000000..00dc875 Binary files /dev/null and b/core/core-frontend/public/images/username.png differ diff --git a/core/core-frontend/src/assets/img/code.png b/core/core-frontend/src/assets/img/code.png new file mode 100644 index 0000000..33e52dd Binary files /dev/null and b/core/core-frontend/src/assets/img/code.png differ diff --git a/core/core-frontend/src/assets/img/loginform.png b/core/core-frontend/src/assets/img/loginform.png new file mode 100644 index 0000000..143299e Binary files /dev/null and b/core/core-frontend/src/assets/img/loginform.png differ diff --git a/core/core-frontend/src/assets/img/password.png b/core/core-frontend/src/assets/img/password.png new file mode 100644 index 0000000..9f03c83 Binary files /dev/null and b/core/core-frontend/src/assets/img/password.png differ diff --git a/core/core-frontend/src/assets/img/splitline1.png b/core/core-frontend/src/assets/img/splitline1.png new file mode 100644 index 0000000..2279ef5 Binary files /dev/null and b/core/core-frontend/src/assets/img/splitline1.png differ diff --git a/core/core-frontend/src/assets/img/splitline2.png b/core/core-frontend/src/assets/img/splitline2.png new file mode 100644 index 0000000..a757106 Binary files /dev/null and b/core/core-frontend/src/assets/img/splitline2.png differ diff --git a/core/core-frontend/src/assets/img/titleline.png b/core/core-frontend/src/assets/img/titleline.png new file mode 100644 index 0000000..68928bc Binary files /dev/null and b/core/core-frontend/src/assets/img/titleline.png differ diff --git a/core/core-frontend/src/assets/img/username.png b/core/core-frontend/src/assets/img/username.png new file mode 100644 index 0000000..00dc875 Binary files /dev/null and b/core/core-frontend/src/assets/img/username.png differ diff --git a/core/core-frontend/src/router/index.ts b/core/core-frontend/src/router/index.ts index b6f0b73..a228104 100644 --- a/core/core-frontend/src/router/index.ts +++ b/core/core-frontend/src/router/index.ts @@ -233,6 +233,13 @@ export const routes: AppRouteRecordRaw[] = [ hidden: true, meta: {}, component: () => import('@/viewsnew/application/SfcEditor/index.vue') + }, + { + path: '/SystemLogin', + name: 'SystemLogin', + hidden: true, + meta: {}, + component: () => import('@/viewsnew/application/SystemLogin.vue') } ] diff --git a/core/core-frontend/src/viewsnew/application/PreviewSystem.vue b/core/core-frontend/src/viewsnew/application/PreviewSystem.vue index 4310ba7..033a771 100644 --- a/core/core-frontend/src/viewsnew/application/PreviewSystem.vue +++ b/core/core-frontend/src/viewsnew/application/PreviewSystem.vue @@ -1,13 +1,16 @@ @@ -39,5 +55,6 @@ function getmenuinfo() { .system-box { width: 100%; height: 100vh; + overflow: hidden; } diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/login.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/login.vue new file mode 100644 index 0000000..961282f --- /dev/null +++ b/core/core-frontend/src/viewsnew/application/SfcEditor/login.vue @@ -0,0 +1,189 @@ + + + + + diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/previewNavSfc.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/previewNavSfc.vue index 49c085e..57974cd 100644 --- a/core/core-frontend/src/viewsnew/application/SfcEditor/previewNavSfc.vue +++ b/core/core-frontend/src/viewsnew/application/SfcEditor/previewNavSfc.vue @@ -156,7 +156,8 @@ function init(){ display: flex; flex-direction: column; width: 100%; - height: calc(100vh - 65px); + height: 100vh; + overflow: hidden; } textarea { @@ -167,7 +168,9 @@ textarea { } .preview { + width: 100%; + height: 100vh; flex: 1; - overflow: auto; + overflow: hidden; } \ No newline at end of file diff --git a/core/core-frontend/src/viewsnew/application/SystemLogin.vue b/core/core-frontend/src/viewsnew/application/SystemLogin.vue new file mode 100644 index 0000000..12fd564 --- /dev/null +++ b/core/core-frontend/src/viewsnew/application/SystemLogin.vue @@ -0,0 +1,166 @@ + + + + diff --git a/core/core-frontend/src/viewsnew/application/index.vue b/core/core-frontend/src/viewsnew/application/index.vue index 2f07ff6..c649a60 100644 --- a/core/core-frontend/src/viewsnew/application/index.vue +++ b/core/core-frontend/src/viewsnew/application/index.vue @@ -73,9 +73,14 @@ function delClick(row){ } function preview(row){ + // const route = router.resolve({ + // path: '/PreviewSystem', + // query: { id: row.id,name:row.name } + // }); + // window.open(route.href, '_blank'); const route = router.resolve({ - path: '/PreviewSystem', - query: { id: row.id,name:row.name } + path: '/SystemLogin', + query: { id: row.id ,name:row.name} }); window.open(route.href, '_blank'); } diff --git a/core/core-frontend/src/viewsnew/application/module/index.vue b/core/core-frontend/src/viewsnew/application/module/index.vue index f66e0ef..0b381f2 100644 --- a/core/core-frontend/src/viewsnew/application/module/index.vue +++ b/core/core-frontend/src/viewsnew/application/module/index.vue @@ -162,7 +162,7 @@ onBeforeMount(() => { :download-status="downloadStatus" > - @@ -185,6 +185,11 @@ onBeforeMount(() => { position: relative; z-index:1; } + .navbarpreview{ + width: calc(100% - 260px); + height: calc(100vh - 60px); + // overflow: hidden; + }