gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-19 08:19:15 +08:00
Code

fix: 解决代码合并冲突 (#1112)

Browse Source
This commit is contained in:
ssongliu 2023-05-23 15:45:47 +08:00 committed by GitHub
parent 5ac9298db0
commit 09af1e9cdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/components/backup/index.vue
View File

@ -48,7 +48,6 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import ComplexTable from '@/components/complex-table/index.vue';
import { reactive, ref } from 'vue'; import { reactive, ref } from 'vue';
import { dateFormat } from '@/utils/util'; import { dateFormat } from '@/utils/util';
import { useDeleteData } from '@/hooks/use-delete-data'; import { useDeleteData } from '@/hooks/use-delete-data';

1
frontend/src/views/host/ssh/index.vue
View File

@ -9,7 +9,6 @@
<script lang="ts" setup> <script lang="ts" setup>
import i18n from '@/lang'; import i18n from '@/lang';
import LayoutContent from '@/layout/layout-content.vue';
import RouterButton from '@/components/router-button/index.vue'; import RouterButton from '@/components/router-button/index.vue';
const buttons = [ const buttons = [

2
frontend/src/views/host/ssh/log/log.vue
View File

@ -72,9 +72,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import ComplexTable from '@/components/complex-table/index.vue';
import TableSetting from '@/components/table-setting/index.vue'; import TableSetting from '@/components/table-setting/index.vue';
import LayoutContent from '@/layout/layout-content.vue';
import { dateFormat } from '@/utils/util'; import { dateFormat } from '@/utils/util';
import { onMounted, reactive, ref } from '@vue/runtime-core'; import { onMounted, reactive, ref } from '@vue/runtime-core';
import { loadSSHLogs } from '@/api/modules/host'; import { loadSSHLogs } from '@/api/modules/host';

1
frontend/src/views/host/ssh/ssh/index.vue
View File

@ -140,7 +140,6 @@
import { onMounted, reactive, ref } from 'vue'; import { onMounted, reactive, ref } from 'vue';
import { Codemirror } from 'vue-codemirror'; import { Codemirror } from 'vue-codemirror';
import FireRouter from '@/views/host/ssh/index.vue'; import FireRouter from '@/views/host/ssh/index.vue';
import LayoutContent from '@/layout/layout-content.vue';
import { javascript } from '@codemirror/lang-javascript'; import { javascript } from '@codemirror/lang-javascript';
import { oneDark } from '@codemirror/theme-one-dark'; import { oneDark } from '@codemirror/theme-one-dark';
import PubKey from '@/views/host/ssh/ssh/pubkey/index.vue'; import PubKey from '@/views/host/ssh/ssh/pubkey/index.vue';

2
frontend/vite.config.ts
View File

@ -39,7 +39,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
host: '0.0.0.0', host: '0.0.0.0',
proxy: { proxy: {
'/api/v1': { '/api/v1': {
target: 'http://43.142.178.16:9999/', target: 'http://localhost:9999/',
changeOrigin: true, changeOrigin: true,
ws: true, ws: true,
}, },