diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 131c053..257e4f5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,8 +8,8 @@ on: env: REGISTRY: docker.frappet.com IMAGE_NAME: ehr/bma-ehr-user - DEPLOY_HOST: frappet.com - COMPOSE_PATH: /home/frappet/docker/bma-ehr-user + DEPLOY_HOST: 49.0.91.80 + COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-user jobs: # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=test-v6.1 -s DOCKER_USER=sorawit -s DOCKER_PASS=P@ssword -s SSH_PASSWORD=P@ssw0rd @@ -60,11 +60,11 @@ jobs: host: ${{env.DEPLOY_HOST}} username: frappet password: ${{ secrets.SSH_PASSWORD }} - port: 22 + port: 10102 script: | cd "${{env.COMPOSE_PATH}}" - docker-compose pull - docker-compose up -d + docker compose pull + docker compose up -d echo "${{ steps.gen_ver.outputs.image_ver }}"> success - uses: snow-actions/line-notify@v1.1.0 if: success() diff --git a/src/modules/01_dashboard/views/Dashboard.vue b/src/modules/01_dashboard/views/Dashboard.vue index 2cfe962..39e0fd0 100644 --- a/src/modules/01_dashboard/views/Dashboard.vue +++ b/src/modules/01_dashboard/views/Dashboard.vue @@ -241,7 +241,9 @@ const thaiOptions: Intl.DateTimeFormatOptions = { กล่องข้อความ -
ทั้งหมด {{ totalInbox }} ข้อความ
+
+ ทั้งหมด {{ totalInbox }} ข้อความ +
@@ -308,7 +310,7 @@ const thaiOptions: Intl.DateTimeFormatOptions = { icon="mdi-reply" size="10px" color="grey-7" - @click="dialogRepleOpen(item.no)" + @click.stop.prevent="dialogRepleOpen(item.no)" > ตอบกลับข้อความ