智能选址前端修改

web_ui/src/views/industrial-land/AiIndustriaLandDetail.vue

@@ -114,7 +114,7 @@
               autocomplete="off"
               spellcheck="false"
               autocorrect="off"
-              placeholder="您可以试着这样问我，如“帮我在杭州市西湖区找几块面积35亩左右，人口相对密集的工业用地”"
+              placeholder="您可以试着这样问我，如“帮我在萧山区推荐一宗30亩左右的工业用地”"
               autofocus=""
             >
             </textarea>
@@ -128,46 +128,17 @@
           class="left-panel"
           v-if="showQuery"
         >
-          <div class="back-icon" @click="back"></div>
+          <!-- <div class="back-icon" @click="back"></div> -->
           <div v-for="(item, index) in hzData" :key="index">
             <div class="title" @click="resetAnswer(index)">
               {{ item.name }}
             </div>
-            <!-- <div class="jsz" v-if="item.loading">
-                <img src="~@/assets/image/cyyd/jsz.png" />
-
-                {{ hintText }}
-              </div> -->
-            <div class="steps">
-              <div
-                class="item"
-                v-for="(item, index) in steps"
-                :key="index"
-                @click="toggle(index)"
-              >
-                <div class="name-panel">
-                  <img
-                    src="~@/assets/image/cyyd/wtfx-select.png"
-                    class="icon"
-                    v-if="index <= activeIndex"
-                  />
-                  <img
-                    src="~@/assets/image/cyyd/wtfx-normal.png"
-                    class="icon"
-                    v-else
-                  />
-                  <div class="name" :class="{ c: index > activeIndex }">
-                    {{ item.name }}
-                  </div>
-                </div>
-                <div
-                  class="line"
-                  v-if="index != steps.length - 1"
-                  :class="{ checked: index < activeIndex }"
-                ></div>
-              </div>
+            <div class="jsz" v-if="item.loading">
+              <img src="~@/assets/image/cyyd/jsz.png" />
+              {{ hintText }}
             </div>
-            <div class="tab-panel" v-if="false">
+
+            <!-- <div class="tab-panel" v-if="false">
               <div
                 class="item"
                 v-for="(item, index) in tabs"
@@ -179,43 +150,28 @@
                 </div>
                 <div class="line" v-if="index == tabIndex"></div>
               </div>
+            </div> -->
+            <div class="tab-content" v-if="!showResult">
+              <vue-markdown-it
+                :source="item.summary"
+                :options="{
+                  html: true,
+                  linkify: true,
+                }"
+              />
             </div>
-            <!-- <div class="tab-content">
-                <template
-                  v-if="index == hzData.length - 1 && item.loading == false"
-                >
-                  <div class="btns-panel">
-                    <div class="left-btn">
-                      <img src="~@/assets/image/cyyd/share.png" class="icon" />
-                      <div class="diver"></div>
-                      <div class="alias">追问</div>
-                      <img src="~@/assets/image/cyyd/sdyj.png" class="icon" />
-                      <div class="diver"></div>
-                      <div class="alias">深度研究</div>
-                    </div>
-                  </div>
-                </template>
-              </div> -->
           </div>
           <template v-if="showResult">
             <div class="xg-title">
               <img src="~@/assets/image/cyyd/fk.png" />
               <div class="name">回答</div>
-              <!-- <img src="~@/assets/image/cyyd/xs.png" @click="showTableInfo" /> -->
             </div>
             <p>为您找到以下{{ xgdk ? xgdk.length : 0 }}个地块</p>
             <div class="table-panel">
-              <!-- <div class="th">
-                  <div class="it xh">序号</div>
-                  <div class="it">名称</div>
-                  <div class="it">面积(亩)</div>
-                  <div class="it text">单价(万元/m²)</div>
-                  <div class="it xh">得分</div>
-                  <div class="it xh">操作</div>
-                </div> -->
               <template v-if="xgdk && xgdk.length > 0">
                 <div
                   class="dkitem"
+                  :class="{ dkitemchecked: i == dkIndex }"
                   @mouseover="mouseover(i)"
                   @mouseout="mouseout(i)"
                   @click="showDetailModal(citem, i)"
@@ -226,15 +182,8 @@
                   <div class="content">
                     <h3>{{ citem.name }}</h3>
                     <p>
-                      面积：{{
-                        citem.area ? (citem.area * 0.0015).toFixed(2) : "-"
-                      }}亩 单价：{{
-                        citem.unit_price ? citem.unit_price : "-"
-                      }}万元/m² 得分：{{
-                        citem.comprehensive_score
-                          ? citem.comprehensive_score
-                          : "-"
-                      }}
+                      面积：{{ citem.dkmj ? citem.dkmj.toFixed(2) : "-" }}亩
+                      土地用途：{{ citem.tdyt ? citem.tdyt : "-" }}
                     </p>
                   </div>
                 </div>
@@ -323,7 +272,7 @@
           @toggle="toggleInfoTab"
           @gowkt="goWkt"
           @clear="clearMark"
-          :item="activeItem"
+          :item="detailData"
         ></znxz-detail>
         <znxz-compare v-if="shwoCompare" :map="map" ref="compre"></znxz-compare>
         <znxz-collect v-if="shwoCollect" @dkinfo="dkInfo"></znxz-collect>
@@ -416,7 +365,7 @@ export default {
           name: "请帮我在杭州市萧山机场附近推荐几块总价不超过2000万的工业用地",
         },
         {
-          name: "帮我在杭州市西湖区找几块面积35亩左右，人口相对密集的工业用地",
+          name: "帮我在萧山区推荐一宗30亩左右的工业用地",
         },
         {
           name: "请帮我杭州市找几块在开发区内，园区主导产业为新能源的工业用地",
@@ -435,7 +384,7 @@ export default {
       markerLayer: null,
       questionModal: false,
       showLegend: true,
-      hintText: "检索中...",
+      hintText: "思考中...",
       dkIndex: -1,
       hoverDkIndex: -1,
       summary: "",
@@ -497,94 +446,89 @@ export default {
       dkMarkerLayer: [],
       startTime: 0,
       showIndentify: false,
+      detailData: null,
       legend: [
+        // {
+        //   name: "可利用资源",
+        //   fill: "#e48b8b50",
+        //   border: "#000000",
+        // },
+        // {
+        //   name: "永久基本农田",
+        //   fill: "#fefe6050",
+        //   border: "#d7d6d6",
+        // },
+        // {
+        //   name: "生态保护红线",
+        //   fill: "#4d9757",
+        //   border: "#4d9757",
+        // },
+        // {
+        //   name: "控规详细性规划",
+        //   children: [
+        //     {
+        //       name: "工业",
+        //       fill: "#66290080",
+        //       border: "#66290080",
+        //     },
+        //   ],
+        // },
         {
-          name: "城镇开发边界",
-          fill: "#e48b8b50",
-          border: "#000000",
-        },
-        {
-          name: "永久基本农田",
-          fill: "#fefe6050",
-          border: "#d7d6d6",
-        },
-        {
-          name: "生态保护红线",
-          fill: "#4d9757",
-          border: "#4d9757",
-        },
-        {
-          name: "控规详细性规划",
+          name: "可利用资源",
           children: [
             {
-              name: "工业",
-              fill: "#66290080",
-              border: "#66290080",
-            },
-          ],
-        },
-        {
-          name: "供地",
-          children: [
-            {
-              name: "工业",
-              fill: "",
-              border: "rgb(0, 122,255)",
+              name: "公告地块",
+              fill: "green",
+              border: "green",
             },
             {
-              name: "住宅",
-              fill: "",
-              border: "rgb(255,170,0)",
-            },
-            {
-              name: "商业",
-              fill: "",
-              border: "rgb(230,0,0)",
+              name: "计划地块",
+              fill: "blue",
+              border: "blue",
             },
+            // {
+            //   name: "商业",
+            //   fill: "",
+            //   border: "rgb(230,0,0)",
+            // },
           ],
         },
       ],
 
       mockData: {
-        summary: `### 1. 双桥单元XH020203-16地块
+        summary: `### 萧政工出（2020）2号
 
-- **行政区**: 西湖区
+- **行政区**: 萧山区
 - **规划用途**: 工业用地
-- **用地面积**: 24027.0 平方米
-- **用地总价**: 3266.0 万元
-- **综合得分**: 90.0
-- **土地坐落**: 西湖区（双桥单元XH020203 -16地块，东至数治路，南至规划云梦路，西至规划支路，北至肖圣街）
+- **用地面积**: 24.9435亩
+- **土地坐落**: 东至规划工业用地，南至规划支路，西至规划工业用地，北至机场北辅路。
 
 ### 2. 双桥单元XH020203-15地块
 
 - **行政区**: 西湖区
 - **规划用途**: 工业用地
 - **用地面积**: 21756.0 平方米
-- **用地总价**: 2955.0 万元
-- **综合得分**: 88.0
 - **土地坐落**: 西湖区（双桥单元XH020203-15地块，东至规划支路，南至规划云梦路，西至智强路，北至肖圣街）`,
         dks: [
           {
             id: 7286,
             name: "双桥单元XH020203-16地块",
-            county: "西湖区",
-            location:
+            xzqmc: "西湖区",
+            tdyt: "工业用地",
+            address:
               "西湖区（双桥单元XH020203 -16地块，东至数治路，南至规划云梦路，西至规划支路，北至肖圣街）",
-            total_price: 3266.0,
-            unit_price: 0.14,
-            area: 24027.0,
-            comprehensive_score: 90.0,
+            dkmj: 24027.0,
+
             center_wkt: "POINT(120.036582554545 30.3277712108271)",
           },
           {
             id: 7285,
             name: "双桥单元XH020203-15地块",
-            county: "西湖区",
-            location:
+            xzqmc: "西湖区",
+            tdyt: "工业用地",
+            address:
               "西湖区（双桥单元XH020203-15地块，东至规划支路，南至规划云梦路，西至智强路，北至肖圣街）",
-            total_price: 2955.0,
-            unit_price: 0.14,
-            area: 21756.0,
+            dkmj: 21756.0,
             comprehensive_score: 88.0,
             center_wkt: "POINT(120.03392658277 30.3271936782775)",
           },
@@ -813,8 +757,7 @@ export default {
       if (this.inputText == "" || this.inputText == null) {
         // this.$Message.info("请输入");
         // return;
-        this.inputText =
-          "帮我在杭州市西湖区找几块面积35亩左右，人口相对密集的工业用地";
+        this.inputText = "帮我在萧山区推荐一宗30亩左右的工业用地";
       }
 
       this.zwinputText = "";
@@ -823,8 +766,11 @@ export default {
       this.toggleTab(0);
     },
     zwsend() {
+      if (!this.zwinputText) {
+        this.zwinputText = "帮我在萧山区推荐一宗30亩左右的工业用地";
+      }
       var item = { name: this.zwinputText, loading: true };
-      this.hzData.push(item);
+      this.hzData = [item];
       this.activeIndex = 0;
       this.send();
     },
@@ -930,6 +876,7 @@ export default {
         center: myCenter,
         zoom: this.zoomLevel,
         zoomControl: false,
+        attributionControl: false, //去掉右下角的logo
       });
       // var tk = window.ApplicationConfig.tk;
       var tk = "6dfd31e3b55a8466f34997aee5551a9c";
@@ -1066,7 +1013,7 @@ export default {
           }
         }
         this.clearMark();
-        // this.showDetail = true;
+        this.showDetail = true;
         this.activeItem = item;
         this.dkIndex = index;
         //高亮marker
@@ -1139,7 +1086,7 @@ export default {
         this.wt = this.inputText;
         this.hzData = [];
         var item = { name: this.wt, loading: true };
-        this.hzData.push(item);
+        this.hzData = [item];
         this.count = 0;
         this.zwinputText = "";
         this.zhuiwen = false;
@@ -1182,28 +1129,19 @@ export default {
         this.geojsonLayer = this.dkGeo.addTo(this.map);
         this.map.fitBounds(this.dkGeo.getBounds());
       } else {
-        // let query =
-        //   window.ApplicationConfig.landUrl +
-        //   "/0/query?where=id=" +
-        //   item.id +
-        //   "&" +
-        //   "geometryType=esriGeometryPoint&inSR=4490&spatialRel=esriSpatialRelIntersects&relationParam=&outFields=*&returnGeometry=true&" +
-        //   "maxAllowableOffset=&geometryPrecision=&outSR=&returnIdsOnly=false&returnCountOnly=false&orderByFields=&groupByFieldsForStatistics=&" +
-        //   "outStatistics=&returnZ=false&returnM=false&gdbVersion=&returnDistinctValues=false&f=json";
         let query =
           window.ApplicationConfig.geoserverUrl +
           "?service=WFS&version=1.0.0&request=GetFeature&typeName=" +
           window.ApplicationConfig.gdLayerName +
-          "&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=name='" +
-          item.name +
-          "'";
+          "&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=id=" +
+          item.name;
         axios.get(query).then((data) => {
           console.log(data);
           if (data.data.features.length < 1) {
             this.$Message.info("未查询到数据");
             return;
           }
-          this.land = data.data.features[0].attributes;
+          this.detailData = data.data.features[0].properties;
           var geojson = data.data.features[0].geometry;
           var geos = L.geoJSON(geojson, {
             style: function (feature) {
@@ -1220,28 +1158,18 @@ export default {
     //获取地块信息
     async getActiveItemGeometry(item) {
       return new Promise((resolve, reject) => {
-        // let query =
-        //   window.ApplicationConfig.landUrl +
-        //   "/0/query?where=id=" +
-        //   item.id +
-        //   "&" +
-        //   "geometryType=esriGeometryPoint&inSR=4490&spatialRel=esriSpatialRelIntersects&relationParam=&outFields=*&returnGeometry=true&" +
-        //   "maxAllowableOffset=&geometryPrecision=&outSR=&returnIdsOnly=false&returnCountOnly=false&orderByFields=&groupByFieldsForStatistics=&" +
-        //   "outStatistics=&returnZ=false&returnM=false&gdbVersion=&returnDistinctValues=false&f=json";
         let query =
           window.ApplicationConfig.geoserverUrl +
           "?service=WFS&version=1.0.0&request=GetFeature&typeName=" +
           window.ApplicationConfig.gdLayerName +
-          "&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=name='" +
-          item.name +
-          "'";
+          "&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=id=" +
+          item.name;
         axios.get(query).then((data) => {
-          console.log(data);
           if (data.data.features.length < 1) {
-            this.dkGeo = null;
-            this.dkGeojson = null;
+            this.$Message.info("未查询到数据");
             return;
           }
+          this.detailData = data.data.features[0].properties;
           var geojson = data.data.features[0].geometry;
           var geos = L.geoJSON(geojson, {
             style: function (feature) {
@@ -1250,6 +1178,7 @@ export default {
           });
           this.dkGeo = geos;
           this.dkGeoJson = geojson;
+
           resolve();
         });
       });
@@ -1494,7 +1423,8 @@ export default {
     send: _.debounce(async function () {
       let that = this;
       this.showResult = false;
-      this.radarShow = true;
+      //不显示查询时地图上的雷达扫描效果
+      this.radarShow = false;
       this.zhuiwen = false;
       if (this.eventSource) {
         this.eventSource.close();
@@ -1516,13 +1446,12 @@ export default {
       this.activeIndex = 0;
       var question = this.wt.trim();
       if (this.zwinputText != "") {
-        question = question + ",其中" + this.zwinputText.trim();
+        //追问的时候，暂时不用历史数据
+        // question = question + ",其中" + this.zwinputText.trim();
+        question = this.zwinputText.trim();
       }
       let mock = false;
-      if (
-        question ===
-        "帮我在杭州市西湖区找几块面积35亩左右，人口相对密集的工业用地"
-      ) {
+      if (question === "帮我在萧山区推荐一宗30亩左右的工业用地") {
         mock = true;
       }
 
@@ -1539,7 +1468,7 @@ export default {
       this.summary = "";
       this.xgdk = [];
       this.activeIndex = 0;
-      this.hintText = "检索中...";
+      this.hintText = "思考中...";
       this.messages.push({
         id: uuid(),
         content: question,
@@ -1665,7 +1594,7 @@ export default {
             }
 
             if (
-              agentName === "summary" &&
+              agentName != "summary" &&
               lastChoice.role === "assistant" &&
               !executed
             ) {
@@ -1679,7 +1608,7 @@ export default {
               });
             }
             if (agentName === "summary" && executed && execRes) {
-              T.summary = execRes;
+              // T.summary = execRes;
               T.showResult = true;
               T.radarShow = false;
               T.loading = false;
@@ -1689,9 +1618,9 @@ export default {
                   .replaceAll("\n```\n", "");
                 exec_res = JSON.parse(exec_res);
                 var dk = exec_res;
-                dk.sort(function (a, b) {
-                  return b.comprehensive_score - a.comprehensive_score;
-                });
+                // dk.sort(function (a, b) {
+                //   return b.comprehensive_score - a.comprehensive_score;
+                // });
                 T.xgdk = dk;
                 T.clearMark();
                 T.showXgdkCenterPoint();
@@ -1913,7 +1842,7 @@ export default {
         position: absolute;
         right: 17px;
         width: 168px;
-        height: 360px;
+        // height: 360px;
         background: #ffffff;
         border-radius: 10px;
         cursor: pointer;
@@ -2247,14 +2176,12 @@ export default {
           width: 100%;
           height: calc(100% - 260px);
           position: relative;
-          .text {
-            margin: 31px 0px 28px 5px;
-            font-family: Microsoft YaHei;
-            font-weight: 400;
-            line-height: 30px;
-            font-size: 16px;
-            color: #666666;
-          }
+          margin: 31px 0px 28px 5px;
+          font-family: Microsoft YaHei;
+          font-weight: 400;
+          line-height: 30px;
+          font-size: 16px;
+          color: #666666;
           .spin {
             margin: 31px 0px 28px 5px;
             font-family: Microsoft YaHei;
@@ -2590,6 +2517,9 @@ export default {
     }
   }
 }
+.dkitemchecked {
+  border: 1px solid #007bff;
+}
 .dkitem {
   display: flex;
   align-items: center;

web_ui/src/views/industrial-land/ZnxzDetail.vue

@@ -15,15 +15,15 @@
         />
       </div>
       <div class="img-panel">
-        <div class="btn" @click="add" v-if="currentItem == null">加入对比</div>
-        <div class="btn c" @click="remove" v-else>取消对比</div>
+        <!-- <div class="btn" @click="add" v-if="currentItem == null">加入对比</div>
+        <div class="btn c" @click="remove" v-else>取消对比</div> -->
 
         <img src="~@/assets/image/icon-close.png" @click="goClose" />
       </div>
     </div>
     <Spin size="large" class="span" fix v-if="loading"></Spin>
     <div class="content" v-else>
-      <div class="tabs">
+      <!-- <div class="tabs">
         <div
           class="item"
           v-for="(item, index) in tabs"
@@ -39,7 +39,7 @@
         >
           {{ item }}
         </div>
-      </div>
+      </div> -->
       <template v-if="selectIndex == 0 || selectIndex == 1">
         <div class="tab-panel" v-if="selectIndex == 1">
           <div class="zbhj-tabs">
@@ -182,7 +182,7 @@
         </div>
 
         <div class="tab-panel" v-if="selectIndex == 0">
-          <div class="zbhj-tabs">
+          <!-- <div class="zbhj-tabs">
             <div
               class="z-item mr"
               v-for="(item, index) in jbxxTabs"
@@ -198,7 +198,7 @@
               </div>
               <div class="checked" v-if="jbxxIndex == index"></div>
             </div>
-          </div>
+          </div> -->
           <vue-perfect-scrollbar class="zb-panel" :settings="settings">
             <template v-if="jbxxIndex == 0">
               <div class="item" v-for="item in dkxx" :key="item.name">
@@ -643,7 +643,7 @@ export default {
       zbhjList: [],
       currentItem: null,
       currentCollectItem: null,
-      tabs: ["地块信息", "区域特色", "公共设施", "周边环境", "交通条件"],
+      tabs: ["地块信息"],
       zbTabs: [],
       ggssIndex: 0,
       ggssTabs: [],
@@ -747,89 +747,44 @@ export default {
         {
           name: "地块名称",
           value: "",
-          key: "name",
-        },
-        {
-          name: "行政区名称",
-          value: "",
-          key: "county",
+          key: "dkmc",
         },
-        {
-          name: "街道乡镇名称",
-          value: "",
-          key: "jdxz",
-        },
-
-        {
-          name: "开发区名称",
-          value: "",
-          key: "park_name",
-        },
-        {
-          name: "土地坐落",
+         {
+          name: "地块编号",
           value: "",
-          key: "location",
+          key: "dkbh",
         },
         {
-          name: "规划用途",
-          value: "",
-          key: "planned_la",
-        },
-        {
-          name: "地块面积(亩 )",
-          value: "",
-          key: "area",
-        },
-        {
-          name: "单价(万元/平方米)",
-          value: "",
-          key: "unit_price",
-        },
-        {
-          name: "总价(万元)",
+          name: "行政区名称",
           value: "",
-          key: "total_price",
+          key: "xzqmc",
         },
         {
-          name: "主导产业",
+          name: "行政区代码",
           value: "",
-          key: "main_indus",
-        },
-        {
-          name: "是否符合规划",
-          value: "是",
-          key: "planning_c",
-        },
-        {
-          name: "是否完成征地",
-          value: "是",
-          key: "land_acqui",
+          key: "xzqdm",
         },
         {
-          name: "是否完成拆迁",
-          value: "是",
-          key: "demolition",
-        },
-        {
-          name: "固定投资强度",
+          name: "地块面积（亩）",
           value: "",
-          key: "fixed_inve",
+          key: "dkmj",
         },
+
         {
-          name: "亩均税收",
+          name: "土地用途",
           value: "",
-          key: "tax_per_mu",
+          key: "tdyt",
         },
         {
-          name: "单位能耗",
+          name: "地块类型",
           value: "",
-          key: "energy_con",
+          key: "dklx",
         },
         {
-          name: "单位排放",
+          name: "地块位置",
           value: "",
-          key: "discharge_",
-        },
+          key: "address",
+        }
       ],
       conScrollWidth: "", // 滚动内容的宽度
       conClientWidth: "", // box的宽度
@@ -884,11 +839,11 @@ export default {
   },
   methods: {
     init() {
-      this.loading = true;
+      // this.loading = true;
       this.check();
       setTimeout(() => {
         this.analysis();
-      }, 500);
+      }, 200);
     },
     //地类图斑定位
     goInfoLocation(wkt) {
@@ -1219,142 +1174,15 @@ export default {
       });
     },
     analysis() {
-      var id = this.item.dk_id ? this.item.dk_id : this.item.id;
-      let that = this;
-      landMethods.surroundAnalysis(id).then((res) => {
-        if (res.code == 200) {
-          if (res.data) {
-            var data = res.data;
-            if (data.planningCompliance) {
-              data.planningCompliance.forEach((item) => {
-                if (item.name == "城镇开发边界内") {
-                  that.czqkfbjList = item.result == null ? [] : item.result;
-                }
-                if (item.name == "永久基本农田") {
-                  that.yjjbntList = item.result == null ? [] : item.result;
-                }
-                if (item.name == "生态保护红线") {
-                  that.stbhhxList = item.result == null ? [] : item.result;
-                }
-                if (item.name == "符合控制性详细规划") {
-                  that.kzxxxghList = item.result == null ? [] : item.result;
-                }
-              });
-            }
-            that.zbTabs = [];
-            if (data.trafficConditions) {
-              var str = "省道国道乡道县道";
-              var roadData = [];
-              data.trafficConditions.forEach((item) => {
-                if (str.indexOf(item.name) > -1) {
-                  if (item.result) {
-                    var label = "G";
-                    if (item.name == "省道") {
-                      label = "S";
-                    }
-                    if (item.name == "国道") {
-                      label = "G";
-                    }
-                    if (item.name == "县道") {
-                      label = "X";
-                    }
-                    if (item.name == "乡道") {
-                      label = "S";
-                    }
-                    item.result.forEach((t) => {
-                      t.label = label;
-                      roadData.push(t);
-                    });
-                  }
-                } else {
-                  that.zbTabs.push(item);
-                }
-              });
-              if (roadData) {
-                that.zbTabs.push({ name: "公路", result: roadData });
-              }
-              that.yyList = that.zbTabs[0].result;
-            }
-            that.ggssTabs = [];
-            if (data.publicService) {
-              data.publicService.forEach((item) => {
-                item.show = false;
-                var d = item.result;
-                item.result = that.getReduceList(d);
-                that.ggssTabs.push(item);
-              });
-            }
-            that.zbhjTabs = [];
-            if (data.surroundingEnv) {
-              data.surroundingEnv.forEach((item) => {
-                that.zbhjTabs.push(item);
-              });
-            }
-            if (data.regionalCharacteristic) {
-              data.regionalCharacteristic.forEach((item) => {
-                that.qytsTabs.forEach((c) => {
-                  if (c.name == item.name) {
-                    c.result = item.result == null ? [] : item.result;
-                    if (c.name == "周边园区") {
-                      c.result.forEach((t) => {
-                        t.bgpicUrl = that.picUrl + t.refId + ".png";
-                      });
-                    }
-                  }
-                });
-              });
-            }
-            if (data.population) {
-              that.polulation = data.population.result;
-              if (that.polulation) {
-                that.yearData[0].value = that.polulation.中青年人口;
-                that.yearData[1].value = that.polulation.老年人口;
-                that.sexData[1].value = that.polulation.女性人口;
-                that.sexData[0].value = that.polulation.男性人口;
-              } else {
-                that.polulation = {};
-                that.polulation.人口总量 = 0;
-                that.polulation.人口密度 = 0;
-                that.yearData[0].value = 0;
-                that.yearData[1].value = 0;
-                that.sexData[0].value = 0;
-                that.sexData[1].value = 0;
-              }
-            }
-            //地类分析合并
-            if (data.landTypes) {
-              var types = data.landTypes.result ? data.landTypes.result : [];
-              var dlmc = [];
-              types.forEach((item) => {
-                if (!dlmc.includes(item.dlmc)) {
-                  dlmc.push(item.dlmc);
-                }
-              });
-              that.dlfxList = [];
-              dlmc.forEach((citem) => {
-                var t = {
-                  dlmc: citem,
-                };
-                var dlmj = 0;
-                var wkts = [];
-                types.forEach((item, index) => {
-                  if (item.dlmc == citem) {
-                    t.dlbm = item.dlbm;
-                    t.zldwmc = item.zldwmc;
-                    dlmj += item.dlmj;
-                    wkts.push(item.wkt);
-                  }
-                });
-                t.wkt = wkts;
-                t.dlmj = dlmj.toFixed(2);
-                that.dlfxList.push(t);
-              });
-            }
-          }
+      // var id = this.item.dk_id ? this.item.dk_id : this.item.id;
+      // let that = this;
+      this.dkxx.forEach(prop=>{
+        if(prop.key in this.item){
+          prop.value = this.item[prop.key]
         }
-        that.loading = false;
       });
-    },
+      console.log(this.dkxx);
+     },
   },
 };
 </script>

web_ui/static/config.js

@@ -1,7 +1,8 @@
 (function (window) {
   window.ApplicationConfig = {
     serverURL: "/server",
-    subscribeUrl: 'http://ai.zjugis.com:8511/subscribe/',
+    // subscribeUrl: 'http://ai.zjugis.com:8511/subscribe/',
+    subscribeUrl: 'http://localhost:8511/subscribe/',
     // subscribeUrl: 'http://192.168.0.145:8511/subscribe/',
     // zcbdUrl: 'http://ai.zjugis.com:8510/policy/#/home',
     // fgbdUrl: 'http://ai.zjugis.com:8510/policy/#/regulation',
@@ -13,11 +14,11 @@
     zizsUrl: 'http://ai.zjugis.com:8510/#/ai-assistant',
     // aiUrl: 'http://localhost:8080/#/ai',
     // landuseAiUrl:'http://localhost:8080/#/assistant',
-    gdUrl: 'http://60.191.110.204:6080/arcgis/rest/services/NRLLM/ZPGGD/MapServer',
-    landUrl: 'http://60.191.110.204:6080/arcgis/rest/services/NRLLM/LAND_PUBLIC_SALE/MapServer',
-    xzqUrl: 'http://60.191.110.204:6080/arcgis/rest/services/NRLLM/ZJXZQ/MapServer',
+    gdUrl: 'http://60.191.110.204:6080/arcgis/rest/services/sde/ZPGGD/MapServer',
+    landUrl: 'http://60.191.110.204:6080/arcgis/rest/services/sde/ecgap_klyzy/MapServer',
+    xzqUrl: 'http://60.191.110.204:6080/arcgis/rest/services/sde/ZJXZQ/MapServer',
     geoserverUrl:'/geoserver-host/geoserver/sde/ows',
-    gdLayerName:'sde%3Aland_public_sale',
+    gdLayerName:'sde%3Aecgap_klyzy',
     aiAgent: [
       'plan_dispatcher',
       'summary',
@@ -58,263 +59,17 @@
       {
         name: '现状图层', layers: [
           {
-            name: "供地图层",
+            name: "可利用资源",
             id: "GD",
             checked: true,
             // type: 'dynamic',
-            // url: '/arcserver-host/arcgis/rest/services/NRLLM/LAND_PUBLIC_SALE/MapServer'
+            // url: '/arcserver-host/arcgis/rest/services/sde/ecgap_klyzy/MapServer'
             type: 'geoserver',
             url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde/wms',
-            layername: 'sde:land_public_sale'
+            layername: 'sde:ecgap_klyzy'
           }
         ]
-      },
-      {
-        name: '三调', layers: [
-          {
-            name: "三调地类分布",
-            id: "DLFB",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_land_type'
-          },
-        ]
-      },
-      {
-        name: '规划符合度', layers: [
-          {
-            name: "控制性详细规划",
-            id: "KZXXXGH",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_control_planning'
-          },
-          {
-            name: "城镇开发边界线",
-            id: "CZKFBJX",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_development_bound'
-          },{
-            name: "永久基本农田控制线",
-            id: "YJJBNT",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_capital_farmland'
-          }
-          ,{
-            name: "生态保护红线",
-            id: "STBHHX",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_ecological_protection'
-          }
-        ]
-      },
-      {
-        name: '区域特色', layers: [
-          {
-            name: "园区",
-            id: "CYYQ",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_park'
-          },
-        ]
-      },
-      {
-        name: '交通条件', layers: [
-          {
-            name: "港口",
-            id: "JT_GK",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_port'
-          },
-          {
-            name: "机场",
-            id: "JT_JC",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_traffic_airport'
-          },
-          {
-            name: "火车站",
-            id: "JT_HCZ",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_traffic_train_station'
-          },
-          {
-            name: "公交站",
-            id: "JT_GJZ",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_traffic_bus_station'
-          },
-          {
-            name: "地铁站",
-            id: "JT_GJZ",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_traffic_metro_station'
-          },
-          {
-            name: "高速",
-            id: "JT_GS",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_highway_expressway'
-          },
-          {
-            name: "国道",
-            id: "JT_GD",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_way_g'
-          },
-          {
-            name: "省道",
-            id: "JT_GD",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_way_s'
-          },
-          {
-            name: "县道",
-            id: "JT_GD",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_way_x'
-          },
-          {
-            name: "乡道",
-            id: "JT_GD",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_way_y'
-          },
-        ]
-      },
-      {
-        name: '周边环境', layers: [
-          {
-            name: "重大项目",
-            id: "ENV_ZDXM",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_env_major_project'
-          },
-          {
-            name: "地质灾害点",
-            id: "ENV_DZZHD",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_env_geologic_hazard'
-          },
-          {
-            name: "化工厂",
-            id: "ENV_HGC",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_env_chemical_plant'
-          },
-          {
-            name: "危险品仓库",
-            id: "ENV_WXPCK",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_env_gas_station'
-          },
-          {
-            name: "燃气站",
-            id: "ENV_RQZ",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_env_gas_station'
-          },
-        ]
-      },
-      {
-        name: '公共设施', layers: [
-          {
-            name: "公安消防",
-            id: "GAXF",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_ggfw_xfd'
-          },
-          {
-            name: "医疗卫生",
-            id: "YLWS",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_ggfw_ylss'
-          }, {
-            name: "教育学校",
-            id: "JYXX",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_ggfw_jyss'
-          },
-          {
-            name: "文化设施",
-            id: "WHSS",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_ggfw_whss'
-          },
-          {
-            name: "体育设施",
-            id: "TYSS",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_ggfw_tyss'
-          },
-          {
-            name: "公园绿地",
-            id: "GYLD",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_ggfw_gyld'
-          },
-          {
-            name: "政府机构",
-            id: "ZFJG",
-            checked: false,
-            type: 'wmts',
-            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:layer_poi_ggfw_zfjg'
-          },
-        ]
-      },
+      }
     ],
   }
 }(window))