diff --git a/src/components/GdMap/indexww.vue b/src/components/GdMap/indexww.vue
new file mode 100644
index 0000000..9a9a7cf
--- /dev/null
+++ b/src/components/GdMap/indexww.vue
@@ -0,0 +1,381 @@
+<template>
+  <div :id="mapid" class="map"></div>
+  <div class="changeMap_box" v-if="props.isShow">
+    <el-switch v-model="conditionRoute" @change="handleSwitch" active-text="打开路况" inactive-text="关闭路况" style="--el-switch-color:#13ce66;--el-switch-off-color:#ff4949;" />
+    <!-- <el-carousel type="card" height="75px" :autoplay="false" indicator-position="none" :initial-index="3"  @change="onMapImageChange">
+      <el-carousel-item>
+        <div class="mapImageItem">
+          <img :src="require('@/assets/images/slt.jpg')" alt="" />
+          <div>栅格浅色</div>
+        </div>
+      </el-carousel-item>
+      <el-carousel-item>
+        <div class="mapImageItem">
+          <img :src="require('@/assets/images/yxt.jpg')" alt="" />
+          <div>影像图</div>
+        </div>
+      </el-carousel-item>
+      <el-carousel-item>
+        <div class="mapImageItem">
+          <img :src="require('@/assets/images/yst.jpg')" alt="" />
+          <div>栅格深色</div>
+        </div>
+      </el-carousel-item>
+      <el-carousel-item>
+        <div class="mapImageItem">
+          <img :src="require('@/assets/images/shy.png')" alt="" />
+          <div>三合一</div>
+        </div>
+      </el-carousel-item>
+    </el-carousel> -->
+    <!-- 地图缩放 -->
+    <div class="zoomTargetBox">
+      <el-input-number :min="7" :max="18" v-model="zoomTarget" :step="1" step-strictly @change="handleZoom">
+      </el-input-number>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted, onUnmounted, defineProps, nextTick } from "vue";
+import { MapUtil } from "./mapUtil";
+import emitter from "@/utils/eventBus.js";
+import { getItem } from "@/utils/storage";
+const conditionRoute = ref(true); //路况
+const mMap = ref(null); //地图对象
+const mapUtil = ref(null); //地图工具对象
+const zoomTarget = ref(6);
+
+const props = defineProps({
+  mapid: {
+    type: String,
+    default: "mapDiv"
+  },
+  //是否显示可以切换地图底图
+  isShow: {
+    type: Boolean,
+    default: false
+  },
+  //是否显示实时路况
+  isShowMvt: {
+    type: Boolean,
+    default: false
+  },
+  //是否显示地图层级
+  isShowZoom: {
+    type: Boolean,
+    default: false
+  },
+  //是否显示绘制控件
+  isShowDraw: {
+    type: Boolean,
+    default: false
+  }
+});
+try {
+  const userInfo = getItem("deptId")[0].deptCode;
+} catch (error) {}
+let map;
+let mapLayer;
+let mapLayer1;
+onMounted(() => {
+  emitter.on("followUp", (res) => {
+    let box = document.getElementsByClassName("changeMap_box");
+    if (!box) return;
+    box[0].style.right = !res ? "4px" : "398px";
+    box[0].style.transition = "0.5s";
+  });
+
+  map = new EliMap({
+    id: props.mapid,
+    crs: "EPSG:3857",
+    style: {
+      glyphs: "./fonts/{fontstack}/{range}.pbf",
+      center: [94.36,29.65],
+      zoom: 10
+    },
+    transformRequest: (url) => {
+      if (url.indexOf("TileMatrix=") != -1) {
+        const arr = url.split("TileMatrix=");
+        const arr1 = arr[1].split("&");
+        const nurl = `${arr[0]}&TileMatrix=${Number(arr1[0])}&${arr1[1]}&${arr1[2]}`;
+
+      }
+    }
+  });
+
+  window.map = map;
+  map.mapboxGLMap.on("load", () => {
+     map.addGaudLayer({
+      url: 'http://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+    })
+    zoomTarget.value = map.mapboxGLMap.getZoom();
+    // 地图加载完成后发出事件
+    // emit('mapLoaded')
+  });
+  mapUtil.value = new MapUtil(map);
+  // map = new EliMap({
+  //   id: props.mapid,
+  //   crs: "EPSG:4490",
+  //   style: {
+  //     glyphs: "./fonts/{fontstack}/{range}.pbf",
+  //     center: [94.36057012, 29.64276831],
+  //     zoom: 15
+  //   },
+  //   minZoom: 7,
+  //   maxZoom: 18,
+  // });
+  // window.map = map;
+  // map.mapboxGLMap.on("load", () => {
+  //   map.addWMTSLayer(
+  //     "/PGIS_S_TileMapServer/Maps/XZDJ_SL/EzMap"
+  //     ,
+  //     {
+  //       Service: "getImage",
+  //       Type: "RGB",
+  //       ZoomOffset: "0",
+  //       V: "0.3",
+  //       Zoom: "{z}",
+  //       Row: "{y}",
+  //       Col: "{x}"
+  //     },
+  //     {
+  //       tileSize: 300
+  //     }
+  //   );
+  //   zoomTarget.value = map.mapboxGLMap.getZoom();
+  // });
+  // mapUtil.value = new MapUtil(map);
+  mapUtil.value.Drawplot(); //初始化加载绘制工具
+
+  // 设置地图中心点及图层
+  emitter.on("setMapCenter", (res) => {
+    mapUtil.value.setMapCenter(res.location, res.zoomLevel);
+  });
+
+  emitter.on("removePlot", (flag) => {
+    mapUtil.value.removePlot(flag);
+  });
+  emitter.on("removeAll", (flag) => {
+    mapUtil.value.removeAll(flag);
+  });
+  // 撒点
+  emitter.on("addPointArea", (obj) => {
+    mapUtil.value.makerSki(obj);
+  });
+  // 鼠标滑过提示文字的点位
+  emitter.on("showPoint", (obj) => {
+    mapUtil.value.showPoint(obj);
+  });
+
+  // 清除覆盖物
+  emitter.on("deletePointArea", (res) => {
+    mapUtil.value.removeElement(res);
+  });
+  // 清除某个覆盖物的单个
+  emitter.on("deletePointAreaOne", (obj) => {
+    mapUtil.value.removeElementOne(obj.flag, obj.id);
+  });
+
+  // 清除某个覆盖物的单个
+  emitter.on("showSquire", (obj) => {
+    mapUtil.value.zdySquire(obj);
+  });
+
+  // 绘制图形 - 回显区域
+  emitter.on("drawShape", (res) => {
+    mapUtil.value.plot(res, resFun);
+  });
+  emitter.on("removeEara", (flag) => {
+    mapUtil.value.removeEara(flag);
+  });
+  // 回显图形
+  emitter.on("echoPlane", (res) => {
+    mapUtil.value.echoPlane(res);
+  });
+  //移除绘制区域
+  emitter.on("removeEara", (flag) => {
+    mapUtil.value.removeEara(flag);
+  });
+  // 回显线
+  emitter.on("echoLine", (res) => {
+    mapUtil.value.createLine(res, res.flag);
+  });
+  //创建边界面（geojson）
+  emitter.on("setBoundarys", (res) => {
+    mapUtil.value.createBoundarys(res);
+  });
+  // 移除边界
+  emitter.on("removeBj", (res) => {
+    mapUtil.value.removeBj(res);
+  });
+
+  // 轨迹回放
+  emitter.on("drawLineAnimation", (res) => {
+    mapUtil.value.displayLineAnimation(res);
+  });
+
+  // 聚合撒点
+  emitter.on("addPoint", (obj) => {
+    mapUtil.value.aggregateScatteringPoint(obj);
+  });
+
+  // 热力图显示
+  emitter.on("thermodynamicChart", (res) => {
+    mapUtil.value.showHeatDrawing(res);
+  });
+
+  // 扩散圆
+  emitter.on("diffusionCircle", (res) => {
+    mapUtil.value.diffusionCircle(res);
+  });
+
+  // 展示盘曲
+  emitter.on("showGapText", (obj) => {
+    mapUtil.value.gapText(obj);
+  });
+
+  // 获取当前地图中心点
+  emitter.on("getCurrentCenter", (res) => {
+    let centerPoint = map.mapboxGLMap.getCenter();
+    let coords = [centerPoint.lng, centerPoint.lat];
+    emitter.emit("getcentercoord", coords);
+  });
+});
+//切换地图底图
+const onMapImageChange = (val) => {
+  //清除已经存在胡地图图层
+  if (map.mapboxGLMap.getLayer("SGQS_ID"))
+    map.mapboxGLMap.removeLayer("SGQS_ID");
+  if (map.mapboxGLMap.getLayer("YX_ID")) map.mapboxGLMap.removeLayer("YX_ID");
+  if (map.mapboxGLMap.getLayer("SGSG_ID"))
+    map.mapboxGLMap.removeLayer("SGSG_ID");
+  if (map.mapboxGLMap.getLayer("TDT_TITLE_ID"))
+    map.mapboxGLMap.removeLayer("TDT_TITLE_ID");
+  if (map.mapboxGLMap.getLayer("TDT_ROAD_ID"))
+    map.mapboxGLMap.removeLayer("TDT_ROAD_ID");
+  if (map.mapboxGLMap.getLayer("TDT_POI_ID"))
+    map.mapboxGLMap.removeLayer("TDT_POI_ID");
+  //设置图层
+  switch (val) {
+    case 0:
+      mapSetLayer("SGQS_ID", "SGQS");
+      break;
+    case 1:
+      mapSetLayer("YX_ID", "YX");
+      break;
+    case 2:
+      mapSetLayer("SGSG_ID", "SGSG");
+      break;
+    case 3:
+      mapSetLayer("TDT_TITLE_ID", "TDT_TITLE_SOURCES");
+      mapSetLayer("TDT_ROAD_ID", "TDT_ROAD_SOURCES");
+      mapSetLayer("TDT_POI_ID", "TDT_POI_SOURCES");
+      break;
+  }
+  if (map.mapboxGLMap.getLayer("realTimeTrafficlevelOne"))
+    map.mapboxGLMap.moveLayer("realTimeTrafficlevelOne");
+  if (map.mapboxGLMap.getLayer("map_id")) map.mapboxGLMap.moveLayer("map_id");
+  if (map.mapboxGLMap.getLayer("map_ids")) map.mapboxGLMap.moveLayer("map_ids");
+};
+
+//设置图层函数
+const mapSetLayer = (id, source) => {
+  map.mapboxGLMap.addLayer({ id, type: "raster", source });
+};
+
+//获取地图绘制的数据
+const resFun = (coord, type, flag, data) => {
+
+  emitter.emit("coordString", {
+    coord: coord,
+    type: type,
+    flag: flag,
+    data: data
+  });
+};
+
+// 地图层级
+const handleZoom = (val) => {
+  map.mapboxGLMap.setZoom(val);
+};
+
+// 是否打开或者关闭路况
+const handleSwitch = (val) => {
+  if (val) {
+    // 打开
+  } else {
+    // 关闭
+  }
+};
+
+onUnmounted(() => {
+  emitter.off("removePlot");
+  emitter.off("setMapCenter");
+  emitter.off("addPointArea");
+  emitter.off("showPoint");
+  emitter.off("deletePointArea");
+  emitter.off("deletePointAreaOne");
+  emitter.off("drawShape");
+  emitter.off("echoPlane");
+  emitter.off("removeEara");
+  emitter.off("echoLine");
+  emitter.off("addPoint");
+  emitter.off("thermodynamicChart");
+  emitter.off("drawLineAnimation");
+  emitter.off("aggregateScatteringPoint");
+  emitter.off("hotmap");
+  emitter.off("setBoundarys");
+  emitter.off("diffusionCircle");
+  emitter.off("SsCircle");
+  emitter.off("ClearssCircle");
+});
+</script>
+
+<style lang="scss" scoped>
+.map {
+  width: 100%;
+  height: 100%;
+  background-color: aliceblue;
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  margin: auto;
+  z-index: 1;
+}
+
+.changeMap_box {
+  position: absolute;
+  right: 398px;
+  bottom: 4px;
+  z-index: 9;
+  .mapImageItem {
+    border: 1px solid #08aae8;
+    background: rgb(9, 26, 70);
+    & > img {
+      width: 100%;
+      height: 50px;
+    }
+    & > div {
+      text-align: center;
+      position: relative;
+      top: -3px;
+    }
+  }
+  .zoomTargetBox {
+    margin-top: 10px;
+    margin-left: 23px;
+  }
+  ::v-deep .el-input-number__decrease,
+  ::v-deep .el-input-number__increase {
+    background: #133362;
+    color: #fff;
+    border: none;
+  }
+  ::v-deep .el-input__inner {
+    background: #0c1641;
+  }
+}
+</style>
diff --git a/src/components/MyComponents/Upload/index.vue b/src/components/MyComponents/Upload/index.vue
index ae8fd2e..b8d6307 100644
--- a/src/components/MyComponents/Upload/index.vue
+++ b/src/components/MyComponents/Upload/index.vue
@@ -13,14 +13,8 @@
         <div v-if="props.isImg">
           <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="handlePictureCardPreview(file)">
-              <el-icon> <zoom-in /></el-icon>
-            </span>
-            <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file, fileList)">
-              <el-icon>
-                <Delete />
-              </el-icon>
-            </span>
+            <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)"><el-icon> <zoom-in /></el-icon></span>
+            <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file, fileList)"><el-icon><Delete /></el-icon></span>
           </span>
         </div>
         <div v-else>
@@ -86,9 +80,7 @@ const actionUrl = computed(() => {
   if (props.isAll) {
     return "/mosty-api/mosty-base/minio/image/upload/id";
   } else {
-    return props.isImg
-      ? "/mosty-api/mosty-base/minio/image/upload/id"
-      : "/mosty-api/mosty-base/minio/file/upload";
+    return props.isImg ? "/mosty-api/mosty-base/minio/image/upload/id": "/mosty-api/mosty-base/minio/file/upload";
   }
 });
 
@@ -191,7 +183,6 @@ watch(
           }
         });
         }
-
       } else {
         fileList.value = arr.map((el) => {
           if (Object.prototype.toString.call(el) === "[object Object]") {
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/components/detail.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/components/detail.vue
index 5e5e3ce..6e6f7b8 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/components/detail.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/components/detail.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="行为详情次数详情（1）" v-model="dialogVisible" width="60%">
+    <el-dialog :title="`行为详情次数详情（${pageData.tableData.length}）`" v-model="dialogVisible" width="60%">
         <MyTable
             :tableData="pageData.tableData"
             :tableColumn="pageData.tableColumn"
@@ -12,6 +12,7 @@
 </template>
 
 <script setup>
+import { qcckGet } from "@/api/qcckApi.js";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import { ref , reactive  , defineExpose} from 'vue'
 const dialogVisible = ref(false)
@@ -30,16 +31,24 @@ const pageData = reactive({
     pageCurrent: 1
   }, //分页
   tableColumn: [
-    { label: "警情编号", prop: "jqbh"},
-    { label: "报警人", prop: "bjr" },
-    { label: "报警人电话", prop: "bjrdh" },
-    { label: "报警人身份证", prop: "bjrsfzh"},
-    { label: "预警内容", prop: "yjnr",  showOverflowTooltip: true },
-    { label: "报警时间", prop: "jsj",  showOverflowTooltip: true },
+    { label: "警情编号", prop: "jjdbh"},
+    { label: "报警人", prop: "bjrmc" },
+    { label: "报警人电话", prop: "bjdh" },
+    { label: "报警人身份证", prop: "bjrzjhm"},
+    { label: "预警内容", prop: "bjnr",  showOverflowTooltip: true },
+    { label: "报警时间", prop: "yjsj",  showOverflowTooltip: true },
   ]
 });
 const init = (row) => {
-  dialogVisible.value = true
+  dialogVisible.value = true;
+  pageData.tableConfiger.loading = true;
+  pageData.tableData = []
+  qcckGet({yjid:row.id},'/mosty-gsxt/yjzxXwyjxq/selectList').then((res)=>{
+    pageData.tableData = res || [];
+    pageData.tableConfiger.loading = false;
+  }).catch(()=>{
+    pageData.tableConfiger.loading = false;
+  })
 }
 
 defineExpose({
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/index.vue
index c9e9a25..0c33991 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/index.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="titleBox">
       <PageTitle title="行为预警">
-        <el-button type="primary">
+        <el-button type="primary" @click="exportExcel">
           <span style="vertical-align: middle">导出</span>
         </el-button>
       </PageTitle>
@@ -41,6 +41,7 @@
 </template>
 
 <script setup>
+import * as XLSX from "xlsx";
 import Detail from './components/detail.vue'
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import Search from "@/components/aboutTable/Search.vue";
@@ -58,13 +59,11 @@ const searchConfiger = ref(
 const detailRef = ref()
 const queryFrom = ref({});
 const pageData = reactive({
-  tableData: [
-    { xwcs:12 ,xm:'张三' ,sfzh:'510156565656525565',dh:'15665255545',xwfz:'20',xwms:'xxxxxxxxx',xwdl:'xxxxxxx',xwzl:'xxxxxxx'}
-  ], //表格数据
+  tableData: [], //表格数据
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
-    showSelectType: "checkBox",
+    showSelectType: "null",
     loading: false,
     haveControls: false,
   },
@@ -77,8 +76,8 @@ const pageData = reactive({
     { label: "姓名", prop: "xm"},
     { label: "身份证号", prop: "sfzh" },
     { label: "电话", prop: "dh" },
-    { label: "行为大类", prop: "xwdl"},
-    { label: "行为子类", prop: "xwzl",  showOverflowTooltip: true },
+    { label: "行为大类", prop: "xldlmc"},
+    { label: "行为子类", prop: "xwzlmc",  showOverflowTooltip: true },
     { label: "行为描述", prop: "xwms",  showOverflowTooltip: true },
     { label: "行为次数", prop: "xwcs",showSolt: true  },
     { label: "行为分值", prop: "xwfz",},
@@ -103,19 +102,32 @@ const changeSize = (val) =>{
   getList()
 }
 const getList = () =>{
-//   pageData.tableConfiger.loading = true;
-//   qcckGet(queryFrom.value,'/mosty-gsxt/behaviorWarning/selectPage').then((res)=>{
-//     pageData.total = res.total || 0;
-//     pageData.tableConfiger.loading = false;
-//   }).catch(()=>{
-//     pageData.tableConfiger.loading = false;
-//   })
+  pageData.tableConfiger.loading = true;
+  qcckGet(queryFrom.value,'/mosty-gsxt/yjzxXwyj/getPageList').then((res)=>{
+    pageData.total = res.total || 0;
+    pageData.tableConfiger.loading = false;
+    pageData.tableData = res.records || [];
+  }).catch(()=>{
+    pageData.tableConfiger.loading = false;
+  })
 }
 
 const handleClick = (row) => {
   detailRef.value.init(row)
 }
 
+const exportExcel = () => {
+  if (pageData.tableData.length === 0)  return ElMessage({  message: "暂无数据",  type: "warning" });
+  const headers = pageData.tableColumn.map(item => item.label);
+  const data = pageData.tableData.map(item => {
+    return [item.xm, item.sfzh, item.dh, item.xldlmc, item.xwzlmc, item.xwms, item.xwcs, item.xwfz];
+  });
+  const worksheet = XLSX.utils.aoa_to_sheet([headers, ...data]);
+  const workbook = XLSX.utils.book_new();
+  XLSX.utils.book_append_sheet(workbook, worksheet, "sheet1");
+  XLSX.writeFile(workbook, "行为预警.xlsx");
+}
+
 // 表格高度计算
 const tabHeightFn = () => {
   pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;