diff --git a/src/assets/scan.png b/src/assets/scan.png
new file mode 100644
index 0000000..2170faa
Binary files /dev/null and b/src/assets/scan.png differ
diff --git a/src/components/ruler.vue b/src/components/ruler.vue
index b6d43a9..e5a9404 100644
--- a/src/components/ruler.vue
+++ b/src/components/ruler.vue
@@ -49,7 +49,7 @@
           </span>
           </div>
         </div>
-        <div class="scan"></div>
+        <div :class="scan ? 'scan' : 'scan1'"></div>
       </div>
 
       <div
@@ -70,6 +70,7 @@
         </span>
       </div>
       <div
+          v-show="dot1Show"
           v-for="(dot, index) in dots1"
           :key="index"
           class="dot"
@@ -99,13 +100,15 @@ const boxRef = ref(null)
 const distance1 = ref(0)
 
 const props = defineProps({
-  width: {type: Number, required: true,},
-  height: {type: Number, required: true,},
-  boxPos: {type: Object, required: true,},
-  dots: {type: Array, required: true,},
-  dotIndex: {type: Number, required: true,},
-  dots1: {type: Array, required: true,},
-  dotIndex1: {type: Number, required: true,}
+  width: {type: Number, required: true},
+  height: {type: Number, required: true},
+  boxPos: {type: Object, required: true},
+  dots: {type: Array, required: true},
+  dotIndex: {type: Number, required: true},
+  dots1: {type: Array, required: true},
+  dotIndex1: {type: Number, required: true},
+  dot1Show: {type: Boolean, required: true},
+  scan: {type: Boolean, required: true},
 })
 const boxContentX = ref(0)
 const boxContentY = ref(0)
@@ -239,7 +242,6 @@ function zoomScale(value, type) {
   }, 10)
 }
 
-// zoomScale(300, 1)
 
 function getAxisRange() {
   if (!leftTicks.value || leftTicks.value.length === 0) return {min: 0, max: props.height}
@@ -265,8 +267,8 @@ const leftTicks = computed(() => {
     return arr
   }
 
-  let factor = zoomType.value === 1 ? Math.ceil(props.height / 120) : zoomType.value === 2 ? Math.ceil(props.height / 30) : 1
-  let step = Math.floor(10 / factor)
+  let factor = zoomType.value === 1 ? (Math.sqrt(props.height / 22)) : 1
+  let step = (10 / factor)
   if (step < 1) step = 1
 
   const visibleCount = 21
@@ -274,6 +276,7 @@ const leftTicks = computed(() => {
 
   let startValue = centerValue.value - half * step
   let endValue = centerValue.value + half * step
+  console.log(endValue - startValue)
 
   if (startValue < 0) {
     endValue += -startValue
@@ -289,12 +292,16 @@ const leftTicks = computed(() => {
   for (let i = 0; i <= totalSteps; i++) {
     let value = startValue + i * step
     value = Math.floor(value) // 强制整数
+    if (value % 10 !== 0) {
+      let num = Math.floor(value / 10) * 10
+      if (!arr.find(e => e.value === num)) {
+        value = Math.floor(value / 10) * 10
+      }
+    }
     let isMajor = false
 
     if (zoomType.value === 1) {
       isMajor = value % 10 === 0
-    } else if (zoomType.value === 2) {
-      isMajor = true // 类型2只显示大刻度
     } else {
       isMajor = (value * factor) % 100 === 0
     }
@@ -313,7 +320,7 @@ const ticks = computed(() => {
   for (let i = 0; i <= steps; i++) {
     let value = i * step
     if (value > props.width) value = props.width // 防止超过最大值
-    const isMajor = value % 100 === 0
+    const isMajor = value % 10 === 0
     const percent = (value / props.width) * 100
     arr.push({value, major: isMajor, percent})
   }
@@ -477,6 +484,17 @@ const ticks = computed(() => {
         right: 15px;
         transform: translateY(-50%);
       }
+
+      .scan1 {
+        position: absolute;
+        background-image: url("../assets/scan.png");
+        background-size: 100% 100%;
+        width: 100px;
+        height: 100px;
+        top: 50%;
+        right: 15px;
+        transform: translateY(-50%);
+      }
     }
   }
 }
diff --git a/src/views/index.vue b/src/views/index.vue
index 835a0c6..b430f71 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -46,6 +46,24 @@
       </div>
     </div>
     <div class="left">
+      <div class="carPo">
+        经：{{ currentPosition?.lon?.toFixed(2) }}
+        <br>
+        纬：{{ currentPosition?.lat?.toFixed(2) }}
+      </div>
+      <div class="dot1Show">
+        <el-switch
+            v-model="dot1Show"
+            class="ml-2"
+            inline-prompt
+            style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
+            active-text="显示屏蔽数据"
+            inactive-text="不显示屏蔽数据"
+            @change="(e)=>{
+              dotIndex1 = -1
+            }"
+        />
+      </div>
       <Ruler
           ref="rulerRef"
           :width="areaData.width"
@@ -55,6 +73,8 @@
           :dotIndex="dotIndex"
           :dots1="dots1"
           :dotIndex1="dotIndex1"
+          :dot1Show="dot1Show"
+          :scan="scan"
       />
     </div>
 
@@ -246,8 +266,19 @@
         </el-card>
 
         <!-- 目标表格2 -->
-        <el-card shadow="always" style="margin-top: 12px">
+        <el-card shadow="always" style="margin-top: 12px;position:relative;">
+          <div style="position: absolute;right: 30px;top: 20px;z-index: 100;">
+            <el-popover placement="bottom" :width="300" trigger="click">
+              <template #reference>
+                <el-button style="margin-right: 16px">批量处理</el-button>
+              </template>
+              <el-button style="margin-right: 16px" @click="batchDisposal1">处置</el-button>
+              <el-button style="margin-right: 16px" @click="batchDel1">删除</el-button>
+              <el-button style="margin-right: 16px" @click="batchShild1">固定物</el-button>
+            </el-popover>
+          </div>
           <el-table
+              ref="table2Ref"
               highlight-current-row
               :data="table2Data.slice((currentPage2 - 1) * pageSize2, currentPage2 * pageSize2)"
               style="width: 100%"
@@ -264,18 +295,18 @@
             <el-table-column prop="Strength" label="强度信息" width="100"/>
             <el-table-column label="处理方式" show-overflow-tooltip width="200" fixed="right">
               <template #default="scope">
-                <el-button type="primary" @click.stop="openHandleObstacleDialog(scope)" link>处置</el-button>
+                <el-button type="primary" @click.stop="openHandleObstacleDialog1(scope)" link>处置</el-button>
                 <el-popconfirm
                     class="box-item"
                     title="确定删除这个点位吗？"
                     placement="top"
-                    @confirm="delPoint(scope)"
+                    @confirm="delPoint1(scope)"
                 >
                   <template #reference>
                     <el-button type="primary" @click.stop link>删除</el-button>
                   </template>
                 </el-popconfirm>
-                <el-button type="primary" @click.stop="openShildDialog(scope)" link>固定物</el-button>
+                <el-button type="primary" @click.stop="openShildDialog1(scope)" link>固定物</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -531,88 +562,69 @@
           />
         </el-card>
 
-        <!-- 区域选择 -->
-        <el-card shadow="always" style="margin-top: 12px">
-          <el-form inline :model="form3" class="demo-form-inline">
-            <el-form-item v-for="(key, idx) in regionKeys" :key="idx">
-              <el-select
-                  v-model="form3[key]"
-                  :placeholder="key === 'region2' ? '请选择固定目标' : key === 'region' ? '请选择机场' : '请选择区域'"
-                  style="width: 170px"
-                  clearable
-              >
-                <el-option
-                    v-for="option in getOptions(key)"
-                    :key="option.value"
-                    :label="option.label"
-                    :value="option.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-form>
-        </el-card>
-
-        <!-- 检测输入 -->
-        <el-card shadow="always" style="margin-top: 12px">
-          <el-form inline :model="form4" class="demo-form-inline">
-            <el-form-item>
-              <el-input
-                  v-model="form4.input1"
-                  placeholder="请输入检测序号"
-                  style="width: 170px"
-              />
-            </el-form-item>
-
-            <el-form-item>
-              <el-date-picker
-                  v-model="form4.date1"
-                  type="date"
-                  placeholder="选择检测时间"
-                  clearable
-                  style="width: 170px"
-              />
-            </el-form-item>
-
-            <el-form-item>
-              <el-input
-                  v-model="form4.input2"
-                  placeholder="请输入检测人员"
-                  style="width: 170px"
-              />
-            </el-form-item>
-          </el-form>
-        </el-card>
-
         <!-- 数据表格 -->
-        <el-card shadow="always" style="margin-top: 12px">
-          <el-table :data="tableData2" style="width: 100%">
-            <el-table-column label="序号" type="index" width="60"/>
-            <el-table-column prop="coordinate" label="目标坐标" width="120"/>
-            <el-table-column label="告警等级" width="160">
-              <template #default="scope">
-                <el-rate :model-value="scope.row.rate" disabled/>
+        <el-card shadow="always" style="margin-top: 12px;position:relative">
+          <div style="position: absolute;right: 30px;top: 20px;z-index: 100;">
+            <el-popover placement="bottom" :width="300" trigger="click">
+              <template #reference>
+                <el-button style="margin-right: 16px">批量处理</el-button>
               </template>
-            </el-table-column>
-            <el-table-column label="处理状态" show-overflow-tooltip>
+              <el-button style="margin-right: 16px" @click="batchDisposal3">固定物</el-button>
+              <el-button style="margin-right: 16px" @click="batchDel3">删除</el-button>
+            </el-popover>
+          </div>
+          <el-table ref="table4Ref" :data="tableData3" style="width: 100%">
+            <el-table-column type="selection" width="55"/>
+            <el-table-column label="序号" type="index" width="60"/>
+            <el-table-column prop="lon" label="目标经度" width="100"/>
+            <el-table-column prop="lat" label="目标纬度" width="100"/>
+            <el-table-column prop="strength" label="强度信息" width="100"/>
+            <el-table-column label="处理方式" show-overflow-tooltip width="160" fixed="right">
               <template #default="scope">
-                <span v-if="scope.row.type === 1">已处理</span>
-                <span v-else-if="scope.row.type === 2">不处理</span>
-                <span v-else-if="scope.row.type === 3">未发现</span>
+                <el-button type="primary" link @click.stop="openHandleObstacleDialog2(scope)">处置</el-button>
+                <el-button type="primary" link @click.stop="openShildDialog2(scope)">修改</el-button>
+                <el-popconfirm
+                    class="box-item"
+                    title="确定删除这个点位吗？"
+                    placement="top"
+                    @confirm="delShildItem(scope)"
+                >
+                  <template #reference>
+                    <el-button type="primary" @click.stop link>删除</el-button>
+                  </template>
+                </el-popconfirm>
               </template>
             </el-table-column>
           </el-table>
+          <el-pagination
+              v-model:current-page="currentPage4"
+              v-model:page-size="pageSize4"
+              :pager-count="4"
+              :page-sizes="[10,20,50,100, 200, 300, 400]"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total4"
+          />
         </el-card>
       </div>
       <div v-if="itemsId === 5" class="tabsItem">
         <!-- 数据表格 -->
-        <el-card shadow="always" style="margin-top: 12px">
-
+        <el-card shadow="always" style="margin-top: 12px;position:relative">
+          <div style="position: absolute;right: 30px;top: 20px;z-index: 100;">
+            <el-popover placement="bottom" :width="300" trigger="click">
+              <template #reference>
+                <el-button style="margin-right: 16px">批量处理</el-button>
+              </template>
+              <el-button style="margin-right: 16px" @click="batchDisposal2">处置</el-button>
+              <el-button style="margin-right: 16px" @click="batchDel2">删除</el-button>
+            </el-popover>
+          </div>
           <el-table
+              ref="table3Ref"
               highlight-current-row
               :data="tableData2"
               style="width: 100%"
           >
-            <!--            <el-table-column type="selection" width="55"/>-->
+            <el-table-column type="selection" width="55"/>
             <el-table-column label="序号" type="index" width="60"/>
             <el-table-column prop="name" label="名称" width="100"/>
             <el-table-column prop="lon" label="目标经度" width="100"/>
@@ -620,7 +632,8 @@
             <el-table-column prop="strength" label="强度信息" width="100"/>
             <el-table-column label="处理方式" show-overflow-tooltip width="160" fixed="right">
               <template #default="scope">
-                <el-button type="primary" link @click.stop="openShildDialog1(scope)">修改</el-button>
+                <el-button type="primary" link @click.stop="openHandleObstacleDialog2(scope)">处置</el-button>
+                <el-button type="primary" link @click.stop="openShildDialog2(scope)">修改</el-button>
                 <el-popconfirm
                     class="box-item"
                     title="确定删除这个点位吗？"
@@ -717,9 +730,143 @@
         </div>
       </template>
     </el-dialog>
+    <el-dialog v-model="dialog2" title="处置障碍物" width="500">
+      <el-form :model="dialog2Form">
+        <el-form-item label="发现时间" label-width="120px">
+          <el-input v-model="dialog2Form.time" disabled autocomplete="off"/>
+        </el-form-item>
+        <el-form-item label="处理信息描述" label-width="120px">
+          <el-input
+              v-model="dialog2Form.text"
+              style="width: 100%"
+              :rows="2"
+              type="textarea"
+          />
+        </el-form-item>
+        <el-form-item label="处理照片" label-width="120px">
+          <el-upload @click.stop="onSubmit"
+                     ref="uploadRef"
+                     :http-request="uploadFiles1"
+                     :file-list="dialog2Form.fileList.concat({type:'camera'})"
+                     list-type="picture-card">
 
-    <el-dialog v-model="imgDialog">
-      <img width="100%" :src="dialogImageUrl" alt="Preview Image"/>
+            <template #trigger>
+              <el-icon>
+                <Plus/>
+              </el-icon>
+            </template>
+
+            <template #file="{ file }">
+              <div v-if="file.type !=='camera'">
+                <img class="el-upload-list__item-thumbnail" :src="file.url" alt=""/>
+                <span class="el-upload-list__item-actions">
+                  <span
+                      class="el-upload-list__item-preview"
+                      @click="handlePictureCardPreview1(file)"
+                  >
+                    <el-icon><zoom-in/></el-icon>
+                  </span>
+                  <span
+                      class="el-upload-list__item-delete"
+                      @click="handleDownload1(file)"
+                  >
+                    <el-icon><Download/></el-icon>
+                  </span>
+                  <span
+                      class="el-upload-list__item-delete"
+                      @click="handleRemove1(file)"
+                  >
+                    <el-icon><Delete/></el-icon>
+                  </span>
+                </span>
+              </div>
+              <div @click="openCamera1" v-if="file.type ==='camera'" style="border:none"
+                   class="el-upload--picture-card">
+                <el-icon>
+                  <Camera/>
+                </el-icon>
+              </div>
+            </template>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialog2 = false">关闭</el-button>
+          <el-button type="primary" @click="handleObstacle1">
+            处理
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <el-dialog v-model="dialog3" title="处置障碍物" width="500">
+      <el-form :model="dialog3Form">
+        <el-form-item label="发现时间" label-width="120px">
+          <el-input v-model="dialog3Form.time" disabled autocomplete="off"/>
+        </el-form-item>
+        <el-form-item label="处理信息描述" label-width="120px">
+          <el-input
+              v-model="dialog3Form.text"
+              style="width: 100%"
+              :rows="2"
+              type="textarea"
+          />
+        </el-form-item>
+        <el-form-item label="处理照片" label-width="120px">
+          <el-upload @click.stop="onSubmit"
+                     ref="uploadRef"
+                     :http-request="uploadFiles2"
+                     :file-list="dialog3Form.fileList.concat({type:'camera'})"
+                     list-type="picture-card">
+
+            <template #trigger>
+              <el-icon>
+                <Plus/>
+              </el-icon>
+            </template>
+
+            <template #file="{ file }">
+              <div v-if="file.type !=='camera'">
+                <img class="el-upload-list__item-thumbnail" :src="file.url" alt=""/>
+                <span class="el-upload-list__item-actions">
+                  <span
+                      class="el-upload-list__item-preview"
+                      @click="handlePictureCardPreview2(file)"
+                  >
+                    <el-icon><zoom-in/></el-icon>
+                  </span>
+                  <span
+                      class="el-upload-list__item-delete"
+                      @click="handleDownload2(file)"
+                  >
+                    <el-icon><Download/></el-icon>
+                  </span>
+                  <span
+                      class="el-upload-list__item-delete"
+                      @click="handleRemove2(file)"
+                  >
+                    <el-icon><Delete/></el-icon>
+                  </span>
+                </span>
+              </div>
+              <div @click="openCamera2" v-if="file.type ==='camera'" style="border:none"
+                   class="el-upload--picture-card">
+                <el-icon>
+                  <Camera/>
+                </el-icon>
+              </div>
+            </template>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialog2 = false">关闭</el-button>
+          <el-button type="primary" @click="handleObstacle2">
+            处理
+          </el-button>
+        </div>
+      </template>
     </el-dialog>
 
     <el-dialog v-model="shildDialog">
@@ -743,6 +890,49 @@
         </div>
       </template>
     </el-dialog>
+    <el-dialog v-model="shildDialog1">
+      <el-form :model="shildForm1">
+        <el-form-item label="固定物名称" label-width="120px">
+          <el-input v-model="shildForm1.name" autocomplete="off"/>
+        </el-form-item>
+        <el-form-item label="偏差值" label-width="120px">
+          <el-input v-model="shildForm1.deviation" autocomplete="off"/>
+        </el-form-item>
+        <el-form-item label="屏蔽范围" label-width="120px">
+          <el-input v-model="shildForm1.shielding" autocomplete="off"/>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="shildDialog1 = false">关闭</el-button>
+          <el-button type="primary" @click="addShildItem1">
+            确定
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <el-dialog v-model="shildDialog2">
+      <el-form :model="shildForm2">
+        <el-form-item label="固定物名称" label-width="120px">
+          <el-input v-model="shildForm2.name" autocomplete="off"/>
+        </el-form-item>
+        <el-form-item label="偏差值" label-width="120px">
+          <el-input v-model="shildForm2.deviation" autocomplete="off"/>
+        </el-form-item>
+        <el-form-item label="屏蔽范围" label-width="120px">
+          <el-input v-model="shildForm2.shielding" autocomplete="off"/>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="shildDialog2 = false">关闭</el-button>
+          <el-button type="primary" @click="updateShildItem">
+            确定
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+
     <input
         ref="cameraInput"
         type="file"
@@ -751,6 +941,26 @@
         style="display: none"
         @change="handleCameraChange"
     />
+    <input
+        ref="cameraInput1"
+        type="file"
+        accept="image/*"
+        capture="camera"
+        style="display: none"
+        @change="handleCameraChange1"
+    />
+    <input
+        ref="cameraInput2"
+        type="file"
+        accept="image/*"
+        capture="camera"
+        style="display: none"
+        @change="handleCameraChange2"
+    />
+
+    <el-dialog v-model="imgDialog">
+      <img width="100%" :src="dialogImageUrl" alt="Preview Image"/>
+    </el-dialog>
   </div>
 </template>
 <script setup>
@@ -767,7 +977,7 @@ import {
   getParasSignalpro, GetSetting,
   getShildList,
   InserDealObstacleModel,
-  InsertCListData, PosSetting,
+  InsertCListData, PosSetting, PostDealObstacleModel,
   RestartWork,
   setParasPos,
   setParasSignalpro,
@@ -790,9 +1000,6 @@ import {
 
 const date1 = ref([])
 const form1 = ref({})
-const form2 = ref({})
-const form3 = ref({})
-const form4 = ref({})
 const form5 = ref({})
 const form6 = ref({})
 const options1 = ref([])
@@ -813,43 +1020,6 @@ const select3Update = (val) => {
   form6.value.region1 = val
 }
 
-// 上传图片
-const uploadRef = ref(null)
-const uploadFiles = async (e) => {
-  const res = await UpdateImage({files: [e.file]})
-}
-// 图片放大
-const handlePictureCardPreview = (file) => {
-  dialogImageUrl.value = file.url
-  imgDialog.value = true
-}
-// 图片下载
-const handleDownload = (file) => {
-  console.log(file)
-}
-// 图片删除
-const handleRemove = (file) => {
-  console.log(file)
-  dialog1Form.value.fileList = dialog1Form.value.fileList.filter(e => e.url !== file.url)
-}
-// 拍照
-const cameraInput = ref(null)
-const openCamera = () => {
-  cameraInput.value?.click()
-}
-const handleCameraChange = (e) => {
-  const file = e.target.files[0]
-  if (!file) return
-  const url = URL.createObjectURL(file)
-  UpdateImage({files: [file]})
-  dialog1Form.fileList.value.push({
-    name: file.name,
-    url,
-    raw: file
-  })
-  // 重置 input
-  e.target.value = ''
-}
 
 // 默认方法
 const onSubmit = (e) => {
@@ -976,6 +1146,8 @@ const areaData = ref({
 })
 // 雷达状态
 const radarWorkState = ref(0)
+// 扫描状态
+const scan = ref(true)
 // 车辆位置
 const boxPos = ref({x: 100, y: 150, rotate: 0})
 // 车辆实时位置
@@ -991,10 +1163,15 @@ const table1Current = (e,) => {
 }
 const table1Current1 = (e,) => {
   dotIndex.value = -1
-  if (dotIndex1.value === e.index) {
+  if (!dot1Show.value) {
+
     dotIndex1.value = -1
   } else {
-    dotIndex1.value = e.index
+    if (dotIndex1.value === e.index) {
+      dotIndex1.value = -1
+    } else {
+      dotIndex1.value = e.index
+    }
   }
 }
 // ws连接
@@ -1022,6 +1199,7 @@ const getSocket = () => {
 const processData = (data) => {
   if (data.FodName === '雷达信息') {
     radarWorkState.value = data.radar_work_state
+    scan.value = data.radar_work_state
   }
   if (data.FodName === '图像数据') {
   }
@@ -1092,6 +1270,13 @@ const currentPage3 = ref(1)
 // 每页数量
 const pageSize3 = ref(10)
 const total3 = ref(0)
+// 处置列表
+const tableData3 = ref([])
+// 当前页
+const currentPage4 = ref(1)
+// 每页数量
+const pageSize4 = ref(10)
+const total4 = ref(0)
 // 障碍物点位
 const dots = computed(() => {
   return table1Data.value.map((v, k) => {
@@ -1132,6 +1317,127 @@ const dots1 = computed(() => {
 // 当前的目标障碍物
 const dotIndex = ref(-1)
 const dotIndex1 = ref(-1)
+const dot1Show = ref(true)
+
+const dialogImageUrl = ref('')
+const imgDialog = ref(false)
+const uploadRef = ref(null)
+const shildDialog2 = ref(false)
+const shildForm2 = ref({})
+const openShildDialog2 = (e) => {
+  shildDialog2.value = true
+  shildForm2.value = e.row
+}
+// 修改固定物
+const updateShildItem = () => {
+  updateShildData(shildForm1.value).then(e => {
+    shildDialog2.value = false
+    shildForm2.value = {}
+    getShildTableList()
+  })
+}
+// 处置模态框
+const dialog3 = ref(false)
+const dialog3Form = ref({})
+// 上传图片
+const uploadFiles2 = async (e) => {
+  const res = await UpdateImage({files: [e.file]})
+}
+// 图片放大
+const handlePictureCardPreview2 = (file) => {
+  dialogImageUrl.value = file.url
+  imgDialog.value = true
+}
+// 图片下载
+const handleDownload2 = (file) => {
+  console.log(file)
+}
+// 图片删除
+const handleRemove2 = (file) => {
+  console.log(file)
+  dialog3Form.value.fileList = dialog3Form.value.fileList.filter(e => e.url !== file.url)
+}
+// 拍照
+const cameraInput2 = ref(null)
+const openCamera2 = () => {
+  cameraInput2.value?.click()
+}
+const handleCameraChange2 = (e) => {
+  const file = e.target.files[0]
+  if (!file) return
+  const url = URL.createObjectURL(file)
+  UpdateImage({files: [file]})
+  dialog3Form.fileList.value.push({
+    name: file.name,
+    url,
+    raw: file
+  })
+  // 重置 input
+  e.target.value = ''
+}
+// 打开处置模态框
+const openHandleObstacleDialog2 = (e) => {
+  dialog3.value = true
+  dialog3Form.value = {
+    time: e.row.time,
+    longitude: e.row.lon,
+    latitude: e.row.lat,
+    strength: e.row.strength,
+    fileList: []
+  }
+}
+// 删除固定物
+const delShildItem = (e) => {
+  delShildData(e.row).then(e => {
+    getShildTableList()
+  })
+}
+// 确定处理
+const handleObstacle2 = () => {
+  InserDealObstacleModel({
+    longitude: dialog3Form.value.longitude,
+    latitude: dialog3Form.value.latitude,
+    strength: dialog3Form.value.strength,
+    files: dialog3Form.value.fileList.map(e => e.url),
+    findTime: dialog3Form.value.time,
+  }).then(e => {
+    // delShildData(e.row).then(e => {
+    //   getShildTableList()
+    // })
+    dialog3.value = false
+  })
+}
+const table3Ref = ref()
+// 批量删除
+const batchDel2 = () => {
+  let datas = table3Ref.value.getSelectionRows()
+  let promiseArr = []
+  datas.forEach((row) => {
+    promiseArr.push(delShildData(row))
+  })
+  Promise.allSettled(promiseArr).then(() => {
+    getShildTableList()
+  })
+}
+// 批量处置
+const batchDisposal2 = () => {
+  let datas = table3Ref.value.getSelectionRows()
+  let promiseArr = []
+  datas.forEach((row) => {
+    promiseArr.push(InserDealObstacleModel({
+      longitude: row.longitude,
+      latitude: row.latitude,
+      strength: row.strength,
+      files: [],
+      findTime: row.time,
+    }))
+  })
+  Promise.allSettled(promiseArr).then(() => {
+    getShildTableList()
+  })
+}
+
+
 // 固定物模态框
 const shildDialog = ref(false)
 const shildForm = ref({})
@@ -1148,10 +1454,6 @@ const openShildDialog = (e) => {
     shielding: shieldInfoForm.value.shielding,
   }
 }
-const openShildDialog1 = (e) => {
-  shildDialog.value = true
-  shildForm.value = e.row
-}
 // 设置固定物
 const addShildItem = () => {
   let data = null
@@ -1172,28 +1474,45 @@ const addShildItem = () => {
     getShildTableList()
   })
 }
-// 删除固定物
-const delShildItem = (e) => {
-  delShildData(e.row).then(e => {
-    getShildTableList()
-  })
-}
-// 获取固定物列表
-const getShildTableList = () => {
-  getShildList({
-    pageIndex: currentPage3.value,
-    pageSize: pageSize3.value,
-  }).then((e) => {
-    tableData2.value = e.data
-    total3.value = e.totalCount
-  })
-}
-
 // 处置模态框
 const dialog1 = ref(false)
 const dialog1Form = ref({})
-const dialogImageUrl = ref('')
-const imgDialog = ref(false)
+// 上传图片
+const uploadFiles = async (e) => {
+  const res = await UpdateImage({files: [e.file]})
+}
+// 图片放大
+const handlePictureCardPreview = (file) => {
+  dialogImageUrl.value = file.url
+  imgDialog.value = true
+}
+// 图片下载
+const handleDownload = (file) => {
+  console.log(file)
+}
+// 图片删除
+const handleRemove = (file) => {
+  console.log(file)
+  dialog1Form.value.fileList = dialog1Form.value.fileList.filter(e => e.url !== file.url)
+}
+// 拍照
+const cameraInput = ref(null)
+const openCamera = () => {
+  cameraInput.value?.click()
+}
+const handleCameraChange = (e) => {
+  const file = e.target.files[0]
+  if (!file) return
+  const url = URL.createObjectURL(file)
+  UpdateImage({files: [file]})
+  dialog1Form.fileList.value.push({
+    name: file.name,
+    url,
+    raw: file
+  })
+  // 重置 input
+  e.target.value = ''
+}
 // 删除
 const delPoint = (e) => {
 
@@ -1248,7 +1567,6 @@ const handleObstacle = () => {
     }
   })
 }
-
 // 批量处理
 const table1Ref = ref()
 const batchDisposal = () => {
@@ -1268,7 +1586,12 @@ const batchDisposal = () => {
     })
     arr = arr.filter(v => !(v.Lon === row.Lon && v.Lat === row.Lat && v.Strength === row.Strength))
   })
-  tableData1.value = arr
+  tableData1.value = arr.map((v, index) => {
+    return {
+      ...v,
+      index
+    }
+  })
   getShildTableList()
   if (data) {
     let index = table1Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
@@ -1288,7 +1611,12 @@ const batchDel = () => {
   datas.forEach((row) => {
     arr = arr.filter(v => !(v.Lon === row.Lon && v.Lat === row.Lat && v.Strength === row.Strength))
   })
-  tableData1.value = arr
+  tableData1.value = arr.map((v, index) => {
+    return {
+      ...v,
+      index
+    }
+  })
   if (data) {
     let index = table1Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
     if (index >= 0) {
@@ -1315,7 +1643,12 @@ const batchShild = () => {
     })
     arr = arr.filter(v => !(v.Lon === row.Lon && v.Lat === row.Lat && v.Strength === row.Strength))
   })
-  tableData1.value = arr
+  tableData1.value = arr.map((v, index) => {
+    return {
+      ...v,
+      index
+    }
+  })
   getShildTableList()
   if (data) {
     let index = table1Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
@@ -1325,6 +1658,249 @@ const batchShild = () => {
   }
 }
 
+
+// 固定物模态框
+const shildDialog1 = ref(false)
+const shildForm1 = ref({})
+// 打开固定物模态框
+const openShildDialog1 = (e) => {
+  shildDialog1.value = true
+  shildForm1.value = {
+    $index: e.row.$index,
+    lon: e.row.Lon,
+    lat: e.row.Lat,
+    strength: e.row.Strength,
+    name: Math.random().toString().split('.')[1],
+    deviation: shieldInfoForm.value.deviation,
+    shielding: shieldInfoForm.value.shielding,
+  }
+}
+// 设置固定物
+const addShildItem1 = () => {
+  let data = null
+  if (dotIndex1.value >= 0) {
+    data = table2Data.value[dotIndex1.value]
+  }
+  tableData1.value = tableData1.value.filter(v => !(v.Lon === shildForm.value.lon && v.Lat === shildForm.value.lat && v.Strength === shildForm.value.strength))
+  if (data) {
+    let index = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+    if (index >= 0) {
+      dotIndex1.value = index
+    }
+  }
+
+  addShildData(shildForm1.value).then(e => {
+    shildDialog1.value = false
+    shildForm1.value = {}
+    getShildTableList()
+  })
+}
+// 处置模态框
+const dialog2 = ref(false)
+const dialog2Form = ref({})
+// 上传图片
+const uploadFiles1 = async (e) => {
+  const res = await UpdateImage({files: [e.file]})
+}
+// 图片放大
+const handlePictureCardPreview1 = (file) => {
+  dialogImageUrl.value = file.url
+  imgDialog.value = true
+}
+// 图片下载
+const handleDownload1 = (file) => {
+  console.log(file)
+}
+// 图片删除
+const handleRemove1 = (file) => {
+  console.log(file)
+  dialog2Form.value.fileList = dialog2Form.value.fileList.filter(e => e.url !== file.url)
+}
+// 拍照
+const cameraInput1 = ref(null)
+const openCamera1 = () => {
+  cameraInput1.value?.click()
+}
+const handleCameraChange1 = (e) => {
+  const file = e.target.files[0]
+  if (!file) return
+  const url = URL.createObjectURL(file)
+  UpdateImage({files: [file]})
+  dialog2Form.fileList.value.push({
+    name: file.name,
+    url,
+    raw: file
+  })
+  // 重置 input
+  e.target.value = ''
+}
+// 删除
+const delPoint1 = (e) => {
+
+  let data = null
+  if (dotIndex1.value >= 0) {
+    data = table2Data.value[dotIndex1.value]
+  }
+
+  tableData1.value = tableData1.value.filter(v => !(v.Lon === e.row.Lon && v.Lat === e.row.Lat && v.Strength === e.row.Strength))
+
+
+  if (data) {
+    let index = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+    if (index >= 0) {
+      dotIndex1.value = index
+    }
+  }
+}
+// 打开处置模态框
+const openHandleObstacleDialog1 = (e) => {
+  dialog2.value = true
+  dialog2Form.value = {
+    dotIndex: e.index,
+    index: e.$index,
+    time: e.row.time,
+    longitude: e.row.Lon,
+    latitude: e.row.Lat,
+    strength: e.row.Strength,
+    fileList: []
+  }
+}
+// 确定处理
+const handleObstacle1 = () => {
+  InserDealObstacleModel({
+    longitude: dialog1Form.value.longitude,
+    latitude: dialog1Form.value.latitude,
+    strength: dialog1Form.value.strength,
+    files: dialog1Form.value.fileList.map(e => e.url),
+    findTime: dialog1Form.value.time,
+  }).then(e => {
+    let data = null
+    if (dotIndex1.value >= 0) {
+      data = table2Data.value[dotIndex1.value]
+    }
+    dialog2.value = false
+    tableData1.value = tableData1.value.filter(v => !(v.Lon === dialog1Form.value.longitude && v.Lat === dialog1Form.value.latitude && v.Strength === dialog1Form.value.strength))
+    if (data) {
+      let index = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+      if (index >= 0) {
+        dotIndex1.value = index
+      }
+    }
+  })
+}
+// 批量处理
+const table2Ref = ref()
+const batchDisposal1 = () => {
+  let data = null
+  if (dotIndex1.value >= 0) {
+    data = table2Data.value[dotIndex1.value]
+  }
+  let datas = table2Ref.value.getSelectionRows()
+  let arr = JSON.parse(JSON.stringify(tableData1.value))
+  datas.forEach((row) => {
+    InserDealObstacleModel({
+      longitude: row.Lon,
+      latitude: row.Lat,
+      strength: row.Strength,
+      files: [],
+      findTime: '',
+    })
+    arr = arr.filter(v => !(v.Lon === row.Lon && v.Lat === row.Lat && v.Strength === row.Strength))
+  })
+  tableData1.value = arr.map((v, index) => {
+    return {
+      ...v,
+      index
+    }
+  })
+  getShildTableList()
+  if (data) {
+    let index = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+    if (index >= 0) {
+      dotIndex1.value = index
+    }
+  }
+}
+// 批量删除
+const batchDel1 = () => {
+  let data = null
+  if (dotIndex1.value >= 0) {
+    data = table2Data.value[dotIndex1.value]
+  }
+  let datas = table2Ref.value.getSelectionRows()
+  let arr = JSON.parse(JSON.stringify(tableData1.value))
+  datas.forEach((row) => {
+    arr = arr.filter(v => !(v.Lon === row.Lon && v.Lat === row.Lat && v.Strength === row.Strength))
+  })
+  tableData1.value = arr.map((v, index) => {
+    return {
+      ...v,
+      index
+    }
+  })
+  if (data) {
+    let index = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+    if (index >= 0) {
+      dotIndex1.value = index
+    }
+  }
+}
+// 批量固定
+const batchShild1 = () => {
+  let data = null
+  if (dotIndex1.value >= 0) {
+    data = table1Data.value[dotIndex1.value]
+  }
+  let datas = table2Ref.value.getSelectionRows()
+  let arr = JSON.parse(JSON.stringify(tableData1.value))
+  datas.forEach((row) => {
+    addShildData({
+      lon: row.Lon,
+      lat: row.Lat,
+      strength: row.Strength,
+      name: Math.random().toString().split('.')[1],
+      deviation: shieldInfoForm.value.deviation,
+      shielding: shieldInfoForm.value.shielding,
+    })
+    arr = arr.filter(v => !(v.Lon === row.Lon && v.Lat === row.Lat && v.Strength === row.Strength))
+  })
+  tableData1.value = arr.map((v, index) => {
+    return {
+      ...v,
+      index
+    }
+  })
+  getShildTableList()
+  if (data) {
+    let index = table2Data.value.findIndex(v => v.Lon === data.Lon && v.Lat === data.Lat && v.Strength === data.Strength)
+    if (index >= 0) {
+      dotIndex1.value = index
+    }
+  }
+}
+
+
+// 获取固定物列表
+const getShildTableList = () => {
+  getShildList({
+    pageIndex: currentPage3.value,
+    pageSize: pageSize3.value,
+  }).then((e) => {
+    tableData2.value = e.data
+    total3.value = e.totalCount
+  })
+}
+// 获取处置列表
+const getObstacleList = () => {
+  PostDealObstacleModel({
+    pageIndex: currentPage4.value,
+    pageSize: pageSize4.value,
+  }).then(e => {
+    tableData3.value = e.data
+    total4.value = e.totalCount
+  })
+}
+
 // 区域标定页面获取区域信息
 const getArea2 = () => {
   GetAllCData({areaId: form6.value.region1}).then((res) => {
@@ -1357,18 +1933,7 @@ const saveAreaPoint = () => {
     ElMessage.error(err)
   })
 }
-const dotIndexF = (index) => {
-  if (dotIndex.value === index) {
-    dotIndex.value = -1
-  } else if (dotIndex.value > index) {
-    dotIndex.value -= 1
-  } else if (dotIndex.value > index) {
-
-  } else {
-
-  }
-}
-const readTableData = () => {
+const readLocalStorageData = () => {
   tableData1.value = [
     {"Lon": 119.68158733286303, "Lat": 25.929632812633325, "Status": 0},
     {"Lon": 119.68226426875183, "Lat": 25.930447575308917, "Status": 2},
@@ -1467,23 +2032,29 @@ const readTableData = () => {
       index: i
     }
   })
-  // const storedStr = localStorage.getItem('tableData1');
-  // if (!storedStr) {
-  //   return;
-  // }
-  // const storedData = JSON.parse(storedStr);
-  // if (!Array.isArray(storedData)) {
-  //   return;
-  // }
-  // tableData1.value.splice(0, tableData1.value.length, ...(storedData.map((e, index) => {
-  //   return {
-  //     ...e,
-  //     index: index,
-  //   }
-  // })));
-  // if (table1Ref.value) {
-  //   table1Ref.value.doLayout(); // 强制表格重新计算布局
-  // }
+
+
+  let areaData = localStorage.getItem('areaData')
+  if (areaData) {
+    let data = JSON.parse(areaData)
+    form1.value = data;
+    selectUpdate(data.region || '')
+    getAreaData()
+
+    const storedStr = localStorage.getItem(`${data.region}-${data.region1}`);
+    if (storedStr) {
+      const storedData = JSON.parse(storedStr);
+      if (!Array.isArray(storedData)) {
+        return;
+      }
+      tableData1.value.splice(0, tableData1.value.length, ...(storedData.map((e, index) => {
+        return {
+          ...e,
+          index: index,
+        }
+      })));
+    }
+  }
 }
 
 const getTableData = async () => {
@@ -1494,6 +2065,7 @@ const getTableData = async () => {
 // 主界面获取区域信息
 const getAreaData = () => {
   GetAllCData({areaId: form1.value.region1}).then((res) => {
+    localStorage.setItem('areaData', JSON.stringify(form1.value));
     areaPoints.value = res.data
     let data = calcRectangleFromPoints(res.data)
     areaData.value = data
@@ -1503,6 +2075,7 @@ const getAreaData = () => {
       const numA = parseInt(a.name.replace(/[^\d]/g, ''), 10);
       const numB = parseInt(b.name.replace(/[^\d]/g, ''), 10);
       return numA - numB;
+      getAreaData
     });
     const letters = ['a', 'b', 'c', 'd'];
     const result = {};
@@ -1512,14 +2085,30 @@ const getAreaData = () => {
       result[`${key}Lat`] = item.lat;
     });
     UpdateFodScopeData(result)
+
+    tableData1.value = []
+    const storedStr = localStorage.getItem(`${data.region}-${data.region1}`);
+    if (storedStr) {
+      const storedData = JSON.parse(storedStr);
+      if (!Array.isArray(storedData)) {
+        return;
+      }
+      tableData1.value = storedData.map((e, index) => {
+        return {
+          ...e,
+          index: index,
+        }
+      })
+    }
   })
 }
 onMounted(() => {
-  readTableData()
+  readLocalStorageData()
   getTableData()
   getSocket()
   getOption()
   getShildTableList()
+  getObstacleList()
   testFun()
 })
 const testFun = () => {
@@ -1566,8 +2155,8 @@ const testFun = () => {
   areaData.value = data
   getDeviationValue(areaData111.find(e => e.name === '点位3'), areaPoints.value)
   let data1 = {
-    lon: 119.684151,
-    lat: 25.93293,
+    lon: 119.6820045,
+    lat: 25.92951,
     rotate: 303
   }
   const getLocal = () => {
@@ -1581,18 +2170,13 @@ const testFun = () => {
 
 
 watch(() => JSON.stringify([tableData1.value, areaPoints.value]), (oldVal, newVal) => {
-  localStorage.setItem('tableData1', JSON.stringify(tableData1.value));
+
+  if (form1.value.region && form1.value.region1) {
+    localStorage.setItem(`${form1.value.region}-${form1.value.region1}`, JSON.stringify(tableData1.value));
+  }
 }, {deep: true})
 
 
-const table1DataIndexF = () => {
-  tableData1.value = tableData1.value.map((v, k) => {
-    return {
-      ...v,
-      index: k,
-    }
-  })
-}
 </script>
 <style>
 .app-container {
@@ -1654,6 +2238,21 @@ const table1DataIndexF = () => {
   height: calc(100vh - 80px);
   width: 34%;
   vertical-align: top;
+  position: relative;
+
+  .carPo {
+    position: absolute;
+    color: #fff;
+    z-index: 9;
+    left: 40px;
+  }
+
+  .dot1Show {
+    position: absolute;
+    color: #fff;
+    z-index: 9;
+    right: 0;
+  }
 }
 
 .right {