From 8b2059daff4b99d8754c789df3ca10b823bc7c11 Mon Sep 17 00:00:00 2001
From: eroter <331864945@qq.com>
Date: Wed, 21 Aug 2024 12:07:48 +0800
Subject: [PATCH] =?UTF-8?q?feat=20App=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=8E=A8=E9=80=81=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=20feat=20=E9=83=A8=E5=88=86=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/business/appMessage/index.ts    | 11 +++++++++++
 src/views/business/appMessage/index.vue | 22 +++++++++++++++++++++-
 src/views/business/userDevice/index.vue |  2 +-
 src/views/login.vue                     | 12 ++++++------
 src/views/register.vue                  |  2 +-
 5 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/src/api/business/appMessage/index.ts b/src/api/business/appMessage/index.ts
index b784c18..d88d180 100644
--- a/src/api/business/appMessage/index.ts
+++ b/src/api/business/appMessage/index.ts
@@ -62,3 +62,14 @@ export const updateStatus = (id: any, status: string) => {
     data: { id: id, messageStatus: status }
   });
 };
+
+/**
+ * 推送消息
+ * @param data
+ */
+export const pushMessage = (id: any) => {
+  return request({
+    url: '/business/appMessage/push/' + id,
+    method: 'get'
+  });
+};
diff --git a/src/views/business/appMessage/index.vue b/src/views/business/appMessage/index.vue
index fc6556c..8d0dcc4 100644
--- a/src/views/business/appMessage/index.vue
+++ b/src/views/business/appMessage/index.vue
@@ -46,8 +46,12 @@
           <template #default="scope">
               <el-switch
                 v-model="scope.row.messageStatus"
+                inline-prompt
+                active-text="发布"
                 active-value="Published"
                 inactive-value="Draft"
+                inactive-text="草稿"
+                size="large"
                 style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
                 @change="val => updateStatusSwitch(scope.row.id, val)"
               />
@@ -55,6 +59,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
+            <el-button link type="warning" @click="pushMessge(scope.row)">推送</el-button>
             <el-button link type="success" @click="handleView(scope.row)">查看</el-button>
             <el-button link type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
           </template>
@@ -165,7 +170,14 @@
 </template>
 
 <script setup name="AppMessage" lang="ts">
-import { listAppMessage, getAppMessage, addAppMessage, updateAppMessage, updateStatus } from '@/api/business/appMessage';
+import {
+  listAppMessage,
+  getAppMessage,
+  addAppMessage,
+  updateAppMessage,
+  updateStatus,
+  pushMessage
+} from "@/api/business/appMessage";
 import { AppMessageVO, AppMessageQuery, AppMessageForm } from '@/api/business/appMessage/types';
 import { queryUser4Select } from "@/api/business/user";
 import { User4SelectQuery, User4SelectVo } from "@/api/business/user/types";
@@ -343,6 +355,14 @@ const closeViewDetailDialog = () => {
   viewDetailDialog.visible = false;
 }
 
+/** 推送消息 */
+const pushMessge = async (row?: AppMessageVO) => {
+  await proxy?.$modal.confirm('是否确认将此消息推送至在线的用户设备？');
+  const _id = row?.id || ids.value[0]
+  const res = await pushMessage(_id);
+  proxy?.$modal.msgSuccess("消息推送成功");
+}
+
 onMounted(() => {
   getList();
 });
diff --git a/src/views/business/userDevice/index.vue b/src/views/business/userDevice/index.vue
index 7d9d8a1..54b8bb1 100644
--- a/src/views/business/userDevice/index.vue
+++ b/src/views/business/userDevice/index.vue
@@ -167,7 +167,7 @@ const resetQuery = () => {
 
 /** 跳转至设备数据 */
 const jumpToDeviceData = (deviceId: any) => {
-  router.push({ path: '/deviceData/ring', query: { deviceId } });
+  router.push({ path: '/device/data/ring', query: { deviceId } });
 }
 
 onMounted(() => {
diff --git a/src/views/login.vue b/src/views/login.vue
index 7e1394e..ff58ba7 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
+      <h3 class="title">洛克智能设备管理系统</h3>
       <el-form-item v-if="tenantEnabled" prop="tenantId">
         <el-select v-model="loginForm.tenantId" filterable placeholder="请选择/输入公司名称" style="width: 100%">
           <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>
@@ -27,7 +27,7 @@
         </div>
       </el-form-item>
       <el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">记住密码</el-checkbox>
-      <el-form-item style="float: right">
+      <el-form-item v-if="false" style="float: right">
         <el-button circle title="微信登录" @click="doSocialLogin('wechat')">
           <svg-icon icon-class="wechat" />
         </el-button>
@@ -56,7 +56,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2024 疯狂的狮子Li All Rights Reserved.</span>
+      <span>Copyright © 2018-2024 洛克智能设备 All Rights Reserved.</span>
     </div>
   </div>
 </template>
@@ -74,8 +74,8 @@ const router = useRouter();
 
 const loginForm = ref<LoginData>({
   tenantId: '000000',
-  username: 'admin',
-  password: 'admin123',
+  username: '',
+  password: '',
   rememberMe: false,
   code: '',
   uuid: ''
@@ -93,7 +93,7 @@ const loading = ref(false);
 // 验证码开关
 const captchaEnabled = ref(true);
 // 租户开关
-const tenantEnabled = ref(true);
+const tenantEnabled = ref(false);
 
 // 注册开关
 const register = ref(false);
diff --git a/src/views/register.vue b/src/views/register.vue
index c3d1930..1cbdbae 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -50,7 +50,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-register-footer">
-      <span>Copyright © 2018-2024 疯狂的狮子Li All Rights Reserved.</span>
+      <span>Copyright © 2018-2024 洛克智能设备 All Rights Reserved.</span>
     </div>
   </div>
 </template>