diff --git a/cjy-project/src/main/resources/mapper/emergencyInfo/EmergencyInfoMapper.xml b/cjy-project/src/main/resources/mapper/emergencyInfo/EmergencyInfoMapper.xml
index b66fd783..b55033cc 100644
--- a/cjy-project/src/main/resources/mapper/emergencyInfo/EmergencyInfoMapper.xml
+++ b/cjy-project/src/main/resources/mapper/emergencyInfo/EmergencyInfoMapper.xml
@@ -76,30 +76,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectEmergencyInfoList" parameterType="EmergencyInfo" resultMap="MapResult">
-        select t1.id,t1.type,t1.resource_code as resourceCode,t1.resource_name as resourceName,t1.contacts,t1.telephone,t2.address,t3.cover_img as coverImg,t1.inside_area as insideArea
+        select t1.id,t1.type,t1.resource_code as resourceCode,t1.resource_name as resourceName,t1.contacts,t1.telephone,t2.address,t2.lon,t2.lat,t3.cover_img as coverImg,t1.inside_area as insideArea,CONCAT(t4.region_name,t5.region_name,t6.region_name) as region
         from b_emergency_info as t1
         left join b_geography_info as t2 on t1.resource_code = t2.resource_code
         left join b_graphic_info as t3 on t1.resource_code = t3.resource_code
+        left join region t4 on t2.province = t4.region_id
+        left join region t5 on t2.city = t5.region_id
+        left join region t6 on t2.county = t6.region_id
         <where>
             <if test="type != null  and type != ''"> and t1.type = #{type}</if>
-            <if test="searchType == 'resourceCode'">
-                and t1.resource_code like concat('%', #{keywords}, '%')
-            </if>
-            <if test="searchType == 'resourceName'">
-                and t1.resource_name like concat('%', #{keywords}, '%')
-            </if>
-            <if test="searchType == 'creditCode'">
-                and t1.credit_code like concat('%', #{keywords}, '%')
-            </if>
-            <if test="searchType == 'contacts'">
-                and t1.contacts like concat('%', #{keywords}, '%')
-            </if>
-            <if test="searchType == 'telephone'">
-                and t1.telephone like concat('%', #{keywords}, '%')
-            </if>
-            <if test="searchType == 'outCode'">
-                and t1.out_code like concat('%', #{keywords}, '%')
-            </if>
+             <if test="keywords != null and keywords != ''">
+                 <if test="searchType == 'resourceCode'">
+                     and t1.resource_code like concat('%', #{keywords}, '%')
+                 </if>
+                 <if test="searchType == 'resourceName'">
+                     and t1.resource_name like concat('%', #{keywords}, '%')
+                 </if>
+                 <if test="searchType == 'creditCode'">
+                     and t1.credit_code like concat('%', #{keywords}, '%')
+                 </if>
+                 <if test="searchType == 'contacts'">
+                     and t1.contacts like concat('%', #{keywords}, '%')
+                 </if>
+                 <if test="searchType == 'telephone'">
+                     and t1.telephone like concat('%', #{keywords}, '%')
+                 </if>
+                 <if test="searchType == 'outCode'">
+                     and t1.out_code like concat('%', #{keywords}, '%')
+                 </if>
+             </if>
             <if test="resourceName != null and resourceName != ''">
                 and t1.resource_name like concat('%', #{resourceName}, '%')
             </if>
diff --git a/cjy-project/src/main/resources/mapper/guideInfo/GuideInfoMapper.xml b/cjy-project/src/main/resources/mapper/guideInfo/GuideInfoMapper.xml
index d79112ac..67ac7860 100644
--- a/cjy-project/src/main/resources/mapper/guideInfo/GuideInfoMapper.xml
+++ b/cjy-project/src/main/resources/mapper/guideInfo/GuideInfoMapper.xml
@@ -76,6 +76,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from b_guide_info as t1
         left join b_graphic_info as t2 on t1.resource_code = t2.resource_code
         <where>
+            <if test="keywords != null and keywords != ''">
+                <if test="searchType == 'guideName'">
+                    and t1.guide_name like concat('%', #{keywords}, '%')
+                </if>
+                <if test="searchType == 'telephone'">
+                    and t1.telephone like concat('%', #{keywords}, '%')
+                </if>
+                <if test="searchType == 'cardNumber'">
+                    and t1.card_number like concat('%', #{keywords}, '%')
+                </if>
+            </if>
             <if test="guideName != null and guideName != ''">
                 and t1.guide_name like concat('%', #{guideName}, '%')
             </if>
diff --git a/cjy-project/src/main/resources/mapper/publicserviceInfo/PublicserviceInfoMapper.xml b/cjy-project/src/main/resources/mapper/publicserviceInfo/PublicserviceInfoMapper.xml
index c29273ca..307b3ce6 100644
--- a/cjy-project/src/main/resources/mapper/publicserviceInfo/PublicserviceInfoMapper.xml
+++ b/cjy-project/src/main/resources/mapper/publicserviceInfo/PublicserviceInfoMapper.xml
@@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectPublicserviceInfoList" parameterType="PublicserviceInfo"  resultMap="MapResult">
-        select t1.id,t1.type,t1.resource_code as resourceCode,t1.resource_name as resourceName,t1.grade,t1.contacts,t1.telephone,t2.address,t3.image_url as imageUrl,t1.inside_area as insideArea,t1.label
+        select t1.id,t1.type,t1.resource_code as resourceCode,t1.resource_name as resourceName,t1.grade,t1.contacts,t1.telephone,t2.address,t2.lon,t2.lat,t3.image_url as imageUrl,t1.inside_area as insideArea,t1.label
         from b_public_service_info as t1
         left join b_geography_info as t2 on t1.resource_code = t2.resource_code
         left join b_graphic_info as t3 on t1.resource_code = t3.resource_code
diff --git a/cjy-project/src/main/resources/mapper/touristInfo/TouristInfoMapper.xml b/cjy-project/src/main/resources/mapper/touristInfo/TouristInfoMapper.xml
index 7beb3035..0c9b3507 100644
--- a/cjy-project/src/main/resources/mapper/touristInfo/TouristInfoMapper.xml
+++ b/cjy-project/src/main/resources/mapper/touristInfo/TouristInfoMapper.xml
@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTouristInfoList" parameterType="TouristInfo" resultMap="MapResult">
-        select t1.id,t1.type,CAST(t1.resource_code AS char) as resourceCode,t1.resource_name as resourceName,t1.contacts,t1.telephone,t2.address,t1.inside_area as insideArea
+        select t1.id,t1.type,CAST(t1.resource_code AS char) as resourceCode,t1.resource_name as resourceName,t1.contacts,t1.telephone,t2.address,t2.lon,t2.lat,t1.inside_area as insideArea
         from b_tourist_info as t1
         left join b_geography_info as t2 on t1.resource_code = t2.resource_code
         left join b_graphic_info as t3 on t1.resource_code = t3.resource_code
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 4889680b..dcc31927 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -132,6 +132,9 @@ public class SysUser extends BaseEntity {
      * 企业标识号
      */
     private Long organCode;
+
+    /** 前端显示企业名称 */
+    private String organName;
     /**
      * 用户类型
      */
@@ -321,6 +324,14 @@ public class SysUser extends BaseEntity {
         this.userType = userType;
     }
 
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 1be571cb..70e52efd 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"   column="update_time"  />
         <result property="remark"       column="remark"       />
 		<result property="organCode" column="organ_code"/>
+		<result property="organName" column="organName"/>
 		<result property="userType" column="user_type"/>
         <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
@@ -59,8 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,e.organ_name as organName from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
+		left join ti_enterprise_info e on u.organ_code = e.organ_code
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
diff --git a/ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/emergency-list.vue b/ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/emergency-list.vue
new file mode 100644
index 00000000..ab4097d4
--- /dev/null
+++ b/ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/emergency-list.vue
@@ -0,0 +1,63 @@
+<template>
+  <!-- 场馆 列表 -->
+  <div class="p-dialog-box">
+    <div class="display-flex p-form">
+      <el-select class="p-select " v-model="filterData.searchType" placeholder="请选择类型">
+        <el-option label="资源名称" value="resourceName"></el-option>
+        <el-option label="联系人" value="contacts"></el-option>
+        <el-option label="联系电话" value="telephone"></el-option>
+      </el-select>
+      <div class="p-resource-seek m-l-small">
+        <el-input v-model="filterData.keywords" placeholder="请输入关键词"></el-input>
+      </div>
+      <div @click="getresourceListData" class="p-filter-search-btn m-l-small"><i class="iconfont icon-search"></i></div>
+    </div>
+    <el-table class="p-table m-t-small" :data="listData" align="center" show-overflow-tooltip="true" height="450">
+      <el-table-column :key="1" type="index" label="序号" width="50"></el-table-column>
+      <el-table-column :key="2" prop="region" label="区域" width="180"></el-table-column>
+      <el-table-column :key="3" prop="resourceName" label="资源名称" width="180"></el-table-column>
+      <el-table-column :key="4" prop="contacts" label="联系人"></el-table-column>
+      <el-table-column :key="5" prop="telephone" label="联系电话"></el-table-column>
+    </el-table>
+    <div class="p-pagination">
+    <el-pagination
+      :current-page="resourcePage"
+      :page-size="10"
+      layout="prev, pager, next, jumper"
+      :total="total">
+    </el-pagination>
+  </div>
+  </div>
+</template>
+
+<script>
+    import { getBasicList } from "@/api/picture/resource-monitoring/resourceMonitoring";
+    export default {
+      name: "emergency-list",
+      props: ['listData','total','interfacePath','dataType'],
+      data(){
+        return{
+          resourcePage:0,
+          //资源信息筛选 表单
+          filterData: {
+            searchType: "",
+            keywords: "",
+            type: "",
+          },
+        }
+      },
+      methods: {
+          //获取 旅游资源 数据
+          getresourceListData() {
+              this.filterData.type = this.dataType;
+              getBasicList(this.interfacePath,this.filterData).then(response => {
+                  this.total = response.total;
+                  this.listData = response.rows;
+              });
+          },
+      }
+}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/guide-list.vue b/ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/guide-list.vue
index 68c63abb..5e56bd97 100644
--- a/ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/guide-list.vue
+++ b/ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/guide-list.vue
@@ -1,24 +1,76 @@
 <template>
   <!-- 导游 列表-->
   <div class="p-dialog-box">
-
-    <el-table class="p-table" :data="listData" align="center" show-overflow-tooltip="true" height="450">
+    <div class="display-flex p-form">
+      <el-select class="p-select " v-model="filterData.searchType" placeholder="请选择类型">
+        <el-option label="导游姓名" value="guideName"></el-option>
+        <el-option label="联系电话" value="telephone"></el-option>
+        <el-option label="导游证号" value="cardNumber"></el-option>
+      </el-select>
+      <div class="p-resource-seek m-l-small">
+        <el-input v-model="filterData.keywords" placeholder="请输入关键词"></el-input>
+      </div>
+      <div @click="getresourceListData" class="p-filter-search-btn m-l-small"><i class="iconfont icon-search"></i></div>
+    </div>
+    <el-table class="p-table m-t-small" :data="listData" align="center" show-overflow-tooltip="true" height="450">
       <el-table-column type="index" label="序号" width="50"></el-table-column>
-      <el-table-column prop="name" label="资源编码" width="180"></el-table-column>
-      <el-table-column prop="name" label="导游证号"></el-table-column>
-      <el-table-column prop="name" label="导游姓名"></el-table-column>
-      <el-table-column prop="name" label="性别"></el-table-column>
-      <el-table-column prop="name" label="导游等级"></el-table-column>
-      <el-table-column prop="name" label="服务语种"></el-table-column>
-      <el-table-column prop="name" label="联系电话"></el-table-column>
+      <el-table-column prop="resourceCode" label="资源编码" width="180"></el-table-column>
+      <el-table-column prop="cardNumber" label="导游证号" width="180"></el-table-column>
+      <el-table-column prop="guideName" label="导游姓名" width="80"></el-table-column>
+      <el-table-column prop="sex" label="性别" min-width="50" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="level" label="导游等级" min-width="50" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.guide_level" :value="scope.row.level"/>
+        </template>
+      </el-table-column>
+      <el-table-column prop="languages" label="服务语种" min-width="50" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.guide_languages" :value="scope.row.languages.split(',')"/>
+        </template>
+      </el-table-column>
+      <el-table-column prop="telephone" label="联系电话"></el-table-column>
     </el-table>
+    <div class="p-pagination">
+      <el-pagination
+        :current-page="resourcePage"
+        :page-size="10"
+        layout="prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </div>
   </div>
 </template>
 
-<script>export default {
-  name: "guide-list",
-  props: ['listData'],
-}
+<script>
+    import { getBasicList } from "@/api/picture/resource-monitoring/resourceMonitoring";
+    export default {
+        name: "guide-list",
+        props: ['listData','total','interfacePath','dataType'],
+        dicts: ['sys_user_sex','guide_level','guide_languages'],
+        data(){
+            return{
+                resourcePage:0,
+                //资源信息筛选 表单
+                filterData: {
+                    searchType: "",
+                    keywords: "",
+                },
+            }
+        },
+        methods: {
+            //获取 旅游资源 数据
+            getresourceListData() {
+                getBasicList(this.interfacePath,this.filterData).then(response => {
+                    this.total = response.total;
+                    this.listData = response.rows;
+                });
+            },
+        }
+    }
 </script>
 
 <style scoped lang="scss">
diff --git a/ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/tourist-list.vue b/ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/tourist-list.vue
index 5479e357..7d2e2763 100644
--- a/ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/tourist-list.vue
+++ b/ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/tourist-list.vue
@@ -16,63 +16,57 @@
       <el-table-column :key="1" type="index" label="序号" width="50"></el-table-column>
       <el-table-column :key="2" prop="region" label="区域" width="180"></el-table-column>
       <el-table-column :key="3" prop="resourceName" label="资源名称" width="180"></el-table-column>
-      <!--景区 娱乐 旅行社 等级-->
-      <el-table-column :key="4" v-if="dataType == 'museum' || dataType == 'cultural' || dataType == 'memorialhall' || dataType == 'library'" prop="grade" label="等级" min-width="50" show-overflow-tooltip>
+      <!--厕所 等级-->
+      <el-table-column :key="4" v-if="dataType == 'toilet'" prop="grade" label="等级" min-width="50" show-overflow-tooltip>
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.museum_level" :value="scope.row.grade" />
+          <dict-tag :options="dict.type.toilet_level" :value="scope.row.grade" />
         </template>
       </el-table-column>
-      <!--美术馆等级-->
-      <el-table-column :key="4" v-if="dataType == 'artgallery'" prop="grade" label="等级" min-width="50" show-overflow-tooltip>
+      <!--停车场等级-->
+      <el-table-column :key="5" v-if="dataType == 'carpark'" prop="grade" label="等级" min-width="50" show-overflow-tooltip>
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.artgallery_level" :value="scope.row.grade" />
+          <dict-tag :options="dict.type.carpark_level" :value="scope.row.grade" />
         </template>
       </el-table-column>
-      <!--科技馆等级-->
-      <el-table-column :key="4" v-if="dataType == 'technology'" prop="grade" label="等级" min-width="50" show-overflow-tooltip>
+      <!--景区花卉保护等级-->
+      <el-table-column :key="6" v-if="dataType == 'flower'" prop="protectionLevel" label="保护等级" min-width="50" show-overflow-tooltip>
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.technology_level" :value="scope.row.grade" />
+          <dict-tag :options="dict.type.flower_level" :value="scope.row.protectionLevel" />
         </template>
       </el-table-column>
-      <!--博物馆标签-->
-      <el-table-column :key="5" v-if="dataType == 'museum'" prop="label" label="标签" min-width="60" show-overflow-tooltip>
+      <!--展品 藏品 质地-->
+      <el-table-column :key="7" v-if="dataType == 'exhibit' || dataType == 'collection'" prop="texture" label="质地" min-width="50" show-overflow-tooltip>
         <template slot-scope="scope">
-            <dict-tag :options="dict.type.museum_type" :value="scope.row.label.split(',')"/>
+          <dict-tag :options="dict.type.exhibit_quality" :value="scope.row.texture" />
         </template>
       </el-table-column>
-      <!--美术馆 标签-->
-      <el-table-column :key="5" v-if="dataType == 'artgallery'" prop="label" label="标签" min-width="60" show-overflow-tooltip>
+      <!--展品 藏品 年代-->
+      <el-table-column :key="8" v-if="dataType == 'exhibit' || dataType == 'collection'" prop="dynasty" label="年代" min-width="50" show-overflow-tooltip>
         <template slot-scope="scope">
-            <dict-tag :options="dict.type.artgallery_type" :value="scope.row.label.split(',')"/>
+          <dict-tag :options="dict.type.exhibit_dynasty" :value="scope.row.dynasty" />
         </template>
       </el-table-column>
-      <!--纪念馆标签-->
-      <el-table-column :key="5" v-if="dataType == 'cultural'" prop="label" label="标签" min-width="60" show-overflow-tooltip>
+      <!--展品 藏品 品类-->
+      <el-table-column :key="9" v-if="dataType == 'exhibit' || dataType == 'collection'" prop="category" label="品类" min-width="50" show-overflow-tooltip>
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.cultural_type" :value="scope.row.label.split(',')"/>
+          <dict-tag :options="dict.type.exhibit_category" :value="scope.row.category" />
         </template>
       </el-table-column>
-      <!--体育馆标签-->
-      <el-table-column :key="5" v-if="dataType == 'gymnasium'" prop="label" label="标签" min-width="60" show-overflow-tooltip>
+      <!--厕所标签-->
+      <el-table-column :key="10" v-if="dataType == 'toilet'" prop="label" label="标签" min-width="60" show-overflow-tooltip>
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.gymnasium_type" :value="scope.row.label.split(',')"/>
+            <dict-tag :options="dict.type.toilet_type" :value="scope.row.label.split(',')"/>
         </template>
       </el-table-column>
-      <!--纪念馆标签-->
-      <el-table-column :key="5" v-if="dataType == 'memorialhall'" prop="label" label="标签" min-width="60" show-overflow-tooltip>
+      <!--停车场 标签-->
+      <el-table-column :key="11" v-if="dataType == 'carpark'" prop="label" label="标签" min-width="60" show-overflow-tooltip>
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.memorialhall_type" :value="scope.row.label.split(',')"/>
+            <dict-tag :options="dict.type.carpark_type" :value="scope.row.label.split(',')"/>
         </template>
       </el-table-column>
-      <!--图书馆标签-->
-      <el-table-column :key="5" v-if="dataType == 'library'" prop="label" label="标签" min-width="60" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.library_type" :value="scope.row.label.split(',')"/>
-        </template>
-      </el-table-column>
-      <el-table-column :key="6" prop="address" label="地址"></el-table-column>
-      <el-table-column :key="7" prop="contacts" label="联系人"></el-table-column>
-      <el-table-column :key="8" prop="telephone" label="联系电话"></el-table-column>
+      <el-table-column :key="12" prop="address" label="地址"></el-table-column>
+      <el-table-column :key="13" prop="contacts" label="联系人"></el-table-column>
+      <el-table-column :key="14" prop="telephone" label="联系电话"></el-table-column>
     </el-table>
     <div class="p-pagination">
     <el-pagination
@@ -90,8 +84,8 @@
     export default {
       name: "tour-list",
       props: ['listData','total','interfacePath','dataType'],
-      dicts: ['museum_level','artgallery_level','technology_level','museum_type','artgallery_type','cultural_type','gymnasium_type'
-          ,'memorialhall_type','library_type'],
+      dicts: ['toilet_level','toilet_type','carpark_level','carpark_type','flower_level','exhibit_quality','exhibit_dynasty'
+          ,'exhibit_category'],
       data(){
         return{
           resourcePage:0,
diff --git a/ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/worker-list.vue b/ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/worker-list.vue
index 582024c7..261aa0f9 100644
--- a/ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/worker-list.vue
+++ b/ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/worker-list.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- 工作人员 列表-->
   <div class="p-dialog-box">
-    <div class="display-flex p-form">
+    <!--<div class="display-flex p-form">
       <el-select class="p-select " v-model="filterData.searchType" placeholder="请选择类型">
         <el-option label="资源名称" value="resourceName"></el-option>
         <el-option label="联系人" value="contacts"></el-option>
@@ -11,13 +11,13 @@
         <el-input v-model="filterData.keywords" placeholder="请输入关键词"></el-input>
       </div>
       <div @click="getresourceListData" class="p-filter-search-btn m-l-small"><i class="iconfont icon-search"></i></div>
-    </div>
+    </div>-->
     <el-table class="p-table m-t-small" :data="listData" align="center" show-overflow-tooltip="true" height="450">
       <el-table-column :key="1" type="index" label="序号" width="50"></el-table-column>
-      <el-table-column :key="2" prop="region" label="企业" width="180"></el-table-column>
+      <el-table-column :key="2" prop="organName" label="企业" width="180"></el-table-column>
       <el-table-column :key="3" prop="dept.deptName" label="部门" width="180"></el-table-column>
       <el-table-column :key="4" prop="nickName" label="姓名"></el-table-column>
-      <el-table-column :key="5" prop="contacts" label="联系电话"></el-table-column>
+      <el-table-column :key="5" prop="phonenumber" label="联系电话"></el-table-column>
     </el-table>
     <div class="p-pagination">
       <el-pagination
diff --git a/ruoyi-ui/src/views/picture/resource-monitoring/resoure-dialog.vue b/ruoyi-ui/src/views/picture/resource-monitoring/resoure-dialog.vue
index 50861de8..8026a4c3 100644
--- a/ruoyi-ui/src/views/picture/resource-monitoring/resoure-dialog.vue
+++ b/ruoyi-ui/src/views/picture/resource-monitoring/resoure-dialog.vue
@@ -18,12 +18,15 @@
     <iotList v-if="type == 'videolist' || type == 'passflowlist' || type == 'broadcastlist' || type == 'ledlist' || type == 'wifilist' || type == 'polelist' || type == 'patrollist' || type == 'reportlist' || type == 'soslist' || type == 'vibelist' || type == 'geologilist' || type == 'firelist' || type == 'intrudelist'" :listData="propsData" :total="total" :dataType="dataType" :interfacePath="interfacePath"></iotList>
     <videoDetail v-if="type == 'videodetail'" :detailData="propsData"></videoDetail>
 
+    <!--应急场所------------------------------>
+    <emergencyList v-if="type == 'emergmangelist' || type == 'medicalalist' || type == 'firecolist' || type == 'takerefugelist' || type == 'armedlist'" :listData="propsData" :total="total" :dataType="dataType" :interfacePath="interfacePath"></emergencyList>
+
     <!-- 游客服务 ----------------------------------------------------- -->
     <!-- 工作人员 worker -->
     <workerList v-if="type == '01list'" :listData="propsData" :total="total" :dataType="dataType" :interfacePath="interfacePath"></workerList>
     <workerDetail v-if="type == '01tail'"></workerDetail>
     <!-- 导游 guide -->
-    <guideList v-if="type == 'guideList'" :total="total" :dataType="dataType" :interfacePath="interfacePath"></guideList>
+    <guideList v-if="type == 'guidelist'" :listData="propsData" :total="total" :dataType="dataType" :interfacePath="interfacePath"></guideList>
     <guideDetail v-if="type == 'guidedetail'"></guideDetail>
     <!-- 游玩景点 spot -->
 <!--    <spotList v-if="type == 'spotlist'" :listData="propsData" :total="total" :dataType="dataType" :interfacePath="interfacePath"></spotList>-->
@@ -52,6 +55,9 @@ import touristList from "@/views/picture/resource-monitoring/dialog-module/touri
 //引入 视频 列表
 import iotList from "@/views/picture/resource-monitoring/dialog-module/iot-list";
 
+//应急场所--------------------------------------------------------
+import emergencyList from "@/views/picture/resource-monitoring/dialog-module/emergency-list";
+
 
 //游客服务 -----------------------------------------------------
 //引入 工作人员 worker 列表
@@ -72,7 +78,7 @@ export default {
   name: "resoure-dialog",
   components: {
       tourList,scenicDetail,venueList,hotelDetail,
-      iotList,touristList,
+      iotList,touristList,emergencyList,
     workerList,workerDetail,guideDetail,spotList,guideList,spotDetail},
 
   props: ['propsData','type','total','interfacePath','dataType']