feat: update button size

amuluze · Mar 28, 2024 · 3e07e92 · 3e07e92
1 parent 7811dfb
commit 3e07e92
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,7 @@
 .DS_Store
 .vscode
 probe.db
+deploy.sh
 *__pycache__
 *.py[cod]
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,16 +1,19 @@
-version: '3'
+version: "3"
 services:
-  amprobe:
-    image: amuluze/amprobe:v1.0
-    container_name: amprobe                                                          # 容器名为'postgresql'
-    restart: always
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /proc:/host/proc:ro
-      - /sys:/host/sys:ro
-      - /dev:/host/dev:ro
-      - /etc:/host/etc:ro
-      - /:/rootfs:ro
-      - /data/amprobe/configs:/app/configs
-    ports:
-      - 80:80
+    amprobe:
+        image: amuluze/amprobe:v1.2
+        container_name: amprobe # 容器名为'postgresql'
+        restart: always
+        volumes:
+            - /var/run/docker.sock:/var/run/docker.sock
+            - /proc:/host/proc:ro
+            - /sys:/host/sys:ro
+            - /dev:/host/dev:ro
+            - /etc:/host/etc:ro
+            - /:/rootfs:ro
+            - /data/amprobe/configs:/app/configs
+            - /data/amprobe/nginx/nginx.conf:/etc/nginx/nginx.conf
+            - /data/amprobe/supervisor:/etc/supervisor/conf.d
+            - /data/amprobe/dist:/usr/share/nginx/html
+        ports:
+            - 8082:8082
diff --git a/web/src/layout/navbar/Avatar.vue b/web/src/layout/navbar/Avatar.vue
@@ -20,7 +20,7 @@ const doLogout = () => {
     // 1. 退出登录
     logout()
     // 2.清除缓存
-    store.user.setToken('', '', 0)
+    store.user.setToken('', '')
     store.app.isCollapse = false
     // 3.重定向到登录页
     router.replace('/login')

diff --git a/web/src/layout/navbar/Breadcrumb.vue b/web/src/layout/navbar/Breadcrumb.vue
@@ -1,11 +1,12 @@
 <template>
-    <div>
+    Breadcrum
+    <!-- <div>
         <el-breadcrumb separator="/">
             <el-breadcrumb-item v-for="(item, index) in breadcrumbList" :key="index">
                 <span>{{ item.title }}</span>
             </el-breadcrumb-item>
         </el-breadcrumb>
-    </div>
+    </div> -->
 </template>
 <script setup lang="ts"></script>
 <style scoped lang="scss"></style>
diff --git a/web/src/layout/sidebar/Menuitem.vue b/web/src/layout/sidebar/Menuitem.vue
@@ -2,13 +2,13 @@
     <div class="am-menuitem-container" :class="{ 'am-hide-sidebar': hideSidebar }">
         <el-sub-menu v-if="item.children?.length" class="grid" :index="item.path">
             <template #title>
-                <svg-icon v-if="item.meta && item.meta.icon" :icon-class="item.meta.icon" />
+                <svg-icon v-if="item.meta && item.meta.icon" :icon-class="item.meta.icon as string" />
                 <span v-show="!store.app.isCollapse">{{ item.meta?.title }}</span>
             </template>
             <menuitem v-for="i in item.children" :key="i.name" :item="i"></menuitem>
         </el-sub-menu>
         <el-menu-item v-else :index="item.path" @click="handleClickMenu(item)">
-            <svg-icon v-if="item.meta && item.meta.icon" :icon-class="item.meta.icon" />
+            <svg-icon v-if="item.meta && item.meta.icon" :icon-class="item.meta.icon as string" />
             <template #title>{{ item.meta?.title }}</template>
         </el-menu-item>
     </div>

diff --git a/web/src/views/container/container/index.vue b/web/src/views/container/container/index.vue
@@ -68,9 +68,9 @@
         <el-input v-model="logData" rows="20" type="textarea" />
         <template #footer>
             <div class="dialog-footer">
-                <el-button type="primary" plain @click="downloadLog">下载</el-button>
-                <el-button type="info" plain @click="stopLogView">停止</el-button>
-                <el-button type="success" plain @click="handleClose">关闭</el-button>
+                <el-button size="small" type="primary" plain @click="downloadLog">下载</el-button>
+                <el-button size="small" type="info" plain @click="stopLogView">停止</el-button>
+                <el-button size="small" type="success" plain @click="handleClose">关闭</el-button>
             </div>
         </template>
     </el-dialog>
@@ -100,7 +100,7 @@ const viewLog = (container_id: string) => {
     console.log('container_id', container_id)
 
     // 建立 WebSocket 连接
-    ws = new WebSocket('wss://' + location.host + '/ws/' + container_id)
+    ws = new WebSocket('ws://' + location.host + '/ws/' + container_id)
     ws.onopen = () => {
         ws.send(container_id)
     }

diff --git a/web/types/components.d.ts b/web/types/components.d.ts
@@ -11,8 +11,6 @@ declare module 'vue' {
     Echarts: typeof import('./../src/components/Echarts/index.vue')['default']
     ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
-    ElBreadcrumb: (typeof import('element-plus/es'))['ElBreadcrumb']
-    ElBreadcrumbItem: (typeof import('element-plus/es'))['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCol: typeof import('element-plus/es')['ElCol']
@@ -24,28 +22,22 @@ declare module 'vue' {
     ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
-    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSpace: (typeof import('element-plus/es'))['ElSpace']
     ElStatistic: typeof import('element-plus/es')['ElStatistic']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
     IEpDelete: typeof import('~icons/ep/delete')['default']
-    IEpExpand: typeof import('~icons/ep/expand')['default']
-    IEpFold: typeof import('~icons/ep/fold')['default']
     IEpUser: typeof import('~icons/ep/user')['default']
     IEpView: typeof import('~icons/ep/view')['default']
-    Pagination: typeof import('./../src/components/Pagination/index.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SearchForm: typeof import('./../src/components/SearchForm/index.vue')['default']