diff --git a/src/api/applySupermarket/counterfraud/index.js b/src/api/applySupermarket/counterfraud/index.js
new file mode 100644
index 0000000..b0c7a82
--- /dev/null
+++ b/src/api/applySupermarket/counterfraud/index.js
@@ -0,0 +1,18 @@
+// 应用超市 ---> 警情通报
+import request from '@/utils/request'
+// 警情通报主页查询 
+export function get_counterfraud_data(params) {
+    return request({
+        url: '/safety/store/instantalarm/safeCompanyNewsInfo',
+        method: 'get',
+        params
+    })
+}
+
+export function get_counter_item(id) {
+    return request({
+        url: '/safety/store/instantalarm/safeCompanyNewsInfo/' + id,
+        method: 'get',
+        id
+    })
+}
\ No newline at end of file
diff --git a/src/api/applySupermarket/policeReport/index.js b/src/api/applySupermarket/policeReport/index.js
index eb7e2c8..7a1a855 100644
--- a/src/api/applySupermarket/policeReport/index.js
+++ b/src/api/applySupermarket/policeReport/index.js
@@ -3,8 +3,16 @@ import request from '@/utils/request'
 // 警情通报主页查询 
 export function get_report_data(params) {
     return request({
-        url: '/safety/store/personnelReview/safeCompanyInstantAlarm',
+        url: '/safety/store/instantalarm/safeCompanyNewsInfo',
         method: 'get',
         params
     })
+}
+
+export function get_report_item(id) {
+    return request({
+        url: '/safety/store/instantalarm/safeCompanyNewsInfo/' + id,
+        method: 'get',
+        id
+    })
 }
\ No newline at end of file
diff --git a/src/assets/factor/factorback.png b/src/assets/factor/factorback.png
new file mode 100644
index 0000000..a26793c
Binary files /dev/null and b/src/assets/factor/factorback.png differ
diff --git a/src/router/index.js b/src/router/index.js
index 00e29d3..c989bda 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -56,7 +56,12 @@ const routes = [
             path: 'realtimeWarning',
             name: 'realtimeWarning',
             component: () => import('@/views/realtimeWarning'),
-
+          },
+          //要素资源(预)
+          {
+            path: 'factor',
+            name: 'factor',
+            component: () => import('@/views/factor'),
           },
           //要素资源
           {
diff --git a/src/views/applySupermarket/counterfraud/components/counterDialog.vue b/src/views/applySupermarket/counterfraud/components/counterDialog.vue
new file mode 100644
index 0000000..7f6042a
--- /dev/null
+++ b/src/views/applySupermarket/counterfraud/components/counterDialog.vue
@@ -0,0 +1,82 @@
+<template>
+  <el-dialog
+    class="dialog"
+    title="通报详情"
+    :visible.sync="visible"
+    :close-on-click-modal="false"
+    width="1100px"
+    @close="close"
+  >
+    <div class="text">
+      <div style="color: #fff" v-html="this.text"></div>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { get_counter_item } from "@/api/applySupermarket/counterfraud";
+export default {
+  name: "CounterDialog",
+  data() {
+    return {
+      visible: false,
+      text: "",
+    };
+  },
+  methods: {
+    open(item) {
+      this.visible = true;
+      // 请求返回文本
+      get_counter_item(item.id).then((res) => {
+        console.log("id", res.data.content);
+        this.text = res.data.content;
+      });
+    },
+    close() {
+      this.visible = false;
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+/deep/.el-dialog {
+  .el-dialog__title {
+    color: #fff;
+    font-size: 19px;
+    text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
+  }
+  background-image: url("~@/assets/companyFile/dialogBack.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  height: 680px;
+  /* 关闭弹窗叉号 */
+  .el-dialog__headerbtn {
+    .el-dialog__close {
+      color: #e55b5b;
+      font-size: 18px;
+      font-weight: 500;
+    }
+  }
+  .el-dialog__body {
+    padding: 0px;
+    padding-left: 15px;
+    padding-right: 15px;
+    .text {
+      margin-top: 20px;
+      overflow-y: scroll;
+    //   border: 0.1px solid #28847e;
+      height: 600px;
+    }
+    .text::-webkit-scrollbar {
+      width: 6px;
+      background-color: rbga(0,0,0,0);
+      border-radius: 4px;
+    }
+
+    .text::-webkit-scrollbar-thumb {
+      width: 5px;
+      background-color: #28847e;
+      border-radius: 4px;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/applySupermarket/counterfraud/index.vue b/src/views/applySupermarket/counterfraud/index.vue
index af6edfe..72ffc4e 100644
--- a/src/views/applySupermarket/counterfraud/index.vue
+++ b/src/views/applySupermarket/counterfraud/index.vue
@@ -42,7 +42,7 @@
               </div>
               <div class="counterfraud_glossary_text">警情简要:</div>
               <div class="counterfraud_glossary_value">
-                {{ item.counterfraud }}
+                {{ item.title }}
               </div>
             </div>
             <!-- 警情时间 -->
@@ -51,10 +51,13 @@
                 <i class="el-icon-alarm-clock"></i>
               </div>
               <div class="counterfraud_time_text">警情时间:</div>
-              <div class="counterfraud_time_value">{{ item.time }}</div>
+              <div class="counterfraud_time_value">{{ item.modifyTime }}</div>
               <!-- 查看详情按钮 -->
               <div class="counterfraud_btn">
-                <el-button size="small" icon="el-icon-s-promotion"
+                <el-button
+                  size="small"
+                  icon="el-icon-s-promotion"
+                  @click="check_item(item)"
                   >查看详情</el-button
                 >
               </div>
@@ -63,65 +66,44 @@
         </div>
       </div>
     </div>
+    <!-- 分页 -->
+    <lkyPagination
+      :page_sizes="page_sizes"
+      :pageSize="pageSize"
+      :pageNum="pageNum"
+      :total="total"
+      :pagination_width="pagination_width"
+      @size_change="size_change"
+      @num_change="num_change"
+    ></lkyPagination>
+    <CounterDialog ref="counterDialog"></CounterDialog>
   </div>
 </template>
 <script>
-// import { get_counterfraud_data } from "@/api/applySupermarket/policecounterfraud";
+import { get_counterfraud_data } from "@/api/applySupermarket/counterfraud";
+import CounterDialog from "./components/counterDialog";
 export default {
+  name: "Counterfraud",
+  components: {
+    CounterDialog,
+  },
   data() {
     return {
       search: {
         search_time: [this.get_today(), this.get_tomorrow()],
         word: "",
       },
-      counterfraud_list: [
-        {
-          id: "2",
-          counterfraud: "于该日在辖区内发生两起盗窃事件",
-          time: "2023 08 29",
-        },
-        {
-          id: "4",
-        },
-        {
-          id: "5",
-        },
-        {
-          id: "6",
-        },
-        {
-          id: "7",
-        },
-        {
-          id: "8",
-        },
-        {
-          id: "9",
-        },
-        {
-          id: "10",
-        },
-        {
-          id: "11",
-        },
-        {
-          id: "12",
-        },
-        {
-          id: "13",
-        },
-        {
-          id: "14",
-        },
-        {
-          id: "15",
-        },
-      ],
+      counterfraud_list: [],
       pageSize: 16,
       pageNum: 1,
       total: 0,
+      page_sizes: [16],
+      pagination_width: "94",
     };
   },
+  created() {
+    this.search_data();
+  },
   methods: {
     // 转换时间格式
     dateConversion(value) {
@@ -166,7 +148,39 @@ export default {
     },
     // 查询
     search_data() {
-    //   get_counterfraud_data().then();
+      let param = {
+        pageSize: this.pageSize,
+        pageNum: this.pageNum,
+        createTime:
+          this.search.search_time == null
+            ? ""
+            : this.dateConversion(this.search.search_time[0]),
+        updateTime:
+          this.search.search_time == null
+            ? ""
+            : this.dateConversion(this.search.search_time[1]),
+        searchValue: this.search.word,
+        forumCode: "", // 反诈提醒
+      };
+      get_counterfraud_data(param).then((res) => {
+        this.counterfraud_list = res.data;
+        this.total = res.total;
+      });
+    },
+     // 点击查看详情
+    check_item(val) {
+      this.$refs.counterDialog.open(val)
+    },
+    // 分页--每页多少条
+    size_change(val) {
+      this.pageNum = 1;
+      this.pageSize = val;
+      this.search_data();
+    },
+    // 分页--前往哪一页
+    num_change(val) {
+      this.pageNum = val;
+      this.search_data();
     },
     // 重置查询
     reset() {
@@ -257,7 +271,7 @@ export default {
 .item_list {
   width: 94vw;
   height: 62vh;
-  border: 0.1px solid #28847e;
+  // border: 0.1px solid #28847e;
   display: flex;
   justify-content: flex-start;
   align-content: flex-start;
diff --git a/src/views/applySupermarket/policeReport/components/reportDialog.vue b/src/views/applySupermarket/policeReport/components/reportDialog.vue
new file mode 100644
index 0000000..20c72d7
--- /dev/null
+++ b/src/views/applySupermarket/policeReport/components/reportDialog.vue
@@ -0,0 +1,82 @@
+<template>
+  <el-dialog
+    class="dialog"
+    title="通报详情"
+    :visible.sync="visible"
+    :close-on-click-modal="false"
+    width="1100px"
+    @close="close"
+  >
+    <div class="text">
+      <div style="color: #fff" v-html="this.text"></div>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { get_report_item } from "@/api/applySupermarket/policeReport";
+export default {
+  name: "reportDialog",
+  data() {
+    return {
+      visible: false,
+      text: "",
+    };
+  },
+  methods: {
+    open(item) {
+      this.visible = true;
+      // 请求返回文本
+      get_report_item(item.id).then((res) => {
+        console.log("id", res.data.content);
+        this.text = res.data.content;
+      });
+    },
+    close() {
+      this.visible = false;
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+/deep/.el-dialog {
+  .el-dialog__title {
+    color: #fff;
+    font-size: 19px;
+    text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
+  }
+  background-image: url("~@/assets/companyFile/dialogBack.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  height: 680px;
+  /* 关闭弹窗叉号 */
+  .el-dialog__headerbtn {
+    .el-dialog__close {
+      color: #e55b5b;
+      font-size: 18px;
+      font-weight: 500;
+    }
+  }
+  .el-dialog__body {
+    padding: 0px;
+    padding-left: 15px;
+    padding-right: 15px;
+    .text {
+      margin-top: 20px;
+      overflow-y: scroll;
+    //   border: 0.1px solid #28847e;
+      height: 600px;
+    }
+    .text::-webkit-scrollbar {
+      width: 6px;
+      background-color: rgba(0,0,0,0);
+      border-radius: 4px;
+    }
+
+    .text::-webkit-scrollbar-thumb {
+      width: 5px;
+      background-color: #28847e;
+      border-radius: 4px;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/applySupermarket/policeReport/index.vue b/src/views/applySupermarket/policeReport/index.vue
index 22cfdea..59cd5b8 100644
--- a/src/views/applySupermarket/policeReport/index.vue
+++ b/src/views/applySupermarket/policeReport/index.vue
@@ -37,85 +37,67 @@
                 <div class="icon_green"></div>
               </div>
               <div class="report_glossary_text">警情简要:</div>
-              <div class="report_glossary_value">{{ item.report }}</div>
+              <div :title="item.title" class="report_glossary_value">{{ item.title }}</div>
             </div>
             <!-- 警情时间 -->
             <div class="report_time">
-             <div class="report_time_icon">
+              <div class="report_time_icon">
                 <i class="el-icon-alarm-clock"></i>
-             </div>
-             <div class="report_time_text">警情时间:</div>
-             <div class="report_time_value">{{ item.time }}</div>
-             <!-- 查看详情按钮 -->
-             <div class="report_btn">
-                <el-button size="small" icon="el-icon-s-promotion"
-                >查看详情</el-button
-              >
-             </div>
+              </div>
+              <div class="report_time_text">警情时间:</div>
+              <div class="report_time_value">{{ item.modifyTime }}</div>
+              <!-- 查看详情按钮 -->
+              <div class="report_btn">
+                <el-button
+                  size="small"
+                  icon="el-icon-s-promotion"
+                  @click="check_item(item)"
+                  >查看详情</el-button
+                >
+              </div>
             </div>
           </div>
         </div>
       </div>
     </div>
+    <!-- 分页 -->
+    <lkyPagination
+      :page_sizes="page_sizes"
+      :pageSize="pageSize"
+      :pageNum="pageNum"
+      :total="total"
+      :pagination_width="pagination_width"
+      @size_change="size_change"
+      @num_change="num_change"
+    ></lkyPagination>
+    <ReportDialog ref="reportDialog"></ReportDialog>
   </div>
 </template>
 <script>
-import {get_report_data} from '@/api/applySupermarket/policeReport'
+import { get_report_data } from "@/api/applySupermarket/policeReport";
+import ReportDialog from "./components/reportDialog";
 export default {
+  name: "PoliceReport",
+  components: {
+    ReportDialog,
+  },
   data() {
     return {
       search: {
         search_time: [this.get_today(), this.get_tomorrow()],
         word: "",
       },
-      report_list: [
-        {
-          id: "2",
-          report: "于该日在辖区内发生两起盗窃事件",
-          time: "2023 08 29",
-        },
-        {
-          id: "4",
-        },
-        {
-          id: "5",
-        },
-        {
-          id: "6",
-        },
-        {
-          id: "7",
-        },
-        {
-          id: "8",
-        },
-        {
-          id: "9",
-        },
-        {
-          id: "10",
-        },
-        {
-          id: "11",
-        },
-        {
-          id: "12",
-        },
-        {
-          id: "13",
-        },
-        {
-          id: "14",
-        },
-        {
-          id: "15",
-        },
-      ],
+      report_list: [],
       pageSize: 16,
       pageNum: 1,
       total: 0,
+      page_sizes: [16],
+      pagination_width: "94",
     };
   },
+  created() {
+    this.search_data();
+  },
   methods: {
     // 转换时间格式
     dateConversion(value) {
@@ -160,11 +142,43 @@ export default {
     },
     // 查询
     search_data() {
-       get_report_data().then()
+      let param = {
+        pageSize: this.pageSize,
+        pageNum: this.pageNum,
+        createTime:
+          this.search.search_time == null
+            ? ""
+            : this.dateConversion(this.search.search_time[0]),
+        updateTime:
+          this.search.search_time == null
+            ? ""
+            : this.dateConversion(this.search.search_time[1]),
+        searchValue: this.search.word,
+        forumCode: "InstantAlarm", // 警情通报
+      };
+      get_report_data(param).then((res) => {
+        this.report_list = res.data;
+        this.total = res.total;
+      });
+    },
+    // 点击查看详情
+    check_item(val) {
+      this.$refs.reportDialog.open(val);
+    },
+    // 分页--每页多少条
+    size_change(val) {
+      this.pageNum = 1;
+      this.pageSize = val;
+      this.search_data();
+    },
+    // 分页--前往哪一页
+    num_change(val) {
+      this.pageNum = val;
+      this.search_data();
     },
     // 重置查询
     reset() {
-      this.search.course_time = [this.get_today(), this.get_tomorrow()];
+      this.search.search_time = [this.get_today(), this.get_tomorrow()];
       this.search.word = "";
       this.search_data();
     },
@@ -255,7 +269,7 @@ export default {
 .item_list {
   width: 94vw;
   height: 62vh;
-  border: 0.1px solid #28847e;
+  // border: 0.1px solid #28847e;
   display: flex;
   justify-content: flex-start;
   align-content: flex-start;
@@ -356,6 +370,9 @@ export default {
             line-height: 5vh;
             color: #fff;
             text-align: left;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            overflow: hidden;
           }
         }
         .report_time {
diff --git a/src/views/companyCanban/daolu.vue b/src/views/companyCanban/daolu.vue
index e1a4727..f4c0508 100644
--- a/src/views/companyCanban/daolu.vue
+++ b/src/views/companyCanban/daolu.vue
@@ -27,7 +27,7 @@
                 </div>
             </div>
         </div>
-        <el-dialog title="防疫安全上报数据详情" :visible.sync="diaVisible" class="picForm">
+        <el-dialog title="道路交通安全上报数据详情" :visible.sync="diaVisible" class="picForm">
             <div class="topBK">
                 <div class="topBKChild">
                     <div id="ytjc"></div>
diff --git a/src/views/companyCanban/xiaofang.vue b/src/views/companyCanban/xiaofang.vue
index e384480..bcc699d 100644
--- a/src/views/companyCanban/xiaofang.vue
+++ b/src/views/companyCanban/xiaofang.vue
@@ -155,7 +155,7 @@
                 </div>
             </div>
             <div class="xfwh" v-if="fireData && fireData.length">
-                <div class="tjsjTitle">消防设施维护</div>
+                <div class="tjsjTitle">消防事件发生</div>
                 <div class="zhuangshi"></div>
 
                 <div class="huozai hong">
diff --git a/src/views/factor/components/factorMap.vue b/src/views/factor/components/factorMap.vue
new file mode 100644
index 0000000..298f438
--- /dev/null
+++ b/src/views/factor/components/factorMap.vue
@@ -0,0 +1,15 @@
+<!-- 要素资源地图 -->
+<template>
+    <div></div>
+</template>
+<script>
+export default {
+    name:'FactorMap',
+    data() {
+        return {}
+    }
+}
+</script>
+<style lang="less" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/factor/index.vue b/src/views/factor/index.vue
new file mode 100644
index 0000000..56c90ff
--- /dev/null
+++ b/src/views/factor/index.vue
@@ -0,0 +1,64 @@
+<template>
+  <div class="content">
+    <div class="factor_body">
+      <div class="factor_title">要素资源</div>
+      <div class="factor_map">
+        <div class="map_body">
+            <FactorMap ref="factorMap"></FactorMap>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import FactorMap from "./components/factorMap"
+export default {
+  name: "factor",
+  components:{
+    FactorMap
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+<style lang="less" scoped>
+.content {
+  width: 100%;
+  height: calc(100% - 80px);
+  //   border: 0.1px solid #28847e;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .factor_body {
+    width: 100%;
+    height: 90vh;
+    background: url("~@/assets/factor/factorback.png") no-repeat;
+    background-size: 100% 100%;
+    .factor_title {
+      margin-top: 2vh;
+      width: 7vw;
+      height: 3.5vh;
+      color: #fff;
+      font-size: 19px;
+      text-align: center;
+      line-height: 3.5vh;
+      font-weight: 600;
+      letter-spacing: 2px;
+      text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
+    }
+    .factor_map {
+      width: 100%;
+      height: 84vh;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .map_body {
+        width: 98%;
+        height: 82vh;
+        border: 0.1px solid #28847e;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/realtimeWarning/components/warnMap.vue b/src/views/realtimeWarning/components/warnMap.vue
index 5d3c6b8..81b32ed 100644
--- a/src/views/realtimeWarning/components/warnMap.vue
+++ b/src/views/realtimeWarning/components/warnMap.vue
@@ -24,7 +24,6 @@ export default {
   mounted() {
     // 创建地图
     bus.$on("send_map", (list, is_flag) => {
-      console.log("list22", list);
       this.center_point[0] = list[0].longitude;
       this.center_point[1] = list[0].latitude;
       this.trans_list = list;
@@ -51,7 +50,6 @@ export default {
         } else {
           list_item = this.trans_list;
         }
-        console.log("list_item", list_item);
         list_item.forEach((item) => {
           var point = new BMap.Point(item.longitude, item.latitude);
           // 打点的同时，判断预警等级，四种等级打四种点
@@ -61,7 +59,7 @@ export default {
           if (item.color == "red") {
             myIcon = new BMap.Icon(
               require("@/assets/realtimeWarning/red_c.png"),
-              new BMap.Size(40, 65),
+              new BMap.Size(40, 60),
               {
                 imageOffset: new BMap.Size(0, 0, 5), // 设置图片偏移
               }