From d972ce5f21771883421e3d21f93238ba3d1a4146 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Tue, 10 Oct 2023 17:03:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BD=E6=A3=80=E5=8D=B1?=
 =?UTF-8?q?=E5=BA=9F=E5=93=81=E7=AE=B1=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/guojian/index.js                |  9 ++++++++
 src/views/guojian/alarm/index.vue       |  2 +-
 src/views/guojian/historyData/index.vue |  2 +-
 src/views/guojian/sms/index.vue         | 29 ++++++++++++++++++++-----
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/api/guojian/index.js b/src/api/guojian/index.js
index 98e67df..ba37cfa 100644
--- a/src/api/guojian/index.js
+++ b/src/api/guojian/index.js
@@ -17,4 +17,13 @@ export function getSmsRecord(query) {
         method: 'get',
         params: query
     })
+}
+
+
+// 查询短信发送记录
+export function getSmsRecordFromAliyun() {
+    return request({
+        url: 'screen/guoJian/getSmsRecordFromAliyun',
+        method: 'get',
+    })
 }
\ No newline at end of file
diff --git a/src/views/guojian/alarm/index.vue b/src/views/guojian/alarm/index.vue
index f4d19b3..787a244 100644
--- a/src/views/guojian/alarm/index.vue
+++ b/src/views/guojian/alarm/index.vue
@@ -111,7 +111,7 @@ let typeList = [
 
 let deviceList = ref([])
 const loading = ref(false);
-const showSearch = ref(false);
+const showSearch = ref(true);
 const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
diff --git a/src/views/guojian/historyData/index.vue b/src/views/guojian/historyData/index.vue
index ef044b5..e2402ca 100644
--- a/src/views/guojian/historyData/index.vue
+++ b/src/views/guojian/historyData/index.vue
@@ -113,7 +113,7 @@ const { queryParams, form } = toRefs(data);
 
 let deviceList = ref([])
 const loading = ref(false);
-const showSearch = ref(false);
+const showSearch = ref(true);
 const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
diff --git a/src/views/guojian/sms/index.vue b/src/views/guojian/sms/index.vue
index 8d40497..4e5bb9b 100644
--- a/src/views/guojian/sms/index.vue
+++ b/src/views/guojian/sms/index.vue
@@ -29,7 +29,7 @@
                 <el-button type="danger" plain icon="Delete" :disabled="multiple" v-hasPermi="['big:device:del']"
                     @click="handleDelete">删除</el-button>
             </el-col> -->
-            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="refreshList"></right-toolbar>
         </el-row>
 
         <!-- 
@@ -46,11 +46,20 @@
             <!-- <el-table-column type="selection" width="55" align="center" /> -->
             <el-table-column label="序号" type="index" width="80" />
             <!-- <el-table-column label="部门id" prop="id" width="120" /> -->
-            <el-table-column label="时间" prop="ts" width="200" align="center" :show-overflow-tooltip="true" />
+            <el-table-column label="手机号" prop="phoneNum" align="center" :show-overflow-tooltip="true" />
+            <el-table-column label="发送时间" prop="ts" width="200" align="center" :show-overflow-tooltip="true" />
             <el-table-column label="报警类型" prop="alarmType" align="center" :show-overflow-tooltip="true" />
             <el-table-column label="报警值" prop="data" align="center" :show-overflow-tooltip="true" />
-            <el-table-column label="报警内容" prop="content" align="center" :show-overflow-tooltip="true" />
-            <el-table-column label="手机号" prop="phoneNum" align="center" :show-overflow-tooltip="true" />
+            <!-- <el-table-column label="报警内容" prop="content" align="center" :show-overflow-tooltip="true" /> -->
+            <el-table-column label="接收时间" prop="receiveDate" align="center" :show-overflow-tooltip="true" />
+            <el-table-column label="发送状态" prop="status" align="center" :show-overflow-tooltip="true" />
+            <el-table-column label="失败原因" prop="reason" align="center" :show-overflow-tooltip="true" />
+            <el-table-column label="是否已处理" prop="ishandle" align="center" :show-overflow-tooltip="true" > 
+                <template #default="{ row }">
+                    <el-tag v-if="row.ishandle == 0" type="danger">未处理</el-tag>
+                    <el-tag v-if="row.ishandle == 1" type="success">已处理</el-tag>
+                </template>
+                </el-table-column>
 
 
         </el-table>
@@ -65,7 +74,7 @@
 <script setup>
 import { ref, reactive, toRefs, getCurrentInstance, onMounted } from 'vue'
 import { Picture as IconPicture } from '@element-plus/icons-vue'
-import { getSmsRecord } from '@/api/guojian/index'
+import { getSmsRecord,getSmsRecordFromAliyun } from '@/api/guojian/index'
 import useUserStore from '@/store/modules/user'
 const userStore = useUserStore()
 const { proxy } = getCurrentInstance();
@@ -88,7 +97,7 @@ const { queryParams, form } = toRefs(data);
 
 let deviceList = ref([])
 const loading = ref(false);
-const showSearch = ref(false);
+const showSearch = ref(true);
 const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
@@ -111,6 +120,14 @@ function getList() {
 
 }
 
+function refreshList() {
+    getSmsRecordFromAliyun().then(res => {
+        if (res.code == 200) {
+            getList();
+        }
+    });
+}
+
 /** 搜索按钮操作 */
 function handleQuery() {
     getList();