diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUserXJ.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUserXJ.java
index 46c526f0..88196634 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUserXJ.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUserXJ.java
@@ -38,7 +38,7 @@ public class CxxmUserXJ extends BaseEntity {
     /**
      * 部门名称
      */
-    @Excel(name = "角色类型", type = Excel.Type.IMPORT, combo = {"县级管理员", "县级管理员", "外业调查员"})
+    @Excel(name = "角色类型", type = Excel.Type.IMPORT, combo = {"县级管理员", "外业调查员"})
     private String roleName;
 
     /**
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUserZJ.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUserZJ.java
index 72399b71..67860b73 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUserZJ.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUserZJ.java
@@ -32,7 +32,7 @@ public class CxxmUserZJ extends BaseEntity {
     /**
      * 部门名称
      */
-    @Excel(name = "归属市县", type = Excel.Type.IMPORT, combo = {"楚雄市", "禄丰市", "大姚县", "姚安县", "武定县", "双柏县", "牟定县", "南华县", "永仁县", "元谋县"})
+    @Excel(name = "归属市县", type = Excel.Type.IMPORT, combo = {"楚雄彝族自治州","楚雄市", "禄丰市", "大姚县", "姚安县", "武定县", "双柏县", "牟定县", "南华县", "永仁县", "元谋县"})
     private String deptName;
 
     /**
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 0c89f084..bfcaee44 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -8,7 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://ruoyi-mysql:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 123456
+                password: 7ZH2jxM1
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 62ca8ec6..12f8938e 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -79,7 +79,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password: 123456
+    password: 7ZH2jxM1
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -98,7 +98,7 @@ token:
   # 令牌自定义标识
   header: Authorization
   # 令牌密钥
-  secret: abcdefghijklmnopqrstuvwxyz
+  secret: c7uqYnmmmTxmoxUDd7tPYvpum2
   # 令牌有效期（默认30分钟）
   expireTime: 4320
 
@@ -117,7 +117,7 @@ pagehelper:
   supportMethodsArguments: true
   params: count=countSql
 
-# Swagger配置
+# Swagger配置cd
 swagger:
   # 是否开启swagger
   enabled: true
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index e5752826..ae4e63e6 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -114,7 +114,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/login", "/register", "/captchaImage").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
-                .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+                .antMatchers("/swagger-ui.htagml\", \"/swger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
                 .antMatchers("/cxxm/api/version/**","/cxxm/api/type/**","/cxxm/api/user/**").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 327fb00c..a2fcbfb5 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -48,9 +48,11 @@
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
+    "jszip": "^3.10.1",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
+    "shapefile": "^0.6.6",
     "sortablejs": "1.10.2",
     "v-charts": "^1.19.0",
     "v-echarts": "^1.0.2",
diff --git a/ruoyi-ui/src/components/Map2/index.vue b/ruoyi-ui/src/components/Map2/index.vue
new file mode 100644
index 00000000..697f3ad7
--- /dev/null
+++ b/ruoyi-ui/src/components/Map2/index.vue
@@ -0,0 +1,239 @@
+<template>
+  <div className="" style="position: relative">
+    <div id="lonlatMap" style=" width:100%; height: 100%;position: absolute;z-index: 1"></div>
+    <div
+      style="position: absolute;right:10px;top: 10px;z-index: 2;background:rgba(255,255,255,0.6);border-radius: 5px;overflow: hidden">
+      <div class="map-gj">图层</div>
+      <div class="map-gj" @click="onLineTool">测距</div>
+      <div class="map-gj" @click="onPolygonTool">测面</div>
+      <div class="map-gj" @click="clerOver">清除</div>
+    </div>
+  </div>
+</template>
+
+<script>
+var zoom = 18
+export default {
+  components: {},
+  name: 'info',
+  data() {
+    return {
+      map: null,
+      infoData: {},
+      recordData: {},
+      lineTool: null,//测距
+      polygonTool: null,//侧面
+    }
+  },
+  props: ['value', 'files'],
+  watch: {
+    value: {
+      handler: function (newValue, oldValue) {
+        if (newValue) {
+          console.log(newValue, '-加载数据到 低于-')
+          this.infoData = newValue
+        }
+      },
+      immediate: true,
+      deep: true // 为true，表示深度监听，这时候就能监测到a值变化
+    },
+    files: {
+      handler: function (newValue, oldValue) {
+        if (newValue) {
+          console.log(newValue, '-加载巡查情况到地图-')
+          // this.recordData = newValue
+          var thef = this
+          setTimeout(() => {
+            thef.map_set_images(newValue)
+          }, 1500)
+        }
+      },
+      immediate: true,
+      deep: true // 为true，表示深度监听，这时候就能监测到a值变化
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      setTimeout(() => {
+        this.initMap()
+
+      }, 500)
+      setTimeout(() => {
+        this.setMap()
+      }, 1500)
+    })
+  },
+  methods: {
+    onLineTool() {
+      var config = {
+        showLabel: true
+      };
+      //创建标注工具对象
+      this.lineTool = new T.PolylineTool(this.map, config);
+      this.lineTool.open()
+    },
+    onPolygonTool() {
+      var config = {
+        showLabel: true,
+        color: "blue", weight: 3, opacity: 0.5, fillColor: "#FFFFFF", fillOpacity: 0.5
+      };
+      //创建标注工具对象
+      this.polygonTool = new T.PolygonTool(this.map, config);
+      this.polygonTool.open()
+    },
+    clerOver() {
+      var OverLay = this.map.getOverlays()
+      // console.log(OverLay)
+      if (OverLay && OverLay.length > 0) {
+        OverLay.map((item, index) => {
+          if (!item.id) {
+            this.map.removeOverLay(item)
+          }
+        })
+      }
+    },
+    initMap() {
+      return new Promise((resolve, reject) => {
+        // 如果已加载直接返回
+        if (window.T) {
+          console.log('地图脚本初始化成功...')
+          resolve(window.T)
+          reject('error')
+        }
+      })
+    },
+    setMap() {
+      this.map = new window.T.Map('lonlatMap');
+      this.map.setMapType(window.TMAP_HYBRID_MAP); //此地图类型展示卫星和路网的混合视图。
+
+      // console.log(this.infoData)
+      var LngLat = new window.T.LngLat(Number(this.infoData.x), Number(this.infoData.y))
+      this.map.centerAndZoom(
+        LngLat,
+        zoom,
+      );
+      //创建比例尺控件对象
+      var scale = new window.T.Control.Scale();
+      //添加比例尺控件
+      this.map.addControl(scale);
+      this.addmark()
+      this.setMapPolers()
+    },
+    setMarkMap() {
+      console.log('多个标注')
+    },
+    addmark() {
+      var marker = new window.T.Marker(new window.T.LngLat(Number(this.infoData.x), Number(this.infoData.y)));// 创建标注
+      this.map.addOverLay(marker); // 将标注添加到地图中
+      marker.id = "marker_map"
+      var label = new window.T.Label({
+        text: "<b style='background:#fff;padding: 10px;'>" + (this.infoData.dkh || this.infoData.tbbh) + "<b>",
+        position: marker.getLngLat(),
+        offset: new T.Point(3, -30)
+      });
+      this.map.addOverLay(label);
+      label.id = "label_map"
+      marker.addEventListener("drag", function (e) {
+        label.setLngLat(marker.getLngLat());
+      })
+    },
+    map_set_images(images) {
+      if (!images) {
+        return
+      }
+      var info = this.infoData
+      // var imageURL = "https://img0.baidu.com/it/u=2833047327,3565178077&fm=253&fmt=auto&app=138&f=JPEG?w=260&h=260"
+      var imageURL = require("@/assets/images/fx.png")
+      var mapPointsList = []
+      mapPointsList.push(new window.T.LngLat(Number(info.x), Number(info.y)))
+
+      images.map((item, index) => {
+        item.x = item.jd;
+        item.y = item.wd;
+        if (item.x && item.y) {
+          var newindex = Number(index) + 1
+          mapPointsList.push(new window.T.LngLat(Number(item.x), Number(item.y)))
+          item.x = Number(item.x)
+          item.y = Number(item.y)
+          var deg = Number(item.deg)
+          var optdiv = '<div style="position: relative;display: contents; width: 50px;height: 50px;overflow: hidden;">' +
+            '<b style="display: block;  font-size: 15px;background: #007aff;border-radius: 100px;' +
+            'width: 20px;' +
+            'margin: 15px;' +
+            'height: 20px;opacity: 0.4;' +
+            'position: relative;' +
+            'text-align: center;' +
+            'left: -10px;line-height: 1.5;' +
+            'color: white;">' + newindex + '</b>' +
+            '<img  src="' + imageURL + '" style="position: absolute; opacity: 0.5;z-index: -1;top: 0px; left: 0px;width: 50px;height: 50px; transform: rotate(' + deg + 'deg);"alt=""></div>'
+          var map_images = new window.T.Label({
+            text: optdiv,
+            position: new window.T.LngLat(item.x, item.y),
+            offset: new T.Point(-25, -25),
+            images: imageURL
+          });
+
+          this.map.addOverLay(map_images);
+          map_images.id = "map_images"
+
+
+        }
+      })
+
+      var centerPoint = this.map.getViewport(mapPointsList)
+
+      if (centerPoint !== undefined) {
+        // //中心点给到地图
+        this.map.centerAndZoom(
+          centerPoint.center,
+          centerPoint.zoom,
+        );
+      }
+    },
+    setMapPolers() {
+      var opts = JSON.parse(this.infoData.gis)
+      if (opts.type == 'Polygon') {
+        var coordinates = opts.coordinates
+        for (var k in coordinates) {
+          var points = []
+          for (var i in coordinates[k]) {
+            if (coordinates[k][i][0] && coordinates[k][i][1]) {
+              points.push(new window.T.LngLat(Number(coordinates[k][i][0]), Number(coordinates[k][i][1])))
+            }
+          }
+          var polygon = new T.Polygon(points, {
+            color: 'blue',
+            weight: 3,
+            opacity: 0.5,
+            fillColor: '#FFFFFF',
+            fillOpacity: 0.5
+          })
+          console.log(polygon, '--')
+          //向地图上添加面
+          this.map.addOverLay(polygon)
+          polygon.id = "polygon" + k
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.tdt-label {
+  background: none !important;
+  border: none !important;
+  padding: 0;
+  box-shadow: none !important;
+}
+
+.map-gj {
+  padding: 5px 10px;
+  border: 1px solid #999999;
+
+}
+
+.map-gj:last-child {
+  border: none;
+}
+</style>