diff --git a/src/components/MyComponents/ChooseUser/sbss.vue b/src/components/MyComponents/ChooseUser/sbss.vue
index f164c85..2187d6b 100644
--- a/src/components/MyComponents/ChooseUser/sbss.vue
+++ b/src/components/MyComponents/ChooseUser/sbss.vue
@@ -21,8 +21,8 @@
             <el-table-column width="55" #default="{ row }">
               <el-radio v-model="ridioIndex" :label="row.id"></el-radio>
             </el-table-column>
-            <el-table-column prop="sitename" align="center"  label="场所"></el-table-column>
-            <el-table-column prop="partname" align="center"  label="部位"></el-table-column>
+            <el-table-column prop="sitename" align="center" label="场所"></el-table-column>
+            <el-table-column prop="partname" align="center" label="部位"></el-table-column>
             <el-table-column prop="name" align="center" label="设备名称"></el-table-column>
             <el-table-column prop="nbbh" align="center" label="内部编号"></el-table-column>
           </el-table>
@@ -155,20 +155,8 @@ const getListData = async () => {
   tableData.value = [];
   tableloading.value = true;
   const params = listQuery.value;
-  getApi(params, "/mosty-jcgl/aqsbssZb/getPage").then((res) => {
+  getApi(params, "/mosty-jcgl/sbglAqsbss/getPage").then((res) => {
     if (res) {
-      res.records.forEach(item => {
-        let card = item.idEntityCard
-        if (card) {
-          if (card.length == 18) {
-            item.sex = (card.substring(16, 17)) % 2 == 0 ? '2' : '1'
-          } else {
-            item.sex = '1'
-          }
-        } else {
-          item.sex = null
-        }
-      })
       tableData.value = res?.records;
       total.value = Number(res.total);
       tableloading.value = false;
diff --git a/src/components/MyComponents/Dict/DictRidioAndSelect.vue b/src/components/MyComponents/Dict/DictRidioAndSelect.vue
index 5afda98..fbc848c 100644
--- a/src/components/MyComponents/Dict/DictRidioAndSelect.vue
+++ b/src/components/MyComponents/Dict/DictRidioAndSelect.vue
@@ -1,141 +1,141 @@
-<template>
-
-  <div style="width:100%">
-    <!-- radio -->
-    <el-radio-group v-model="modelVal" @change="onChange" v-if="props.selectType === 'radio'"
-      :disabled="props.disabled">
-      <el-radio v-for="(item, i) in props.dictData" :key="i" :label="item.value ? item.value : item.dm"
-        :disabled="item.disabled" @click='getlable(item)'>{{ item.label ? item.label : item.zdmc
-        }}</el-radio>
-    </el-radio-group>
-    <!-- select -->
-    <el-select class="pxdx_box" v-model="modelVal" clearable :multiple='props.multiple' :disabled="props.disabled"
-      :placeholder="props.placeholder" v-else-if="props.selectType === 'select'" @change="onChange" @clear="changeclear"
-      style="width:100%" :collapse-tags="collapseTags">
-      <el-option v-for="item in props.dictData" :key="item.value" :label="item.label" :value="item.value"
-        @click='getlable(item)' :disabled="item.disabled" />
-    </el-select>
-  </div>
-
-</template>
-<script setup>
-import { defineProps, defineEmits, watchEffect, watch } from "vue"
-const props = defineProps({
-  modelValue: String,//选中值 || 回显
-  dictData: Array, //数据
-  disabled: {
-    type: Boolean,
-    default: false
-  },//禁用
-  placeholder: {
-    type: String,
-    default: "请选择"
-  },
-  //是否多选
-  multiple: {
-    type: Boolean,
-    default: false
-  },
-  //选择方式
-  selectType: {
-    type: String,
-    default: "radio" //radio || select
-  },
-  /** 原生属性 -- 多选时是否将选中值按文字的形式展示 */
-  collapseTags: {
-    type: Boolean,
-    default: undefined,
-  },
-  //需要禁用的某个或者多个选项
-  disabledItem: Array,
-  /** 自动清空字典匹配不上的内容(目前仅做单选) */
-  autoClear: {
-    type: Boolean,
-    default: true
-  }
-})
-const modelVal = defineModel()
-const emits = defineEmits(["update:modelValue", 'onChange', 'getselect', 'changeclear'])
-const onChange = (val) => {
-  emits("update:modelValue", val)
-  let namearr = []
-  if (props.multiple) {
-    for (let i = 0; i < val.length; i++) {
-      const name = props.dictData && props.dictData.find(item => item.value == val[i])?.label
-      namearr.push(name)
-    }
-    emits("onChange", val, namearr)
-  } else {
-    const label = props.dictData && props.dictData.find(item => item.value == val)?.label
-    emits("onChange", val, label)
-  }
-}
-function getlable(val) {
-  if (props.disabled) return
-  emits("getselect", val)
-}
-function changeclear(val) {
-  emits("changeclear", val)
-}
-/** 获取需要的内容 */
-const getNeedVal = (val,dictData) => {
-  let arr = []
-  if (typeof val === 'string' && val) {
-    arr = val.split(',')
-  } else if (Array.isArray(val)) {
-    arr = val.map(item=>item)
-  }
-  /** 是否有脏数据,即字典没有的数据 */
-  const isSomeNotHad = arr.some(value => {
-    return !dictData.find(item => item.value == value)
-  })
-  if (isSomeNotHad) {
-    arr = arr.filter(value => {
-      const obj = dictData.find(item => item.value == value)
-      return obj
-    })
-  }
-  return arr
-}
-watch([() => props.dictData, () => props.modelValue], ([opt, val]) => {
-  if (props.autoClear && opt?.length && val?.length) {
-    // 多选
-    if (props.multiple) {
-      // const newVal = getNeedVal(val,opt)
-      // emits("update:modelValue", newVal)
-      // 单选
-    } else {
-      // 清除不存在的项
-      let arr = Array.isArray(opt) ? opt : []
-      const curr = arr.find(item => item?.value == val)
-      if (!curr) emits("update:modelValue", '')
-    }
-  }
-})
-watchEffect(() => {
-  //处理是否禁用选项
-  if (props.dictData?.length) {
-    props.dictData.forEach(item => {
-      item.disabled = false
-    })
-    if (props.disabledItem?.length) {
-      props.dictData.forEach(item => {
-        props.disabledItem.forEach(it => {
-          if (item.value == it) {
-            item.disabled = true
-          }
-        })
-      })
-    } else {
-      props.dictData.forEach(item => {
-        item.disabled = false
-      })
-    }
-  }
-})
-</script>
-<style>
-.el-select-dropdown__item.is-disabled {
-  color: #999 !important;
-}
-</style>
+<template>
+
+  <div style="width:100%">
+    <!-- radio -->
+    <el-radio-group v-model="modelVal" @change="onChange" v-if="props.selectType === 'radio'"
+      :disabled="props.disabled">
+      <el-radio v-for="(item, i) in props.dictData" :key="i" :label="item.value ? item.value : item.dm"
+        :disabled="item.disabled" @click='getlable(item)'>{{ item.label ? item.label : item.zdmc
+        }}</el-radio>
+    </el-radio-group>
+    <!-- select -->
+    <el-select class="pxdx_box" v-model="modelVal" clearable :multiple='props.multiple' :disabled="props.disabled"
+      :placeholder="props.placeholder" v-else-if="props.selectType === 'select'" @change="onChange" @clear="changeclear"
+      style="width:100%" :collapse-tags="collapseTags">
+      <el-option v-for="item in props.dictData" :key="item.value" :label="item.label" :value="item.value"
+        @click='getlable(item)' :disabled="item.disabled" />
+    </el-select>
+  </div>
+
+</template>
+<script setup>
+import { defineProps, defineEmits, watchEffect, watch } from "vue"
+const props = defineProps({
+  modelValue: String,//选中值 || 回显
+  dictData: Array, //数据
+  disabled: {
+    type: Boolean,
+    default: false
+  },//禁用
+  placeholder: {
+    type: String,
+    default: "请选择"
+  },
+  //是否多选
+  multiple: {
+    type: Boolean,
+    default: false
+  },
+  //选择方式
+  selectType: {
+    type: String,
+    default: "radio" //radio || select
+  },
+  /** 原生属性 -- 多选时是否将选中值按文字的形式展示 */
+  collapseTags: {
+    type: Boolean,
+    default: undefined,
+  },
+  //需要禁用的某个或者多个选项
+  disabledItem: Array,
+  /** 自动清空字典匹配不上的内容(目前仅做单选) */
+  autoClear: {
+    type: Boolean,
+    default: true
+  }
+})
+const modelVal = defineModel()
+const emits = defineEmits(["update:modelValue", 'onChange', 'getselect', 'changeclear'])
+const onChange = (val) => {
+  emits("update:modelValue", val)
+  let namearr = []
+  if (props.multiple) {
+    for (let i = 0; i < val.length; i++) {
+      const name = props.dictData && props.dictData.find(item => item.value == val[i])?.label
+      namearr.push(name)
+    }
+    emits("onChange", val, namearr)
+  } else {
+    const label = props.dictData && props.dictData.find(item => item.value == val)?.label
+    emits("onChange", val, label)
+  }
+}
+function getlable(val) {
+  if (props.disabled) return
+  emits("getselect", val)
+}
+function changeclear(val) {
+  emits("changeclear", val)
+}
+/** 获取需要的内容 */
+const getNeedVal = (val,dictData) => {
+  let arr = []
+  if (typeof val === 'string' && val) {
+    arr = val.split(',')
+  } else if (Array.isArray(val)) {
+    arr = val.map(item=>item)
+  }
+  /** 是否有脏数据,即字典没有的数据 */
+  const isSomeNotHad = arr.some(value => {
+    return !dictData.find(item => item.value == value)
+  })
+  if (isSomeNotHad) {
+    arr = arr.filter(value => {
+      const obj = dictData.find(item => item.value == value)
+      return obj
+    })
+  }
+  return arr
+}
+watch([() => props.dictData, () => props.modelValue], ([opt, val]) => {
+  if (props.autoClear && opt?.length && val?.length) {
+    // 多选
+    if (props.multiple) {
+      // const newVal = getNeedVal(val,opt)
+      // emits("update:modelValue", newVal)
+      // 单选
+    } else {
+      // 清除不存在的项
+      let arr = Array.isArray(opt) ? opt : []
+      const curr = arr.find(item => item?.value == val)
+      if (!curr) emits("update:modelValue", '')
+    }
+  }
+})
+watchEffect(() => {
+  //处理是否禁用选项
+  if (props.dictData?.length) {
+    props.dictData.forEach(item => {
+      item.disabled = false
+    })
+    if (props.disabledItem?.length) {
+      props.dictData.forEach(item => {
+        props.disabledItem.forEach(it => {
+          if (item.value == it) {
+            item.disabled = true
+          }
+        })
+      })
+    } else {
+      props.dictData.forEach(item => {
+        item.disabled = false
+      })
+    }
+  }
+})
+</script>
+<style>
+.el-select-dropdown__item.is-disabled {
+  color: #999 !important;
+}
+</style>
diff --git a/src/components/MyComponents/Dict/DictTree.vue b/src/components/MyComponents/Dict/DictTree.vue
index 13a8388..c50af98 100644
--- a/src/components/MyComponents/Dict/DictTree.vue
+++ b/src/components/MyComponents/Dict/DictTree.vue
@@ -1,107 +1,107 @@
-<template>
-  <div style="width: 100%;">
-    <el-cascader ref="cascader" v-model="modelVal" filterable :props="pageData.cascaderProps"
-      :options="pageData.options" @change="handleChange" :placeholder="props.placeholder" style="width: 100%;"
-      :disabled="props.disabled" :show-all-levels="showAllLevels" clearable />
-  </div>
-</template>
-<script setup>
-import { defineProps, reactive, onMounted, defineEmits, ref, watchEffect } from "vue"
-import { getApi } from "@/api/tobAcco_api.js";
-const props = defineProps({
-  modelValue: String,//选中的数据|| 回显
-  placeholder: {
-    type: String,
-    default: "请选择"
-  },
-  //类型：通用字典 || xzqh 行政区划|| array结构后的字典(数组)
-  type: {
-    type: String,
-    default: ""
-  },
-  zdlist: {
-    type: Array,
-    default: [],//结构后的字典(数组)
-  },
-  disabled: Boolean,
-  zdbh: String,//字典编号
-})
-const modelVal = defineModel()
-const cascader = ref()
-const emits = defineEmits(["update:modelValue", "nameChange", "onChange"])
-const showAllLevels = ref(false);//是否显示全部路径
-const pageData = reactive({
-  options: [],
-  cascaderProps: {
-    children: "itemList",
-    label: "zdmc",
-    value: "dm",
-    checkStrictly: false
-  }
-})
-onMounted(() => {
-
-})
-
-//获取字典数据
-const getDictCdata = () => {
-  showAllLevels.value = false;
-  getApi({ zdbh: props.zdbh }, "/mosty-base/sysDict/getDictTree").then(res => {
-    if (res) {
-      pageData.options = res.itemList
-    }
-  })
-}
-//获取行政区划字典数据
-const getXzqhDictCdata = () => {
-  showAllLevels.value = false;
-  pageData.cascaderProps.checkStrictly = true
-  getApi({ zdbh: props.zdbh, dm: "52" }, "/mosty-base/sysDict/getDictTreeXzqh").then(res => {
-    pageData.options = res ? res.itemList : []
-
-  })
-}
-const handleChange = (val) => {
-  if (cascader.value.getCheckedNodes()[0]) {
-    /** 选择的名称数组例如['载客','大型'] */
-    const pathLabels = cascader.value.getCheckedNodes()[0].pathLabels
-    /**选择的值 例如 [1,2] */
-    const pathValues = cascader.value.getCheckedNodes()[0].pathValues
-    const checkedNodes = cascader.value.getCheckedNodes()[0].label
-    const checkObj = {
-      dm: cascader.value.getCheckedNodes()[0].value,
-      label: cascader.value.getCheckedNodes()[0].label,
-    }
-    emits("update:modelValue", cascader.value.getCheckedNodes()[0].value)
-    emits("nameChange", checkedNodes, pathLabels)
-    emits("onChange", checkObj, pathValues)
-  } else {
-    emits("update:modelValue", '')
-    emits("nameChange", null, [])
-    emits("onChange", null, [])
-  }
-
-}
-
-watchEffect(() => {
-  if (props.zdbh) {
-    if (props.type == 'xzqh') {
-      getXzqhDictCdata()
-    } else {
-      getDictCdata()
-    }
-  } else {
-    if (props.type == 'array') {
-      pageData.options = props.zdlist
-    }
-  }
-})
-
-</script>
-<style lang="scss" scoped></style>
-<style>
-.el-cascader-node:not(.is-disabled):focus,
-.el-cascader-node:not(.is-disabled):hover {
-  color: #fff;
-}
+<template>
+  <div style="width: 100%;">
+    <el-cascader ref="cascader" v-model="modelVal" filterable :props="pageData.cascaderProps"
+      :options="pageData.options" @change="handleChange" :placeholder="props.placeholder" style="width: 100%;"
+      :disabled="props.disabled" :show-all-levels="showAllLevels" clearable />
+  </div>
+</template>
+<script setup>
+import { defineProps, reactive, onMounted, defineEmits, ref, watchEffect } from "vue"
+import { getApi } from "@/api/tobAcco_api.js";
+const props = defineProps({
+  modelValue: String,//选中的数据|| 回显
+  placeholder: {
+    type: String,
+    default: "请选择"
+  },
+  //类型：通用字典 || xzqh 行政区划|| array结构后的字典(数组)
+  type: {
+    type: String,
+    default: ""
+  },
+  zdlist: {
+    type: Array,
+    default: [],//结构后的字典(数组)
+  },
+  disabled: Boolean,
+  zdbh: String,//字典编号
+})
+const modelVal = defineModel()
+const cascader = ref()
+const emits = defineEmits(["update:modelValue", "nameChange", "onChange"])
+const showAllLevels = ref(false);//是否显示全部路径
+const pageData = reactive({
+  options: [],
+  cascaderProps: {
+    children: "itemList",
+    label: "zdmc",
+    value: "dm",
+    checkStrictly: false
+  }
+})
+onMounted(() => {
+
+})
+
+//获取字典数据
+const getDictCdata = () => {
+  showAllLevels.value = false;
+  getApi({ zdbh: props.zdbh }, "/mosty-base/sysDict/getDictTree").then(res => {
+    if (res) {
+      pageData.options = res.itemList
+    }
+  })
+}
+//获取行政区划字典数据
+const getXzqhDictCdata = () => {
+  showAllLevels.value = false;
+  pageData.cascaderProps.checkStrictly = true
+  getApi({ zdbh: props.zdbh, dm: "52" }, "/mosty-base/sysDict/getDictTreeXzqh").then(res => {
+    pageData.options = res ? res.itemList : []
+
+  })
+}
+const handleChange = (val) => {
+  if (cascader.value.getCheckedNodes()[0]) {
+    /** 选择的名称数组例如['载客','大型'] */
+    const pathLabels = cascader.value.getCheckedNodes()[0].pathLabels
+    /**选择的值 例如 [1,2] */
+    const pathValues = cascader.value.getCheckedNodes()[0].pathValues
+    const checkedNodes = cascader.value.getCheckedNodes()[0].label
+    const checkObj = {
+      dm: cascader.value.getCheckedNodes()[0].value,
+      label: cascader.value.getCheckedNodes()[0].label,
+    }
+    emits("update:modelValue", cascader.value.getCheckedNodes()[0].value)
+    emits("nameChange", checkedNodes, pathLabels)
+    emits("onChange", checkObj, pathValues)
+  } else {
+    emits("update:modelValue", '')
+    emits("nameChange", null, [])
+    emits("onChange", null, [])
+  }
+
+}
+
+watchEffect(() => {
+  if (props.zdbh) {
+    if (props.type == 'xzqh') {
+      getXzqhDictCdata()
+    } else {
+      getDictCdata()
+    }
+  } else {
+    if (props.type == 'array') {
+      pageData.options = props.zdlist
+    }
+  }
+})
+
+</script>
+<style lang="scss" scoped></style>
+<style>
+.el-cascader-node:not(.is-disabled):focus,
+.el-cascader-node:not(.is-disabled):hover {
+  color: #fff;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/MyComponents/TabList/Fssblb.vue b/src/components/MyComponents/TabList/Fssblb.vue
index a7d4398..e2c5889 100644
--- a/src/components/MyComponents/TabList/Fssblb.vue
+++ b/src/components/MyComponents/TabList/Fssblb.vue
@@ -3,7 +3,7 @@
     <!-- 查询 -->
     <div class='tabox'>
       <div class="headBox3">
-        <el-input placeholder="请输入内部编号进行查询" v-model="pageData.listQuery.nbbh" clearable style='width:250px'></el-input>
+        <el-input placeholder="请输入设备编号进行查询" v-model="pageData.listQuery.sbbh" clearable style='width:250px'></el-input>
         <el-button type="primary" @click="Searchdata" class="ml6">
           <el-icon>
             <Search />
@@ -19,6 +19,9 @@
       </div>
       <MOSTY.Table :table-columns="pageData.tableColumns" :tableData="pageData.tableData" :tableloading="tableloading"
         :tableHeight="'40vh'" :isSort="true" @SortChange="SortChange">
+        <template #cameraType="{ row }">
+          <dict-tag :options="D_BZ_SXTLX" :value="row.cameraType" :tag="false" />
+        </template>
         <template #actions="{ row, $index }">
           <span class="operedit" @click="handlexg(row, $index)" v-if='props.isEdit'>
             <el-icon>
@@ -59,6 +62,7 @@ import { reactive, ref, getCurrentInstance, watchEffect } from "vue"
 import { getApi, postApi } from "@/api/tobAcco_api.js";
 import { ElMessage } from "element-plus";
 const { proxy } = getCurrentInstance();
+const { D_BZ_SXTLX } = proxy.$dict("D_BZ_SXTLX")
 const emits = defineEmits(["handleChange", 'tableChange']);
 const tableloading = ref(false);
 const addbpdShow = ref(false)
@@ -78,6 +82,11 @@ const props = defineProps({
   isEdit: {
     type: Boolean,
     default: true
+  },
+  // 设备类型
+  sblx: {
+    type: String,
+    default: ''
   }
 });
 const formData = ref({})
@@ -93,8 +102,8 @@ const pageData = reactive({
       sortable: true
     },
     {
-      title: "内部编号",
-      prop: "nbbh",
+      title: "设备编号",
+      prop: "sbbh",
       sortable: true
     },
     {
@@ -126,8 +135,15 @@ const pageData = reactive({
   tableData: []
 })
 watchEffect(() => {
-  if (props.obj.id) {
-    pageData.listQuery.zbid = props.obj.id
+  if (props.sblx == '200102010000') {
+    pageData.tableColumns.splice(2, 0, {
+      title: "类型",
+      prop: "cameraType",
+      slot: true
+    })
+  }
+  if (props.obj.parentid) {
+    pageData.listQuery.zbid = props.obj.parentid
     //获取子表
     getzblist()
   }
@@ -178,7 +194,7 @@ function handleSee(row) {
 function handledelete(row) {
   getApi({}, `/mosty-jcgl/aqsbssZb/del/${row.id}`).then(res => {
     ElMessage.success("删除成功");
-    emits("searchChange", true);
+    emits("tableChange", true);
     getzblist()
   })
 }
diff --git a/src/components/dialog/Addxfszb.vue b/src/components/dialog/Addxfszb.vue
index 8292e3e..91c032b 100644
--- a/src/components/dialog/Addxfszb.vue
+++ b/src/components/dialog/Addxfszb.vue
@@ -28,19 +28,25 @@
                                 :label="item.partname ? item.partname : item.qtmc" :value="item.id" />
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="设备编号:" prop="sbbh">
+                        <el-input v-model="fromObj.sbbh" clearable style="width: 337px"></el-input>
+                    </el-form-item>
                     <el-form-item label="设备名称:" prop="name">
                         <el-input v-model="fromObj.name" style="width: 337px" />
                     </el-form-item>
                     <el-form-item label="具体位置:" prop="location">
                         <el-input v-model="fromObj.location" clearable style="width: 337px"></el-input>
                     </el-form-item>
-                    <el-form-item label="摄像头国标编号:" prop="spbh" v-if="fromObj.sblx == '200102010000'">
-                        <el-input v-model="fromObj.spbh" clearable type="number" style="width: 337px"></el-input>
+                    <el-form-item label="摄像头类型:" prop="cameraType" v-if="fromObj.sblx == '06'">
+                        <el-select v-model="fromObj.cameraType" style="width: 337px;">
+                            <el-option v-for="item in D_BZ_SXTLX" :key="item.value" :label="item.label"
+                                :value="item.value" />
+                        </el-select>
                     </el-form-item>
-                    <el-form-item label="摄像头IP地址:" prop="ipaddr" v-if="fromObj.sblx == '200102010000'">
+                    <el-form-item label="摄像头IP地址:" prop="ipaddr" v-if="fromObj.sblx == '06'">
                         <el-input v-model="fromObj.ipaddr" clearable style="width: 337px"></el-input>
                     </el-form-item>
-                    <el-form-item label="摄像头端口号:" prop="port" v-if="fromObj.sblx == '200102010000'">
+                    <el-form-item label="摄像头端口号:" prop="port" v-if="fromObj.sblx == '06'">
                         <el-input v-model="fromObj.port" type="number" clearable style="width: 337px"></el-input>
                     </el-form-item>
                 </el-form>
@@ -65,13 +71,15 @@ import { ElMessage } from "element-plus";
 import { getApi, postApi } from "@/api/tobAcco_api.js";
 const { proxy } = getCurrentInstance();
 const saveloading = ref(false)
+const { D_BZ_SXTLX } = proxy.$dict("D_BZ_SXTLX")
 const rules = {
     sitename: [{ required: true, message: "请输入场所名称", trigger: "blur" }],
+    cameraType: [{ required: true, message: "请选择摄像头类型", trigger: "blur" }],
     buildingname: [{ required: true, message: "请选择所属建筑物", trigger: "blur" }],
     floorname: [{ required: true, message: "请选择所属楼层", trigger: "blur" }],
     partname: [{ required: true, message: "请选择所属部位", trigger: "blur" }],
     name: [{ required: true, message: "请输入名称", trigger: "blur" }],
-    spbh: [{ required: true, message: "请输入摄像头国标编号", trigger: "blur" }],
+    sbbh: [{ required: true, message: "请输入设备编号", trigger: "blur" }],
     ipaddr: [{ required: true, message: "请输入摄像头IP地址", trigger: "blur" }],
     port: [{ required: true, message: "请输入摄像头端口号", trigger: "blur" }],
     location: [{ required: true, message: "请输入具体位置", trigger: "blur" }],
@@ -89,10 +97,11 @@ const bwlist = ref([])
 const emit = defineEmits("saveSuccess");
 const ruleFormRef = ref();
 onMounted(() => {
+    console.log(props.formData.sblx)
     fromObj.value.sblx = props.formData.sblx
     fromObj.value.sitename = props.formData.sitename
     fromObj.value.siteid = props.formData.siteid
-    fromObj.value.zbid = props.formData.id
+    fromObj.value.zbid = props.formData.parentid
     getjzwlist(props.formData.siteid)
     if (props.formData.id) {
         getmain(props.formData.id)
@@ -203,24 +212,10 @@ function getmain(id) {
                 getlcxq(res.buildingid);
                 getjzwlist(res.siteid)
                 getbwdata(res.floorid)
-                gettotal()
             }
         });
     }
 }
-//获取统计
-function gettotal() {
-    postApi({
-        bizId: fromObj.value.id,
-        bizType: fromObj.value.sblx
-    }, '/mosty-jcgl/deviceUpkeepRecord/statistics').then(res => {
-        tablist2.value.forEach(item => {
-            if (item.title.includes(["维保记录"])) {
-                item.num = res ? res : 0
-            }
-        })
-    })
-}
 //获取建筑物详情
 function getlcxq(id) {
     getApi({}, `/mosty-jcgl/building/getBuildingById/${id}`).then(res => {
@@ -234,17 +229,11 @@ function getlcxq(id) {
 }
 const black = () => {
     if (props.formData.saveBtnShow) {
-        proxy.$modal.confirm('离开会丢失页面中修改的内容，确认离开吗？')
-            .then(() => {
-                // 关闭上一次的表单校验
-                ruleFormRef.value.clearValidate();
-                emit("saveSuccess");
-            })
-            .catch(() => {
-                // catch error
-            })
+        proxy.$modal.confirm('离开会丢失页面中修改的内容，确认离开吗？').then(() => {
+            ruleFormRef.value.clearValidate();
+            emit("saveSuccess");
+        })
     } else {
-        // 关闭上一次的表单校验
         ruleFormRef.value.clearValidate();
         emit("saveSuccess");
     }
diff --git a/src/main.js b/src/main.js
index 627f244..b211402 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,79 +1,77 @@
-import * as ElIcons from "@element-plus/icons-vue";
-import { createApp, reactive } from "vue";
-import App from "./App.vue";
-import router from "./router";
-import store from "./store";
-import { getItem, removeAllItem } from "@/utils/storage";
-import installElementPlus from "./plugins/element";
-import plugins from "./plugins";
-import "./assets/css/element-plus.scss";
-import "./assets/css/layout.scss";
-import "./assets/css/public.scss";
-import ELMessage from "element-plus";
-import InfiniteScroll from "./utils/lazyLoad";
-import DictTag from "@/components/DictTag/index";
-import * as echarts from "echarts";
-import percentageDirective from "@/utils/percentage";
-import VueUeditorWrap from "vue-ueditor-wrap";
-import { ElMessageBox, ElMessage } from "element-plus"
-const app = createApp(App);
-app.directive("percentage", percentageDirective);
+import * as ElIcons from "@element-plus/icons-vue"
+import { createApp } from "vue"
+import App from "./App.vue"
+import router from "./router"
+import store from "./store"
+import { getItem } from "@/utils/storage"
+import installElementPlus from "./plugins/element"
+import plugins from "./plugins"
+import "./assets/css/element-plus.scss"
+import "./assets/css/layout.scss"
+import "./assets/css/public.scss"
+import ELMessage from "element-plus"
+import InfiniteScroll from "./utils/lazyLoad"
+import DictTag from "@/components/DictTag/index"
+import * as echarts from "echarts"
+import percentageDirective from "@/utils/percentage"
+import VueUeditorWrap from "vue-ueditor-wrap"
+const app = createApp(App)
+app.directive("percentage", percentageDirective)
 //注册自定义指令
-// app.use(InfiniteScroll);
-app.use(VueUeditorWrap);
-Object.keys(ElIcons).forEach((key) => {
+app.use(VueUeditorWrap)
+Object.keys(ElIcons).forEach(key => {
   //全局注册 element 图标
-  app.component(key, ElIcons[key]);
-});
-
+  app.component(key, ElIcons[key])
+})
 
 //告诉前页面内的事件监听器内部是否会调用preventDefault函数来阻止事件的默认行为，以便浏览器根据这个信息更好地做出决策来优化页面性能
 // import "default-passive-events";
-import installDirective from "@/directives";
+import installDirective from "@/directives"
 
 // 初始化样式表
-import "@/styles/base.scss";
+import "@/styles/base.scss"
 
 // import "@/styles/common.scss";
 // 导入svgIcon
-import installIcons from "@/icons";
+import installIcons from "@/icons"
 
 //导入路由鉴权
-import "./permission";
+import "./permission"
 
 //全局属性(v2过滤器)
-import installFilter from "@/filters";
+import installFilter from "@/filters"
 //事件总线
-import mitt from "mitt";
+import mitt from "mitt"
 
-import { resetForm } from "@/utils/validate";
-import { getDict, setCascader, getDictValue, setDict } from "@/utils/dict";
+import { resetForm } from "@/utils/validate"
+import { getDict, setCascader, getDictValue, setDict } from "@/utils/dict"
 //挂载全局方法
-app.config.globalProperties.resetForm = resetForm;
-app.config.globalProperties.InfiniteScroll = InfiniteScroll;
-app.config.globalProperties.$dict = getDict; //字典公共函数
-app.config.globalProperties.$message = ELMessage; //element提示组件
-app.config.globalProperties.$set = setCascader; //设置级联选择器回显
-app.config.globalProperties.$getDictVal = getDictValue; //翻译字典数据
-app.config.globalProperties.$setDict = setDict; //翻译字典数据
-app.config.globalProperties.mittBus = new mitt(); //配置事件总线
-app.component("DictTag", DictTag); //字典组件
+app.config.globalProperties.resetForm = resetForm
+app.config.globalProperties.InfiniteScroll = InfiniteScroll
+app.config.globalProperties.$dict = getDict //字典公共函数
+app.config.globalProperties.$message = ELMessage //element提示组件
+app.config.globalProperties.$set = setCascader //设置级联选择器回显
+app.config.globalProperties.$getDictVal = getDictValue //翻译字典数据
+app.config.globalProperties.$setDict = setDict //翻译字典数据
+app.config.globalProperties.mittBus = new mitt() //配置事件总线
+app.config.globalProperties.$Hls = window.Hls //配置事件总线
+app.component("DictTag", DictTag) //字典组件
 // 将echarts挂载到全局中，这样组件就能通过 this.$echarts 访问了
-app.config.globalProperties.$echarts = echarts; //echarts图表
-installElementPlus(app);
-installIcons(app);
-installFilter(app);
-installDirective(app);
-app.use(store).use(router).use(plugins).mount("#app");
+app.config.globalProperties.$echarts = echarts //echarts图表
+installElementPlus(app)
+installIcons(app)
+installFilter(app)
+installDirective(app)
+app.use(store).use(router).use(plugins).mount("#app")
 
 // 路由的导航守卫，主要防止未登录时跳转到其他页面
 router.beforeEach((to, from, next) => {
-  let token = getItem("token");
+  let token = getItem("token")
   if (to.path === "/login") {
-    window.localStorage.removeItem("token");
-    next();
+    window.localStorage.removeItem("token")
+    next()
   } else {
-    if (!token) next("/login");
-    else next();
+    if (!token) next("/login")
+    else next()
   }
-});
+})
diff --git a/src/views/dutyBook/home/workbench.vue b/src/views/dutyBook/home/workbench.vue
index 1846dd2..ec25bf2 100644
--- a/src/views/dutyBook/home/workbench.vue
+++ b/src/views/dutyBook/home/workbench.vue
@@ -1,22 +1,1384 @@
 <template>
-    <div class="workbench">
-        工作台,安全方针 模板用
+  <div class="workbench" :class="{'isItFullScreen': isItFullScreen }">
+    <div class="largeScreenTitle">
+      <img class="largeScreenTitleImg" src="../../../assets/largeScreen/系统标题%20(1).png" alt="加载失败">
+      <div class="headInformation">
+        <div>
+          <img src="../../../assets/largeScreen/日期.png" alt="">
+          <span>2025-3-12:23:33</span>
+          <img src="../../../assets/largeScreen/icon／通用／天气.png" alt="">
+          <span>晴天 32</span>
+        </div>
+        <div class="titleImg">
+          <img src="../../../assets/largeScreen/XXXXXX工业园管理平台.png" alt="">
+        </div>
+        <div class="fullScreen">
+          <img @click="enterFullscreen()" src="../../../assets/largeScreen/Vector.png" alt="">
+        </div>
+      </div>
     </div>
+    <div class="layoutContainer">
+      <div class="theLeft">
+        <div class="theLeftItem">
+          <div class="theLeftItemTitle">设备状态</div>
+          <div class="theLeftItemContent  equipmentStatus">
+            <div class="updateTime">更新时间： 2024-12-34</div>
+            <div class="updateTimeMap">
+              <div class="updateTimeMapItem">
+                <el-progress type="circle" color="#0b9ff4" :stroke-width="10" width="70" :percentage="80" />
+              </div>
+              <div class="updateTimeMapItem">
+                <el-progress type="circle" color="#e0940b" :stroke-width="10" width="70" :percentage="60" />
+              </div>
+              <div class="updateTimeMapItem">
+                <el-progress type="circle" color="#CBF2FA" :stroke-width="10" width="70" :percentage="90" />
+              </div>
+              <div class="updateTimeMapItem">
+                <el-progress type="circle" color="#95ee0f" :stroke-width="10" width="70" :percentage="40" />
+              </div>
+            </div>
+            <div class="progressBarTitle">
+              <span>火警</span>
+              <span>火警</span>
+              <span>火警</span>
+              <span>火警</span>
+            </div>
+          </div>
+        </div>
+        <div class="theLeftItem">
+          <div class="theLeftItemTitle">设备状态</div>
+          <div class="theLeftItemContent  eventStatistics">
+            <div class="eventStatisticsItem" v-for="index of 6" :key="index">
+              <img v-if="index <= 3" src="../../../assets/largeScreen/未处理报警数.png" alt="">
+              <img v-else src="../../../assets/largeScreen/已处理报警数.png" alt="">
+              <div>
+                <p>65</p>
+                <span>未处理报警数</span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="theLeftItem">
+          <div class="theLeftItemTitle">履职雷达图</div>
+          <div class="theLeftItemContent performanceContainer">
+            <div class="performanceRadarChart" id="deputyActivity"></div>
+            <div class="performanceRadarInfo">
+              <div v-for="index of 6" :key="index">A 制度建设</div>
+            </div>
+          </div>
+        </div>
+        <div class="theLeftItem">
+          <div class="theLeftItemTitle titleOfHazardStatistics">
+            <span>隐患统计</span>
+            <el-select
+              style="width: 100px;"
+              v-model="value"
+              class="m-2"
+              placeholder="Select"
+              size="large"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </div>
+          <div class="theLeftItemContent hazardStatistics">
+            <div class="hazardStatisticsTitle">
+              <div>
+                <p>发现隐患： 14</p>
+                <img src="../../../assets/largeScreen/标注.png" alt="">
+              </div>
+              <div>
+                <p>处理隐患： 28</p>
+                <img src="../../../assets/largeScreen/标注.png" alt="">
+              </div>
+            </div>
+            <div class="hiddenDangerMap" id="hiddenDangerMap"></div>
+          </div>
+        </div>
+      </div>
+      <div class="middle">
+        <div class="middleItem3d">
+          <iframe ref="middle3d" class="middleItem_3d" src="http://183.222.39.242:9999/webgl/"></iframe>
+        </div>
+        <div class="middleItem middleItemBox">
+          <div class="middleItemContainer">
+            <div class="theLeftItemTitle">警告时段分析</div>
+            <div class="theLeftItemContent warningPeriodAnalysis">
+              <div class="warningPeriodAnalysisItem">
+                <div class="warningPeriodAnalysisItemTitle">
+                  <i></i>
+                  <span>白天：</span>
+                  <span>10 - 12时</span>
+                  <i></i>
+                </div>
+                <div class="accountForTitle">
+                  <span>共报表</span>
+                  <span>占比</span>
+                </div>
+                <div class="accountForNumber">
+                  <span>41起</span>
+                  <span>36%</span>
+                </div>
+                <div class="warningPeriodAnalysisItemTitle">
+                  <i></i>
+                  <span>白天：</span>
+                  <span>10 - 12时</span>
+                  <i></i>
+                </div>
+                <div class="accountForTitle">
+                  <span>共报表</span>
+                  <span>占比</span>
+                </div>
+                <div class="accountForNumber">
+                  <span>41起</span>
+                  <span>36%</span>
+                </div>
+              </div>
+              <div class="warningPeriodAnalysisItem" id="warningPeriodAnalysisItem"></div>
+            </div>
+          </div>
+          <div class="middleItemContainer">
+            <div class="theLeftItemTitle titleOfHazardStatistics">
+              <span>报警趋势</span>
+              <el-select
+                style="width: 100px;"
+                v-model="value"
+                class="m-2"
+                placeholder="Select"
+                size="large">
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </div>
+            <div id="alarmTrend" class="theLeftItemContent"></div>
+          </div>
+        </div>
+        <div class="middleItem">
+          <div class="theLeftItemTitle">设备状态</div>
+          <div class="theLeftItemContent  eventStatisticsStatic">
+            <div class="eventStatisticsStaticItem">
+              <p>
+                <span>800</span>
+                个
+              </p>
+              <img src="../../../assets/largeScreen/火灾报警.png" alt="">
+              <p>火灾报警</p>
+            </div>
+            <div class="eventStatisticsStaticItem">
+              <p>
+                <span>800</span>
+                个
+              </p>
+              <img src="../../../assets/largeScreen/火灾报警.png" alt="">
+              <p>电气报警</p>
+            </div>
+            <div class="eventStatisticsStaticItem">
+              <p>
+                <span>800</span>
+                个
+              </p>
+              <img src="../../../assets/largeScreen/消防给水.png" alt="">
+              <p>消防给水</p>
+            </div>
+            <div class="eventStatisticsStaticItem">
+              <p>
+                <span>800</span>
+                个
+              </p>
+              <img src="../../../assets/largeScreen/气体灭火.png" alt="">
+              <p>气体灭火</p>
+            </div>
+            <div class="eventStatisticsStaticItem">
+              <p>
+                <span>800</span>
+                个
+              </p>
+              <img src="../../../assets/largeScreen/消火栓.png" alt="">
+              <p>消火栓</p>
+            </div>
+            <div class="eventStatisticsStaticItem">
+              <p>
+                <span>800</span>
+                个
+              </p>
+              <img src="../../../assets/largeScreen/消防电源.png" alt="">
+              <p>消防电源</p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="theRightSide">
+        <div class="theRightSideItem">
+          <div class="theLeftItemTitle">系统评分</div>
+          <div class="theLeftItemContent systemScore">
+            <div class="systemScoreLeft" id="systemScoreLeft"></div>
+            <div class="systemScoreRight">
+              <div class="systemScoreRightItem">
+                <p>报警处理率</p>
+                <span>98%</span>
+              </div>
+              <div class="systemScoreRightItem">
+                <p>信息处理率</p>
+                <span>98%</span>
+              </div>
+              <div class="systemScoreRightItem">
+                <p>巡查处理率</p>
+                <span>98%</span>
+              </div>
+              <div class="systemScoreRightItem">
+                <p>设备完好率</p>
+                <span>98%</span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="theRightSideItem">
+          <div class="theLeftItemTitle">应急资源</div>
+          <div class="theLeftItemContent">
+            <div class="theLeftItemContent  eventStatistics" id="emergencyResources">
+              <div class="eventStatisticsItem" v-for="index of 6" :key="index">
+                <img src="../../../assets/largeScreen/救援队伍.png" alt="">
+                <div>
+                  <p>65</p>
+                  <span>救援队伍</span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="theRightSideItem">
+          <div class="theLeftItemTitle">值班查岗</div>
+          <div class="theLeftItemContent onDutyInspection">
+            <div id="onDutyInspection"></div>
+            <div class="onDutyInspectionRight">
+              <div class="onDutyInspectionMap" v-for="index of 3" :key="index">
+                <div>
+                  <i></i>
+                  <span>查岗次数</span>
+                </div>
+                <span>56次</span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="theRightSideItem">
+          <div class="theLeftItemTitle titleOfHazardStatistics">
+            <span>告警消息</span>
+            <el-select
+              style="width: 100px;"
+              v-model="value"
+              class="m-2"
+              placeholder="Select"
+              size="large">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </div>
+          <div class="theLeftItemContent">
+            <div class="theLeftItemContentTab">
+              <div>警告时间</div>
+              <div>警告位置</div>
+              <div>设备类型</div>
+            </div>
+            <div class="theLeftItemContentTable">
+              <div class="theLeftItemContentTableItem" v-for="index of scrollListArr" :key="index">
+                <div>2025-3-18</div>
+                <div>B栋2楼204室</div>
+                <div>独立烟感</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script setup>
 
-import { useStore } from "vuex";
-import { useRouter } from "vue-router";
-import { ref } from 'vue';
+import { ref, onMounted, onUnmounted, nextTick } from "vue"
+import * as echarts from "echarts"
+import { ElLoading } from "element-plus"
 
+let app_main = null
+let middle3d = ref(null)
+let value = ref(1)
+let isItFullScreen = ref(false)
+let scrollListArr = ref(new Array(20).fill(0))
+let options = ref([
+  {
+    label: "近一周",
+    value: 1
+  },
+  {
+    label: "近一月",
+    value: 2
+  }
+])
+
+/**
+ * 初始化字体
+ */
+const initializeFontSize = () => {
+  let baseSize = 192
+  let basePc = baseSize / 1920 // 表示1920的设计图,使用100PX的默认值
+  let vW = window.innerWidth // 当前窗口的宽度
+  let vH = window.innerHeight // 当前窗口的高度
+  // 非正常屏幕下的尺寸换算
+  let dueH = vW * 1080 / 1920
+  if (vH > dueH) { // 当前屏幕高度小于应有的屏幕高度，就需要根据当前屏幕高度重新计算屏幕宽度
+    vW = vH * 1920 / 1080
+  }
+  let rem = vW * basePc // 以默认比例值乘以当前窗口宽度,得到该宽度下的相应font-size值
+  document.documentElement.style.fontSize = rem + "px"
+}
+
+/**
+ * 履职雷达图
+ */
+const performanceRadarChart = () => {
+  let chartDom = document.getElementById("deputyActivity")
+  let myChart = echarts.init(chartDom)
+  let option
+
+  option = {
+    legend: {
+      show: false  // 隐藏图例
+    },
+    radar: {
+      indicator: [
+        { name: "A", max: 6500 },
+        { name: "B", max: 16000 },
+        { name: "C", max: 30000 },
+        { name: "D", max: 38000 },
+        { name: "E", max: 52000 },
+        { name: "F", max: 52000 }
+      ],
+      nameGap: 4 // 图中工艺等字距离图的距离
+    },
+    series: [
+      {
+        name: "Budget vs spending",
+        type: "radar",
+        data: [
+          {
+            value: [4200, 3000, 20000, 35000, 50000, 4000],
+            name: "Allocated Budget"
+          }
+        ],
+        areaStyle: {
+          color: new echarts.graphic.LinearGradient(
+            0, 0, 0, 1,
+            [
+              { offset: 0, color: "rgba(40,115,169,0.61)" }, // 此处可以调整颜色和透明度
+              { offset: 1, color: "rgba(39,112,173,0.66)" } // 此处可以调整颜色和透明度
+            ]
+          )
+        }
+      }
+    ]
+  }
+  option && myChart.setOption(option)
+}
+
+/**
+ * 履职隐患初始化
+ */
+const initializationOfHazardMapForJobPerformance = () => {
+  let chartDom = document.getElementById("hiddenDangerMap")
+  let myChart = echarts.init(chartDom)
+  let option
+  option = {
+    grid: {
+      top: "20px",
+      left: "20px",
+      right: "20px",
+      bottom: "20px"
+    },
+    tooltip: {
+      trigger: "axis"
+    },
+    legend: {
+      show: false
+    },
+    xAxis: [
+      {
+        watch: 10,
+        axisLine: {
+          lineStyle: {
+            color: "#fff",
+            width: 0.5,
+            type: "solid"
+          }
+        },
+        axisLabel: {
+          fontSize: 8,
+          color: "#FFFFFF",
+          margin: 6
+        },
+        type: "category",
+        data: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14],
+        axisPointer: {
+          type: "shadow"
+        },
+        axisTick: {
+          alignWithLabel: true,
+          inside: true
+        },
+        splitNumber: 5
+      }
+    ],
+    yAxis: [
+      {
+        axisLabel: {
+          fontSize: 6,
+          color: "#FFFFFF"
+        },
+        splitLine: {
+          lineStyle: {
+            color: "#0072FF",
+            width: 0.1
+          }
+        },
+        type: "value",
+        alignTicks: true,
+        min: 0,
+        max: 250,
+        interval: 50,
+        axisLine: {
+          show: true
+        },
+        axisTick: {
+          show: true,
+          inside: true
+        }
+      },
+      {
+        splitLine: {
+          lineStyle: {
+            color: "#0072FF",
+            width: 0.1
+          }
+        },
+        axisTick: { show: false },
+        axisLabel: { show: false },
+        type: "value",
+        alignTicks: false,
+        min: 0,
+        max: 25,
+        interval: 5,
+        axisLine: {
+          show: false
+        }
+      }
+    ],
+    series: [
+      {
+        name: "Evaporation",
+        type: "bar",
+        data: [
+          2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3
+        ],
+        itemStyle: {
+          color: {
+            type: "linear",
+            x: 0,
+            y: 0,
+            x2: 0,
+            y2: 1,
+            colorStops: [
+              {
+                offset: 0,
+                color: "#00FFFF"
+              },
+              {
+                offset: 1,
+                color: "rgba(0,255,255,0.06)"
+              }
+            ]
+          }
+        }
+      },
+      {
+        name: "Temperature",
+        type: "line",
+        yAxisIndex: 1,
+        data: [2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2, 0],
+        itemStyle: {
+          color: {
+            type: "linear",
+            x: 0,
+            y: 0,
+            x2: 0,
+            y2: 1,
+            colorStops: [
+              {
+                offset: 0,
+                color: "rgb(210,107,116)"
+              },
+              {
+                offset: 1,
+                color: "rgb(210,107,116)"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+  option && myChart.setOption(option)
+}
+
+/**
+ * 警告时段分析
+ */
+const warningPeriodAnalysis = () => {
+
+  let chartDom = document.getElementById("warningPeriodAnalysisItem")
+  let myChart = echarts.init(chartDom)
+  let option
+
+  option = {
+    legend: {
+      right: "right",
+      top: "24%",
+      itemWidth: 10,
+      itemHeight: 8,
+      itemGap: 6,
+      textStyle: {
+        color: "#fff",
+        fontSize: 12
+      }
+    },
+    series: [
+      {
+        label: {
+          show: false
+        },
+        name: "Nightingale Chart",
+        type: "pie",
+        radius: [20, 56],
+        center: ["30%", "50%"],
+        roseType: "area",
+        itemStyle: {
+          borderRadius: 8
+        },
+        data: [
+          { value: 40, name: "rose 1" },
+          { value: 38, name: "rose 2" },
+          { value: 32, name: "rose 3" },
+          { value: 30, name: "rose 4" },
+          { value: 28, name: "rose 5" }
+        ]
+      }
+    ]
+  }
+
+  option && myChart.setOption(option)
+}
+
+/**
+ * 报警趋势
+ */
+const initializeAlarmTrend = () => {
+  let chartDom = document.getElementById("alarmTrend")
+  let myChart = echarts.init(chartDom)
+  let option
+
+  option = {
+    grid: {
+      top: "20px",
+      left: "40px",
+      right: "10px",
+      bottom: "30px"
+    },
+    xAxis: {
+      type: "category",
+      data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
+      axisLabel: {
+        color: "#FFFFFF"
+      }
+    },
+    yAxis: {
+      splitLine: {
+        lineStyle: {
+          color: "#FFFFFF",
+          width: 0.1
+        }
+      },
+      type: "value",
+      axisLabel: {
+        color: "#FFFFFF"
+      }
+    },
+    series: [
+      {
+        data: [150, 230, 224, 218, 135, 147, 260],
+        type: "line",
+        areaStyle: {
+          color: "rgba(31,121,206,0.37)"
+        },
+        smooth: true
+      }
+    ]
+  }
+
+  option && myChart.setOption(option)
+}
+
+/**
+ * 初始化系统评分
+ */
+const initializeSystemRating = () => {
+  let chartDom = document.getElementById("systemScoreLeft")
+  let myChart = echarts.init(chartDom)
+  let option
+
+
+  option = {
+
+    series: [
+      {
+        type: "gauge",
+        center: ["50%", "54%"], //调整位置
+        radius: 40, //外圆半径55
+        startAngle: -134, // 结束位置
+        // endAngle: 100, // 结束位置
+        pointer: {
+          show: false // 是否显示仪表盘指针
+        },
+        progress: {
+          // 展示当前进度。
+          show: true, // 是否展示进度条
+          overlap: false, // 是否重叠
+          roundCap: false, // 是否圆顶
+          clip: false // 是否裁掉超出部分
+        },
+        axisLine: {
+          // 设置线条
+          lineStyle: {
+            width: 15, // 圆环宽 15
+            opacity: 0.1
+          }
+        },
+        itemStyle: {
+          normal: {
+            //具体颜色显示
+            color: {
+              type: "radial", // 使用径向渐变色
+              x: 0.2, // 渐变色的起始点位置
+              y: 1,
+              r: 1, // 渐变半径，值为0到1之间
+              colorStops: [
+                { offset: 0, color: "rgba(0, 255, 229, 1)" }, // 渐变颜色1
+                { offset: 1, color: "rgba(0, 255, 229, 1)" } // 渐变颜色2
+              ]
+
+            },
+            //饼状图阴影，值越大阴影亮度越高
+            shadowBlur: 24, // 模糊
+            shadowColor: "rgba(0, 255, 229, 0.5)" // 圆环阴影色
+          }
+        },
+        axisTick: {
+          // 刻度样式。
+          show: true, // 是否显示刻度。
+          distance: -45,
+          splitNumber: 5,
+          lineStyle: {
+            width: 4,
+            color: "rgba(0, 255, 229, 1)"
+          }
+        },
+        splitLine: {
+          distance: -40,
+          length: 14,
+          lineStyle: {
+            width: 3,
+            color: "#999"
+          }
+        },
+        axisLabel: {
+          //刻度标签。
+          show: true, // 是否显示标签。
+          color: "#999",
+          fontSize: 10,
+          distance: 14 // 标签与刻度线的距离。
+        },
+        data: [
+          {
+            value: 50, // 可写变量  此value 对应 formatter: '{value}%' 中的Value
+            detail: {
+              // 仪表盘边框数据详情，用于显示数据。
+              valueAnimation: true, // 是否开启标签的数字动画。
+              offsetCenter: ["0%", "-10%"], // 相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
+              fontSize: 16 // 文字的字体大小。
+            }
+          }
+        ],
+        detail: {
+          //仪表盘详情，用于显示数据 仪表盘中间数字数据。
+          color: "rgba(57, 193, 91, 1)", // 文本颜色，默认取数值所在的区间的颜色
+          formatter: "{value}%▴" // 格式化函数或者字符串
+        }
+      }
+    ]
+  }
+
+  option && myChart.setOption(option)
+}
+
+/**
+ * 初始化值班查岗
+ */
+const initializeDutyInspection = () => {
+  let chartDom = document.getElementById("onDutyInspection")
+  let myChart = echarts.init(chartDom)
+  let option
+
+  option = {
+    legend: {
+      show: false
+    },
+    series: [
+      {
+        label: {
+          show: false
+        },
+        name: "Nightingale Chart",
+        type: "pie",
+        radius: [40, 60],
+        center: ["60%", "50%"],
+        roseType: "area",
+        itemStyle: {
+          borderRadius: 8
+        },
+        data: [
+          { value: 30, name: "rose 1" },
+          { value: 28, name: "rose 2" },
+          { value: 52, name: "rose 3" }
+        ]
+      }
+    ]
+  }
+  option && myChart.setOption(option)
+}
+
+/**
+ * 进入全屏和退出全屏
+ * @param element
+ */
+const enterFullscreen = (element = document.documentElement) => {
+  if (!isItFullScreen.value) {
+    if (element.requestFullscreen) {
+      element.requestFullscreen()
+    } else if (element.mozRequestFullScreen) { // Firefox
+      element.mozRequestFullScreen()
+    } else if (element.webkitRequestFullscreen) { // Chrome/Safari/Opera
+      element.webkitRequestFullscreen()
+    } else if (element.msRequestFullscreen) { // IE/Edge
+      element.msRequestFullscreen()
+    }
+  } else {
+    if (document.exitFullscreen) {
+      document.exitFullscreen()
+    } else if (document.mozCancelFullScreen) { // Firefox
+      document.mozCancelFullScreen()
+    } else if (document.webkitExitFullscreen) { // Chrome/Safari/Opera
+      document.webkitExitFullscreen()
+    } else if (document.msExitFullscreen) { // IE/Edge
+      document.msExitFullscreen()
+    }
+  }
+  isItFullScreen.value = !isItFullScreen.value
+}
+
+/**
+ * 设置容器的高度，使大屏能在小屏幕上正常显示全
+ */
+const setContainerHeight = () => {
+  let availableHeight = window.innerHeight - 134
+  app_main = document.getElementsByClassName("app-main")[0]
+  app_main.style.height = availableHeight + "px"
+  app_main.style.overflowY = "scroll"
+}
+
+/**
+ * 条转其他页面时初始化容器高度，使得容器不影响其他页面
+ */
+const initializeContainerHeight = () => {
+  app_main.style.height = "auto"
+  app_main.style.overflowY = ""
+}
+
+/**
+ * 加载3D模型
+ */
+const load3dModel = () => {
+  let loading = ElLoading.service({
+    lock: true,
+    text: "模型初始化中......",
+    background: "rgba(0, 0, 0, 0.7)",
+    target: document.querySelector(".middleItem_3d")
+  })
+  if (middle3d.value) {
+    const iframe = middle3d.value
+    // 监听iframe的load事件
+    iframe.onload = () => {
+      loading.close()
+    }
+  }
+}
+
+
+onMounted(() => {
+  performanceRadarChart()
+  initializationOfHazardMapForJobPerformance()
+  warningPeriodAnalysis()
+  initializeAlarmTrend()
+  initializeSystemRating()
+  initializeDutyInspection()
+  setContainerHeight()
+  load3dModel()
+})
+
+onUnmounted(() => initializeContainerHeight())
+
+// 初始化
+initializeFontSize()
+// 监听窗口变化
+window.onresize = () => {
+  initializeFontSize()
+}
 
 </script>
+
 <style scoped lang="scss">
-.workbench {
-    width: 100%;
-    height: calc(100vh - 140px);
-    color: #333;
-    background: #fff;
+* {
+  padding: 0;
+  margin: 0;
+  box-sizing: border-box;
 }
-</style>
\ No newline at end of file
+
+.isItFullScreen {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+}
+
+.workbench {
+  //width: 100%;
+  //height: calc(100vh - 140px);
+  //color: #333;
+  //background: #95ee0f;
+  background-image: url("../../../assets/largeScreen/大背景.png");
+  background-size: 100% 100%;
+
+
+  .largeScreenTitle {
+    height: 88px;
+    width: 100%;
+    margin-bottom: 8px;
+    position: relative;
+
+    .headInformation {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: start;
+
+      > div {
+        width: 33.3%;
+        display: flex;
+        align-items: center;
+        justify-content: left;
+        font-size: 16px;
+
+        > img {
+          width: 20px;
+          margin-right: 8px;
+          margin-left: 20px;
+        }
+      }
+
+      .titleImg {
+        text-align: center;
+
+        > img {
+          width: 100%;
+          height: 40px;
+          margin-top: 22px;
+          //margin-left: 100px;
+        }
+      }
+    }
+
+    .largeScreenTitleImg {
+      width: 100%;
+    }
+  }
+
+  .layoutContainer {
+    display: flex;
+    align-items: start;
+    justify-content: space-between;
+    padding: 0 10px;
+
+    .theLeft, .theRightSide {
+      width: 24%;
+    }
+
+    .middle {
+      width: calc(100% - 48% - 10px);
+
+      .middleItem3d {
+        height: 482px;
+        margin-bottom: 10px;
+
+        iframe {
+          width: 100%;
+          height: 100%;
+          border: none;
+        }
+      }
+
+      .middleItemBox {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+      }
+
+      .middleItem {
+        width: 100%;
+        height: 236px;
+        margin-bottom: 10px;
+
+        .middleItemContainer {
+          width: 50%;
+          height: 100%;
+
+          .warningPeriodAnalysis {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            .warningPeriodAnalysisItem {
+              width: 50%;
+              height: 100%;
+
+              .warningPeriodAnalysisItemTitle {
+                background-image: url("../../../assets/largeScreen/时段背景.png");
+                background-size: 100% 100%;
+                height: 28px;
+                line-height: 28px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                margin-top: 14px;
+
+                i {
+                  display: block;
+                  width: 6px;
+                  height: 6px;
+                  border-radius: 50%;
+                  background: #A9F0FF;
+                }
+
+                span:nth-child(2) {
+                  margin-left: 8px;
+                  margin-right: 10px;
+                }
+
+                span:nth-child(3) {
+                  margin-right: 8px;
+                  color: #A9F0FF;
+                }
+              }
+
+              .accountForTitle {
+                font-size: 13px;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                padding: 0 20px;
+                margin-top: 8px;
+              }
+
+              .accountForNumber {
+                font-size: 18px;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                padding: 0 20px;
+                font-weight: bold;
+                margin-top: 4px;
+
+                span:nth-child(1) {
+                  color: #ee6969;
+                }
+
+                span:nth-child(2) {
+                  color: #A9F0FF;
+                }
+              }
+            }
+          }
+        }
+      }
+
+      .middleItem:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    > div {
+      height: 100%;
+      //background: #0b6c51;
+      padding-bottom: 14px;
+
+      .theLeftItem, .theRightSideItem {
+        height: 236px;
+        width: 100%;
+        margin-bottom: 10px;
+      }
+
+      .theLeftItem:last-child, .theRightSideItem:last-child {
+        margin-bottom: 0;
+      }
+    }
+  }
+
+  .theLeftItemTitle {
+    height: 24px;
+    line-height: 24px;
+    background-image: url("../../../assets/largeScreen/小标题-设备状态‘.png");
+    background-size: 100% 100%;
+    padding-left: 20px;
+    color: #A9F0FF;
+    margin-bottom: 2px;
+  }
+
+  .equipmentStatus {
+    padding: 20px 0;
+
+    .updateTime {
+      text-align: center;
+      color: #CBF2FA;;
+      margin-bottom: 18px;
+      font-size: 16px;
+    }
+
+    .updateTimeMap {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+
+      .updateTimeMapItem {
+        width: 25%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+
+    .progressBarTitle {
+      margin-top: 18px;
+
+      span {
+        display: inline-block;
+        vertical-align: mathematical;
+        width: 25%;
+        text-align: center;
+        font-size: 14px;
+        color: #CBF2FA;;
+      }
+    }
+  }
+
+
+  .eventStatistics {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    justify-content: space-between;
+    padding: 20px 0;
+
+    .eventStatisticsItem {
+      width: 33.3%;
+      display: flex;
+      align-items: center;
+      justify-content: left;
+
+      img {
+        width: 48px;
+      }
+
+      p {
+        color: #A9F0FF;
+        font-size: 20px;
+      }
+
+      span {
+        font-size: 12px;
+      }
+    }
+  }
+
+  .performanceContainer {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 10px;
+
+    > div {
+      width: 50%;
+      height: 100%;
+    }
+
+    .performanceRadarInfo {
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: left;
+      font-size: 13px;
+      padding: 28px 0;
+
+      > div {
+        text-align: center;
+        width: 50%;
+        color: #A9F0FF;
+      }
+    }
+  }
+
+  .titleOfHazardStatistics {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .hazardStatistics {
+    padding: 10px;
+
+    .hazardStatisticsTitle {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+
+      > div {
+        width: 50%;
+        font-size: 12px;
+        color: #A9F0FF;
+      }
+
+      > div:nth-child(1) {
+        text-align: right;
+        margin-right: 10px;
+      }
+
+      > div:nth-child(2) {
+        margin-left: 10px;
+      }
+    }
+
+    .hiddenDangerMap {
+      height: calc(100% - 34px);
+      width: 100%;
+    }
+  }
+}
+
+
+:deep(.el-progress__text span) {
+  color: #CBF2FA;
+  font-size: 14px;
+}
+
+
+:deep() {
+  path:first-child {
+    stroke: transparent;
+  }
+}
+
+:deep(.el-input--large .el-input__inner) {
+  height: 28px;
+  color: #CBF2FA;
+  font-size: 14px;
+  background: transparent;
+  border: none;
+  outline: none;
+}
+
+.theLeftItemContent {
+  height: calc(236px - 26px);
+  width: 100%;
+  background-image: url("../../../assets/largeScreen/告警时段分析.png");
+  background-size: 100% 100%;
+}
+
+.eventStatisticsStatic {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 20px;
+
+  .eventStatisticsStaticItem {
+    text-align: center;
+
+    span {
+      font-size: 28px;
+      font-weight: bolder;
+    }
+  }
+}
+
+.systemScore {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  > div {
+    width: 50%;
+    height: 100%;
+  }
+
+  .systemScoreRight {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    justify-content: space-between;
+    padding: 30px 10px;
+
+    .systemScoreRightItem {
+      width: calc((100% - 10px) / 2);
+      background-image: url("../../../assets/largeScreen/事件统计框.png");
+      background-size: 100% 100%;
+      text-align: center;
+      padding: 10px 0;
+
+      p {
+        font-size: 12px;
+        margin-top: 3px;
+      }
+
+      span {
+        font-size: 18px;
+        color: #CBF2FA;
+        font-weight: bolder;
+      }
+    }
+  }
+}
+
+#emergencyResources {
+  img {
+    width: 84px;
+    margin-right: 0;
+  }
+}
+
+
+.onDutyInspection {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  > div {
+    width: 50%;
+    height: 100%;
+  }
+}
+
+.onDutyInspectionRight {
+  text-align: center;
+  padding: 60px 0;
+
+  .onDutyInspectionMap {
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+    margin-bottom: 8px;
+
+    > div {
+      display: flex;
+      align-items: center;
+      justify-content: left;
+    }
+
+    i {
+      display: block;
+      width: 10px;
+      height: 10px;
+      background: #0b9ff4;
+      margin-right: 8px;
+    }
+  }
+}
+
+.theLeftItemContentTab {
+  display: flex;
+  align-items: center;
+  background: rgba(84, 139, 171, 0.54);
+  color: #0b9ff4;
+  border: 1px solid #058cdc;
+
+  > div {
+    width: calc(100% / 3);
+    height: 28px;
+    line-height: 28px;
+    text-align: center;
+  }
+}
+
+.theLeftItemContentTable {
+  height: calc(100% - 38px);
+  overflow: hidden;
+
+  .theLeftItemContentTableItem {
+    display: flex;
+    align-items: center;
+
+    > div {
+      width: calc(100% / 3);
+      height: 28px;
+      line-height: 28px;
+      color: #eeeaea;
+      text-align: center;
+      border-bottom: 1px solid #058cdc;
+    }
+  }
+}
+
+.fullScreen {
+  background: #0b9ff4;
+  position: relative;
+
+  img {
+    position: absolute;
+    top: -10px;
+    right: 0;
+    cursor: pointer;
+  }
+}
+
+</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 630b72d..463876a 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -100,7 +100,6 @@ function getlogin() {
             isTrue.value = true
           })
         } else {
-
           if (loginForm.value.checked) {
             localStorage.setItem("userName", loginForm.value.userName);
             localStorage.setItem("password", loginForm.value.password);
@@ -115,26 +114,20 @@ function getlogin() {
               fullPath: "/dutyBook/home/workbench",
               meta: {
                 meta: {
-                  title: "工作台"
-                  // icon: "gerenzhongxin"
+                  title: "消防管理大屏"
                 }
               },
               name: "dutyBook/home/workbench",
               params: {},
               path: "/dutyBook/home/workbench",
               query: {},
-              title: "工作台"
+              title: "消防管理大屏"
             },
             {
               immediate: true
             }
           );
-          // router.push('/editPassword')
           router.push('/dutyBook/home/workbench')
-          // router.push('/newsystem').then(() => {
-          //   // 如果路由已经切换完成，则刷新页面
-          //   location.reload();
-          // });
           getuserinfo()
         }
 
diff --git a/src/views/lps/bkq/AddOrEdite/index.vue b/src/views/lps/bkq/AddOrEdite/index.vue
index 45afd4c..64c2d41 100644
--- a/src/views/lps/bkq/AddOrEdite/index.vue
+++ b/src/views/lps/bkq/AddOrEdite/index.vue
@@ -8,6 +8,12 @@
             <el-form-item label="设备名称：" prop="sbmc">
               <el-input v-model="data.fromObj.sbmc" placeholder="请输入设备名称" style="width: 220px"></el-input>
             </el-form-item>
+            <el-form-item label="设备类型：" prop="cameraType">
+              <el-select v-model="data.fromObj.cameraType" placeholder="请选择设备类型" clearable style="width: 220px">
+                <el-option v-for="item in D_BZ_SXTLX" :key="item.value" :label="item.label"
+                  :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="国标编号：" prop="sbbh">
               <el-input v-model="data.fromObj.sbbh" type="number" placeholder="请输入国标编号" style="width: 220px"></el-input>
             </el-form-item>
@@ -56,7 +62,7 @@ import ChooseUser from "@/components/MyComponents/ChooseUser/Leader.vue"
 import PageTitle from "@/components/PageTitle/PageTitle.vue"
 import MyTable from "@/components/aboutTable/MyTable/index.vue"
 const { proxy } = getCurrentInstance()
-const { D_BZ_DLSBZT } = proxy.$dict("D_BZ_DLSBZT")
+const { D_BZ_DLSBZT, D_BZ_SXTLX } = proxy.$dict("D_BZ_DLSBZT", "D_BZ_SXTLX")
 const ruleFormRef = ref()
 const props = defineProps({
   saveBtnShow: {
@@ -70,6 +76,7 @@ const props = defineProps({
 })
 const rules = reactive({
   sbmc: [{ required: true, message: "请输入设备名称" }],
+  cameraType: [{ required: true, message: "请选择设备类型" }],
   sbbh: [{ required: true, message: "请输入设备编号" }],
   sbzt: [{ required: true, message: "请选择设备状态" }],
   hosts: [{ required: true, message: "请输入IP地址" }],
diff --git a/src/views/lps/bkq/Main/index.vue b/src/views/lps/bkq/Main/index.vue
index 41f738f..74d0886 100644
--- a/src/views/lps/bkq/Main/index.vue
+++ b/src/views/lps/bkq/Main/index.vue
@@ -18,9 +18,14 @@
         <MOSTY.Table :table-columns="data.tableColumn" :tableData="data.tableData" :tableloading="tableloading"
           :isSort="true">
           <template #sbzt="{ row }">
-            <dict-tag v-if="row.sbzt" :options="D_BZ_DLSBZT" :value="row.sbzt" :tag="false" :color="row.sbzt == '01' ? 'green' : 'orange'" />
+            <dict-tag v-if="row.sbzt" :options="D_BZ_DLSBZT" :value="row.sbzt" :tag="false"
+              :color="row.sbzt == '01' ? 'green' : 'orange'" />
             <span v-else>无</span>
           </template>
+          <template #cameraType="{ row }">
+            <dict-tag v-if="row.cameraType" :options="D_BZ_SXTLX" :value="row.cameraType" :tag="false" />
+            <span v-else>--</span>
+          </template>
           <!--操作-->
           <template #actions="{ row }">
             <span class="operesee" @click="seeInfo(row)"><el-icon>
@@ -56,7 +61,7 @@ import { exportXlsx } from "@/excel/Export2Excel.js"
 import { ElMessage } from "element-plus"
 import { reactive, onMounted, ref, getCurrentInstance } from "vue"
 const { proxy } = getCurrentInstance()
-const { D_BZ_DLSBZT } = proxy.$dict("D_BZ_DLSBZT")
+const { D_BZ_DLSBZT, D_BZ_SXTLX } = proxy.$dict("D_BZ_DLSBZT", "D_BZ_SXTLX")
 const emit = defineEmits("changePage")
 const tableloading = ref(false)
 const listQuery = reactive({
@@ -72,6 +77,13 @@ const searchArr = reactive([
     width: "250px",
     placeholder: "请选择设备状态"
   },
+  {
+    showType: "select",
+    prop: "cameraType",
+    options: D_BZ_SXTLX,
+    width: "250px",
+    placeholder: "请选择设备类型"
+  },
   {
     showType: "input",
     prop: "keywords",
@@ -99,6 +111,11 @@ const data = reactive({
       title: "端口号",
       prop: "port"
     },
+    {
+      title: "设备类型",
+      prop: "cameraType",
+      slot: true
+    },
     {
       title: "设备状态",
       prop: "sbzt",
@@ -127,6 +144,7 @@ const changeSize = val => {
 const onSearch = obj => {
   listQuery.sbzt = obj.sbzt
   listQuery.keywords = obj.keywords
+  listQuery.cameraType = obj.cameraType
   getTableData()
 }
 // 查询表格数据
diff --git a/src/views/lps/yjsb/AddOrEdite/index.vue b/src/views/lps/yjsb/AddOrEdite/index.vue
index 3ea2639..b183ca8 100644
--- a/src/views/lps/yjsb/AddOrEdite/index.vue
+++ b/src/views/lps/yjsb/AddOrEdite/index.vue
@@ -1,67 +1,83 @@
 <template>
-  <MOSTY.FromPage :title="props.formData.title" @closeDialog="closepost">
+  <MOSTY.FromPage :title="props.editObj.title" @closeDialog="closepost">
     <template #content>
       <MOSTY.Assort :title="'基础信息'" />
-      <el-form :model="props.formData" ref="ruleFormRef" label-position="right" :rules="rules" label-width="150px"
-        :disabled='!props.formData.saveBtnShow'>
+      <el-form :model="data.config" ref="ruleFormRef" label-position="right" :rules="rules" label-width="150px"
+        :disabled='!props.editObj.saveBtnShow'>
         <el-form-item label="设备类型：" prop="sblx">
-          <el-select v-model="props.formData.sblx" placeholder="请选择设备类型" clearable style="width: 337px">
+          <el-select v-model="data.config.sblx" placeholder="请选择设备类型" clearable style="width: 337px">
             <el-option v-for="item in D_BZ_YJSBLX" :key="item.value" :label="item.label"
               :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="预警设备名称:" prop="sbmc">
-          <el-input v-model="props.formData.sbmc" style="width: 337px" />
+          <el-input v-model="data.config.sbmc" style="width: 337px" />
         </el-form-item>
         <el-form-item label="设备编号:" prop="sbbh">
-          <el-input v-model="props.formData.sbbh" style="width: 337px" />
+          <el-input v-model="data.config.sbbh" style="width: 337px" />
         </el-form-item>
         <el-form-item label="设备状态：" prop="sbzt">
-          <el-select v-model="props.formData.sbzt" placeholder="请选择设备状态" clearable style="width: 337px">
+          <el-select v-model="data.config.sbzt" placeholder="请选择设备状态" clearable style="width: 337px">
             <el-option v-for="item in D_BZ_DLSBZT" :key="item.value" :label="item.label"
               :value="item.value"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="IP地址：" prop="ipaddr">
+          <el-input v-model="data.config.ipaddr" placeholder="请输入IP地址" style="width: 337px"></el-input>
+        </el-form-item>
+        <el-form-item label="端口号：" prop="port">
+          <el-input v-model="data.config.port" type="number" placeholder="请输入端口号" style="width: 337px"></el-input>
+        </el-form-item>
         <el-form-item label="绑定设备:" prop="parentname">
-          <el-input v-model="props.formData.parentname" style="width: 337px" readonly clearable>
+          <el-input v-model="data.config.parentname" style="width: 337px" readonly clearable>
             <template #append>
               <el-button class='cursor' @click="chooseSb()">选择</el-button>
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item label="设备名称:" prop="name">
-          <el-input v-model="props.formData.name" style="width: 337px" disabled />
-        </el-form-item>
         <el-form-item label="所属场所:" prop="sitename">
-          <el-input v-model="props.formData.sitename" style="width: 337px" disabled />
+          <el-input v-model="data.config.sitename" style="width: 337px" disabled />
         </el-form-item>
-        <el-form-item :label="props.formData.publicarea == '1' ? '所属场区:' : '所属建筑物:'" prop="buildingname">
-          <el-input v-model="props.formData.buildingname" style="width: 337px" disabled />
+        <el-form-item :label="data.config.publicarea == '1' ? '所属场区:' : '所属建筑物:'" prop="buildingname">
+          <el-input v-model="data.config.buildingname" style="width: 337px" disabled />
         </el-form-item>
-        <el-form-item label="所属楼层:" prop="floorname" v-if="props.formData.publicarea != '1'">
-          <el-input v-model="props.formData.floorname" style="width: 337px" disabled />
+        <el-form-item label="所属楼层:" prop="floorname" v-if="data.config.publicarea != '1'">
+          <el-input v-model="data.config.floorname" style="width: 337px" disabled />
         </el-form-item>
         <el-form-item label="部位名称:" prop="partname">
-          <el-input v-model="props.formData.partname" style="width: 337px" disabled />
+          <el-input v-model="data.config.partname" style="width: 337px" disabled />
         </el-form-item>
         <el-form-item label="责任部门:" prop="deptname">
-          <el-input v-model="props.formData.deptname" style="width: 337px" disabled />
+          <el-input v-model="data.config.deptname" style="width: 337px" disabled />
         </el-form-item>
         <el-form-item label="责任人：" style="width: 100%; " prop="responsibilitypersonname">
-          <el-input v-model="props.formData.responsibilitypersonname" :rows="3" type="textarea" style="width:1310px"
+          <el-input v-model="data.config.responsibilitypersonname" :rows="3" type="textarea" style="width:1310px"
             disabled />
         </el-form-item>
         <el-form-item label="具体位置：" style="width: 100%; " prop="location">
-          <el-input v-model="props.formData.location" :rows="3" type="textarea" style="width:1310px" />
+          <el-input v-model="data.config.location" :rows="3" type="textarea" style="width:1310px" />
         </el-form-item>
         <el-form-item label="备注：" style="width: 100%; ">
-          <el-input v-model="props.formData.bz" :rows="3" type="textarea" style="width:1310px" />
+          <el-input v-model="data.config.bz" :rows="3" type="textarea" style="width:1310px" />
         </el-form-item>
       </el-form>
+      <MOSTY.Assort v-if="data.config.id" :title="'关联信息(固定信息)'" />
+      <div>
+        <div v-if="data.config.id">
+          <div class="table-lable">
+            <span>动态信息</span>
+            <img :src="getImgUrl('img/icon-jt.png')" style="cursor: pointer" @click="isShowdt = !isShowdt" />
+          </div>
+          <div v-if="data.config.id">
+            <MOSTY.TabList :tablist="tablist2" :obj="data.config" :showCount="true" :sblx="sblx"
+              :isEdit="props.editObj.saveBtnShow" @tableChange="tableChange" @resetChange="resetChange" />
+          </div>
+        </div>
+      </div>
     </template>
     <template #footer>
-      <el-button type="primary" @click="saveData(ruleFormRef)" v-loading="saveloading"
-        v-if='props.formData.saveBtnShow'> <el-icon>
+      <el-button type="primary" @click="saveData(ruleFormRef)" v-loading="saveloading" v-if='props.editObj.saveBtnShow'>
+        <el-icon>
           <DocumentChecked />
         </el-icon>保存 </el-button>
       <el-button @click="closepost"><el-icon>
@@ -70,18 +86,17 @@
     </template>
   </MOSTY.FromPage>
   <div>
-    <Sbss v-model="showSbss" :data="props.formData.parentid" :sbid="leaderid" :sblx="sblx" @choosedSbss="choosedSbss"
+    <Sbss v-model="showSbss" :data="data.config.parentid" :sbid="leaderid" :sblx="sblx" @choosedSbss="choosedSbss"
       searchType="04"></Sbss>
   </div>
 </template>
 
 <script setup>
-import { ref, getCurrentInstance, defineAsyncComponent, onMounted, watch } from "vue";
+import { getImgUrl } from "@/utils/tools.js"
+import { ref, getCurrentInstance, onMounted, watch, reactive, defineAsyncComponent } from "vue";
 import * as MOSTY from "@/components/MyComponents/index";
 import Sbss from "@/components/MyComponents/ChooseUser/sbss.vue";
 import { ElMessage } from "element-plus";
-import * as rule from "@/utils/rules.js";
-import { getItem } from "@/utils/storage";
 import { getApi, postApi } from "@/api/tobAcco_api.js";
 const { proxy } = getCurrentInstance();
 const { D_BZ_DLSBZT, D_BZ_YJSBLX } = proxy.$dict("D_BZ_DLSBZT", "D_BZ_YJSBLX")
@@ -93,39 +108,65 @@ const rules = {
   sbmc: [{ required: true, message: "请输入预警设备名称" }],
   sbbh: [{ required: true, message: "请输入设备编号" }],
   sbzt: [{ required: true, message: "请选择设备状态" }],
+  sblx: [{ required: true, message: "请选择设备类型" }],
   parentname: [{ required: true, message: "请选择绑定设备" }],
-  name: [{ required: true, message: "设备名称不能为空" }],
+  ipaddr: [{ required: true, message: "请输入IP地址" }],
+  port: [{ required: true, message: "请输入端口号" }],
   deptname: [{ required: true, message: "责任部门不能为空" }],
   responsibilitypersonname: [{ required: true, message: "责任人不能为空" }],
   location: [{ required: true, message: "请输入具体位置" }]
 };
+const tablist2 = ref([])
 const saveloading = ref(false)
 const showSbss = ref(false);
 const ruleFormRef = ref();
 const sblx = ref(null)
-const emits = defineEmits(["saveSuccess", '"update:modelValue"']);
+const emit = defineEmits(["saveSuccess", '"update:modelValue"']);
 // 接收子组件传来的
 const props = defineProps({
-  modelValue: {
-    type: Boolean,
-    required: true
-  },
-  formData: {
+  editObj: {
     type: Object,
-    default: {}
+    default: () => { }
   }
 });
+const data = reactive({
+  fromObj: {},
+  config: {
+    title: "",
+    saveBtnShow: true,
+    type: ""
+  }
+})
 watch(
-  () => props.formData.sblx,
+  () => data.config.sblx,
   (val) => {
     let arr = [['01', '200101030500'], ['02', '200101020200'], ['03', '200101020100'], ['04', '200101020300'],
-    ['05', '200101030100']];
+    ['05', '200101030100'], ['06', '200102010000']];
     for (let i = 0; i < arr.length; i++) {
       const item = arr[i];
       let zddm = item[0];
       let sblxdm = item[1];
       if (zddm == val) {
         sblx.value = sblxdm;
+        if (["200101060100", '200101060200', '200101030500', '200101020200',
+          '200101020100', '200101020300', '200102010000', "200101030100"].includes(sblx.value)) {
+          let title = '附属设备'
+          if (['200101020200', '200101020100'].includes(sblx.value)) {
+            title = '液位仪';
+          } else if ('200101020300' == sblx.value) {
+            title = '压力传感器'
+          } else if ('200102010000' == sblx.value) {
+            title = '视频摄像头'
+          }
+          tablist2.value.push({
+            title: title,
+            num: 0,
+            icon: "sbss2",
+            sblx: sblx.value,
+            actives: true,
+            components: defineAsyncComponent(() => import("@/components/MyComponents/TabList/Fssblb.vue"))
+          })
+        }
         break
       }
     }
@@ -136,45 +177,67 @@ watch(
   }
 );
 onMounted(() => {
-  props.formData.publicarea = '1'
-  //获取建筑物详情
-  if (props.formData.buildingid) {
-    getApi({}, `/mosty-jcgl/building/getBuildingById/${props.formData.buildingid}`).then(res => {
-      props.formData.publicarea = res.publicarea ? res.publicarea : "2"
+  data.config.publicarea = '1'
+  if (props.editObj) {
+    data.config = props.editObj
+  }
+  getMain(data.config.id)
+})
+//子表总数
+function gettabcount() {
+  getApi({ id: data.config.parentid }, "/mosty-jcgl/aqsbssZb/countAll").then(res => {
+    tablist2.value.forEach(item => {
+      if (["附属设备", "液位仪", "压力传感器", "视频摄像头"].includes(item.title)) {
+        item.num = res ? res : 0
+      }
+    })
+  })
+}
+// 获取详情
+function getMain(id) {
+  if (id) {
+    getApi({ id: id }, "/mosty-lps/yjsbInfo/getInfo").then(res => {
+      if (res) {
+        data.config = res
+        //获取建筑物详情
+        if (data.fromObj.buildingid) {
+          getApi({}, `/mosty-jcgl/building/getBuildingById/${data.fromObj.buildingid}`).then(res => {
+            data.config.publicarea = res.publicarea ? res.publicarea : "2"
+          })
+        }
+        //统计各类总数
+        gettabcount()
+      }
     })
   }
-})
+}
+//获取子表数据
+function tableChange(val) {
+  gettabcount()
+}
 // 选择设备设施
-function choosedSbss(data) {
-  props.formData.parentid = data.id
-  props.formData.parentname = data.name
-  props.formData.location = data.location
-  // 查询主设备信息
-  getApi({}, "/mosty-jcgl/sbglAqsbss/queryTbSbglAqsbssById?id=" + data.zbid).then((res) => {
-    if (res) {
-      props.formData.siteid = res.siteid
-      props.formData.sitename = res.sitename
-      props.formData.buildingid = res.buildingid
-      props.formData.buildingname = res.buildingname
-      // 查询建筑物
-      //获取建筑物详情
-      getApi({}, `/mosty-jcgl/building/getBuildingById/${res.buildingid}`).then(res => {
-        props.formData.publicarea = res.publicarea ? res.publicarea : "2"
-      })
-      props.formData.floorid = res.floorid
-      props.formData.floorname = res.floorname
-      props.formData.partid = res.partid
-      props.formData.partname = res.partname
-      props.formData.sbid = res.id
-      props.formData.name = res.name
-      props.formData.deptcode = res.responsibilitydeptid
-      props.formData.deptname = res.responsibilitydeptname
-      props.formData.responsibilitypersonname = res.responsibilitypersonname
-      props.formData.responsibilityperson = res.responsibilityperson
-    } else {
-      ElMessage.error("未找到设备信息");
-    }
+function choosedSbss(res) {
+  data.config.parentid = res.id
+  data.config.parentname = res.name
+  data.config.location = res.location
+  data.config.siteid = res.siteid
+  data.config.sitename = res.sitename
+  data.config.buildingid = res.buildingid
+  data.config.buildingname = res.buildingname
+  //获取建筑物详情
+  getApi({}, `/mosty-jcgl/building/getBuildingById/${res.buildingid}`).then(resp => {
+    data.config.publicarea = resp.publicarea ? resp.publicarea : "2"
   })
+  data.config.floorid = res.floorid
+  data.config.floorname = res.floorname
+  data.config.partid = res.partid
+  data.config.partname = res.partname
+  data.config.sbid = res.id
+  data.config.name = res.name
+  data.config.deptcode = res.responsibilitydeptid
+  data.config.deptname = res.responsibilitydeptname
+  data.config.responsibilitypersonname = res.responsibilitypersonname
+  data.config.responsibilityperson = res.responsibilityperson
 }
 // 打开选择设备弹窗
 function chooseSb() {
@@ -185,12 +248,12 @@ function chooseSb() {
   showSbss.value = true
 }
 function closepost() {
-  if (props.formData.saveBtnShow) {
+  if (props.editObj.saveBtnShow) {
     proxy.$modal.confirm('离开会丢失页面中修改的内容，确认离开吗？').then(() => {
-      emits("saveSuccess");
+      emit("changePage", "Main")
     })
   } else {
-    emits("saveSuccess");
+    emit("changePage", "Main")
   }
 }
 // 保存数据
@@ -199,17 +262,17 @@ const saveData = async (ruleFormRef) => {
   if (!ruleFormRef) return
   ruleFormRef.validate((valid) => {
     if (valid) {
-      if (!props.formData.id) {
-        postApi(props.formData, "/mosty-lps/yjsbInfo/add").then((res) => {
+      if (!props.editObj.id) {
+        postApi(data.config, "/mosty-lps/yjsbInfo/add").then((res) => {
           ElMessage.success("新增成功");
-          emits("saveSuccess");
+          emit("changePage", "Main")
         }).finally(() => {
           saveloading.value = false
         })
       } else {
-        postApi(props.formData, "/mosty-lps/yjsbInfo/edit").then((res) => {
+        postApi(data.config, "/mosty-lps/yjsbInfo/edit").then((res) => {
           ElMessage.success("修改成功");
-          emits("saveSuccess");
+          emit("changePage", "Main")
         }).finally(() => {
           saveloading.value = false
         })
diff --git a/src/views/lps/yjsb/Main/index.vue b/src/views/lps/yjsb/Main/index.vue
index 0c0e4e7..2fd4517 100644
--- a/src/views/lps/yjsb/Main/index.vue
+++ b/src/views/lps/yjsb/Main/index.vue
@@ -1,175 +1,243 @@
 <template>
-  <div>
-    <div class="bigBox">
-      <!-- 基础隐患排查 -->
-      <div class="left" :style="{ width: lfBoxWid }">
-        <div class="title">
-          <div style="display: flex; align-items: center">
-            <div style="padding-top: 5px; margin-right: 5px">
-              <el-icon style="color: var(--el-color-primary) !important">
-                <List />
-              </el-icon>
-            </div>
-            <span class="zzjgxx" v-if="iconChange">场所部位</span>
-          </div>
-          <el-icon @click="handleCollapse" v-show="iconChange">
-            <DArrowLeft />
+  <MOSTY.PageTree pageTitle="预警设备管理" @getDeptId="getdeptData" :isShowOrgTree="isShowLeftTree">
+    <template #serach>
+      <el-divider />
+      <MOSTY.Search :searchArr="searchArr" @submit="onSearch" />
+      <el-divider />
+      <div class="btnBox">
+        <el-button @click="addInfo">
+          <el-icon size="small">
+            <Plus />
           </el-icon>
-          <el-icon @click="handleCollapse" v-show="!iconChange">
-            <DArrowRight />
-          </el-icon>
-        </div>
-        <div class="treeBox" :style="{ height: treeHeight }">
-          <el-tree ref="treeRef" class="filter-tree" :props="endProps" node-key="id" :load="loadNode" lazy
-            :default-expanded-keys="defaultExpandedKeys" @node-click="nodeClick" :filter-node-method="filterNode"
-            :data="treeData" />
-        </div>
+          新增
+        </el-button>
       </div>
-      <div class="right" :style="{ width: rgBoxWid }">
-        <div class="headBox">
-          <span class="title">预警设备列表</span>
-        </div>
-        <div class="box" style="flex: 1">
-          <YjsbList :searchObj="searchObj" />
-        </div>
+    </template>
+    <template #table>
+      <section class="eltab9">
+        <MOSTY.Table :table-columns="data.tableColumn" :tableData="data.tableData" :tableloading="tableloading"
+          :isSort="true" actionsW="300">
+          <template #sbzt="{ row }">
+            <dict-tag v-if="row.sbzt" :options="D_BZ_DLSBZT" :value="row.sbzt" :tag="false"
+              :color="row.sbzt == '01' ? 'green' : 'orange'" />
+            <span v-else>无</span>
+          </template>
+          <template #ipaddr="{ row }">
+            <span v-if="row.ipaddr && row.port">{{ row.ipaddr + ":" + row.port }}</span>
+            <span v-else>--</span>
+          </template>
+          <template #sblx="{ row }">
+            <dict-tag v-if="row.sblx" :options="D_BZ_YJSBLX" :value="row.sblx" :tag="false" />
+            <span v-else>无</span>
+          </template>
+          <template #actions="{ row }">
+            <span class="operesee" @click="videoControl(row)" v-if="row.sblx == '06'">
+              <el-icon>
+                <Compass />
+              </el-icon>视频操作</span>
+            <span class="operesee" @click="showInfo(row)">
+              <el-icon>
+                <Compass />
+              </el-icon>查看</span>
+            <span class="operedit" @click="editInfo(row)">
+              <el-icon>
+                <EditPen />
+              </el-icon>修改</span>
+            <el-popconfirm confirm-button-text="是" cancel-button-text="否" icon-color="red" title="确定要删除?"
+              @confirm="delInfo(row)">
+              <template #reference>
+                <span class="operdel" size="small"><el-icon>
+                    <Delete />
+                  </el-icon>
+                  删除</span>
+              </template>
+            </el-popconfirm>
+          </template>
+        </MOSTY.Table>
+      </section>
+      <div class="fenye">
+        <MOSTY.Pages :pageConfiger="listQuery" @changeNo="changeNo" @changeSize="changeSize"></MOSTY.Pages>
       </div>
-    </div>
-  </div>
+    </template>
+  </MOSTY.PageTree>
 </template>
 
 <script setup>
-import { onMounted, ref, reactive, getCurrentInstance } from "vue";
-import { getItem } from "@/utils/storage"
+import * as MOSTY from "@/components/MyComponents/index"
 import { getApi, postApi } from "@/api/tobAcco_api.js"
-import YjsbList from "./yjsbList.vue";
-const emits = defineEmits(["changePage"])
-const endProps = {
-  children: "childDeptList",
-  value: "id",
-  label: "name",
-  isLeaf: "leaf"
-};
-const defaultExpandedKeys = ref([])
-const treeData = ref([]);
-const node_had = ref([]);
-const resolve_had = ref([]);
-const iconChange = ref(true);
-const lfBoxWid = ref("300px");
-const rgBoxWid = ref("calc(100% - 300px)");
-const treemrData = ref([]);
-const treeRef = ref(null);
-const searchObj = ref({})
-const treeQuery = ref({
-  parentid: "",
-  type: '01',
+import { ElMessage } from "element-plus"
+import { reactive, ref, getCurrentInstance, onMounted } from "vue"
+const { proxy } = getCurrentInstance()
+const { D_BZ_DLSBZT, D_BZ_YJSBLX } = proxy.$dict("D_BZ_DLSBZT", "D_BZ_YJSBLX")
+const emit = defineEmits("changePage")
+const tableloading = ref(false)
+const listQuery = reactive({
+  pageCurrent: 1,
+  pageSize: 10,
+  total: 0
+})
+const searchArr = reactive([
+  {
+    showType: "input",
+    prop: "keywords",
+    width: '250px',
+    placeholder: '请输入设备名称或编号查询'
+  },
+  {
+    showType: "select",
+    prop: "sblx",
+    options: D_BZ_YJSBLX,
+    width: "250px",
+    placeholder: "请选择设备类型"
+  },
+  {
+    showType: "select",
+    prop: "sbzt",
+    options: D_BZ_DLSBZT,
+    width: "250px",
+    placeholder: "请选择设备状态"
+  },
+])
+const data = reactive({
+  searchObj: {},
+  tableData: [],
+  tableColumn: [
+    {
+      title: "所属单位",
+      prop: "orgname"
+    },
+    {
+      title: "所属部门",
+      prop: "deptname"
+    },
+    {
+      title: "设备类型",
+      prop: "sblx",
+      slot: true
+    },
+    {
+      title: "设备名称",
+      prop: "sbmc"
+    },
+    {
+      title: "设备编号",
+      prop: "sbbh"
+    },
+    {
+      title: "设备状态",
+      prop: "sbzt",
+      slot: true
+    },
+    {
+      title: "物联IP端口",
+      prop: "ipaddr",
+      slot: true
+    },
+    {
+      title: "操作",
+      prop: "actions",
+      slot: true
+    }
+  ]
+})
+onMounted(() => {
+  // videoControl();
 });
-//获取场所树数据
-function getTreeData() {
-  getApi(treeQuery.value, "/mosty-jcgl/site/querySceneTree").then((res) => {
-    if (res.length == 1) {
-      res.forEach((element) => {
-        treemrData.value = setTimeout(() => { treeRef.value.setCurrentKey(element.id) }, 200)
-        defaultExpandedKeys.value = [element.id]
-        if (element.siteid) {
-          searchObj.value.siteid = element.siteid
-          searchObj.value.deptId = null
-        } else {
-          searchObj.value.deptId = element.orgid ? element.orgid : element.id
-          searchObj.value.siteid = null
-        }
-      });
-    }
-    for (let i = 0; i < res.length; i++) {
-      res[i].leaf = !res[i].hasChildren;
-    }
-    if (res.length > 0) treeData.value = res;
-  });
+// 开启视频操作
+const videoControl = row => {
+  console.log(row)
+  let arr = {
+    title: "视频",
+    sbbh: row.sbbh,
+    saveBtnShow: false,
+    type: "showVideo",
+    id: (row && row.parentid) ? row.parentid : '5200316847792de043a5b2a9dbede8698677'
+  }
+  emit("changePage", "VideoPlay", arr)
 }
-//懒加载方法
-async function loadNode(node, resolve) {
-  treeQuery.value.parentid = node.data.id;
-  treeQuery.value.type = node.data.type;
-  if (node.level === 0) {
-    node_had.value = node;
-    resolve_had.value = resolve;
-    getTreeData();
-  }
-  if (node.level >= 1) {
-    getApi(treeQuery.value, "/mosty-jcgl/site/querySceneSiteTree").then(
-      (res) => {
-        for (let i = 0; i < res.length; i++) {
-          res[i].leaf = !res[i].hasChildren;
-        }
-        resolve(res);
-      }
-    );
-  }
+// 切换组织机构
+const getdeptData = val => {
+  listQuery.deptId = val.id;
+  listQuery.pageCurrent = 1;
+  getTableData();
 }
-const filterNode = (value, data) => {
-  if (!value) return true;
-  return data.name.includes(value);
-};
-const nodeClick = (node) => {
-  if (node.siteid) {
-    searchObj.value.siteid = node.siteid
-    searchObj.value.deptId = null
-  } else {
-    searchObj.value.deptId = node.orgid ? node.orgid : node.id
-    searchObj.value.siteid = null
+//分页
+const changeNo = val => {
+  listQuery.pageCurrent = val
+  getTableData()
+}
+const changeSize = val => {
+  listQuery.pageSize = val
+  getTableData()
+}
+// 查询数据
+const onSearch = obj => {
+  listQuery.pageCurrent = 1;
+  listQuery.keywords = obj.keywords;
+  listQuery.sbzt = obj.sbzt;
+  listQuery.sblx = obj.sblx;
+  getTableData()
+}
+// 查询表格数据
+function getTableData() {
+  tableloading.value = true
+  getApi(listQuery, `/mosty-lps/yjsbInfo/getPageList`).then(res => {
+    if (res.records) {
+      data.tableData = res.records
+      tableloading.value = false
+      listQuery.total = res.total
+    } else {
+      data.tableData = []
+      tableloading.value = false
+    }
+  }).finally(() => {
+    tableloading.value = false
+  })
+}
+//新增预警设备
+const addInfo = () => {
+  let arr = {
+    title: "新增预警设备",
+    saveBtnShow: true,
+    type: "add"
   }
-};
-const handleCollapse = () => {
-  iconChange.value = !iconChange.value;
-  if (iconChange.value) {
-    lfBoxWid.value = "300px";
-    rgBoxWid.value = "calc(100% - 300px)";
-  } else {
-    lfBoxWid.value = "40px";
-    rgBoxWid.value = "calc(100% - 40px)";
+  emit("changePage", "AddOrEdite", arr)
+}
+//修改预警设备
+const editInfo = row => {
+  let arr = {
+    title: "修改预警设备",
+    saveBtnShow: true,
+    type: "edit",
+    id: row.id ? row.id : null
   }
-};
+  emit("changePage", "AddOrEdite", arr)
+}
+//查看
+const showInfo = row => {
+  let arr = {
+    title: "查看预警设备",
+    saveBtnShow: false,
+    id: row.id ? row.id : null
+  }
+  emit("changePage", "AddOrEdite", arr)
+}
+
+//删除
+const delInfo = row => {
+  postApi({}, "/mosty-lps/yjsbInfo/del/" + row.id).then(res => {
+    ElMessage.success("删除成功")
+    getTableData()
+  })
+}
+
 </script>
 
 <style lang="scss" scoped>
-.bigBox {
+.btnBox {
   display: flex;
-
-  .title {
-    height: 39px;
-    line-height: 39px;
-    font-size: 18px;
-    color: var(--el-color-primary);
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .el-icon {
-      cursor: pointer;
-    }
-  }
-
-  .left {
-    width: 300px;
-    background: #ffffff;
-    box-shadow: 0px 2px 10px 0px rgba(107, 107, 107, 0.1);
-    border-radius: 0px 0px 0px 0px;
-    opacity: 1;
-
-    .treeBox {
-      height: calc(100vh - 164px);
-      overflow: auto;
-    }
-  }
-
-  .right {
-    padding: 0 10px;
-    margin: 0px 0 0 10px;
-    background: #fff;
-
-    .headBox {
-      display: flex;
-      align-items: center;
-    }
-  }
+  align-items: center;
+  justify-content: flex-end;
+  margin-bottom: 12px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/lps/yjsb/index.vue b/src/views/lps/yjsb/index.vue
index d9dae08..6f646e5 100644
--- a/src/views/lps/yjsb/index.vue
+++ b/src/views/lps/yjsb/index.vue
@@ -1,19 +1,22 @@
 <template>
   <div>
     <Main v-if="showPage === 'Main'" @changePage="changePage"></Main>
+    <AddOrEdite v-else-if="showPage === 'AddOrEdite'" @changePage="changePage" :editObj="editObj.editObj"></AddOrEdite>
+    <VideoPlay v-else-if="showPage === 'VideoPlay'" @changePage="changePage" :editObj="editObj.editObj"></VideoPlay>
   </div>
 </template>
 
 <script setup>
 import Main from "./Main/index.vue";
+import AddOrEdite from "./AddOrEdite/index.vue";
+import VideoPlay from "./videoPlay/index.vue";
 import { reactive, ref } from "vue";
-
 let showPage = ref('Main')
 let editObj = reactive({
   editObj: null
 })
-const changePage = (val, obj) =>{
-  if(obj){
+const changePage = (val, obj) => {
+  if (obj) {
     editObj.editObj = obj
   } else {
     editObj.editObj = null
@@ -21,6 +24,5 @@ const changePage = (val, obj) =>{
   showPage.value = val
 }
 </script>
- 
-<style lang = "scss" scoped>
-</style>
\ No newline at end of file
+
+<style lang="scss" scoped></style>