余杭一张图

YHYZT/client/public/config.js

@@ -4,7 +4,7 @@ window.ApplicationConfig = {
   validateURL: "http://localhost:5566/yzt/api/user/validate",
   previewPrefix: 'http://localhost:5566/yzt',
   zhmhUrl: 'http://localhost:8088/#/yh-yzt/data-center',
-  sysTitle:'余杭区一张图系统',
+  sysTitle: '余杭区一张图系统',
   loginTitle: '余杭自然资源',
   mapLayerConfig: {
     use: "outerNet",
@@ -13,7 +13,7 @@ window.ApplicationConfig = {
     },
     innerNet: {
       view: {
-        center: [119.18941102181378,31.916615382910482],
+        center: [119.18941102181378, 31.916615382910482],
         zoom: 8.9,
         // extent: [], // 限制视图的范围,此范围之外的任何内容都不能在地图上看到。
         fitExtent: [
@@ -43,7 +43,7 @@ window.ApplicationConfig = {
               visible: true,
               serverType: "ArcGISTile",
               wmtsForceUrl: true,
-              url:  'http://10.0.0.98:8555/jsyx/tip-gateway/proxy/tip-token-57a3f34c1f08fbe296847542215fe807/aa35ac2fbabe6332fe75260c2f02e62f/arcgis/rest/services/YGYX/YGYX_2022/MapServer'
+              url: 'http://10.0.0.98:8555/jsyx/tip-gateway/proxy/tip-token-57a3f34c1f08fbe296847542215fe807/aa35ac2fbabe6332fe75260c2f02e62f/arcgis/rest/services/YGYX/YGYX_2022/MapServer'
             },
             {
               id: "xzqh-s",
@@ -67,11 +67,11 @@ window.ApplicationConfig = {
     },
     outerNet: {
       view: {
-        center: [120.04038786870176,30.351083159766333],
+        center: [120.04038786870176, 30.351083159766333],
         zoom: 10,
         // extent: [], // 限制视图的范围,此范围之外的任何内容都不能在地图上看到。
         fitExtent: [
-          119.62233911273222,30.08259495011349,120.4584366246713,30.619571369419177
+          119.62233911273222, 30.08259495011349, 120.4584366246713, 30.619571369419177
         ],
         minZoom: 7,
         maxZoom: 21
@@ -137,7 +137,7 @@ window.ApplicationConfig = {
                   visible: true,
                   opacity: 0.8,
                   serverType: "dynamic",
-                  url:"http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_XZQH/MapServer",
+                  url: "http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_XZQH/MapServer",
                   params: {
                     layers: "show:0,1,2",
                     layerDefs: {}
@@ -159,7 +159,7 @@ window.ApplicationConfig = {
                   visible: false,
                   opacity: 0.8,
                   serverType: "dynamic",
-                  url:"http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_DZ_YFQ/MapServer"
+                  url: "http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_DZ_YFQ/MapServer"
                 },
                 {
                   id: "DZZHYHD",
@@ -168,7 +168,7 @@ window.ApplicationConfig = {
                   visible: false,
                   opacity: 0.8,
                   serverType: "dynamic",
-                  url:"http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_DZ_YHD/MapServer"
+                  url: "http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_DZ_YHD/MapServer"
                 },
               ]
             }
@@ -187,7 +187,7 @@ window.ApplicationConfig = {
               enabled: true,
               visible: true,
               serverType: "dynamic",
-              url:"http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_PEWG_NEW/MapServer",
+              url: "http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_PEWG_NEW/MapServer",
               params: {
                 layers: "show:0,1",
                 layerDefs: {}
@@ -199,7 +199,7 @@ window.ApplicationConfig = {
               enabled: true,
               visible: true,
               serverType: "dynamic",
-              url:"http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_NZYDK_NEW/MapServer",
+              url: "http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_NZYDK_NEW/MapServer",
               params: {
                 layers: "show:0,1",
                 layerDefs: {}
@@ -211,7 +211,7 @@ window.ApplicationConfig = {
               enabled: true,
               visible: true,
               serverType: "dynamic",
-              url:"http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_ST_GDDK_NEW/MapServer",
+              url: "http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_ST_GDDK_NEW/MapServer",
               params: {
                 layers: "show:0,1",
                 layerDefs: {}
@@ -224,16 +224,16 @@ window.ApplicationConfig = {
               visible: false,
               opacity: 0.8,
               serverType: "dynamic",
-              url:"http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_LSYD/MapServer"
+              url: "http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_LSYD/MapServer"
             },
             {
-                id: "YHYZT_SSNYD",
-                name: "设施农用地",
-                enabled: true,
-                visible: false,
-                opacity: 0.8,
-                serverType: "dynamic",
-                url:"http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/SSNYD/MapServer"
+              id: "YHYZT_SSNYD",
+              name: "设施农用地",
+              enabled: true,
+              visible: false,
+              opacity: 0.8,
+              serverType: "dynamic",
+              url: "http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/SSNYD/MapServer"
             },
             {
               id: "YHYZT_KC_TKQ",
@@ -242,7 +242,7 @@ window.ApplicationConfig = {
               visible: false,
               opacity: 0.8,
               serverType: "dynamic",
-              url:"http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_KC_TKQ/MapServer"
+              url: "http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_KC_TKQ/MapServer"
             },
             {
               id: "YHYZT_KC_YYCKQ_KKOO",
@@ -251,124 +251,156 @@ window.ApplicationConfig = {
               visible: false,
               opacity: 0.8,
               serverType: "dynamic",
-              url:"http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_KC_YYCKQ_KKOO/MapServer"
+              url: "http://60.191.110.204:6080/arcgis/rest/services/yh_yzt/YHYZT_KC_YYCKQ_KKOO/MapServer"
             }
           ]
         },
       ]
     }
   },
-  staticData:{
-    项目类型:[
-      {label:'单独选址项目',value:'2'},
-      {label:'城市分批次项目',value:'3'},
-      {label:'实施方案项目',value:'10'}
-    ],
-    指标类型:[
-      {label:'计划指标（A）',value:'A'},
-      {label:'折抵指标（B）',value:'B'},
-      {label:'增减挂钩指标（复垦指标）（C）',value:'C'},
-      {label:'复盘指标（D）',value:'D'},
-      {label:'违法用地指标（E）',value:'E'},
-      {label:'低丘缓坡、荒滩未用地指标（F）',value:'F'}
+  staticData: {
+    项目类型: [
+      { label: '单独选址项目', value: '2' },
+      { label: '城市分批次项目', value: '3' },
+      { label: '实施方案项目', value: '10' }
     ],
-    批准机关:[
-      {label:'国务院',value:'1'},
-      {label:'省政府',value:'2'},
-      {label:'市政府',value:'3'}
+    指标类型: [
+      { label: '计划指标（A）', value: 'A' },
+      { label: '折抵指标（B）', value: 'B' },
+      { label: '增减挂钩指标（复垦指标）（C）', value: 'C' },
+      { label: '复盘指标（D）', value: 'D' },
+      { label: '违法用地指标（E）', value: 'E' },
+      { label: '低丘缓坡、荒滩未用地指标（F）', value: 'F' }
     ],
-    指标级别:[
-      {label:'无',value:'7'},
-      {label:'使用城乡建设用地增减挂钩指标',value:'5'},
-      {label:'使用试点专项指标',value:'6'},
-      {label:'申请国家计划指标',value:'1'},
-      {label:'使用省预留计划指标',value:'2'},
-      {label:'使用切块下达指标',value:'3'},
-      {label:'使用盘活批而未供土地转用指标',value:'4'}
+    批准机关: [
+      { label: '国务院', value: '1' },
+      { label: '省政府', value: '2' },
+      { label: '市政府', value: '3' }
     ],
-    重点项目级别:[
-      {label:'国家重点',value:'1'},
-      {label:'省重点',value:'2'},
-      {label:'市重点',value:'3'}
+    指标级别: [
+      { label: '无', value: '7' },
+      { label: '使用城乡建设用地增减挂钩指标', value: '5' },
+      { label: '使用试点专项指标', value: '6' },
+      { label: '申请国家计划指标', value: '1' },
+      { label: '使用省预留计划指标', value: '2' },
+      { label: '使用切块下达指标', value: '3' },
+      { label: '使用盘活批而未供土地转用指标', value: '4' }
     ],
-    供地方式:[
-      {label:'划拨',value:'1'},
-      {label:'招拍挂出让',value:'2'},
-      {label:'协议出让',value:'3'},
-      {label:'租赁',value:'4'},
-      {label:'作价出资或入股',value:'5'},
-      {label:'集体土地使用',value:'6'},
-      {label:'招标出让',value:'21'},
-      {label:'拍卖出让',value:'22'},
-      {label:'挂牌出让',value:'23'}
+    重点项目级别: [
+      { label: '国家重点', value: '1' },
+      { label: '省重点', value: '2' },
+      { label: '市重点', value: '3' }
     ],
-    供地项目类型:[
-      {label:'工业',value:'工业'},
-      {label:'经营',value:'经营'},
-      {label:'划拨',value:'划拨'},
-      {label:'集体',value:'集体'},
-      {label:'协议',value:'协议'},
-      {label:'其他',value:'其他'}
+    供地方式: [
+      { label: '划拨', value: '1' },
+      { label: '招拍挂出让', value: '2' },
+      { label: '协议出让', value: '3' },
+      { label: '租赁', value: '4' },
+      { label: '作价出资或入股', value: '5' },
+      { label: '集体土地使用', value: '6' },
+      { label: '招标出让', value: '21' },
+      { label: '拍卖出让', value: '22' },
+      { label: '挂牌出让', value: '23' }
     ],
-    行政区:[
-      {label:'余杭区',value:'330110'},
+    行政区: [
+      { label: '余杭区', value: '330110' },
     ]
   },
-  mapFieldConfig:{
+  mapFieldConfig: {
     "layersData": [
-      {"name":"供地地块","value":"st_gddk","serverName": "供地数据","serverId": "YHYZT_ST_GDDK_NEW","isAnal": false},
-      {"name":"农转用地块","value":"st_nzydk","serverName": "农转用数据","serverId": "YHYZT_NZYDK_NEW","isAnal": false},
-      {"name":"批而未供","value":"pewg","serverName": "批而未供数据","serverId": "YHYZT_PEWG_NEW","isAnal": false},
-      {"name":"探矿权","value":"kc_tkq","serverName": "探矿权","serverId": "YHYZT_KC_TKQ","isAnal": false},
-      {"name":"矿产已有采矿权","value":"kc_yyckq","serverName": "矿产已有采矿权","serverId": "YHYZT_KC_YYCKQ_KKOO","isAnal": false},
-      {"name":"临时用地","value":"lsyd","serverName": "临时用地","serverId": "YHYZT_LSYD","isAnal": true}
+      { "name": "供地地块", "value": "st_gddk", "serverName": "供地数据", "serverId": "YHYZT_ST_GDDK_NEW", "isAnal": true },
+      { "name": "农转用地块", "value": "st_nzydk", "serverName": "农转用数据", "serverId": "YHYZT_NZYDK_NEW", "isAnal": true },
+      { "name": "批而未供", "value": "pewg", "serverName": "批而未供数据", "serverId": "YHYZT_PEWG_NEW", "isAnal": true },
+      { "name": "探矿权", "value": "kc_tkq", "serverName": "探矿权", "serverId": "YHYZT_KC_TKQ", "isAnal": true },
+      { "name": "矿产已有采矿权", "value": "kc_yyckq", "serverName": "矿产已有采矿权", "serverId": "YHYZT_KC_YYCKQ_KKOO", "isAnal": true },
+      { "name": "设施农用地", "value": "ssnyd", "serverName": "设施农用地", "serverId": "YHYZT_SSNYD", "isAnal": true },
+      { "name": "永久基本农田储备库", "value": "yjjbntcbk", "serverName": "永久基本农田储备库", "serverId": "YJJBNTCBK", "isAnal": true },
+      { "name": "永久基本农田补划方案", "value": "yjjbntbhfa", "serverName": "永久基本农田补划方案", "serverId": "YJJBNTBHFA", "isAnal": true },
+      { "name": "农整拆旧地块", "value": "nz_cjdk_20200702", "serverName": "农整拆旧地块", "serverId": "YHYZT_NZ_CJDK_20200702", "isAnal": true },
+      { "name": "农整建新地块", "value": "nz_jxdk", "serverName": "农整建新地块", "serverId": "YHYZT_NZ_JXDK", "isAnal": true },
+      { "name": "临时用地", "value": "yhyzt_lsyd", "serverName": "临时用地", "serverId": "YHYZT_LSYD", "isAnal": true },
+      { "name": "农民建房", "value": "nmjf", "serverName": "农民建房", "serverId": "YHYZT_NMJF_NEW", "isAnal": true }
     ],
     "layerFieldData": {
       "st_gddk": [
-        {"name": "dk_bh","aliasname": "批准文号"},
-        {"name": "dk_mc","aliasname": "地块名称"},
-        {"name": "dk_mj","aliasname": "地块面积"},
-        {"name": "td_zl","aliasname": "土地坐落"},
-        {"name": "dw_mc","aliasname": "用地单位"},
-        {"name": "area","aliasname": "图斑面积"}
+        { "name": "dk_bh", "aliasname": "批准文号" },
+        { "name": "dk_mc", "aliasname": "地块名称" },
+        { "name": "dk_mj", "aliasname": "地块面积" },
+        { "name": "td_zl", "aliasname": "土地坐落" },
+        { "name": "dw_mc", "aliasname": "用地单位" },
+        { "name": "area", "aliasname": "图斑面积" }
       ],
       "st_nzydk": [
-        {"name": "dk_bh","aliasname": "项目名称"},
-        {"name": "pch","aliasname": "批次号"},
-        {"name": "pwh","aliasname": "批文号"},
-        {"name": "pzrq","aliasname": "批准日期"},
-        {"name": "dk_bh","aliasname": "地块编号"},
-        {"name": "dk_yt","aliasname": "地块用途"},
-        {"name": "dk_mj","aliasname": "地块面积"},
-        {"name": "td_zl","aliasname": "土地坐落"},
-        {"name": "area","aliasname": "图斑面积"}
+        { "name": "dk_mc", "aliasname": "项目名称" },
+        { "name": "pch", "aliasname": "批次号" },
+        { "name": "pwh", "aliasname": "批文号" },
+        { "name": "pzrq", "aliasname": "批准日期" },
+        { "name": "dk_bh", "aliasname": "地块编号" },
+        { "name": "dk_yt", "aliasname": "地块用途" },
+        { "name": "dk_mj", "aliasname": "地块面积" },
+        { "name": "td_zl", "aliasname": "土地坐落" },
+        { "name": "st_area(shape)", "aliasname": "图斑面积" }
       ],
       "pewg": [
-        {"name": "dk_bh","aliasname": "批准文号"},
-        {"name": "dk_mc","aliasname": "地块名称"},
-        {"name": "dk_mj","aliasname": "地块面积"},
-        {"name": "dk_zl","aliasname": "土地坐落"},
-        {"name": "dw_mc","aliasname": "用地单位"}
+        { "name": "dk_bh", "aliasname": "批准文号" },
+        { "name": "dk_mc", "aliasname": "地块名称" },
+        { "name": "dk_mj", "aliasname": "地块面积" },
+        { "name": "dk_zl", "aliasname": "土地坐落" },
+        { "name": "dw_mc", "aliasname": "用地单位" }
+      ],
+      "ssnyd": [
+        { "name": "xmmc", "aliasname": "项目名称" },
+        { "name": "pzwh", "aliasname": "批准文号" },
+        { "name": "pzlx", "aliasname": "批准类型" },
+      ],
+      "yjjbntbhfa": [
+        { "name": "项目名称", "aliasname": "项目名称" },
+        { "name": "面积", "aliasname": "面积" }
+      ],
+      "yjjbntcbk": [
+        { "name": "项目名称", "aliasname": "项目名称" },
+        { "name": "面积", "aliasname": "面积" }
+      ],
+      "nz_cjdk_20200702": [
+        { "name": "xmmc", "aliasname": "项目名称" },
+        { "name": "dk_guid", "aliasname": "ID" }
+      ],
+      "nz_jxdk": [
+        { "name": "ch_ghyt", "aliasname": "规划用途" },
+        { "name": "dk_guid", "aliasname": "ID" }
+      ],
+      "yhyzt_lsyd": [
+        { "name": "xmmc", "aliasname": "项目名称" },
+        { "name": "yddw", "aliasname": "用地单位" },
+        { "name": "zlwz", "aliasname": "坐落" },
+        { "name": "pzdw", "aliasname": "批准单位" },
+        { "name": "pzwh", "aliasname": "批准文号" },
+        { "name": "pzsj", "aliasname": "批准时间" },
+        { "name": "pzmj", "aliasname": "批准面积" }
+      ],
+      "kc_tkq": [
+        { "name": "id", "aliasname": "序号" },
+        { "name": "项目名称", "aliasname": "项目名称" },
       ],
-      "kc_tkq":[
-        {"name": "id","aliasname": "序号"},
-        {"name": "项目名称","aliasname": "项目名称"},
+      "lsyd": [
+        { "name": "objectid", "aliasname": "序号" },
+        { "name": "xmmc", "aliasname": "项目名称" },
+        { "name": "yddw", "aliasname": "用地单位名称" },
+        { "name": "pzwh", "aliasname": "批准文号" },
       ],
-      "lsyd":[
-        {"name": "objectid","aliasname": "序号"},
-        {"name": "xmmc","aliasname": "项目名称"},
-        {"name": "yddw","aliasname": "用地单位名称"},
-        {"name": "pzwh","aliasname": "批准文号"},
+      "nmjf": [
+        { "name": "objectid", "aliasname": "序号" },
+        { "name": "xmmc", "aliasname": "项目名称" }
       ]
     },
     "analysisData": {
       "yf": [
-        {"name":"探矿权","value":"kc_tkq","serverName": "探矿权","serverId": "KCYYCKQ"},
-        {"name":"矿产已有采矿权","value":"kc_yyckq","serverName": "矿产已有采矿权","serverId": "KCYYCKQ"}
+        { "name": "探矿权", "value": "kc_tkq", "serverName": "探矿权", "serverId": "KCYYCKQ" },
+        { "name": "矿产已有采矿权", "value": "kc_yyckq", "serverName": "矿产已有采矿权", "serverId": "KCYYCKQ" }
       ],
       "dz": [
-        {"name":"地质灾害易发区","value":"yfq","serverName": "地质灾害易发区","serverId": "DZZHYFQ"},
-        {"name":"地质灾害隐患点","value":"yhd","serverName": "地质灾害隐患点","serverId": "DZZHYHD"}
+        { "name": "地质灾害易发区", "value": "yfq", "serverName": "地质灾害易发区", "serverId": "DZZHYFQ" },
+        { "name": "地质灾害隐患点", "value": "yhd", "serverName": "地质灾害隐患点", "serverId": "DZZHYHD" }
       ]
     }
   }

YHYZT/client/src/views/DataManage/nzy/Detail.vue

@@ -6,7 +6,7 @@
       :style="{ width: contentWidth + 'px' }"
     >
       <el-tab-pane label="报批项目信息" name="first">
-        <div class="content">
+        <div class="content" :style="{ height: contentHeight + 'px' }">
           <div class="head">
             <div class="title">
               <div></div>
@@ -1078,7 +1078,12 @@ export default {
     updateBpxm() {
       this.jbxxEdit = false;
       let params = new FormData();
-      params.append("project", JSON.stringify(this.currProject));
+      // 提取年份前先复制对象，避免修改原始数据
+      const projectToSend = { ...this.currProject };
+      if (projectToSend.zb_nd instanceof Date) {
+        projectToSend.zb_nd = projectToSend.zb_nd.getFullYear();
+      }
+      params.append("project", JSON.stringify(projectToSend));
       let _this = this;
       this.$ajax
         .post("/api/data/manage/nzy/editOneBpxm", params, this, true)
@@ -1308,6 +1313,7 @@ export default {
       padding: 0px 20px;
       width: 100%;
       margin-top: 15px;
+      overflow-y: auto;
       table {
         width: 100%;
         border-collapse: collapse;

YHYZT/server/target/classes/mapper/DataCenterMapper.xml

@@ -3,13 +3,17 @@
 <mapper namespace="com.zjugis.yzt.dao.DataCenterMapper">
 
     <select id="getGddkList" parameterType="Map" resultType="Map">
-        with tx as (
-        select t.*,st_area(shape) area
+        select tx.*
+        <if test="map.wkt!=null and map.wkt!=''">
+            ,st_area(st_geometry(intersect_area::varchar,4528)) as xjmj
+        </if>
+         from(
+        select t.*,st_area(shape) as area
         <if test="map.wkt!=null and map.wkt!=''">
             ,st_astext(st_intersection(st_geometry(st_astext(shape)::varchar, 4528),st_geometry(#{map.wkt}, 4528)))::varchar
-            intersect_area
+            as intersect_area
         </if>
-        from ${map.tableName} t
+        from ${map.tableName} as t
         <where>
             <if test="map.fieldName!=null and map.fieldName!=''">
                 <choose>
@@ -22,13 +26,10 @@
                 </choose>
             </if>
             <if test="map.wkt!=null and map.wkt!=''">
-                st_intersects (shape,st_geometry(#{map.wkt}, 4528 )) is true
+                st_intersects(shape,st_geometry(#{map.wkt}, 4528 ))
             </if>
         </where>
-        )
-        select tx.*,
-        st_area(st_geometry(intersect_area::varchar,4528)) xjmj
-        from tx
+        ) as tx
     </select>
     <select id="getGddkListMj" parameterType="Map" resultType="Map">
         with tx as (