diff --git a/src/api/device/linkage.js b/src/api/device/linkage.js
new file mode 100644
index 0000000..0f3b7b9
--- /dev/null
+++ b/src/api/device/linkage.js
@@ -0,0 +1,44 @@
+import request from "@/utils/request";
+
+// 查询场景联动列表
+export function listLinkage(query) {
+  return request({
+    url: "/device/linkage/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询场景联动详细
+export function getLinkage(sceneId) {
+  return request({
+    url: "/device/linkage/" + sceneId,
+    method: "get",
+  });
+}
+
+// 新增场景联动
+export function addLinkage(data) {
+  return request({
+    url: "/device/linkage",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改场景联动
+export function updateLinkage(data) {
+  return request({
+    url: "/device/linkage",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除场景联动
+export function delLinkage(sceneId) {
+  return request({
+    url: "/device/linkage/" + sceneId,
+    method: "delete",
+  });
+}
diff --git a/src/components/NotificationCenter/index.vue b/src/components/NotificationCenter/index.vue
index 0874dc4..cf16ffe 100644
--- a/src/components/NotificationCenter/index.vue
+++ b/src/components/NotificationCenter/index.vue
@@ -8,10 +8,7 @@
         width="320"
       >
         <template #reference>
-          <el-badge
-            :hidden="unreadCount === 0"
-            :value="unreadCount"
-          >
+          <el-badge :hidden="unreadCount === 0" :value="unreadCount">
             <el-icon class="notification-icon" @click="visible = !visible">
               <Bell />
             </el-icon>
@@ -24,7 +21,7 @@
           <div class="notification-content">
             <div class="status-tab">
               <el-radio-group
-                v-model="status"
+                v-model="queryParams.status"
                 class="ios-style-radio"
                 size="small"
               >
@@ -42,27 +39,23 @@
                 {{ selectMulti ? "取消" : "选择" }}
               </el-button>
               <el-button
-                v-if="ids.length && status === 2"
+                v-if="ids.length && queryParams.status === 2"
                 link
                 size="small"
                 type="danger"
                 @click="deleteReadMsg"
-              >删除
+                >删除
               </el-button>
               <el-button
-                v-if="ids.length && status === 1"
+                v-if="ids.length && queryParams.status === 1"
                 link
                 size="small"
                 type="danger"
                 @click="markAsRead"
-              >标为已读
+                >标为已读
               </el-button>
-              <el-button
-                link
-                size="small"
-                type="primary"
-                @click="refreshList"
-              >刷新
+              <el-button link size="small" type="primary" @click="refreshList"
+                >刷新
               </el-button>
             </div>
             <el-scrollbar class="notification-list" height="480">
@@ -85,9 +78,11 @@
                       @click="openMsgDetail(item)"
                     >
                       <span class="notification-title">{{
-                          item.msgTitle
-                        }}</span>
-                      <span class="notification-time">{{ dayjs(item.sendTime).format("YYYY-MM-DD HH:mm:ss") }}</span>
+                        item.msgTitle
+                      }}</span>
+                      <span class="notification-time">{{
+                        dayjs(item.sendTime).format("YYYY-MM-DD HH:mm:ss")
+                      }}</span>
                     </div>
                   </div>
                 </template>
@@ -116,8 +111,7 @@
       <!--      </template>-->
       {{ msgDetail.msgContent }}
     </el-dialog>
-    <el-dialog v-model="showOfflineNotice"
-               title="下线通知"></el-dialog>
+    <el-dialog v-model="showOfflineNotice" title="下线通知"></el-dialog>
   </div>
 </template>
 
@@ -146,9 +140,9 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    status: 1
+    status: 1,
   },
-  msgDetail: {}
+  msgDetail: {},
 });
 const router = useRouter();
 const loadKey = ref(0);
@@ -166,36 +160,26 @@ const ids = ref([]); //选中的列表
 const refreshList = () => {
   ids.value = [];
   selectMulti.value = false;
-  queryParams.value.status = status.value;
   queryParams.value.pageNum = 1;
-  // if (status.value === 2) {
   notificationList.value = [];
-  // }
   loadKey.value += 1;
 };
-watch(status, (value) => {
-  ids.value = [];
-  selectMulti.value = false;
-  queryParams.value.status = value;
-  queryParams.value.pageNum = 1;
-  // if (value === 2) {
-  notificationList.value = [];
-  // }
-  loadKey.value += 1;
-});
+
+watch(
+  () => queryParams.value.status,
+  (value) => {
+    ids.value = [];
+    selectMulti.value = false;
+    queryParams.value.pageNum = 1;
+    notificationList.value = [];
+    loadKey.value += 1;
+  }
+);
 const loadMore = async ($state) => {
-  // console.log($state);
   try {
     loading.value = true;
     const resp = await listMsg(queryParams.value);
-    // if (queryParams.value.status === 0) {
-    //   notificationStore.pushItems(resp.rows);
-    // } else if (queryParams.value.status === 2) {
     notificationList.value.push(...resp.rows);
-    // }
-    // queryParams.value.status === 0 &&
-    // resp.rows.length &&
-    // updateMsg(resp.rows.map((el) => el.msgId).join(","), 1);
     total.value = resp.total;
     if (queryParams.value.status === 1) {
       unreadCount.value = resp.total;
@@ -232,9 +216,6 @@ const deleteReadMsg = async () => {
 const markAsRead = async () => {
   await updateMsg(ids.value.join(","), 2);
   refreshList();
-  /*  for (const id of ids.value) {
-      notificationStore.removeItem(id);
-    }*/
   ids.value = [];
   selectMulti.value = false;
 };
@@ -256,55 +237,40 @@ function logout() {
     cancelButtonText: "取消",
     showCancelButton: false,
     showClose: false,
-    type: "warning"
+    type: "warning",
   })
     .then(() => {
       userStore.logOut().then(() => {
         location.href = "/index";
-        // router.go("/index")
       });
     })
     .catch(() => {
       userStore.logOut().then(() => {
         location.href = "/index";
-        // router.go("/index")
       });
     });
 }
 
 watch(visible, (value) => {
   if (value) {
+    /*当打开通知弹窗时*/
     notificationList.value = [];
     queryParams.value.pageNum = 1;
     queryParams.value.status = 1;
-    status.value = 1;
     loadKey.value++;
   }
 });
 
-
+/*获取未读数量*/
 const getUnreadCount = async () => {
-  // loading.value = true;
-  // notificationList.value = [];
-  // queryParams.value.pageNum = 1;
-  // queryParams.value.status = 1;
-  // status.value = 1;
   const resp = await listMsg({
-    pageSize: 10, pageNum: 1, status: 1
+    pageSize: 10,
+    pageNum: 1,
+    status: 1,
   });
-  // if (queryParams.value.status === 0) {
-  //   notificationStore.pushItems(resp.rows);
-  // } else if (queryParams.value.status === 2) {
-
-  // notificationList.value.push(...resp.rows);
-  // }
-  // queryParams.value.status === 0 &&
-  // resp.rows.length &&
-  // updateMsg(resp.rows.map((el) => el.msgId).join(","), 1);
   unreadCount.value = resp.total;
-  // queryParams.value.pageNum++;
-  // loading.value = false;
 };
+
 onMounted(() => {
   getUnreadCount();
   if (userStore.userId) {
@@ -337,20 +303,12 @@ onMounted(() => {
       console.log(event.data);
       const wsData = JSON.parse(event.data);
       if (wsData.type === "msg") {
-        // if (visible.value) {
-        //   refreshList();
-        // } else {
         if (visible.value && queryParams.value.status === 1) {
           refreshList();
         } else {
           getUnreadCount();
         }
-        // }
-        // const msg = wsData.data;
-        // updateMsg(msg.msgId, 1);
-        // notificationStore.pushItem(msg);
       } else if (wsData.type === "offline") {
-        // showOfflineNotice.value = true;
         logout();
       }
     });
@@ -396,7 +354,6 @@ onMounted(() => {
     margin-top: 16px;
 
     .notification-item {
-
       display: flex;
       align-items: center;
       justify-content: space-between;
@@ -449,7 +406,6 @@ onMounted(() => {
 
       &:last-child {
         border-bottom: 1px solid #eeefef;
-
       }
     }
   }
diff --git a/src/components/TableSelect/index.vue b/src/components/TableSelect/index.vue
index 13c3439..3dfb8a2 100644
--- a/src/components/TableSelect/index.vue
+++ b/src/components/TableSelect/index.vue
@@ -11,6 +11,7 @@
         v-loading="loading"
         :data="dataList"
         @select="handleSelect"
+        @row-click="handleRowClick"
         @select-all="handleSelectAll"
       >
         <el-table-column
@@ -53,8 +54,8 @@
     <template #footer>
       <div class="dialog-footer">
         <el-button v-if="!readonly" type="primary" @click="confirmSelect"
-          >确认</el-button
-        >
+          >确认
+        </el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </template>
@@ -62,7 +63,7 @@
 </template>
 
 <script name="TableSelect" setup>
-import { nextTick, reactive, ref, toRefs, watchEffect } from "vue";
+import { nextTick, onMounted, reactive, ref, toRefs, watchEffect } from "vue";
 import { cloneDeep } from "lodash-es";
 import Pagination from "@/components/Pagination/index.vue";
 
@@ -75,6 +76,14 @@ const props = defineProps({
     type: Array,
     default: [],
   },
+  multiple: {
+    type: Boolean,
+    default: true,
+  },
+  multiPage: {
+    type: Boolean,
+    default: true,
+  },
   readonly: {
     type: Boolean,
     default: false,
@@ -90,7 +99,7 @@ const props = defineProps({
     type: Boolean,
   },
 });
-const { list } = toRefs(props);
+const { list, multiple } = toRefs(props);
 
 const emit = defineEmits(["update:modelValue", "confirm-select"]);
 
@@ -102,8 +111,8 @@ const selectedProperties = ref([]);
 const ids = ref([]);
 const data = reactive({
   queryParams: {
-    pageNum: 1,
-    pageSize: 10,
+    pageNum: props.multiPage ? 1 : null,
+    pageSize: props.multiPage ? 10 : null,
   },
 });
 
@@ -135,19 +144,35 @@ const cancel = () => {
   selectedProperties.value = [];
   emit("update:modelValue", false);
 };
+const handleSelectChange = (selection) => {};
 
+const handleRowClick = (row, _, event) => {
+  event.target?.parentNode?.parentNode?.firstElementChild?.firstElementChild?.firstElementChild?.click();
+};
 /*监听单选事件*/
 const handleSelect = (selection, row) => {
   const isCheck =
     selection.findIndex((el) => el[props.selectKey] === row[props.selectKey]) >
-    -1;
+    -1; /* 是否将行切换为选中状态 */
   if (isCheck) {
+    /*如果是单选状态 multiple 为false */
+    if (!multiple.value) {
+      // nextTick(() => {
+      selectedProperties.value = [];
+      selection.forEach((el) => {
+        if (el[props.selectKey] !== row[props.selectKey]) {
+          tableRef.value.toggleRowSelection(el, false);
+        }
+      });
+      // });
+    }
     /*添加选中*/
     const isIdNotExist =
       selectedProperties.value.findIndex(
         (el) => el[props.selectKey] === row[props.selectKey]
       ) === -1;
     if (isIdNotExist) {
+      console.log(isIdNotExist);
       selectedProperties.value.push(row);
     }
   } else {
@@ -205,13 +230,24 @@ const confirmSelect = () => {
 defineExpose({
   getList,
 });
+
+onMounted(() => {
+  document.documentElement.style.setProperty(
+    "--show-select-all",
+    multiple.value ? "visible" : "hidden"
+  );
+  document.documentElement.style.setProperty(
+    "--checkbox-round",
+    multiple.value ? "inherit" : "50%"
+  );
+});
 </script>
 
 <style lang="scss" scoped>
 :deep(.el-table__header) {
   .el-table-column--selection {
     .el-checkbox {
-      //visibility: hidden;
+      visibility: var(--show-select-all);
     }
   }
 }
diff --git a/src/constant/dict.js b/src/constant/dict.js
index 4223c2d..ea6f7d6 100644
--- a/src/constant/dict.js
+++ b/src/constant/dict.js
@@ -323,3 +323,16 @@ export const noticeStatusDict = [
     elTagType: "success",
   },
 ];
+
+export const triggerTypeDict = [
+  {
+    label: "设备触发",
+    value: "1",
+    elTagType: "danger",
+  },
+  {
+    label: "正常",
+    value: "0",
+    elTagType: "success",
+  },
+];
diff --git a/src/settings.js b/src/settings.js
index e2b80d5..8b727e5 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -20,7 +20,7 @@ export default {
   /**
    * 是否显示 tagsView
    */
-  tagsView: true,
+  tagsView: false,
 
   /**
    * 是否固定头部
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 58ecee4..309b0fc 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -11,7 +11,7 @@ const useUserStore = defineStore("user", {
     roles: [],
     userId: null,
     permissions: [],
-    uniqueId: ""
+    uniqueId: "",
   }),
   actions: {
     // 登录
@@ -77,11 +77,11 @@ const useUserStore = defineStore("user", {
             reject(error);
           });
       });
-    }
+    },
   },
   persist: {
-    paths: ["uniqueId"]
-  }
+    paths: ["uniqueId"],
+  },
 });
 
 export default useUserStore;
diff --git a/src/views/device/linkage/index.vue b/src/views/device/linkage/index.vue
new file mode 100644
index 0000000..935e6b7
--- /dev/null
+++ b/src/views/device/linkage/index.vue
@@ -0,0 +1,1283 @@
+<template>
+  <div class="app-container">
+    <el-form
+      v-show="showSearch"
+      ref="queryRef"
+      :inline="true"
+      :model="queryParams"
+      label-width="68px"
+    >
+      <el-form-item label="场景名称" prop="alertName">
+        <el-input
+          v-model="queryParams.alertName"
+          clearable
+          placeholder="请输入场景名称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+
+      <!--      <el-form-item label="产品" prop="productId">-->
+      <!--        <el-select-->
+      <!--          v-model="queryParams.productId"-->
+      <!--          :remote-method="getProductOptions"-->
+      <!--          clearable-->
+      <!--          filterable-->
+      <!--          placeholder="请选择产品"-->
+      <!--          remote-->
+      <!--          remote-show-suffix-->
+      <!--        >-->
+      <!--          <el-option-->
+      <!--            v-for="item in productOptions"-->
+      <!--            :key="item.productId"-->
+      <!--            :label="item.productName"-->
+      <!--            :value="item.productId"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <el-form-item>
+        <el-button icon="Search" type="primary" @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
+          v-hasPermi="['product:alertRule:add']"
+          icon="Plus"
+          plain
+          type="primary"
+          @click="handleAdd"
+          >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button icon="refresh" plain type="success" @click="getList"
+          >刷新
+        </el-button>
+      </el-col>
+
+      <right-toolbar
+        v-model:showSearch="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="linkAgeList"
+      border
+      class="custom-table-style"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column align="center" type="selection" width="55" />
+      <el-table-column align="center" label="场景名称" prop="sceneName" />
+      <el-table-column align="center" label="触发设备">
+        <template #default="{ row }">
+          <template v-if="row.triggersStr">
+            <el-tag
+              v-for="item in JSON.parse(row.triggersStr).slice(0, 3)"
+              :key="item.triggerId"
+              >{{ item.deviceName }}
+            </el-tag>
+            <span v-if="JSON.parse(row.triggersStr).length > 3">...</span>
+          </template>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="执行设备">
+        <template #default="{ row }">
+          <template v-if="row.actionsStr">
+            <el-tag
+              v-for="item in JSON.parse(row.actionsStr).slice(0, 3)"
+              :key="item.triggerId"
+              >{{ item.deviceName }}
+            </el-tag>
+            <span v-if="JSON.parse(row.actionsStr).length > 3">...</span>
+          </template>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="触发类型">
+        <template #default="{ row }">
+          <!--          <dict-tag :options="" :value="[row.status]" />-->
+          {{ triggerSource.find((el) => el.value === row.triggerType)?.label }}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="告警状态" prop="status">
+        <template #default="{ row }">
+          <dict-tag :options="alertStatusDict" :value="[row.status]" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="备注" prop="remark" />
+      <el-table-column
+        align="center"
+        class-name="small-padding fixed-width"
+        label="操作"
+      >
+        <template #default="{ row }">
+          <el-button
+            v-hasPermi="['product:alertRule:edit']"
+            icon="Edit"
+            link
+            type="warning"
+            @click="handleUpdate(row)"
+            >{{ "查看" }}
+          </el-button>
+          <el-button
+            v-hasPermi="['product:alertRule:remove']"
+            icon="Delete"
+            link
+            type="danger"
+            @click="handleDelete(row)"
+            >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNum"
+      :total="total"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改设备告警对话框 -->
+    <el-dialog v-model="open" :title="title" append-to-body width="800px">
+      <div
+        class="el-divider el-divider--horizontal"
+        style="margin-top: -25px"
+      ></div>
+      <el-form ref="alertRef" :model="form" :rules="rules" label-width="80px">
+        <el-row :gutter="50">
+          <el-col :span="12">
+            <el-form-item label="告警名称" prop="sceneName">
+              <el-input v-model="form.sceneName" placeholder="请输入告警名称" />
+            </el-form-item>
+
+            <el-form-item label="启动状态">
+              <el-switch
+                v-model="form.status"
+                :active-value="1"
+                :inactive-value="2"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="form.remark"
+                placeholder="请输入内容"
+                rows="6"
+                type="textarea"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-divider></el-divider>
+        <el-form-item label="触发器" prop="triggers">
+          <el-select
+            v-model="form.conditions"
+            placeholder="请选择"
+            style="margin-bottom: 10px; width: 100%"
+          >
+            <el-option
+              v-for="item in triggerConditions"
+              :key="item.value"
+              :disabled="form.triggers.length === 1 && item.value === '2'"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <div
+            v-for="(item, index) in form.triggers"
+            :key="index"
+            style="
+              margin-bottom: 15px;
+              border: 1px solid #ddd;
+              border-radius: 4px;
+              padding: 10px;
+              width: 100%;
+            "
+          >
+            <el-row style="margin-bottom: 14px">
+              <el-col :span="4">
+                <el-form-item
+                  :prop="`triggers.${index}.triggerType`"
+                  :rules="[{ required: true, message: '请选择触发类型' }]"
+                >
+                  <el-select
+                    v-model="item.triggerType"
+                    placeholder="请选择"
+                    size="small"
+                  >
+                    <el-option
+                      v-for="subItem in triggerSource.filter(
+                        (el) => form.triggers.length <= 1 || el.value === '1'
+                      )"
+                      :key="subItem.value"
+                      :label="subItem.label"
+                      :value="subItem.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :offset="1" :span="5">
+                <el-form-item
+                  :prop="`triggers.${index}.productId`"
+                  :rules="[{ required: true, message: '请选择产品' }]"
+                >
+                  <el-tag
+                    v-if="item.productId"
+                    class="product-tags"
+                    closable
+                    type="info"
+                    @close="
+                      item.productId = null;
+                      item.productName = null;
+                      item.deviceId = null;
+                      item.deviceName = null;
+                      item.modelId = null;
+                    "
+                  >
+                    {{ item.productName }}
+                  </el-tag>
+                  <el-button
+                    v-else
+                    icon="plus"
+                    plain
+                    size="small"
+                    style="width: 100%"
+                    @click="
+                      selectProductMode = 'triggers';
+                      activeTriggerIndex = index;
+                      showSelectProduct = true;
+                    "
+                    >选择产品
+                  </el-button>
+                </el-form-item>
+              </el-col>
+              <el-col v-if="item.productId" :offset="1" :span="5">
+                <el-form-item
+                  :prop="`triggers.${index}.deviceId`"
+                  :rules="[{ required: true, message: '请选择设备' }]"
+                >
+                  <el-tag
+                    v-if="item.deviceId"
+                    class="product-tags"
+                    closable
+                    type="info"
+                    @close="
+                      item.deviceId = null;
+                      item.deviceName = null;
+                    "
+                    >{{ item.deviceName }}
+                  </el-tag>
+                  <el-button
+                    v-else
+                    icon="plus"
+                    plain
+                    size="small"
+                    style="width: 100%"
+                    @click="
+                      selectProductMode = 'triggers';
+                      activeTriggerIndex = index;
+                      showSelectDevice = true;
+                    "
+                    >选择设备
+                  </el-button>
+                </el-form-item>
+              </el-col>
+              <el-col v-if="index !== 0" :offset="1" :span="2">
+                <!--                :offset="item.triggerType === '1' ? 17 : 1"-->
+                <el-button
+                  link
+                  size="small"
+                  type="danger"
+                  @click="removeTriggerItem(index)"
+                  >删除
+                </el-button>
+              </el-col>
+            </el-row>
+            <!--定时-->
+            <el-row v-if="item.triggerType === '2'" style="margin-bottom: 14px">
+              <el-col :span="24">
+                <el-row>
+                  <el-col :span="18">
+                    <el-form-item
+                      :prop="`triggers.${index}.cronExpression`"
+                      :rules="[
+                        {
+                          required: true,
+                          message: '请输入cron执行表达式',
+                          trigger: 'blur',
+                        },
+                      ]"
+                    >
+                      <el-input
+                        v-model="item.cronExpression"
+                        placeholder="cron执行表达式"
+                        size="small"
+                      >
+                        <template #append>
+                          <el-button
+                            size="small"
+                            type="primary"
+                            @click="handleShowCron(item, index)"
+                          >
+                            生成表达式
+                            <i class="el-icon-time el-icon--right"></i>
+                          </el-button>
+                        </template>
+                      </el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-col>
+            </el-row>
+            <!--设备-->
+            <el-row v-if="item.triggerType === '1'" style="margin-bottom: 14px">
+              <el-col :span="4">
+                <el-form-item
+                  :prop="`triggers.${index}.modelType`"
+                  :rules="[
+                    {
+                      required: true,
+                      message: '请选择类别',
+                      trigger: 'change',
+                    },
+                  ]"
+                >
+                  <el-select
+                    v-model="item.modelType"
+                    placeholder="请选择"
+                    size="small"
+                    @change="item.modelId = null"
+                  >
+                    <el-option
+                      v-for="subItem in modelTypes"
+                      :key="subItem.value"
+                      :label="subItem.label"
+                      :value="subItem.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col
+                v-if="['1', '2', '3'].includes(item.modelType)"
+                :offset="1"
+                :span="4"
+              >
+                <el-form-item
+                  :prop="`triggers.${index}.modelId`"
+                  :rules="[
+                    {
+                      required: true,
+                      message: '请选择物模型',
+                      trigger: 'change',
+                    },
+                  ]"
+                >
+                  <el-select
+                    v-model="item.modelId"
+                    placeholder="请选择"
+                    size="small"
+                    @change="handleTriggerModelChange($event, index)"
+                  >
+                    <el-option
+                      v-for="subItem in item.modelList?.filter(
+                        (el) => el.type === parseInt(item.modelType)
+                      ) ?? []"
+                      :key="subItem.modelId"
+                      :label="subItem.modelName"
+                      :value="subItem.modelId"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col
+                v-if="['1', '2', '3'].includes(item.modelType)"
+                :offset="1"
+                :span="5"
+              >
+                <el-form-item
+                  :prop="`triggers.${index}.operator`"
+                  :rules="[
+                    {
+                      required: true,
+                      message: '请选择操作符',
+                      trigger: 'blur',
+                    },
+                  ]"
+                >
+                  <el-select
+                    v-model="item.operator"
+                    placeholder="请选择操作符"
+                    size="small"
+                  >
+                    <el-option key="=" label="等于(=)" value="=" />
+                    <el-option key="!=" label="不等于(!=)" value="!=" />
+                    <el-option key=">" label="大于(>)" value=">" />
+                    <el-option key="<" label="小于(<)" value="<" />
+                    <el-option key=">=" label="大于等于(>=)" value=">=" />
+                    <el-option key="<=" label="小于等于(<=)" value="<=" />
+                    <el-option
+                      key="contain"
+                      label="包含(contain)"
+                      value="contain"
+                    />
+                    <el-option
+                      key="notcontain"
+                      label="不包含(not contain)"
+                      value="notcontain"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col
+                v-if="['1', '2', '3'].includes(item.modelType)"
+                :offset="1"
+                :span="5"
+              >
+                <el-form-item
+                  :prop="`triggers.${index}.modelValue`"
+                  :rules="[
+                    { required: true, message: '请输入值', trigger: 'blur' },
+                  ]"
+                >
+                  <el-input
+                    v-model="item.modelValue"
+                    placeholder="值"
+                    size="small"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <el-button
+            v-if="form.triggers[0].triggerType === '1'"
+            link
+            size="small"
+            type="primary"
+            @click="addTriggerItem"
+          >
+            添加触发器
+          </el-button>
+        </el-form-item>
+
+        <el-divider></el-divider>
+        <el-form-item label="执行动作">
+          <div
+            v-for="(item, index) in form.actions"
+            :key="index"
+            style="
+              margin-bottom: 15px;
+              border: 1px solid #ddd;
+              border-radius: 4px;
+              padding: 10px;
+              width: 100%;
+            "
+          >
+            <el-row style="margin-bottom: 14px">
+              <el-col :span="4">
+                <el-form-item
+                  :prop="`actions.${index}.productId`"
+                  :rules="[{ required: true, message: '请选择产品' }]"
+                >
+                  <el-tag
+                    v-if="item.productId"
+                    class="product-tags"
+                    closable
+                    type="info"
+                    @close="
+                      item.productId = null;
+                      item.productName = null;
+                      item.modelId = null;
+                    "
+                  >
+                    {{ item.productName }}
+                  </el-tag>
+                  <el-button
+                    v-else
+                    icon="plus"
+                    plain
+                    size="small"
+                    style="width: 100%"
+                    @click="
+                      selectProductMode = 'actions';
+                      activeActionIndex = index;
+                      showSelectProduct = true;
+                    "
+                    >选择产品
+                  </el-button>
+                </el-form-item>
+              </el-col>
+              <el-col v-if="item.productId" :offset="1" :span="4">
+                <el-form-item
+                  :prop="`actions.${index}.deviceId`"
+                  :rules="[{ required: true, message: '请选择设备' }]"
+                >
+                  <el-tag
+                    v-if="item.deviceId"
+                    class="product-tags"
+                    closable
+                    type="info"
+                    @close="
+                      item.deviceId = null;
+                      item.deviceName = null;
+                    "
+                    >{{ item.deviceName }}
+                  </el-tag>
+                  <el-button
+                    v-else
+                    icon="plus"
+                    plain
+                    size="small"
+                    @click="
+                      selectProductMode = 'actions';
+                      activeActionIndex = index;
+                      showSelectDevice = true;
+                    "
+                    >选择设备
+                  </el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row style="margin-bottom: 4px">
+              <el-col :span="4">
+                <!-- 选择物模型类型 -->
+                <el-form-item
+                  :prop="`actions.${index}.modelType`"
+                  :rules="[{ required: true, message: '请选择' }]"
+                >
+                  <el-select
+                    v-model="item.modelType"
+                    placeholder="请选择"
+                    size="small"
+                  >
+                    <el-option
+                      v-for="subItem in modelTypes.filter((el) =>
+                        ['1', '2', '3'].includes(el.value)
+                      )"
+                      :key="subItem.value"
+                      :label="subItem.label"
+                      :value="subItem.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :offset="1" :span="4">
+                <!-- 物模型选择 -->
+                <el-form-item>
+                  <el-select
+                    v-model="item.modelId"
+                    placeholder="请选择"
+                    size="small"
+                    @change="handleActionsModelChange($event, index)"
+                  >
+                    <el-option
+                      v-for="subItem in item.modelList?.filter(
+                        (el) => el.type === parseInt(item.modelType)
+                      ) ?? []"
+                      :key="subItem.modelId"
+                      :label="subItem.modelName"
+                      :value="subItem.modelId"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :offset="1" :span="5">
+                <el-form-item>
+                  <el-select
+                    v-model="item.operator"
+                    placeholder="请选择操作符"
+                    size="small"
+                  >
+                    <el-option key="=" label="等于(=)" value="=" />
+                    <el-option key="!=" label="不等于(!=)" value="!=" />
+                    <el-option key=">" label="大于(>)" value=">" />
+                    <el-option key="<" label="小于(<)" value="<" />
+                    <el-option key=">=" label="大于等于(>=)" value=">=" />
+                    <el-option key="<=" label="小于等于(<=)" value="<=" />
+                    <el-option
+                      key="contain"
+                      label="包含(contain)"
+                      value="contain"
+                    />
+                    <el-option
+                      key="notcontain"
+                      label="不包含(not contain)"
+                      value="notcontain"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :offset="1" :span="5">
+                <el-form-item>
+                  <el-input
+                    v-model="item.modelValue"
+                    placeholder="值"
+                    size="small"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col v-if="index !== 0" :offset="1" :span="2">
+                <el-button
+                  link
+                  plus
+                  size="small"
+                  type="danger"
+                  @click="removeActionItem(index)"
+                  >删除
+                </el-button>
+              </el-col>
+            </el-row>
+          </div>
+
+          <el-button link size="small" type="primary" @click="addActionItem"
+            >添加执行动作
+          </el-button>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <!--          v-if="productId"-->
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-dialog
+      v-model="openCron"
+      append-to-body
+      class="scrollbar"
+      destroy-on-close
+      title="Cron表达式生成器"
+    >
+      <crontab
+        :expression="expression"
+        style="padding-bottom: 80px"
+        @fill="crontabFill"
+        @hide="openCron = false"
+      ></crontab>
+    </el-dialog>
+
+    <table-select
+      v-model="showSelectProduct"
+      :multiple="false"
+      :request-method="listProduct"
+      :table-struct="[
+        {
+          label: 'ID',
+          prop: 'productId',
+        },
+        {
+          label: '产品名称',
+          prop: 'productName',
+        },
+      ]"
+      select-key="productId"
+      @confirm-select="handleConfirmSelectProduct"
+    />
+
+    <table-select
+      v-model="showSelectDevice"
+      :multiple="false"
+      :request-method="listDeviceByProductId"
+      :table-struct="[
+        {
+          label: 'ID',
+          prop: 'deviceId',
+        },
+        {
+          label: '设备名称',
+          prop: 'deviceName',
+        },
+      ]"
+      select-key="deviceId"
+      @confirm-select="handleConfirmSelectDevice"
+    />
+  </div>
+</template>
+
+<script name="SceneLinkage" setup>
+import Crontab from "@/components/Crontab/index.vue";
+import TableSelect from "@/components/TableSelect/index.vue";
+import DictTag from "@/components/DictTag/index.vue";
+import { computed, getCurrentInstance, reactive, ref, toRefs } from "vue";
+import { useDict } from "@/utils/dict";
+import { listProduct } from "@/api/product/product";
+import { listDevice } from "@/api/iot/device";
+import { listModel } from "@/api/thingsmodel/model";
+import { alertStatusDict } from "@/constant/dict";
+import {
+  addLinkage,
+  delLinkage,
+  getLinkage,
+  listLinkage,
+  updateLinkage,
+} from "@/api/device/linkage";
+import { omit } from "lodash-es";
+import { ElMessage } from "element-plus";
+
+const showSelectProduct = ref(false);
+const showSelectModel = ref(false);
+const showSelectDevice = ref(false);
+const { proxy } = getCurrentInstance();
+
+// 物模型类别
+const modelTypes = [
+  {
+    value: "1",
+    label: "属性",
+  },
+  {
+    value: "2",
+    label: "服务",
+  },
+  {
+    value: "3",
+    label: "事件",
+  },
+  {
+    value: "4",
+    label: "设备上线",
+  },
+  {
+    value: "5",
+    label: "设备下线",
+  },
+];
+// 触发器条件
+const triggerConditions = [
+  {
+    value: "1",
+    label: "满足任一条件",
+  },
+  {
+    value: "2",
+    label: "满足所有条件",
+  },
+];
+
+const productOptions = ref([]);
+const linkAgeList = ref([]);
+const open = ref(false);
+const openCron = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+const expression = ref(""); // 传入的表达式
+const triggerIndex = ref(0); // 触发器的索引，用于接收传入的表达式
+const activeTriggerIndex = ref(-1); /*触发器索引, 用于产品和设备选择*/
+const timerWeekRepeatValue = ref("1");
+const timerWeekValue = ref([1, 2, 3, 4, 5, 6, 7]);
+const timerTimeValue = ref("");
+const triggerSource = ref([
+  {
+    value: "1",
+    label: "设备触发",
+  },
+  {
+    value: "2",
+    label: "定时触发",
+  },
+]);
+
+const { iot_alert_level, sys_job_status } = useDict(
+  "iot_alert_level",
+  "sys_job_status"
+);
+const data = reactive({
+  form: {
+    conditions: "1", // 触发器条件
+    triggers: [],
+    actions: [],
+  },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    tenantId: null,
+    alertName: null,
+    alertLevel: null,
+    productId: null,
+    triggers: null,
+    actions: null,
+    status: null,
+  },
+  rules: {
+    sceneName: [
+      { required: true, message: "场景名称不能为空", trigger: "blur" },
+    ],
+    productId: [{ required: true, message: "产品不能为空", trigger: "change" }],
+    triggers: [{ required: true, message: "触发器不能为空", trigger: "blur" }],
+    actions: [{ required: true, message: "执行动作不能为空", trigger: "blur" }],
+  },
+  // 产品
+  productInfo: {},
+  thingsModel: {},
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备告警列表 */
+function getList() {
+  loading.value = true;
+  listLinkage(queryParams.value).then((response) => {
+    linkAgeList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+const selectProductMode =
+  ref("triggers"); /*选择产品的模式, triggers / actions*/
+const activeActionIndex = ref(-1); /*选中的 action 索引*/
+
+/*确认选择产品*/
+const handleConfirmSelectProduct = (data) => {
+  if (data.length) {
+    if (selectProductMode.value === "triggers") {
+      /*选择触发器的产品*/
+      form.value.triggers[activeTriggerIndex.value].productId =
+        data[0].productId;
+      form.value.triggers[activeTriggerIndex.value].productSn =
+        data[0].productSn;
+      form.value.triggers[activeTriggerIndex.value].productName =
+        data[0].productName;
+      /*获取物模型选项*/
+      listModel({
+        productId: data[0].productId,
+      }).then((resp) => {
+        form.value.triggers[activeTriggerIndex.value].modelList = resp.rows;
+      });
+    } else if (selectProductMode.value === "actions") {
+      /*选择动作的产品*/
+      form.value.actions[activeActionIndex.value].productId = data[0].productId;
+      form.value.actions[activeActionIndex.value].productSn = data[0].productSn;
+      form.value.actions[activeActionIndex.value].productName =
+        data[0].productName;
+      /*获取物模型选项*/
+      listModel({
+        productId: data[0].productId,
+      }).then((resp) => {
+        form.value.actions[activeActionIndex.value].modelList = resp.rows;
+      });
+    }
+  }
+  showSelectProduct.value = false;
+};
+
+/*确认选择设备*/
+const handleConfirmSelectDevice = (data) => {
+  if (data.length) {
+    if (selectProductMode.value === "triggers") {
+      form.value.triggers[activeTriggerIndex.value].deviceId = data[0].deviceId;
+      form.value.triggers[activeTriggerIndex.value].deviceSn =
+        data[0].serialNumber;
+      form.value.triggers[activeTriggerIndex.value].deviceName =
+        data[0].deviceName;
+    } else if (selectProductMode.value === "actions") {
+      form.value.actions[activeActionIndex.value].deviceId = data[0].deviceId;
+      form.value.actions[activeActionIndex.value].deviceSn =
+        data[0].serialNumber;
+      form.value.actions[activeActionIndex.value].deviceName =
+        data[0].deviceName;
+    }
+  }
+  showSelectDevice.value = false;
+};
+
+/*确认选择物模型*/
+const handleConfirmSelectModel = (data) => {
+  if (data.length) {
+    form.value.triggers[activeTriggerIndex.value].modelId = data[0].modelId;
+    form.value.triggers[activeTriggerIndex.value].modelName = data[0].modelName;
+  }
+  showSelectModel.value = false;
+};
+
+const listDeviceByProductId = computed(() => {
+  let productId;
+  if (selectProductMode.value === "triggers") {
+    productId = form.value.triggers[activeTriggerIndex.value]?.productId;
+  } else if (selectProductMode.value === "actions") {
+    productId = form.value.actions[activeActionIndex.value]?.productId;
+  }
+  return (queryParams) =>
+    listDevice({
+      ...queryParams,
+      productId,
+    });
+});
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    sceneId: null,
+    tenantId: null,
+    alertName: null,
+    alertLevel: null,
+    productId: null,
+    triggerType: null,
+    status: null,
+    createBy: null,
+    createTime: null,
+    remark: null,
+    noticeConfigId: null,
+    noticeConfigName: null,
+    conditions: "1", // 触发器条件
+    triggers: [
+      {
+        productId: null,
+        productSn: null,
+        deviceId: null,
+        modelValue: null,
+        triggerType: "1", //1=设备，2=定时，3=告警输出
+        modelType: "1", // 1=属性，2=服务
+        cronExpression: null,
+      },
+    ],
+    actions: [
+      {
+        productId: null,
+        modelId: null,
+        modelValue: null,
+        modelKey: null,
+        operator: null,
+        modelType: "1", // 1=属性，2=服务
+      },
+    ],
+  };
+  proxy.resetForm("alertRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.sceneId);
+  single.value = selection.length !== 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加设备告警";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const _sceneId = row.sceneId || ids.value;
+  getLinkage(_sceneId).then((response) => {
+    form.value = response.data;
+    try {
+      form.value.triggers = JSON.parse(response.data.triggersStr);
+    } catch (e) {
+      console.error(e);
+      console.log("fail parse triggers str");
+    }
+    /*获取triggers物模型选项*/
+    form.value.triggers.forEach(async (el) => {
+      el.modelList = (
+        await listModel({
+          productId: el.productId,
+        })
+      ).rows;
+    });
+    form.value.conditions = form.value.triggers[0]?.conditions;
+    try {
+      form.value.actions = JSON.parse(response.data.actionsStr);
+    } catch (e) {
+      console.log("fail parse actions str");
+    }
+    /*获取actions物模型选项*/
+    form.value.actions?.forEach(async (el) => {
+      el.modelList = (
+        await listModel({
+          productId: el.productId,
+        })
+      ).rows;
+    });
+    open.value = true;
+    title.value = "修改设备告警";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["alertRef"].validate((valid) => {
+    if (valid) {
+      /*在每个触发器对象中添加 conditions, status 字段*/
+      form.value.triggers.forEach((el) => {
+        el.conditions = form.value.conditions;
+        el.status = form.value.status;
+      });
+
+      /*删除物模型选项列表*/
+      form.value.triggers = form.value.triggers.map((el) =>
+        omit(el, ["modelList"])
+      );
+      form.value.actions = form.value.actions.map((el) =>
+        omit(el, ["modelList"])
+      );
+
+      /*在顶层添加触发器类型字段*/
+      form.value.triggerType = form.value.triggers[0]?.triggerType;
+
+      if (form.value.sceneId != null) {
+        updateLinkage(form.value).then((response) => {
+          ElMessage.success("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addLinkage(form.value).then((response) => {
+          ElMessage.success("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _sceneIds = row.sceneId || ids.value;
+  proxy.$modal
+    .confirm('是否确认删除设备告警编号为"' + _sceneIds + '"的数据项？')
+    .then(function () {
+      return delLinkage(_sceneIds);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("删除成功");
+    })
+    .catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download(
+    "device/alert/export",
+    {
+      ...queryParams.value,
+    },
+    `alert_${new Date().getTime()}.xlsx`
+  );
+}
+
+/**
+ * 添加动作
+ */
+const addActionItem = () => {
+  form.value.actions.push({
+    productId: null,
+    modelId: null,
+    modelValue: "",
+    modelKey: "",
+    operator: "",
+    modelType: "1", // 1=属性，2=服务
+  });
+};
+
+/** 删除动作 */
+const removeActionItem = (index) => {
+  form.value.actions.splice(index, 1);
+};
+
+/** 触发器源改变事件 **/
+const changeTriggerSource = () => {
+  setTriggerSource();
+};
+
+/**
+ * 设置触发器源
+ */
+const setTriggerSource = () => {
+  // 触发器只能包含一个定时
+  let hasTimer = false;
+  for (let i = 0; i < form.value.triggers.length; i++) {
+    if (form.value.triggers[i].triggerType === "2") {
+      hasTimer = true;
+    }
+  }
+  if (hasTimer) {
+    triggerSource.value = [
+      {
+        value: "1",
+        label: "设备触发",
+      },
+    ];
+  } else {
+    //定时
+    triggerSource.value = [
+      {
+        value: "1",
+        label: "设备触发",
+      },
+      {
+        value: "2",
+        label: "定时触发",
+      },
+    ];
+  }
+  /**/
+};
+
+/**
+ * 添加触发器
+ */
+const addTriggerItem = () => {
+  // setTriggerSource();
+  form.value.triggers.push({
+    productId: null,
+    productSn: null,
+    triggerType: "1", // 1=设备，2=定时，3=告警输出
+    modelType: "1", // 1=属性，2=服务
+    cronExpression: null,
+    modelKey: null,
+    modelValue: null,
+    // conditions: "2",
+    operator: null,
+    modelId: null,
+    // value: "",
+    // id: "",
+    // name: "",
+    // jobId: 0,
+    // deviceId: 0,
+    // deviceName: "请选择一个设备",
+    // isAdvance: 1
+  });
+};
+
+/**
+ * 删除触发器
+ * @param index
+ */
+const removeTriggerItem = (index) => {
+  form.value.triggers.splice(index, 1);
+  if (form.value.triggers.length === 1) {
+    form.value.conditions = "1";
+  }
+  // setTriggerSource();
+};
+/** cron表达式按钮操作 */
+const handleShowCron = (item, index) => {
+  expression.value = item.cronExpression;
+  triggerIndex.value = index;
+  openCron.value = true;
+};
+/** 确定后回传值 */
+const crontabFill = (value) => {
+  form.value.triggers[triggerIndex.value].cronExpression = value;
+};
+/** 修改重复事件 **/
+const repeatChange = (data) => {
+  if (timerWeekRepeatValue.value === "1") {
+    // 每天
+    timerWeekValue.value = [1, 2, 3, 4, 5, 6, 7];
+    form.value.repeat = 1;
+  } else if (timerWeekRepeatValue.value === "2") {
+    // 仅此一次
+    timerWeekValue.value = [];
+    form.value.isRepeat = 0;
+  } else {
+    // 指定
+    form.value.isRepeat = 1;
+  }
+  gentCronExpression();
+};
+
+/** 星期改变事件 **/
+const weekChange = (data) => {
+  gentCronExpression();
+};
+
+/** 时间改变事件 **/
+const timeChange = (data) => {
+  gentCronExpression();
+};
+
+/**自定义cron表达式选项改变事件 */
+const customerCronChange = (data) => {
+  gentCronExpression();
+};
+
+/** 生成cron表达式**/
+const gentCronExpression = () => {
+  if (timerTimeValue.value === "") {
+    proxy.$modal.alertError("执行时间不能为空");
+  }
+  let minute = timerTimeValue.value.substring(0, 2);
+  let hour = timerTimeValue.value.substring(3);
+  let week = "*";
+  if (timerWeekValue.value.length > 0) {
+    week = timerWeekValue.value;
+  }
+  form.value.triggers[triggerIndex.value].cronExpression =
+    "0 " + minute + " " + hour + " ? * " + week;
+};
+
+const handleTriggerModelChange = (data, index) => {
+  const _model = form.value.triggers[index].modelList.find(
+    (el) => el.modelId === data
+  );
+  form.value.triggers[index].modelKey = _model?.identifier;
+  form.value.triggers[index].datatype = _model?.datatype;
+};
+
+const handleActionsModelChange = (data, index) => {
+  form.value.actions[index].modelKey = form.value.actions[index].modelList.find(
+    (el) => el.modelId === data
+  ).identifier;
+};
+
+getList();
+</script>
+
+<style lang="scss" scoped>
+:deep(.product-tags) {
+  width: 100%;
+
+  .el-tag__content {
+    overflow: hidden;
+    text-overflow: ellipsis; //文本溢出显示省略号
+    white-space: nowrap; //文本不会换行
+  }
+}
+</style>
diff --git a/src/views/product/alertRule/index.vue b/src/views/product/alertRule/index.vue
index 5901c36..35cd222 100644
--- a/src/views/product/alertRule/index.vue
+++ b/src/views/product/alertRule/index.vue
@@ -59,7 +59,7 @@
       </el-form-item>
       <el-form-item>
         <el-button icon="Search" type="primary" @click="handleQuery"
-        >搜索
+          >搜索
         </el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
@@ -75,7 +75,7 @@
           plain
           type="primary"
           @click="handleAdd"
-        >新增
+          >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -85,7 +85,7 @@
           plain
           type="success"
           @click="getList"
-        >刷新
+          >刷新
         </el-button>
       </el-col>
       <!--      <el-col :span="1.5">-->
@@ -178,7 +178,7 @@
             link
             type="warning"
             @click="handleUpdate(row)"
-          >{{ productId ? "修改" : "查看" }}
+            >{{ productId ? "修改" : "查看" }}
           </el-button>
           <el-button
             v-hasPermi="['product:alertRule:remove']"
@@ -186,7 +186,7 @@
             link
             type="danger"
             @click="handleDelete(row)"
-          >删除
+            >删除
           </el-button>
         </template>
       </el-table-column>
@@ -339,7 +339,7 @@
                   size="small"
                   type="danger"
                   @click="removeTriggerItem(index)"
-                >删除
+                  >删除
                 </el-button>
               </el-col>
             </el-row>
@@ -601,19 +601,19 @@
                 size="small"
                 type="danger"
                 @click="removeActionItem(index)"
-              >删除
+                >删除
               </el-button>
             </el-col>
           </el-row>
           <el-button link size="small" type="primary" @click="addActionItem"
-          >添加执行动作
+            >添加执行动作
           </el-button>
         </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
           <el-button v-if="productId" type="primary" @click="submitForm"
-          >确 定
+            >确 定
           </el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
@@ -666,7 +666,13 @@
 
 <script name="Alert" setup>
 import Crontab from "@/components/Crontab/index.vue";
-import { addAlertRule, delAlertRule, getAlertRule, listAlertRule, updateAlertRule } from "@/api/product/alertRule";
+import {
+  addAlertRule,
+  delAlertRule,
+  getAlertRule,
+  listAlertRule,
+  updateAlertRule,
+} from "@/api/product/alertRule";
 import { getCurrentInstance, reactive, ref, toRefs, watch } from "vue";
 import { useDict } from "@/utils/dict";
 import { listProduct } from "@/api/product/product";
@@ -680,116 +686,116 @@ const { proxy } = getCurrentInstance();
 const props = defineProps({
   product: {
     type: Object,
-    default: null
+    default: null,
   },
   productId: {
     type: Number,
-    default: null
-  }
+    default: null,
+  },
 });
 
 const { product, productId } = toRefs(props);
 const timerWeeks = [
   {
     value: 1,
-    label: "周一"
+    label: "周一",
   },
   {
     value: 2,
-    label: "周二"
+    label: "周二",
   },
   {
     value: 3,
-    label: "周三"
+    label: "周三",
   },
   {
     value: 4,
-    label: "周四"
+    label: "周四",
   },
   {
     value: 5,
-    label: "周五"
+    label: "周五",
   },
   {
     value: 6,
-    label: "周六"
+    label: "周六",
   },
   {
     value: 7,
-    label: "周日"
-  }
+    label: "周日",
+  },
 ];
 
 // 执行动作源
 const actionSource = [
   {
     value: 1,
-    label: "设备"
+    label: "设备",
   },
   {
     value: 3,
-    label: "告警输出"
-  }
+    label: "告警输出",
+  },
 ];
 // 物模型类别
 const modelTypes = [
   {
     value: "1",
-    label: "属性"
+    label: "属性",
   },
   {
     value: "2",
-    label: "服务"
+    label: "服务",
   },
   {
     value: "3",
-    label: "事件"
+    label: "事件",
   },
   {
     value: "4",
-    label: "设备上线"
+    label: "设备上线",
   },
   {
     value: "5",
-    label: "设备下线"
-  }
+    label: "设备下线",
+  },
 ];
 // 触发器条件
 const triggerConditions = [
   {
     value: "2",
-    label: "满足所有条件"
+    label: "满足所有条件",
   },
   {
     value: "1",
-    label: "满足任一条件"
-  }
+    label: "满足任一条件",
+  },
 ];
 // 告警状态
 const alertType = [
   {
     value: 1,
-    label: "启动"
+    label: "启动",
   },
   {
     value: 2,
-    label: "停止"
-  }
+    label: "停止",
+  },
 ];
 // 周
 const timerWeekRepeats = ref([
   {
     value: "1",
-    label: "每天"
+    label: "每天",
   },
   {
     value: "2",
-    label: "仅此一次"
+    label: "仅此一次",
   },
   {
     value: "3",
-    label: "指定"
-  }
+    label: "指定",
+  },
 ]);
 const productOptions = ref([]);
 const noticeConfigOptions = ref([]); /*通知配置选项*/
@@ -813,12 +819,12 @@ const modelList = ref([]);
 const triggerSource = ref([
   {
     value: "1",
-    label: "设备触发"
+    label: "设备触发",
   },
   {
     value: "2",
-    label: "定时触发"
-  }
+    label: "定时触发",
+  },
 ]);
 
 const { iot_alert_level, sys_job_status } = useDict(
@@ -829,7 +835,7 @@ const data = reactive({
   form: {
     conditions: "1", // 触发器条件
     triggers: [],
-    actions: []
+    actions: [],
   },
   queryParams: {
     pageNum: 1,
@@ -840,25 +846,25 @@ const data = reactive({
     productId: null,
     triggers: null,
     actions: null,
-    status: null
+    status: null,
   },
   rules: {
     noticeConfigId: [
-      { required: true, message: "告警通知不能为空", trigger: "change" }
+      { required: true, message: "告警通知不能为空", trigger: "change" },
     ],
     alertName: [
-      { required: true, message: "告警名称不能为空", trigger: "blur" }
+      { required: true, message: "告警名称不能为空", trigger: "blur" },
     ],
     alertLevel: [
-      { required: true, message: "告警级别不能为空", trigger: "change" }
+      { required: true, message: "告警级别不能为空", trigger: "change" },
     ],
     productId: [{ required: true, message: "产品不能为空", trigger: "change" }],
     triggers: [{ required: true, message: "触发器不能为空", trigger: "blur" }],
-    actions: [{ required: true, message: "执行动作不能为空", trigger: "blur" }]
+    actions: [{ required: true, message: "执行动作不能为空", trigger: "blur" }],
   },
   // 产品
   productInfo: {},
-  thingsModel: {}
+  thingsModel: {},
 });
 
 const { queryParams, form, rules, productInfo } = toRefs(data);
@@ -866,7 +872,7 @@ const getNoticeConfigOption = (keyword) => {
   listNoticeConfig({
     configName: keyword,
     pageNum: 1,
-    pageSize: 100
+    pageSize: 100,
   }).then((resp) => {
     noticeConfigOptions.value = resp.rows;
   });
@@ -912,14 +918,14 @@ function reset() {
         modelValue: null,
         triggerType: "1", //1=设备，2=定时，3=告警输出
         modelType: "1", // 1=属性，2=服务
-        cronExpression: null
+        cronExpression: null,
         // jobId: 0,
         // deviceId: 0,
         // deviceName: "请选择一个设备",
         // id: "",
         // name: "",
         // isAdvance: 1
-      }
+      },
     ],
     actions: [
       {
@@ -928,14 +934,14 @@ function reset() {
         modelValue: null,
         modelKey: null,
         operator: null,
-        modelType: "1" // 1=属性，2=服务
+        modelType: "1", // 1=属性，2=服务
         // id: "",
         // name: "",
         // deviceId: 0,
         // deviceName: "请选择一个设备",
         // triggerType: "1", //1=设备，2=定时，3=告警输出
-      }
-    ]
+      },
+    ],
   };
   proxy.resetForm("alertRef");
 }
@@ -1021,16 +1027,15 @@ function submitForm() {
 function handleDelete(row) {
   const _alertIds = row.alertId || ids.value;
   proxy.$modal
-    .confirm("是否确认删除设备告警编号为\"" + _alertIds + "\"的数据项？")
-    .then(function() {
+    .confirm('是否确认删除设备告警编号为"' + _alertIds + '"的数据项？')
+    .then(function () {
       return delAlertRule(_alertIds);
     })
     .then(() => {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => {
-    });
+    .catch(() => {});
 }
 
 /** 导出按钮操作 */
@@ -1038,7 +1043,7 @@ function handleExport() {
   proxy.download(
     "device/alert/export",
     {
-      ...queryParams.value
+      ...queryParams.value,
     },
     `alert_${new Date().getTime()}.xlsx`
   );
@@ -1052,7 +1057,7 @@ const addActionItem = () => {
     modelValue: "",
     modelKey: "",
     operator: "",
-    modelType: "1" // 1=属性，2=服务
+    modelType: "1", // 1=属性，2=服务
     // id: "",
     // name: "",
     // value: ""
@@ -1079,20 +1084,20 @@ const setTriggerSource = () => {
     triggerSource.value = [
       {
         value: "1",
-        label: "设备触发"
-      }
+        label: "设备触发",
+      },
     ];
   } else {
     //定时
     triggerSource.value = [
       {
         value: "1",
-        label: "设备触发"
+        label: "设备触发",
       },
       {
         value: "2",
-        label: "定时触发"
-      }
+        label: "定时触发",
+      },
     ];
   }
   /**/
@@ -1110,7 +1115,7 @@ const addTriggerItem = () => {
     modelValue: null,
     // conditions: "2",
     operator: null,
-    modelId: null
+    modelId: null,
     // value: "",
     // id: "",
     // name: "",
@@ -1185,7 +1190,7 @@ function getProductOptions(keyword) {
   listProduct({
     productName: keyword,
     pageNum: 1,
-    pageSize: 20
+    pageSize: 20,
   }).then((resp) => {
     productOptions.value = resp.rows;
   });
@@ -1195,7 +1200,7 @@ function getDeviceOptions(keyword) {
   listDevice({
     deviceName: keyword,
     pageNum: 1,
-    pageSize: 20
+    pageSize: 20,
   }).then((resp) => {
     deviceOptions.value = resp.rows;
   });
@@ -1203,7 +1208,7 @@ function getDeviceOptions(keyword) {
 
 const getThingsModelOptions = (productId) => {
   listModel({
-    productId
+    productId,
   }).then((resp) => {
     modelList.value = resp.rows;
   });
@@ -1227,7 +1232,7 @@ watch(
     getList();
   },
   {
-    immediate: true
+    immediate: true,
   }
 );
 
diff --git a/src/views/product/product/edit.vue b/src/views/product/product/edit.vue
index bd2b9db..64b48f4 100644
--- a/src/views/product/product/edit.vue
+++ b/src/views/product/product/edit.vue
@@ -118,7 +118,7 @@
       >
         <firmware v-if="form.productId" :product-id="form.productId" />
       </el-tab-pane>
-      <el-tab-pane :disabled="!form.productId" label="告警配置" lazy>
+      <el-tab-pane :disabled="!form.productId" label="告警联动" lazy>
         <alert
           v-if="form.productId"
           :product="form"
diff --git a/src/views/product/product/index.vue b/src/views/product/product/index.vue
index e0a8ae5..c4626c2 100644
--- a/src/views/product/product/index.vue
+++ b/src/views/product/product/index.vue
@@ -198,20 +198,20 @@
       <!--          />-->
       <!--        </template>-->
       <!--      </el-table-column>-->
-      <el-table-column align="center" label="图片" prop="imgUrl">
-        <template #default="{ row }">
-          <el-image
-            :preview-src-list="[`${baseUrl}/${row.imgUrl}`]"
-            :src="`${baseUrl}/${row.imgUrl}`"
-          ></el-image>
-        </template>
-      </el-table-column>
+      <!--      <el-table-column align="center" label="图片" prop="imgUrl">-->
+      <!--        <template #default="{ row }">-->
+      <!--          <el-image-->
+      <!--            :preview-src-list="[`${baseUrl}/${row.imgUrl}`]"-->
+      <!--            :src="`${baseUrl}/${row.imgUrl}`"-->
+      <!--          ></el-image>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
       <el-table-column align="center" label="备注" prop="remark" />
       <el-table-column
         align="center"
         class-name="small-padding fixed-width"
         label="操作"
-        width="190px"
+        width="240px"
       >
         <template #default="scope">
           <!--          TODO:-->
@@ -231,7 +231,17 @@
             >详情
             <!--            {{ scope.row.status === 2 ? "查看" : "" }}-->
           </el-button>
-          <el-button link type="primary" @click="viewDeviceList(scope.row)"
+          <el-button
+            link
+            type="primary"
+            @click="viewEditTab(scope.row, 'model')"
+            >物模型
+            <!--            {{ scope.row.status === 2 ? "查看" : "" }}-->
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="viewEditTab(scope.row, 'device')"
             >设备列表
             <!--            {{ scope.row.status === 2 ? "查看" : "" }}-->
           </el-button>
@@ -463,14 +473,14 @@ function handleUpdate(row) {
   // });
 }
 
-const viewDeviceList = (row) => {
+const viewEditTab = (row, tab) => {
   const _productId = row.productId;
   router.push({
     path: "/produc/product/edit",
     query: {
       productId: _productId,
-      pageNum: queryParams.value.pageNum,
-      initTab: "device",
+      // pageNum: queryParams.value.pageNum,
+      initTab: tab,
     },
   });
 };
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 64378d7..967181c 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -97,16 +97,16 @@
           >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['sys:tenant:export']"
-          icon="Download"
-          plain
-          type="warning"
-          @click="handleExport"
-          >导出
-        </el-button>
-      </el-col>
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          v-hasPermi="['sys:tenant:export']"-->
+      <!--          icon="Download"-->
+      <!--          plain-->
+      <!--          type="warning"-->
+      <!--          @click="handleExport"-->
+      <!--          >导出-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
       <right-toolbar
         v-model:showSearch="showSearch"
         @queryTable="getList"
@@ -384,10 +384,18 @@ const data = reactive({
     loginAccount: null,
   },
   rules: {
+    expireTime: [
+      {
+        required: true,
+        message: "请选择到期时间",
+        trigger: "change",
+      },
+    ],
     tenantName: [
       { required: true, message: "请输入租户名称", trigger: "blur" },
     ],
   },
+
   loginUserForm: {},
   loginUserRules: {
     username: [