diff --git a/src/views/alarm/send/components/add_edit.vue b/src/views/alarm/send/components/add_edit.vue
new file mode 100644
index 0000000..fd70b92
--- /dev/null
+++ b/src/views/alarm/send/components/add_edit.vue
@@ -0,0 +1,194 @@
+
+<template>
+    <base-dialog :title="prop.title" width="60%" :visible="prop.visible" :autoHeight="false" @open="handleOpen"
+        @handleConfirm="handleConfirm" @close="handleClose">
+        <div class="body">
+            <el-form :model="prop.form" label-width="120px">
+                <el-form-item>
+                    <template #label>
+                        <span>
+                           <el-tooltip content="多个邮箱之间用逗号','分隔" placement="top">
+                              <el-icon><question-filled /></el-icon>
+                           </el-tooltip>
+                           发送邮箱
+                        </span>
+                     </template>
+                    <el-input v-model="prop.form.email" placeholder="邮箱" />
+                </el-form-item>
+                <el-form-item label="监控类型">
+                    <el-select v-model="prop.form.typeId" @change="typeChange" filterable placeholder="选择监控类型">
+                        <el-option value="" label="请选择"></el-option>
+                        <el-option v-for="item in monitorList" :key="item.value" :label="item.label" :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="监控列表">
+                    <el-select v-model="prop.form.ids" multiple filterable placeholder="Select" style="width: 240px">
+                        <el-option v-for="item in optionsList" :key="item.value" :label="item.label" :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="邮件标题">
+                    <el-input v-model="prop.form.email_title" placeholder="备注" />
+                </el-form-item>
+                <el-form-item>
+                    <template #label>
+                        <span>
+                           <el-tooltip content="邮件内容可以用特殊字符代替，$t:设备类型，$x:超标值，$y:超标事件,$z:超标位置传感器" placement="top">
+                              <el-icon><question-filled /></el-icon>
+                           </el-tooltip>
+                           邮件内容
+                        </span>
+                     </template>
+                    <el-input v-model="prop.form.email_content" placeholder="备注" />
+                </el-form-item>
+                <el-form-item label="备注">
+                    <el-input v-model="prop.form.remark" placeholder="备注" />
+                </el-form-item>
+            </el-form>
+        </div>
+    </base-dialog>
+</template>
+   
+<script setup>
+import { ref, watch, getCurrentInstance } from 'vue'
+import { Check, Close } from '@element-plus/icons-vue'
+import { addScreen, updateScreen } from '@/api/big/screen'
+import { getDeviceTypeList } from '@/api/big/deviceType'
+import { getDeviceList } from '@/api/big/device'
+
+const prop = defineProps({
+    visible: {
+        type: Boolean,
+        default: false,
+    },
+    title: {
+        type: String,
+        default: '提示',
+    },
+    type: {
+        type: String,
+        default: 'add',
+    },
+    form: {
+        type: Object,
+        default: {
+            email: undefined,
+            typeId: undefined,
+            ids: undefined,
+            email_title: false,
+            email_content: undefined,
+            remark: undefined,
+        },
+    }
+})
+let monitorList = ref([
+    { label: '设备', value: 1 },
+    { label: '类型', value: 2 }
+])
+
+
+function typeChange(val) {
+    prop.form.ids = undefined
+    if (val == 1) {
+        DeviceList()
+    } else if(val == 2) {
+        remoteMethodTypeId()
+    } else {
+        optionsList.value = []
+    }
+}
+const optionsList = ref([])
+const { proxy: ctx } = getCurrentInstance()
+
+
+const handleClose = () => {
+    //baseFormRef.value.reset()
+    emit('closeDialog')
+    emit('refreshTable')
+}
+// 弹窗弹出
+const handleOpen = () => {
+    // getAddFormOptions()
+}
+
+
+// 刷新表格事件
+const emit = defineEmits(['refreshTable', 'closeDialog'])
+// 添加/修改
+async function addDeductionInfo() {
+    emit('closeDialog')
+    return
+    //增加
+    if (prop.type == 'add') {
+        let { code, msg } = await addScreen(prop.form)
+        ctx.$message({
+            type: code === 200 ? 'success' : 'warning',
+            message: msg,
+        })
+        if (code === 200) {
+            // 刷新表格
+            emit('refreshTable')
+            emit('closeDialog')
+        }
+    } else { //修改
+        let { code, msg } = await updateScreen(prop.form)
+        ctx.$message({
+            type: code === 200 ? 'success' : 'warning',
+            message: msg,
+        })
+        if (code === 200) {
+            // 刷新表格
+            emit('refreshTable')
+            emit('closeDialog')
+        }
+    }
+
+
+}
+// 点击确定
+const handleConfirm = () => {
+    addDeductionInfo()
+}
+
+/** 查询设备列表 */
+function DeviceList() {
+    // console.log(JSON.stringify(queryParams.value));
+    getDeviceList({userId: 1}).then(res => {
+        optionsList.value = res.rows.map(item => {
+                return {
+                    label: item.name,
+                    value: item.id
+                }
+            })
+    });
+
+}
+
+//获取设备类型列表
+function remoteMethodTypeId() {
+    getDeviceTypeList({ pageSize: 100 }).then(res => {
+        if (res.code === 200) {
+            optionsList.value = res.rows.map(item => {
+                return {
+                    label: item.desc,
+                    value: item.id
+                }
+            })
+        }
+    })
+}
+
+</script>
+   
+<style lang="scss" scoped>
+.body {
+    height: 100%;
+}
+
+.img-preview {
+    max-width: 100%;
+    max-height: 100%;
+    display: block;
+    margin: 0 auto;
+    padding-top: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/alarm/send/index.vue b/src/views/alarm/send/index.vue
new file mode 100644
index 0000000..3fa559e
--- /dev/null
+++ b/src/views/alarm/send/index.vue
@@ -0,0 +1,290 @@
+<!--
+ * @FilePath: \code\Goats-Cloud-ui\src\views\big\device\index.vue
+ * @Author: 王路平
+ * @文件版本: V1.0.0
+ * @Date: 2023-06-17 08:22:57
+ * @Description: 
+ * 
+ * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
+-->
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+            <el-form-item label="设备名称" prop="name">
+                <el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable style="width: 200px"
+                    @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="机架号" prop="label">
+                <el-input v-model="queryParams.label" placeholder="请输入机架号" clearable style="width: 200px"
+                    @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备类型" prop="type">
+                <!-- <el-input v-model="queryParams.type" placeholder="请输入设备类型" clearable style="width: 200px"
+                    @keyup.enter="handleQuery" /> -->
+                    <el-select v-model="queryParams.type" value-key="label" style="width: 200px" filterable placeholder="选择设备类型" @keyup.enter="handleQuery">
+                        <el-option value="" label="请选择"></el-option>
+                        <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.label" />
+                    </el-select>
+            </el-form-item>
+            <el-form-item label="部门名称" prop="dept">
+                <el-input v-model="queryParams.dept" placeholder="请输入部门名称" clearable style="width: 200px"
+                    @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="Plus" @click="handleAdd"
+                    v-hasPermi="['big:device:add']">新增</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="success" plain icon="Edit" :disabled="single" v-hasPermi="['big:device:update']"
+                    @click="handleUpdate(ids[0])">修改</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <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>
+        </el-row>
+
+        <!-- 表格数据 -->
+        <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="序号" type="index" width="120" />
+            <!-- <el-table-column label="部门id" prop="id" width="120" /> -->
+            <el-table-column label="设备名称" prop="name" :show-overflow-tooltip="true" />
+            <el-table-column label="机架号" prop="label" :show-overflow-tooltip="true" />
+            <el-table-column label="类型" prop="type" :show-overflow-tooltip="true" />
+            <el-table-column label="型号" prop="model" align="center" :show-overflow-tooltip="true" />
+            <el-table-column label="所属部门" prop="deptName" align="center" :show-overflow-tooltip="true" />
+            <el-table-column label="状态" align="center" :show-overflow-tooltip="true">
+                <template #default="scope">
+                    <el-tag v-if="scope.row.status == 'true'" type="success">在线</el-tag>
+                    <el-tag v-else type="warning">离线</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
+                <template #default="scope">
+                    <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">
+                        <el-button link type="primary" v-hasPermi="['big:device:update']" icon="Edit"
+                            @click="handleUpdate(scope.row.id)"></el-button>
+                    </el-tooltip>
+                    <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
+                        <el-button link type="primary" icon="Delete" v-hasPermi="['big:device:del']"
+                            @click="handleDelete(scope.row)"></el-button>
+                    </el-tooltip>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+        <add_edit @closeDialog="open = false" :type="type" :title="title" :form="form" :visible="open"
+            @refreshTable="getList" />
+        <!-- <assemblyVue @closeDialog="assemblyOpen = false" :form="assemblyForm" :title="assemblyTitle" :visible="assemblyOpen"></assemblyVue>
+        <el-dialog v-model="imgDialogVisible">
+            <img w-full :src="dialogImageUrl" alt="Preview Image" class="img-preview" />
+        </el-dialog>
+        <devInfo ref="devInfoRight" @closeDialog="devinfoopen = false" :visible="devinfoopen" :form="devinfoForm" :title="devinfoTitle"></devInfo> -->
+    </div>
+</template>
+  
+<script setup>
+import { ref, reactive, toRefs, getCurrentInstance, onMounted } from 'vue'
+import { Picture as IconPicture } from '@element-plus/icons-vue'
+import { getDeviceList, delDevice } from '@/api/big/device'
+import { getDeptList } from '@/api/big/dept'
+import { getDeviceTypeList } from '@/api/big/deviceType'
+import useDeviceStore from '@/store/modules/device'
+import add_edit from './components/add_edit.vue'
+import useUserStore from '@/store/modules/user'
+// import assemblyVue from './components/assembly'
+// import devInfo from './components/devInfo.vue'
+const store = useDeviceStore()
+const userStore = useUserStore()
+const { proxy } = getCurrentInstance();
+const data = reactive({
+    form: {},
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: '',
+        dept: '',
+        type: '',
+        label: '',
+        userId: 1,
+    },
+});
+
+const { queryParams, form } = toRefs(data);
+
+// testScreen({}).then(res => {
+//  alert(JSON.stringify(res))
+// })
+
+let deviceList = ref([])
+
+const open = ref(false);
+const loading = ref(false);
+const showSearch = ref(false);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+const file_list = ref([])
+const type = ref("add");
+const typeList = ref([])
+/** 查询设备列表 */
+function getList() {
+    // loading.value = true;
+    // console.log(JSON.stringify(queryParams.value));
+    // getDeviceList(queryParams.value).then(res => {
+    //     loading.value = false;
+    //     deviceList.value = res.rows;
+    //     total.value = res.total;
+    // });
+
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+    getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+    proxy.resetForm("queryRef");
+    handleQuery();
+}
+
+/** 添加部门 */
+function handleAdd() {
+    title.value = "添加发送计划";
+    form.value = {
+            email: undefined,
+            typeId: undefined,
+            ids: undefined,
+            email_title: undefined,
+            email_content: undefined,
+            remark: undefined,
+        };
+    file_list.value = []
+    type.value = "add";
+    open.value = true;
+}
+/** 修改部门 */
+function handleUpdate(id) {
+    title.value = "修改设备类型";
+    // deviceList.value.find(item => {
+    //     if (item.id == id) {
+    //         form.value = item;
+    //     }
+    // })
+    type.value = "update";
+
+    // console.log(form.value, 'form.value');
+    open.value = true;
+}
+
+
+
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+    let rows = deviceList.value.filter(item => ids.value.includes(item.id));
+    const names = row.name || rows.map(item => item.name).join(',');
+    const deviceTypeIds = row.id || ids.value.join(',');
+    proxy.$modal.confirm('是否确认删除名称为"' + names + '"的数据项？').then(function () {
+        return delDevice(deviceTypeIds);
+    }).then(() => {
+        getList();
+        proxy.$modal.msgSuccess("删除成功");
+    }).catch(() => { });
+
+}
+
+function handleSelectionChange(selection) {
+    ids.value = selection.map(item => item.id);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+}
+
+
+
+
+
+//获取设备类型列表
+function remoteMethodTypeId() {
+    getDeviceTypeList({ pageSize: 100 }).then(res => {
+        if (res.code === 200) {
+            typeList.value = res.rows.map(item => {
+                return {
+                    label: item.desc,
+                    value: item.id
+                }
+            })
+            store.setTypeList(typeList.value)
+        }
+    })
+}
+
+//获取部门列表
+function remoteMethodDeptId() {
+    getDeptList({ pageSize: 100 }).then(res => {
+        if (res.code === 200) {
+            let deptList = res.rows.map(item => {
+                return {
+                    label: item.deptName,
+                    value: String(item.deptId)
+                }
+            })
+            store.setDeptList(deptList)
+        }
+    })
+}
+//获取网关列表
+function remoteMethodGetwayId() {
+    getDeviceList({ pageNum: 1,pageSize: 100, type: '网关',userId:1 }).then(res => {
+        if (res.code === 200) {
+            let getwayList = res.rows.map(item => {
+                return {
+                    label: item.name,
+                    value: item.id
+                }
+            })
+            store.setGetwayList(getwayList)
+        }
+    })
+}
+
+// 获取表单选项
+function getAddFormOptions() {
+    remoteMethodTypeId()
+    remoteMethodDeptId()
+    remoteMethodGetwayId()
+}
+onMounted(() => {
+    getList();
+    getAddFormOptions()
+})
+
+</script>
+  
+<style lang="scss" scoped>
+:deep(.el-table .el-table__cell) {
+    z-index: auto;
+}
+
+.img-preview {
+    max-width: 100%;
+    max-height: 100%;
+    display: block;
+    margin: 0 auto;
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/alarm/sendlog/index.vue b/src/views/alarm/sendlog/index.vue
new file mode 100644
index 0000000..e559191
--- /dev/null
+++ b/src/views/alarm/sendlog/index.vue
@@ -0,0 +1,12 @@
+<template>
+  <div class="">
+    sendlog
+  </div>
+</template>
+
+<script setup>
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/big/screen/components/add_edit.vue b/src/views/big/screen/components/add_edit.vue
index 983db52..19965f4 100644
--- a/src/views/big/screen/components/add_edit.vue
+++ b/src/views/big/screen/components/add_edit.vue
@@ -59,7 +59,6 @@ const prop = defineProps({
             img: undefined,
             releases: false,
             path: undefined,
-            img: undefined,
         },
     }
 })
diff --git a/src/views/big/screen/index.vue b/src/views/big/screen/index.vue
index bc15cde..1a79bec 100644
--- a/src/views/big/screen/index.vue
+++ b/src/views/big/screen/index.vue
@@ -33,7 +33,7 @@
       <!-- <el-table-column label="" prop="path" :show-overflow-tooltip="true" /> -->
       <el-table-column label="大屏图片" align="center">
         <template #default="scope">
-          <el-image :src="scope.row.img" :preview-src-list="[scope.row.img]" fit="cover"
+          <el-image :src="scope.row.image" :preview-src-list="[scope.row.img]" fit="cover"
             style="width: 100px; height: 100px">
             <template #error>
               <div class="image-slot">
@@ -174,7 +174,7 @@ function getList() {
     screenList.value = res.rows.map(item => {
       const regex = /^(http|https):\/\/[^ "]+$/;
       let isTrue = regex.test(item.img);
-      item.img = isTrue ? item.img : import.meta.env.VITE_APP_BASE_API + item.img
+      item.image= isTrue ? item.img : import.meta.env.VITE_APP_BASE_API + item.img
       return item
     });
     total.value = res.total;
diff --git a/src/views/login.vue b/src/views/login.vue
index 7ca1c73..52c3c63 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -76,7 +76,7 @@ const { proxy } = getCurrentInstance();
 
 const loginForm = ref({
   username: "admin",
-  password: "admin123",
+  password: "123456",
   rememberMe: false,
   code: "",
   uuid: ""