Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/api/ghss/gdbh.js

@@ -13,4 +13,21 @@ export function GetFactorList(params) {
         method: 'get',
         params
     })
-}
+}
+//添加模型分析研判
+export function AddGdbh(data) {
+    return request({
+        url: '/apply/gdbh/AddGdbh',
+        method: 'post',
+        data:data
+    })
+}
+//历史记录查询
+export function SelectGdbhList(params) {
+    return request({
+        url: '/apply/gdbh/SelectGdbhList',
+        method: 'get',
+        params
+    })
+}
+

src/components/Query/clickQuery/clickQuery.vue

@@ -150,12 +150,12 @@ export default {
           iconName: "el-icon-office-building",
           isSelect: false,
         },
-        {
-          index: 4,
-          lable: "矢量",
-          iconName: "el-icon-picture",
-          isSelect: false,
-        },
+        // {
+        //   index: 4,
+        //   lable: "矢量",
+        //   iconName: "el-icon-picture",
+        //   isSelect: false,
+        // },
         {
           index: 5,
           lable: "联级查询",
@@ -329,8 +329,8 @@ export default {
               clampToGround: true,
             }),
           });
+          viewer.flyTo(e);
         }
-        viewer.flyTo(e);
       } else {
         this.$message({
           message: "空间范围为空！",
@@ -360,8 +360,8 @@ export default {
       that.layersData = [];
       this.remove_query_click();
       let scene = viewer.scene;
-      that.viewer.entities.removeAll();
-      that.dataSourceLayer.entities.removeAll();
+      viewer.entities.removeAll();
+      dataSourceLayer.entities.removeAll();
       //拾取模型
       let pickedFeature = scene.pick(movement.position);
       if (

src/views/complianceAnalysis/components/lsjl.vue

@@ -48,7 +48,7 @@
         <!-- <div>{{ dindex + 1 }}. 项目名称：{{ item.xmmc }}</div> -->
         <div class="index">{{ dindex + 1 }}</div>
         <div class="nameTitle">{{ item.xmmc }}</div>
-        <div>建设单位：{{ item.jsdw }}</div>
+        <div v-if="type != 'gdbh'">建设单位：{{ item.jsdw }}</div>
         <div class="item_bottom">
           <el-tag type="warning" v-if="item.rwzt == 0">创建</el-tag>
           <el-tag v-if="item.rwzt == 1">执行中</el-tag>
@@ -87,6 +87,7 @@ import { GetPage, Delect } from "@/api/ghss/hgxfx.js";
 import { Message, MessageBox } from "element-ui";
 import { rest } from "lodash";
 import { GetXzResList, DelXzRes } from "../../../api/ghss/ghxz.js";
+import { SelectGdbhList } from "../../../api/ghss/gdbh.js";
 let dataSources;
 export default {
   props: {
@@ -242,54 +243,18 @@ export default {
           this.datalist = [...this.datalist, ...res.data.items];
         });
       } else if (this.$props.type == "gdbh") {
-        console.log("我是耕地保护");
-        setTimeout(() => {
-          this.$emit("updateParent", "loading", false);
-        }, 100);
         //耕保历史记录
-        let tempData = [
-          {
-            bsm: "012bf914cf6344528e75a500a25965a8",
-            xmmc: "15耕地保护项目_20240828094815",
-            xmlx: null,
-            rwzt: 99,
-            jsdw: "建设单位",
-            fxbg: null,
-            geom: null,
-            dks: [],
-            landCount: 0,
-            xzyz: [],
-            createAt: "2024-08-28 10:05:23",
-          },
-          {
-            bsm: "10eb1b95ca0b44c6998fd7770d769b64",
-            xmmc: "小谷——耕地保护项目_20240828093845",
-            xmlx: null,
-            rwzt: 1,
-            jsdw: "建设单位",
-            fxbg: null,
-            geom: null,
-            dks: [],
-            landCount: 0,
-            xzyz: [],
-            createAt: "2024-08-28 09:42:39",
-          },
-          {
-            bsm: "8f84735ec1414d8b9962d8013220ca86",
-            xmmc: "小谷——耕地保护项目_20240828093845",
-            xmlx: null,
-            rwzt: 1,
-            jsdw: "建设单位",
-            fxbg: null,
-            geom: null,
-            dks: [],
-            landCount: 0,
-            xzyz: [],
-            createAt: "2024-08-28 09:39:54",
-          },
-        ];
-        this.listdisabled = tempData.length < 10;
-        this.datalist = [...this.datalist, ...tempData];
+        SelectGdbhList().then((res) => {
+          setTimeout(() => {
+            this.$emit("updateParent", "loading", false);
+          }, 100);
+
+          if (res.code == 200) {
+            console.log("我是耕地保护");
+            this.listdisabled = res.rows.length < 10;
+            this.datalist = [...this.datalist, ...res.rows];
+          }
+        });
       }
     },
     zoomItem(item) {

src/views/farmlandProtection/components/fxjg.vue

@@ -36,16 +36,111 @@
       </div>
       <el-button size="mini" @click="zdyModel">图表切换</el-button>
     </div>
+    <div>
+      <pie
+        class="echart"
+        unit="平方千米"
+        @echartClick="(name) => echartClick(name, item.value)"
+        :ref="`echartRef`"
+      ></pie>
+    </div>
+
+    <div class="site-title">
+      <div class="siteCon">
+        <div class="site_Icon"></div>
+        <span>套合结果</span>
+      </div>
+    </div>
+    <div class="Integration">
+      <!-- <div></div> -->
+      <div class="Integration_list">
+        <div class="listCol">
+          <div class="listText">
+            <span style="color: #fff">占压耕地图斑数</span>
+            <span color="#2d8cf0">{{ 203 }}个</span>
+          </div>
+        </div>
+        <div class="listCol">
+          <div class="listText">
+            <span style="color: #fff">占压耕地面积(㎡)</span>
+            <span color="#2d8cf0">{{ 20314.52 }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="Integration_list">
+        <div class="listCol">
+          <div class="listText">
+            <span style="color: #fff">占压永久基本农田图斑数</span>
+            <span color="#2d8cf0">{{ 203 }}个</span>
+          </div>
+        </div>
+        <div class="listCol">
+          <div class="listText">
+            <span style="color: #fff">占压永久基本农田面积(㎡)</span>
+            <span color="#2d8cf0">{{ 20314.52 }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="Integration_list">
+        <div class="listCol">
+          <div class="listText">
+            <span style="color: #fff">占压耕地图斑数</span>
+            <span color="#2d8cf0">{{ 203 }}个</span>
+          </div>
+        </div>
+        <div class="listCol">
+          <div class="listText">
+            <span style="color: #fff">占压耕地面积(㎡)</span>
+            <span color="#2d8cf0">{{ 20314.52 }}</span>
+          </div>
+        </div>
+        <div class="listCol">
+          <div class="listText">
+            <span style="color: #fff">占压耕地面积(㎡)</span>
+            <span color="#2d8cf0">{{ 20314.52 }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="Integration_list">
+        <div class="listCol">
+          <div class="listText">
+            <span style="color: #fff">占压生态保护红线图斑数</span>
+            <span color="#2d8cf0">{{ 203 }}个</span>
+          </div>
+        </div>
+        <div class="listCol">
+          <div class="listText">
+            <span style="color: #fff">占压公益林面积(㎡)</span>
+            <span color="#2d8cf0">{{ 20314.52 }}</span>
+          </div>
+        </div>
+        <div class="listCol">
+          <div class="listText">
+            <span style="color: #fff">占压自然保护地图斑数</span>
+            <span color="#2d8cf0">{{ 20314.52 }}个</span>
+          </div>
+        </div>
+        <div class="listCol">
+          <div class="listText">
+            <span style="color: #fff">占压自然保护地面积(㎡)</span>
+            <span color="#2d8cf0">{{ 20314.52 }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
+import pie from "@/components/echartsTemplate/pieNew.vue";
 export default {
   props: {
     fxjgObj: {
       type: Object,
     },
   },
+
+  components: { pie },
   data() {
     return {
       imgs: {
@@ -54,6 +149,35 @@ export default {
       },
     };
   },
+  methods: {
+    GetSumList() {
+      let data = [
+        { name: "中央资金", value: "13.45" },
+        { name: "省级资金", value: "5" },
+        { name: "市级资金", value: "18.67" },
+      ];
+      // this.setEchart({ data, type: '"horizontal"', total: 37.12 }, 2);
+      this.$refs[`echartRef`].setOptions({ data, type: '"horizontal"' }, 2);
+    },
+    echartClick(name, { iseyes }) {
+      console.log(name, ":name");
+      // this.reset();
+
+      // this.tableData.forEach((res) => {
+      //   const keys = Object.keys(res);
+      //   for (const key of keys) {
+      //     let value = res[key];
+      //     if (value == name) {
+      //       this.addPolygon(res.空间信息.split(";")[1], "all", "#ff0000", true);
+      //     }
+      //   }
+
+      // })
+    },
+  },
+  mounted() {
+    this.GetSumList();
+  },
 };
 </script>
 
@@ -64,12 +188,21 @@ export default {
   overflow-x: hidden;
   padding-right: 10px;
   line-height: 40px;
+  .echart {
+    // width: 19rem;
+    // height: 350px;
+    width: 387px !important;
+    height: 200px !important;
+  }
+
   .downloadDiv {
     position: relative;
+
     .xmmc {
       width: calc(100% - 60px);
       display: inline-block;
     }
+
     .export {
       width: 95px;
       height: 28px;
@@ -81,35 +214,42 @@ export default {
       right: 2px;
       bottom: 6px;
     }
+
     .text {
       color: #cddeeb;
     }
   }
+
   .divrow {
     height: 50px;
     background-color: #0f7bc875;
     display: flex;
     justify-content: space-between;
     margin-bottom: 8px;
+
     .divCol {
       // background-color: #cddeeb5a;
       width: 49%;
       display: flex;
       align-items: center;
       white-space: nowrap;
+
       .divImg {
         width: 25%;
         height: 40px;
+
         img {
           height: 2.5rem;
           width: 2.5rem;
         }
       }
+
       .divText {
         width: 75%;
         // padding-left: 0.5rem;
         display: flex;
         flex-direction: column;
+
         span {
           height: 20px;
           // background: rgba(255, 0, 0, 0.258);
@@ -119,5 +259,38 @@ export default {
       }
     }
   }
+
+  .Integration {
+    max-height: 32vh;
+    overflow: hidden;
+    overflow-y: auto;
+    .Integration_list {
+      // height: 50px;
+      background-color: #0f7bc875;
+      display: flex;
+      justify-content: space-between;
+      // margin-bottom: 8px;
+      margin-top: 8px;
+      flex-wrap: wrap;
+      padding: 10px;
+      .listCol {
+        width: 49%;
+        display: flex;
+        align-items: center;
+        white-space: nowrap;
+        margin-bottom: 5px;
+        .listText {
+          width: 100%;
+          display: flex;
+          flex-direction: column;
+          span {
+            height: 20px;
+            height: 20px;
+            line-height: 20px;
+          }
+        }
+      }
+    }
+  }
 }
 </style>

src/views/farmlandProtection/components/fzjcyp.vue

@@ -53,7 +53,7 @@ import range from "@/components/mapview/range.vue"; //绘制范围
 import zdyModelPop from "./zdyModelPop.vue"; //自定义模型面板
 import moment from "moment";
 import { Message } from "element-ui";
-import { GetMxList } from "../../../api/ghss/gdbh.js";
+import { GetMxList ,AddGdbh} from "../../../api/ghss/gdbh.js";
 export default {
   components: {
     range,
@@ -170,8 +170,9 @@ export default {
             return;
           }
           let obj = {
-            xzmj: Number(this.ruleForm.xzmj),
+            xzfw: this.$refs.range.fileDataID,
             xmmc: this.ruleForm.xmmc,
+            mxlist:this.anaModels
           };
 
           const loading = this.$loading({
@@ -185,20 +186,20 @@ export default {
             this.activeTabs = "lsju";
             this.$emit("updateParent", "activeTabs", "lsju");
           }, 1000);
-          //   AddFzxz(obj)
-          //     .then((res) => {
-          //       loading.close();
-          //       this.activeTabs = "lsju";
-          //       this.$emit("updateParent", "activeTabs", "lsju");
-          //       this.$message({
-          //         message: res.message,
-          //         type: res.success ? "success" : "warning",
-          //       });
-          //       this.reset();
-          //     }).catch((error) => {
-          //       loading.close();
-          //       Message.error(error)
-          //     });
+          AddGdbh(obj)
+              .then((res) => {
+                loading.close();
+                this.activeTabs = "lsju";
+                this.$emit("updateParent", "activeTabs", "lsju");
+                this.$message({
+                  message: res.message,
+                  type: res.success ? "success" : "warning",
+                });
+                this.reset();
+              }).catch((error) => {
+                loading.close();
+                Message.error(error)
+              });
         } else {
           loading.close();
           console.log("error submit!!");

static/Config/config.js

@@ -1,5 +1,5 @@
 //后台地址配置
-window.axiosURI = "http://192.168.100.30:8080";
+window.axiosURI = "http://192.168.60.2:8080";
 window.ZTaxiosURI = "http://localhost:9300";
 window.aiURI = "http://192.168.60.6:5000";
 //倾斜模型高度配置