diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5c2472d..35f47cd 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -230,7 +230,7 @@
   clickIndex.value = props.data.findIndex(item => item === row)
   console.log('右击', clickIndex.value)
   // 获取自定义菜单元素
-  var menu = document.getElementById('custom-menu')
+  var menu = document.getElementById('custom-menu') as HTMLElement
   // 设置自定义菜单的位置并显示
   let positionX = event.pageX
   let positionY = event.pageY
@@ -247,7 +247,9 @@
 // 点击其他位置隐藏自定义菜单
 document.addEventListener('click', () => {
   if (!props.needContextmenu) { return }
-  document.getElementById('custom-menu').style.display = 'none'
+  if (document.getElementById('custom-menu')) {
+    (document.getElementById('custom-menu') as HTMLElement).style.display = 'none'
+  }
 })
 // 添加行
 const costomAddRow = (type: string) => {
@@ -291,6 +293,20 @@
     })
     table.value!.clearSelection()
   }
+  else if (type === 'del-current') {
+    props.data.splice(clickIndex.value, 1)
+  }
+  else if (type === 'del-select') {
+    if (!multiSelectData.value.length) {
+      ElMessage.warning('未选择数据')
+      return
+    }
+    multiSelectData.value.forEach((item, index) => {
+      const dataIndex = props.data.findIndex(citem => item === citem)
+      props.data.splice(dataIndex, 1)
+    })
+    table.value!.clearSelection()
+  }
   clickIndex.value = -1
 }
 </script>
@@ -322,23 +338,15 @@
         >
           <template #default="scope">
             <span
-              v-if="!column.filter && !column.isLink"
+              v-if="!column.filter && !column.isLink && !column.isCustom"
               :style="column.styleFilter ? column.styleFilter(scope.row) : ''"
             >{{ scope.row[column.value] }}</span>
             <span
               v-if="column.filter && !column.isLink"
               :style="column.styleFilter ? column.styleFilter(scope.row) : ''"
             >{{ column.filter(scope.row) }}</span>
-            <div v-if="column.isLink">
-              <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
-            </div>
-            <div v-if="column.followLink">
-              <div
-                v-for="(item, index) in scope.row.followLinkArr" :key="index"
-                @click="handleClickFollowLink(scope.row, item)"
-              >
-                <span :class="item !== '/' ? 'follow-link' : ''">{{ item }}</span>
-              </div>
+            <div v-if="column.isCustom">
+              <slot name="isCustom" :scope="scope" />
             </div>
           </template>
         </el-table-column>
@@ -386,6 +394,12 @@
       <p v-if="isShowmultiSelect && isMulti" class="menu-item" @click="costomAddRow('select-next')">
         选中行后方插入
       </p>
+      <p class="menu-item" @click="costomAddRow('del-current')">
+        删除当前行
+      </p>
+      <p v-if="isShowmultiSelect && isMulti" class="menu-item" @click="costomAddRow('del-select')">
+        删除选中行
+      </p>
     </div>
   </div>
 </template>

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5c2472d..35f47cd 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -230,7 +230,7 @@
   clickIndex.value = props.data.findIndex(item => item === row)
   console.log('右击', clickIndex.value)
   // 获取自定义菜单元素
-  var menu = document.getElementById('custom-menu')
+  var menu = document.getElementById('custom-menu') as HTMLElement
   // 设置自定义菜单的位置并显示
   let positionX = event.pageX
   let positionY = event.pageY
@@ -247,7 +247,9 @@
 // 点击其他位置隐藏自定义菜单
 document.addEventListener('click', () => {
   if (!props.needContextmenu) { return }
-  document.getElementById('custom-menu').style.display = 'none'
+  if (document.getElementById('custom-menu')) {
+    (document.getElementById('custom-menu') as HTMLElement).style.display = 'none'
+  }
 })
 // 添加行
 const costomAddRow = (type: string) => {
@@ -291,6 +293,20 @@
     })
     table.value!.clearSelection()
   }
+  else if (type === 'del-current') {
+    props.data.splice(clickIndex.value, 1)
+  }
+  else if (type === 'del-select') {
+    if (!multiSelectData.value.length) {
+      ElMessage.warning('未选择数据')
+      return
+    }
+    multiSelectData.value.forEach((item, index) => {
+      const dataIndex = props.data.findIndex(citem => item === citem)
+      props.data.splice(dataIndex, 1)
+    })
+    table.value!.clearSelection()
+  }
   clickIndex.value = -1
 }
 </script>
@@ -322,23 +338,15 @@
         >
           <template #default="scope">
             <span
-              v-if="!column.filter && !column.isLink"
+              v-if="!column.filter && !column.isLink && !column.isCustom"
               :style="column.styleFilter ? column.styleFilter(scope.row) : ''"
             >{{ scope.row[column.value] }}</span>
             <span
               v-if="column.filter && !column.isLink"
               :style="column.styleFilter ? column.styleFilter(scope.row) : ''"
             >{{ column.filter(scope.row) }}</span>
-            <div v-if="column.isLink">
-              <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
-            </div>
-            <div v-if="column.followLink">
-              <div
-                v-for="(item, index) in scope.row.followLinkArr" :key="index"
-                @click="handleClickFollowLink(scope.row, item)"
-              >
-                <span :class="item !== '/' ? 'follow-link' : ''">{{ item }}</span>
-              </div>
+            <div v-if="column.isCustom">
+              <slot name="isCustom" :scope="scope" />
             </div>
           </template>
         </el-table-column>
@@ -386,6 +394,12 @@
       <p v-if="isShowmultiSelect && isMulti" class="menu-item" @click="costomAddRow('select-next')">
         选中行后方插入
       </p>
+      <p class="menu-item" @click="costomAddRow('del-current')">
+        删除当前行
+      </p>
+      <p v-if="isShowmultiSelect && isMulti" class="menu-item" @click="costomAddRow('del-select')">
+        删除选中行
+      </p>
     </div>
   </div>
 </template>
diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index d0a8430..2b9a6fc 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -18,6 +18,7 @@
     checkList.value = data.map((item: any) => item.text)
   }
   else {
+    // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
     checkList.value = data.columns.map((item: any) => item.text)
   }
   dialogFormVisible.value = true
@@ -47,6 +48,7 @@
         <el-col :span="24">
           <el-form-item label="配置列:" prop="config">
             <el-checkbox-group v-model="checkList" :min="4">
+              <!-- :disabled="item.isRequired" -->
               <el-checkbox v-for="item in checkAllList" :key="item" :label="item.text" :value="item.text" />
             </el-checkbox-group>
           </el-form-item>

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5c2472d..35f47cd 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -230,7 +230,7 @@
   clickIndex.value = props.data.findIndex(item => item === row)
   console.log('右击', clickIndex.value)
   // 获取自定义菜单元素
-  var menu = document.getElementById('custom-menu')
+  var menu = document.getElementById('custom-menu') as HTMLElement
   // 设置自定义菜单的位置并显示
   let positionX = event.pageX
   let positionY = event.pageY
@@ -247,7 +247,9 @@
 // 点击其他位置隐藏自定义菜单
 document.addEventListener('click', () => {
   if (!props.needContextmenu) { return }
-  document.getElementById('custom-menu').style.display = 'none'
+  if (document.getElementById('custom-menu')) {
+    (document.getElementById('custom-menu') as HTMLElement).style.display = 'none'
+  }
 })
 // 添加行
 const costomAddRow = (type: string) => {
@@ -291,6 +293,20 @@
     })
     table.value!.clearSelection()
   }
+  else if (type === 'del-current') {
+    props.data.splice(clickIndex.value, 1)
+  }
+  else if (type === 'del-select') {
+    if (!multiSelectData.value.length) {
+      ElMessage.warning('未选择数据')
+      return
+    }
+    multiSelectData.value.forEach((item, index) => {
+      const dataIndex = props.data.findIndex(citem => item === citem)
+      props.data.splice(dataIndex, 1)
+    })
+    table.value!.clearSelection()
+  }
   clickIndex.value = -1
 }
 </script>
@@ -322,23 +338,15 @@
         >
           <template #default="scope">
             <span
-              v-if="!column.filter && !column.isLink"
+              v-if="!column.filter && !column.isLink && !column.isCustom"
               :style="column.styleFilter ? column.styleFilter(scope.row) : ''"
             >{{ scope.row[column.value] }}</span>
             <span
               v-if="column.filter && !column.isLink"
               :style="column.styleFilter ? column.styleFilter(scope.row) : ''"
             >{{ column.filter(scope.row) }}</span>
-            <div v-if="column.isLink">
-              <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
-            </div>
-            <div v-if="column.followLink">
-              <div
-                v-for="(item, index) in scope.row.followLinkArr" :key="index"
-                @click="handleClickFollowLink(scope.row, item)"
-              >
-                <span :class="item !== '/' ? 'follow-link' : ''">{{ item }}</span>
-              </div>
+            <div v-if="column.isCustom">
+              <slot name="isCustom" :scope="scope" />
             </div>
           </template>
         </el-table-column>
@@ -386,6 +394,12 @@
       <p v-if="isShowmultiSelect && isMulti" class="menu-item" @click="costomAddRow('select-next')">
         选中行后方插入
       </p>
+      <p class="menu-item" @click="costomAddRow('del-current')">
+        删除当前行
+      </p>
+      <p v-if="isShowmultiSelect && isMulti" class="menu-item" @click="costomAddRow('del-select')">
+        删除选中行
+      </p>
     </div>
   </div>
 </template>
diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index d0a8430..2b9a6fc 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -18,6 +18,7 @@
     checkList.value = data.map((item: any) => item.text)
   }
   else {
+    // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
     checkList.value = data.columns.map((item: any) => item.text)
   }
   dialogFormVisible.value = true
@@ -47,6 +48,7 @@
         <el-col :span="24">
           <el-form-item label="配置列:" prop="config">
             <el-checkbox-group v-model="checkList" :min="4">
+              <!-- :disabled="item.isRequired" -->
               <el-checkbox v-for="item in checkAllList" :key="item" :label="item.text" :value="item.text" />
             </el-checkbox-group>
           </el-form-item>
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 87b1567..c468022 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -63,6 +63,7 @@
 }
 else {
   console.log('无存储', props.configTitle, props.columns)
+  // props.edit(props.columns.filter((item: any) => item.isRequired))
   props.edit(props.columns)
 }
 </script>

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 5c2472d..35f47cd 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -230,7 +230,7 @@
   clickIndex.value = props.data.findIndex(item => item === row)
   console.log('右击', clickIndex.value)
   // 获取自定义菜单元素
-  var menu = document.getElementById('custom-menu')
+  var menu = document.getElementById('custom-menu') as HTMLElement
   // 设置自定义菜单的位置并显示
   let positionX = event.pageX
   let positionY = event.pageY
@@ -247,7 +247,9 @@
 // 点击其他位置隐藏自定义菜单
 document.addEventListener('click', () => {
   if (!props.needContextmenu) { return }
-  document.getElementById('custom-menu').style.display = 'none'
+  if (document.getElementById('custom-menu')) {
+    (document.getElementById('custom-menu') as HTMLElement).style.display = 'none'
+  }
 })
 // 添加行
 const costomAddRow = (type: string) => {
@@ -291,6 +293,20 @@
     })
     table.value!.clearSelection()
   }
+  else if (type === 'del-current') {
+    props.data.splice(clickIndex.value, 1)
+  }
+  else if (type === 'del-select') {
+    if (!multiSelectData.value.length) {
+      ElMessage.warning('未选择数据')
+      return
+    }
+    multiSelectData.value.forEach((item, index) => {
+      const dataIndex = props.data.findIndex(citem => item === citem)
+      props.data.splice(dataIndex, 1)
+    })
+    table.value!.clearSelection()
+  }
   clickIndex.value = -1
 }
 </script>
@@ -322,23 +338,15 @@
         >
           <template #default="scope">
             <span
-              v-if="!column.filter && !column.isLink"
+              v-if="!column.filter && !column.isLink && !column.isCustom"
               :style="column.styleFilter ? column.styleFilter(scope.row) : ''"
             >{{ scope.row[column.value] }}</span>
             <span
               v-if="column.filter && !column.isLink"
               :style="column.styleFilter ? column.styleFilter(scope.row) : ''"
             >{{ column.filter(scope.row) }}</span>
-            <div v-if="column.isLink">
-              <show-photo v-for="(item, index) in scope.row.fileArr" :key="index" :minio-file-name="item" /><br>
-            </div>
-            <div v-if="column.followLink">
-              <div
-                v-for="(item, index) in scope.row.followLinkArr" :key="index"
-                @click="handleClickFollowLink(scope.row, item)"
-              >
-                <span :class="item !== '/' ? 'follow-link' : ''">{{ item }}</span>
-              </div>
+            <div v-if="column.isCustom">
+              <slot name="isCustom" :scope="scope" />
             </div>
           </template>
         </el-table-column>
@@ -386,6 +394,12 @@
       <p v-if="isShowmultiSelect && isMulti" class="menu-item" @click="costomAddRow('select-next')">
         选中行后方插入
       </p>
+      <p class="menu-item" @click="costomAddRow('del-current')">
+        删除当前行
+      </p>
+      <p v-if="isShowmultiSelect && isMulti" class="menu-item" @click="costomAddRow('del-select')">
+        删除选中行
+      </p>
     </div>
   </div>
 </template>
diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index d0a8430..2b9a6fc 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -18,6 +18,7 @@
     checkList.value = data.map((item: any) => item.text)
   }
   else {
+    // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
     checkList.value = data.columns.map((item: any) => item.text)
   }
   dialogFormVisible.value = true
@@ -47,6 +48,7 @@
         <el-col :span="24">
           <el-form-item label="配置列:" prop="config">
             <el-checkbox-group v-model="checkList" :min="4">
+              <!-- :disabled="item.isRequired" -->
               <el-checkbox v-for="item in checkAllList" :key="item" :label="item.text" :value="item.text" />
             </el-checkbox-group>
           </el-form-item>
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 87b1567..c468022 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -63,6 +63,7 @@
 }
 else {
   console.log('无存储', props.configTitle, props.columns)
+  // props.edit(props.columns.filter((item: any) => item.isRequired))
   props.edit(props.columns)
 }
 </script>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 485b182..3b198cf 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -14,19 +14,19 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '状态', value: 'onlineState', align: 'center', isCustom: true },
-  { text: '设备编号', value: 'devcode', align: 'center' },
-  { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+  { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '70' },
+  { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
   { text: '监测对象', value: 'watchObjectName', align: 'center' },
   { text: '设备型号', value: 'isUsedName', align: 'center' },
-  { text: '厂商', value: 'isUsedName', align: 'center' },
-  { text: '安装位号', value: 'isUsedName', align: 'center' },
-  { text: '详细位置', value: 'isUsedName', align: 'center' },
-  { text: '管理单位', value: 'isUsedName', align: 'center' },
-  { text: '在用情况', value: 'isUsedName', align: 'center' },
-  { text: '电量', value: 'isUsedName', align: 'center' },
-  { text: '最新上报时间', value: 'isUsedName', align: 'center' },
-  { text: '安装日期', value: 'isUsedName', align: 'center' },
+  { text: '厂商', value: 'isUsedName', align: 'center', isRequired: true },
+  { text: '安装位号', value: 'isUsedName', align: 'center', isRequired: true },
+  { text: '详细位置', value: 'isUsedName', align: 'center', isRequired: true },
+  { text: '管理单位', value: 'isUsedName', align: 'center', isRequired: true },
+  { text: '在用情况', value: 'isUsedName', align: 'center', isRequired: true },
+  { text: '电量', value: 'isUsedName', align: 'center', isRequired: true },
+  { text: '最新上报时间', value: 'isUsedName', align: 'center', isRequired: true },
+  { text: '安装日期', value: 'isUsedName', align: 'center', isRequired: true },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -132,7 +132,7 @@
     </search-area>
     <!-- 表头标题 -->
     <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :is-config="true" config-title="device-device" :columns="columns" :config-columns="columnsConfig"
       :edit="editColumns"
     >
       <template #btns-right>
@@ -161,6 +161,10 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope }">
+          <!-- 状态 -->
+          <div class="circle" :class="scope.row.onlineState === '1' ? 'online' : 'offline'" />
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
@@ -180,3 +184,20 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss" scoped>
+.circle {
+  width: 18px;
+  height: 18px;
+  border-radius: 50%;
+  margin: 0 auto;
+}
+
+.online {
+  background-color: #95f204;
+}
+
+.offline {
+  background-color: #7f7f7f;
+}
+</style>