Browse Source

自动项目编号修改,一张图加水系

lamphua 6 months ago
parent
commit
b291755b3b

+ 8
- 2
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java View File

146
     public AjaxResult getProjectNumberByYear(CmcProject cmcProject)
146
     public AjaxResult getProjectNumberByYear(CmcProject cmcProject)
147
     {
147
     {
148
         List<CmcProject> list = cmcProjectService.selectCmcAllProjectList(cmcProject);
148
         List<CmcProject> list = cmcProjectService.selectCmcAllProjectList(cmcProject);
149
-        String number = list.get(0).getProjectNumber().substring(5);
150
-        String projectNumber = cmcProject.getProjectNumber() + (Integer.parseInt(number) + 1);
149
+        String number = "0";
150
+        String projectNumber = "";
151
+        if (list.size() > 0)
152
+            number = list.get(0).getProjectNumber().substring(5);
153
+        if (Integer.parseInt(number) < 9)
154
+            projectNumber = cmcProject.getProjectNumber() + "0" + (Integer.parseInt(number) + 1);
155
+        else
156
+            projectNumber = cmcProject.getProjectNumber() + (Integer.parseInt(number) + 1);
151
         return success(projectNumber);
157
         return success(projectNumber);
152
     }
158
     }
153
 
159
 

+ 22
- 1
oa-ui/src/views/file/index/projectLayer.vue View File

4
  * @Author: ysh
4
  * @Author: ysh
5
  * @Date: 2022-10-20 17:27:09
5
  * @Date: 2022-10-20 17:27:09
6
  * @LastEditors: wrh
6
  * @LastEditors: wrh
7
- * @LastEditTime: 2024-09-04 15:01:44
7
+ * @LastEditTime: 2025-01-02 09:29:11
8
 -->
8
 -->
9
 <template>
9
 <template>
10
   <div class="layer-box">
10
   <div class="layer-box">
11
     <div class="checkList">
11
     <div class="checkList">
12
       <el-checkbox-group v-model="checkList">
12
       <el-checkbox-group v-model="checkList">
13
+        <el-checkbox label="水系" @change="checkedSx" />
13
         <el-checkbox label="范围" @change="checkedRange" />
14
         <el-checkbox label="范围" @change="checkedRange" />
14
         <el-checkbox label="控制点" @change="checkedCp" />
15
         <el-checkbox label="控制点" @change="checkedCp" />
15
       </el-checkbox-group>
16
       </el-checkbox-group>
66
   data() {
67
   data() {
67
     return {
68
     return {
68
       kmlPath: process.env.VUE_APP_BASE_API,
69
       kmlPath: process.env.VUE_APP_BASE_API,
70
+      sxLayer: new VectorLayer({
71
+              style: new Style({
72
+                stroke: new Stroke({
73
+                  color: '#0000ff',
74
+                  width: 2
75
+                })
76
+              }),
77
+              source: new VectorSource({
78
+                url: process.env.VUE_APP_BASE_API + "/profile/upload/uploadKmlFiles/shuixi.kml",
79
+                format: new KML({
80
+                  extractStyles: false
81
+                }),
82
+                projection: 'EPSG:4326'
83
+              })
84
+            }),
69
       treeDatas: [],
85
       treeDatas: [],
70
       selectedNodeKey: [],
86
       selectedNodeKey: [],
71
       allNodeKey: [],
87
       allNodeKey: [],
154
           this.allNodeKey = selectList;
170
           this.allNodeKey = selectList;
155
         }
171
         }
156
       })
172
       })
173
+      this.sxLayer.setVisible(false);
174
+      this.$store.getters.map.addLayer(this.sxLayer);
157
     },
175
     },
158
     /* 全选 */
176
     /* 全选 */
159
     handleAllSelect() {
177
     handleAllSelect() {
202
         }, 200);
220
         }, 200);
203
       }
221
       }
204
     },
222
     },
223
+    checkedSx(val) {
224
+      this.sxLayer.setVisible(val);
225
+    },
205
     checkedRange(val) {
226
     checkedRange(val) {
206
       let datas = this.$refs.projectTree.getCheckedNodes();
227
       let datas = this.$refs.projectTree.getCheckedNodes();
207
       for (let d of datas) {
228
       for (let d of datas) {

Loading…
Cancel
Save