资料管理系统

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesAchievementController.java

@@ -129,12 +129,14 @@ public class FilesAchievementController extends BaseController
                 if (filesAchievement.getId() == null || !IdList.contains(filesAchievement.getId()))
                     filesAchievement.setId(new SnowFlake().generateId());
                 CmcProject cmcProject = new CmcProject();
-                cmcProject = cmcProjectService.selectCmcProjectByProjectNumber(filesAchievement.getProjectNumber());
-                if(cmcProject != null){
+                String[] projectNumbers = new String[1];
+                projectNumbers[0] = filesAchievement.getProjectNumber();
+                if (cmcProjectService.selectCmcProjectByProjectNumbers(projectNumbers).size() > 0)
+                    cmcProject = cmcProjectService.selectCmcProjectByProjectNumbers(projectNumbers).get(0);
+                if (cmcProject != null)
                     filesAchievement.setProjectId(cmcProject.getProjectId());
-                }else{
+                else
                     filesAchievement.setProjectId(null);
-                }
                 String storageAddress = filesAchievement.getStorageAddress();
                 if (storageAddress != null && !storageAddress.equals("")) {
                     filesAchievement.setStorageId(new SnowFlake().generateId());

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesProjectController.java

@@ -12,6 +12,7 @@ import com.ruoyi.oa.domain.CmcProject;
 import com.ruoyi.oa.service.ICmcProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -188,4 +189,12 @@ public class FilesProjectController extends BaseController {
     public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(cmcProjectService.deleteCmcProjectByProjectIds(ids));
     }
+
+    /**
+     * 根据项目编号查询项目信息
+     */
+    @GetMapping("/query/{projectNumbers}")
+    public AjaxResult getInfoByProjectNumber(@PathVariable String[] projectNumbers){
+        return AjaxResult.success(cmcProjectService.selectCmcProjectByProjectNumbers(projectNumbers));
+    }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProjectMapper.java

@@ -22,10 +22,10 @@ public interface CmcProjectMapper
     /**
      * 查询cmc项目
      *
-     * @param projectNumber cmc项目编号
-     * @return cmc项目
+     * @param projectNumbers cmc项目编号
+     * @return cmc项目列表
      */
-    public CmcProject selectCmcProjectByProjectNumber(String projectNumber);
+    public List<CmcProject> selectCmcProjectByProjectNumbers(String[] projectNumbers);
 
     /**
      * 查询cmc项目列表

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProjectService.java

@@ -24,9 +24,9 @@ public interface ICmcProjectService
      * 查询cmc项目
      *
      * @param projectNumber cmc项目编号
-     * @return cmc项目
+     * @return cmc项目列表
      */
-    public CmcProject selectCmcProjectByProjectNumber(String projectNumber);
+    public List<CmcProject> selectCmcProjectByProjectNumbers(String[] projectNumber);
 
     /**
      * 查询cmc项目列表

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectServiceImpl.java

@@ -37,13 +37,13 @@ public class CmcProjectServiceImpl implements ICmcProjectService
     /**
      * 查询cmc项目
      *
-     * @param projectNumber cmc项目编号
-     * @return cmc项目
+     * @param projectNumbers cmc项目编号
+     * @return cmc项目列表
      */
     @Override
-    public CmcProject selectCmcProjectByProjectNumber(String projectNumber)
+    public List<CmcProject> selectCmcProjectByProjectNumbers(String[] projectNumbers)
     {
-        return cmcProjectMapper.selectCmcProjectByProjectNumber(projectNumber);
+        return cmcProjectMapper.selectCmcProjectByProjectNumbers(projectNumbers);
     }
 
     /**

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -119,10 +119,13 @@
         where p.project_id = #{projectId}
     </select>
 
-    <select id="selectCmcProjectByProjectNumber" parameterType="String" resultMap="CmcProjectResult">
+    <select id="selectCmcProjectByProjectNumbers" parameterType="String" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
         where
-        (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') AND NOT (p.project_number REGEXP '[/\\*-]') and p.project_number = #{projectNumber}
+        (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') AND NOT (p.project_number REGEXP '[/\\*-]') and p.project_number in
+        <foreach item="projectNumber" collection="array" open="(" separator="," close=")">
+            #{projectNumber}
+        </foreach>
     </select>
 
     <insert id="insertCmcProject" parameterType="CmcProject">

oa-ui/src/api/file/project.js

@@ -89,4 +89,12 @@ export function getProjectKml(url) {
     url: url,
     method: 'get',
   })
-}
+}
+
+// 根据项目编号查询项目信息
+export function getInfoByProjectNumbers(projectNumbers) {
+  return request({
+    url: '/file/project/query/' + projectNumbers,
+    method: 'get'
+  })
+}

oa-ui/src/views/file/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:49
  * @LastEditors: wrh
- * @LastEditTime: 2024-09-03 16:08:10
+ * @LastEditTime: 2024-09-05 10:46:23
 -->
 <template>
   <div class="warpper-container">
@@ -10,15 +10,12 @@
     <div class="map-container" id="maps" tabindex="0"></div>
     <!-- 鼠标移动坐标 -->
     <div id="mouse-position"></div>
-    <!-- 项目信息弹出框 -->
-    <info-box :datas="clickFeature" :maps="map" @closePopup="closePopup" @open="openProject"></info-box>
+    <!-- 项目点位是否显示 -->
+    <div class="projectpoint-switch">
+      <el-checkbox fill="#fff" v-model="checkedCluster" label="项目点位" border size="large" @change="switchCluster" />
+    </div>
     <!-- 工具栏列表 -->
     <div class="tool-box">
-      <div class="item">
-        <el-tooltip effect="dark" content="视角复位" placement="right">
-          <div class="view" @click="resetView()"></div>
-        </el-tooltip>
-      </div>
       <div class="item">
         <el-tooltip effect="dark" content="图层" placement="right">
           <div class="layers" @click="layersOpen = !layersOpen"></div>
@@ -34,27 +31,38 @@
           <div class="selectM" @click="polygonSelect()"></div>
         </el-tooltip>
       </div>
+      <div class="item">
+        <el-tooltip effect="dark" content="视角复位" placement="right">
+          <div class="view" @click="resetView()"></div>
+        </el-tooltip>
+      </div>
     </div>
-    <transition-group appear name="animate__animated animate__bounce" enter-active-class="animate__fadeInLeft"
-      leave-active-class="animate__fadeOutLeft">
-      <div class="layer-type dialog_wrap" v-if="layersOpen" @mousedown.stop="move">
-        <div class="layer-content">
-          <div>
-            <el-icon class="close" @click="layersOpen = false">
-              <CloseBold />
-            </el-icon>
-          </div>
-          <el-tabs v-model="activeName" class="demo-tabs">
-            <el-tab-pane label="项目图层" name="first">
-              <project-layer :proTree="projectList" :maps="map"></project-layer>
-            </el-tab-pane>
-          </el-tabs>
+    <!-- 信息提示框 -->
+    <el-alert class="alter-position" title="开始矩形框选，按下ESC取消框选，按下Enter搜索框选范围内的项目" type="warning" show-icon
+      v-if="selectedInfo" @close="selectedInfo = false" />
+    <!-- 地图样式 -->
+    <div class="switch-map">
+      <switch-map></switch-map>
+    </div>
+    <!-- <transition-group appear name="animate__animated animate__bounce" enter-active-class="animate__fadeInLeft"
+      leave-active-class="animate__fadeOutLeft"> -->
+    <div class="layer-type dialog_wrap" v-if="layersOpen" @mousedown.stop="move">
+      <div class="layer-content">
+        <div class="layer-header">
+          图层管理
+          <span class="layer-closer" @click="closeLayer"></span>
         </div>
+        <el-tabs v-model="activeName" class="demo-tabs">
+          <el-tab-pane label="项目图层" name="first">
+            <project-layer :proTree="projectList" :maps="map"></project-layer>
+          </el-tab-pane>
+        </el-tabs>
       </div>
-    </transition-group>
+    </div>
+    <!-- </transition-group> -->
     <!-- 项目信息弹出框 -->
     <div id="popup" class="ol-popup" v-if="clickFeature != null">
-      <span id="popup-closer" class="ol-popup-closer" @click="closePopup"></span>
+      <span class="ol-popup-closer" @click="closePopup"></span>
       <div id="popup-content">
         <el-descriptions :column="1" border v-if="clickFeature.type == 'projectPoint'">
           <el-descriptions-item label="项目编号" width="130px">
@@ -81,7 +89,7 @@
           </el-descriptions>
         </div>
       </div>
-      <div class="look-achi" @click="" v-if="clickFeature.type == 'projectPoint'">成果目录>></div>
+      <div class="look-achi" @click="openProject" v-if="clickFeature.type == 'projectPoint'">成果目录>></div>
     </div>
     <!-- 项目目录 -->
     <div class="right-project" :class="{ closeProBox: isOpenPro }">
@@ -194,9 +202,7 @@
           <div class="achi-content">
             <div class="achi-header">
               成果目录
-              <el-icon class="close" @click="dialogTableVisible = false">
-                <CloseBold />
-              </el-icon>
+              <span class="achi-closer" @click="closeAchi"></span>
             </div>
             <div class="achi-projectNumber">项目编号:{{ dialogTitle }}</div>
             <el-table :data="achiDialogData" height="400px">
@@ -259,8 +265,9 @@
 <script>
 import { Tianditu, ZhongKe, ArcGISBlue, Autonavi, google, terrain, vect } from '@/utils/maps'
 import { listProject, getProject } from '@/api/oa/project/project'
-import infoBox from './index/infoBox.vue';
+import { getInfoByProjectNumbers } from '@/api/file/project'
 import ProjectLayer from './index/projectLayer.vue';
+import SwitchMap from './index/switchMap.vue';
 import sjxActive from '@/assets/images/gis/sjd.png';
 // ---------------------------------ol引用------------------------------------------------
 import 'ol/ol.css'
@@ -285,7 +292,7 @@ import { Circle, Fill, Stroke, Style, RegularShape, Icon, Text } from 'ol/style'
 import { MousePosition, ScaleLine, defaults as defaultControls } from 'ol/control';
 import { getAchievementByProject, listAchievement } from "@/api/file/achievement";
 export default {
-  components: { infoBox, ProjectLayer },
+  components: { SwitchMap, ProjectLayer },
   dicts: ['cmc_achi_type', 'cmc_scale_grade'],
   data() {
     return {
@@ -299,6 +306,7 @@ export default {
       select: null,
       popup: null,
       clusters: null,
+      checkedCluster: true,
       drawBox: null,
       activeName: 'first',
       isDrawing: false,
@@ -309,10 +317,12 @@ export default {
       searchType: '',
       projectList: [],
       allproTableData: [],
+      achiDialogData: [],
       clusters: null,
       total: 0,
       loading: true,
       tableHeight: 0,
+      selectedInfo: false,
       clickFeature: {},
       clickDatas: {
         selectFeatures: null,
@@ -390,6 +400,7 @@ export default {
         ],
         view: this.view,
       })
+      this.$store.commit('SET_MAP', this.map)
       this.map.addOverlay(this.popup);
       this.mapClick(this.map);
       // this.clickFeaturePopInfo();
@@ -477,7 +488,32 @@ export default {
           });
         }
       })
+
+      /* 键盘事件 */
+      document.onkeydown = function (event) {
+        let e = event || window.event || arguments.callee.caller.arguments[0];
+        if (e && e.keyCode == 27) {
+          if (that.drawBox.getActive()) {
+            that.drawBox.finishDrawing();
+            that.selectedInfo = false;
+            that.map.removeInteraction(that.drawBox);
+          }
+        } else if (e && e.keyCode == 13) {
+          let newArray = [...new Set(that.seletctedCluters)];
+          getInfoByProjectNumbers(newArray).then(res => {
+            if (res.data) {
+              that.projectList = res.data;
+              if (that.isOpenPro == true) {
+                that.isOpenPro = false;
+              }
+            } else {
+              that.projectList = that.allproTableData;
+            }
+          })
+        }
+      };
     },
+
     clickFeaturePopInfo() {
       let that = this;
       if (that.select !== null) {
@@ -509,10 +545,20 @@ export default {
     closePopup() {
       this.popup.setPosition(undefined);
     },
+    /* 关闭成果框 */
+    closeAchi() {
+      this.dialogTableVisible = false;
+      this.dialogTitle = '';
+      this.achiDialogData = [];
+    },
+    /* 关闭图层框 */
+    closeLayer() {
+      this.layersOpen = false;
+    },
     openProject() {
       this.dialogTableVisible = true;
-      // let projectId = datas.clickFeature.id;
-      // this.dialogTitle = datas.clickFeature.projectNumber
+      let projectId = this.clickFeature.projectId;
+      this.dialogTitle = this.clickFeature.projectNumber;
       listAchievement({ projectId }).then(res => {
         if (res.total == 0) {
           this.$message.error('暂无成果，请添加');
@@ -555,6 +601,7 @@ export default {
         geometryFunction: createBox()
       });
       that.drawBox.on('drawstart', function () {
+        that.selectedInfo = true;
         that.seletctedCluters = [];
         that.select.getFeatures().clear();
         that.isDrawing = true;
@@ -575,7 +622,7 @@ export default {
           let selectedFeatures = that.select.getFeatures();
           for (let i = 0; i < selectedFeatures.getLength(); i++) {
             let feature = selectedFeatures.item(i);
-            feature = feature.values_.features;
+            feature = feature.get('features');
             if (feature.length == 1) {
               let name = feature[0].name;
               selected.push(name);
@@ -594,7 +641,63 @@ export default {
       that.map.addInteraction(that.drawBox);
     },
     polygonSelect() {
-
+      let that = this;
+      that.select = new Select({
+        condition: never,
+        style: that.selectedStyle
+      });
+      // 创建框选图层
+      let drawLayer = new VectorLayer({
+        source: new VectorSource(),
+      });
+      // 创建绘制工具
+      that.drawBox = new Draw({
+        source: drawLayer.getSource(),
+        type: 'Polygon',
+      });
+      that.drawBox.on('drawstart', function () {
+        that.selectedInfo = true;
+        that.seletctedCluters = [];
+        that.select.getFeatures().clear();
+        that.isDrawing = true;
+        // drawLayer.getSource().clear();
+      });
+      // 结束绘制
+      that.drawBox.on('drawend', function (e) {
+        if (e.feature) {
+          // 获取框选范围
+          let geometry = e.feature.getGeometry();
+          let extent = geometry.getExtent();
+          // 查询框选范围内的所有点
+          that.getLayerByName('clusters').getSource().forEachFeatureIntersectingExtent(extent, function (feature) {
+            let coordinates = feature.getGeometry().getCoordinates();
+            // 判断该点是否在圆内部
+            if (geometry.intersectsCoordinate(coordinates)) {
+              that.select.getFeatures().push(feature);
+            }
+          });
+          // 遍历被选中的要素
+          let selected = [];
+          let selectedFeatures = that.select.getFeatures();
+          for (let i = 0; i < selectedFeatures.getLength(); i++) {
+            let feature = selectedFeatures.item(i);
+            feature = feature.get('features');
+            if (feature.length == 1) {
+              let name = feature[0].name;
+              selected.push(name);
+            } else {
+              for (let f of feature) {
+                let name = f.name;
+                selected.push(name);
+              }
+            }
+            that.seletctedCluters = selected;
+          }
+        }
+        that.isDrawing = false;
+      })
+      that.map.addInteraction(that.select);
+      that.map.addInteraction(that.drawBox);
     },
     /* 通过图层名称获取图层 */
     getLayerByName(name) {
@@ -810,7 +913,7 @@ export default {
       }
     },
     getText(feature, resolution) {
-      let features = feature.values_.features;
+      let features = feature.get('features');
       let reo = resolution * 100;
       let text;
       if (reo > 2) {
@@ -849,6 +952,10 @@ export default {
         this.projectList = data;
       })
     },
+    /* 开关聚合项目点 */
+    switchCluster(val) {
+      this.clusters.setVisible(val);
+    },
     tableRowClassName() {
 
     },
@@ -863,10 +970,7 @@ export default {
           this.$message.error('暂无成果，请添加');
           this.achiDialogData = [];
         } else {
-          if (this.dialogTableVisible == false)
-            this.dialogTableVisible = true;
-          else
-            this.dialogTableVisible = false;
+          this.dialogTableVisible = true;
           this.achiDialogData = res.rows;
         }
       })
@@ -914,6 +1018,15 @@ export default {
 <style lang="scss" scoped>
 .warpper-container {
   position: relative;
+
+  .projectpoint-switch {
+    position: absolute;
+    top: 10px;
+    left: 60px;
+    width: 100px;
+    height: 50px;
+    color: #fff;
+  }
 }
 
 .map-container {
@@ -963,16 +1076,21 @@ export default {
     font-family: '黑体';
     position: relative;
 
-    .close {
+    .achi-closer {
+      text-decoration: none;
       position: absolute;
-      right: 20px;
-      top: 10px;
+      top: 2px;
+      right: 8px;
     }
 
-    .close:hover {
-      color: #409EFF;
+    .achi-closer:after {
+      content: "✖";
       cursor: pointer;
     }
+
+    .achi-closer:hover:after {
+      color: #409EFF;
+    }
   }
 
 }
@@ -1154,4 +1272,64 @@ export default {
   transform: translate(-50%, 0);
   margin-left: -11px;
 }
+
+.layer-type {
+  position: absolute;
+  top: 70px;
+  left: 53px;
+  width: 300px;
+  padding: 12px 10px;
+  background-color: #fff;
+  border-radius: 5px;
+  cursor: move;
+
+  .title {
+    font-size: 16px;
+    text-align: center;
+    line-height: 45px;
+  }
+
+  .layer-content {
+    cursor: default;
+    position: relative;
+
+    .layer-header {
+      text-align: center;
+      line-height: 40px;
+      font-weight: bold;
+      font-family: '黑体';
+      position: relative;
+
+      .layer-closer {
+        text-decoration: none;
+        position: absolute;
+        top: 2px;
+        right: 8px;
+      }
+
+      .layer-closer:after {
+        content: "✖";
+        cursor: pointer;
+      }
+
+      .layer-closer:hover:after {
+        color: #409EFF;
+      }
+    }
+  }
+}
+
+.alter-position {
+  width: 470px;
+  position: absolute;
+  left: 50%;
+  top: 10px;
+  transform: translate(-50%, 0);
+}
+
+.switch-map {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+}
 </style>

oa-ui/src/views/file/index/infoBox.vue

@@ -1,139 +0,0 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: ysh
- * @Date: 2022-11-22 11:41:47
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-28 16:04:26
--->
-<template>
-  <div id="popup" class="ol-popup">
-    <span id="popup-closer" class="ol-popup-closer" @click="$emit('closePopup')"></span>
-    <div id="popup-content">
-      <el-descriptions :column="1" border v-if="datas.type == 'projectPoint'">
-        <el-descriptions-item label="项目编号" width="130px">
-          {{ datas.projectNumber }}
-        </el-descriptions-item>
-        <el-descriptions-item label="项目名称" width="130px">
-          {{ datas.projectName }}
-        </el-descriptions-item>
-        <el-descriptions-item label="项目负责人" width="130px">
-          {{ datas.projectLeader }}
-        </el-descriptions-item>
-        <el-descriptions-item label="存放地址" width="130px">
-          {{ datas.storageAddress == '' || datas.storageAddress == null ? '暂无' :
-      datas.storageAddress }}
-        </el-descriptions-item>
-      </el-descriptions>
-
-      <div v-if="datas.type == 'featurePoint'">
-        <div class="title">项目编号:{{ datas.projectNumber }}</div>
-        <el-descriptions :column="1" border>
-          <el-descriptions-item label="名称" width="130px">
-            {{ datas.selectFeatures.values_.name }}
-          </el-descriptions-item>
-        </el-descriptions>
-      </div>
-    </div>
-    <div class="look-achi" @click="$emit('open')" v-if="datas.type == 'projectPoint'">成果目录>></div>
-  </div>
-</template>
-
-<script>
-
-
-export default {
-  props: {
-    datas: {
-      type: Object,
-      required: true
-    },
-  },
-  data() {
-    return {
-    };
-  },
-  watch: {
-    'datas.type'(val){
-    }
-  },
-  mounted() {
-  },
-  methods: {},
-}
-
-</script>
-
-<style lang="scss" scoped>
-// 弹出框
-.ol-popup {
-  position: absolute;
-  background-color: #fff;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2);
-  padding: 22px;
-  border-radius: 10px;
-  // border: 1px solid #cccccc;
-  bottom: 17px;
-  left: -129px;
-  min-width: 280px;
-  width: 200px;
-
-  .ol-popup-closer {
-    text-decoration: none;
-    position: absolute;
-    top: 2px;
-    right: 8px;
-  }
-
-  .ol-popup-closer:after {
-    content: "✖";
-    cursor: pointer;
-  }
-
-  .ol-popup-closer:hover:after {
-    color: #409EFF;
-  }
-}
-
-
-.ol-popup:after,
-.ol-popup:before {
-  top: 100%;
-  border: solid transparent;
-  content: " ";
-  height: 0;
-  width: 0;
-  position: absolute;
-  pointer-events: none;
-}
-
-.ol-popup:after {
-  border-top-color: #fff;
-  border-width: 10px;
-  left: 50%;
-  transform: translate(-50%, 0);
-  margin-left: -10px;
-}
-
-.ol-popup:before {
-  border-top-color: #fff;
-  border-width: 11px;
-  left: 50%;
-  transform: translate(-50%, 0);
-  margin-left: -11px;
-}
-
-.look-achi {
-  text-align: right;
-  color: #409EFF;
-  cursor: pointer;
-  font-size: 14px;
-  margin-top: 10px;
-  font-family: '微软雅黑';
-}
-
-.title {
-  font-size: 14px;
-  font-family: 'Times New Roman', '黑体', Times, serif, ;
-}
-</style>

oa-ui/src/views/file/index/projectLayer.vue

@@ -4,7 +4,7 @@
  * @Author: ysh
  * @Date: 2022-10-20 17:27:09
  * @LastEditors: wrh
- * @LastEditTime: 2024-06-07 09:04:52
+ * @LastEditTime: 2024-09-04 15:01:44
 -->
 <template>
   <div class="layer-box">
@@ -22,12 +22,12 @@
     <div style="margin-top: 10px;">
       <el-input v-model="filterInput" class="w-50 m-2" placeholder="请输入项目编号" @keyup.enter="handleFilterNode">
         <template #append>
-          <el-button icon="Search" @click="handleFilterNode"></el-button>
+          <el-button icon="el-icon-search" @click="handleFilterNode"></el-button>
         </template>
       </el-input>
     </div>
-    <el-scrollbar height="400px">
-      <el-tree :data="treeDatas" :props="defaultProps" node-key="id" show-checkbox ref="projectTree"
+    <el-scrollbar class="list-tree-div">
+      <el-tree class="filter-tree" :data="treeDatas" :props="defaultProps" node-key="id" show-checkbox ref="projectTree"
         :default-checked-keys="selectedNodeKey" @check-change="handleCheckChange" default-expand-all
         @node-click="handleNodeClick" highlight-current :filter-node-method="filterNode" />
     </el-scrollbar>
@@ -95,8 +95,8 @@ export default {
           let list = [];
           let selectList = [];
           for (let t of tree) {
-            let kmlUrl = this.kmlPath + "/profile/" + t.projectKml;
-            let cpUrl = this.kmlPath + "/profile/" + t.projectCp;
+            let kmlUrl = this.kmlPath + "/profile/upload" + t.projectKml;
+            let cpUrl = this.kmlPath + "/profile/upload" + t.projectCp;
             let obj = {};
             obj.id = t.projectNumber;
             obj.name = t.projectNumber + '-' + t.projectName;
@@ -171,7 +171,7 @@ export default {
     },
     // 触发筛选
     handleFilterNode() {
-      this.$refs.projectTree.filter(filterInput.value)
+      this.$refs.projectTree.filter(this.filterInput)
     },
     handleCheckChange(data, checked, indeterminate) {
       if (this.checkList.indexOf('范围') != -1) {
@@ -215,8 +215,7 @@ export default {
       }
     },
     cpStyle(obj) {
-      let feature = obj[0];
-      let resolution = obj[1];
+      let feature = obj;
       let style = new Style({
         image: new Icon({
           src: sjx,
@@ -226,7 +225,7 @@ export default {
           color: '#30A9DE',
         }),
         text: new Text({
-          text: this.getText(feature, resolution),
+          text: this.getText(feature),
           font: '14px sans-serif',
           textAlign: 'center',
           textBaseline: 'middle',
@@ -251,7 +250,7 @@ export default {
       if (reo > 2) {
         text = '';
       } else {
-        text = feature.values_.name;
+        text = feature.name;
       }
       return text;
     },
@@ -267,6 +266,70 @@ export default {
   border: 1px dashed #bccfec;
 }
 
+.list-tree-div {
+  width: 280px;
+  height: 660px;
+  overflow: auto;
+  background: none;
+  flex-grow: 1;
+  display: flex;
+
+  .el-scrollbar {
+    display: flex;
+    padding: 2.6px 16px 16px 0;
+    width: 280px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden;
+      overflow-y: auto;
+      min-width: 250px;
+
+      .el-tree.filter-tree {
+        .el-tree-node {
+          >.el-tree-node__content {
+            /* 让纵向滚动条与内容最右边界限之间留有8px的宽度，使效果更好看。 */
+            padding: 0 8px 0 0;
+
+            .el-tree-node__expand-icon {
+              margin: -2 0 0 3px;
+              padding: 0;
+            }
+
+            >label.el-checkbox {
+              margin-right: 4px;
+              margin-bottom: 0px;
+              font-size: 12px;
+            }
+
+            .el-tree-node__label {
+              font-size: 12px;
+              line-height: 12px;
+            }
+          }
+
+          .el-tree-node__children {
+            /* 出现横轴滚动条 */
+            display: inline-block;
+            min-width: 100%;
+          }
+
+        }
+      }
+
+    }
+
+    .el-scrollbar__bar {
+      &.is-horizontal {
+        bottom: 0;
+      }
+
+      &.is-vertical {
+        right: 0;
+      }
+    }
+  }
+}
+
 :deep(.el-checkbox__label) {
   color: var(--el-tree-text-color) !important;
 }
@@ -282,5 +345,4 @@ export default {
 
 :deep(.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content) {
   background-color: #bccfec !important;
-}
-</style>
+}</style>

oa-ui/src/views/file/index/switchMap.vue

@@ -4,33 +4,33 @@
  * @Author: ysh
  * @Date: 2023-06-02 14:13:06
  * @LastEditors: wrh
- * @LastEditTime: 2024-06-07 11:47:21
+ * @LastEditTime: 2024-09-04 16:36:38
 -->
 <template>
   <div class="map-box">
     <div class="open-box" v-if="isClose" @click="closeSwitch">
       <i class="el-icon-d-arrow-right"></i>
     </div>
-    <div class="close-box"  @click="closeSwitch">
+    <div class="close-box" @click="closeSwitch">
       <i class="el-icon-d-arrow-left"></i>
     </div>
     <el-tooltip class="box-item" effect="dark" content="高德" placement="top">
       <div class="box-item" :class="{ close: isClose }" @click="translateMapBox('高德')">
       </div>
     </el-tooltip>
-    <el-tooltip class="box-item" effect="dark" content="谷歌" placement="top">
+    <!-- <el-tooltip class="box-item" effect="dark" content="谷歌" placement="top">
       <div class="box-item" :class="{ close: isClose }" @click="translateMapBox('谷歌')">
       </div>
     </el-tooltip>
     <el-tooltip class="box-item" effect="dark" content="天地图" placement="top">
       <div class="box-item" :class="{ close: isClose }" @click="translateMapBox('天地图')">
       </div>
-    </el-tooltip>
+    </el-tooltip> -->
     <el-tooltip class="box-item" effect="dark" content="中科星图" placement="top">
       <div class="box-item" :class="{ close: isClose }" @click="translateMapBox('中科星图')">
       </div>
     </el-tooltip>
-    <el-tooltip class="box-item" effect="dark" content="ArcGIS" placement="top">
+    <!-- <el-tooltip class="box-item" effect="dark" content="ArcGIS" placement="top">
       <div class="box-item" :class="{ close: isClose }" @click="translateMapBox('ArcGIS')">
       </div>
     </el-tooltip>
@@ -41,7 +41,7 @@
     <el-tooltip class="box-item" effect="dark" content="矢量图" placement="top">
       <div class="box-item" :class="{ close: isClose }" @click="translateMapBox('矢量图')">
       </div>
-    </el-tooltip>
+    </el-tooltip> -->
   </div>
 </template>
 
@@ -69,18 +69,18 @@ export default {
           if (name == type) {
             if (type == '高德') {
               layer.setVisible(true);
-            } else if (type == '天地图') {
-              layer.setVisible(true);
+            // } else if (type == '天地图') {
+            //   layer.setVisible(true);
             } else if (type == '中科星图') {
               layer.setVisible(true);
-            } else if (type == '谷歌') {
-              layer.setVisible(true);
-            } else if (type == 'ArcGIS') {
-              layer.setVisible(true);
-            } else if (type == '天地图地形') {
-              layer.setVisible(true);
-            } else if (type == '矢量图') {
-              layer.setVisible(true);
+            // } else if (type == '谷歌') {
+            //   layer.setVisible(true);
+            // } else if (type == 'ArcGIS') {
+            //   layer.setVisible(true);
+            // } else if (type == '天地图地形') {
+            //   layer.setVisible(true);
+            // } else if (type == '矢量图') {
+            //   layer.setVisible(true);
             }
           }
         }
@@ -152,11 +152,11 @@ export default {
   z-index: 11;
 }
 
-.box-item:nth-child(3) {
-  background-image: url('../../../assets/images/gis/谷歌影像.png');
-  background-size: 100% 100%;
-  z-index: 10;
-}
+// .box-item:nth-child(3) {
+//   background-image: url('../../../assets/images/gis/谷歌影像.png');
+//   background-size: 100% 100%;
+//   z-index: 10;
+// }
 
 .box-item:nth-child(4) {
   background-image: url('../../../assets/images/gis/天地图.png');
@@ -164,7 +164,7 @@ export default {
   z-index: 9;
 }
 
-.box-item:nth-child(5) {
+.box-item:nth-child(3) {
   background-image: url('../../../assets/images/gis/中科星图影像.png');
   background-size: 100% 100%;
   z-index: 8;

oa-ui/src/views/oa/device/detail.vue

@@ -283,7 +283,7 @@
           <el-select v-model="expenseForm.expenseType" placeholder="请选择" clearable @change="expenseTypePath">
             <el-option label="保险费" value="0"></el-option>
             <el-option label="维修/保养费" value="1"></el-option>
-            <el-option label="检定费" value="2"></el-option>
+            <el-option label="检定费" value="3"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="费用金额" prop="expense">