Browse Source

地图定位功能试下你

songxy 6 days ago
parent
commit
0e6a4a2e6d

+ 19 - 1
YHYZT/client/src/views/DataManage/gd/Detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="xm-detal">
-    <el-tabs type="border-card" v-model="currentTab">
+    <el-tabs type="border-card" v-model="currentTab" @tab-click="handleTabClick">
       <el-tab-pane label="项目信息" name="tab1">
         <div class="tables_grid">  
           <div class="title">地块索引</div>
@@ -210,6 +210,24 @@ export default {
         }
       })
     },
+    handleTabClick(tab) {
+      if (tab.name === 'tab2') {
+        // 切换到地图tab时,调用地块定位,使用objectid
+        if (this.detailData && this.detailData.objectid) {
+          this.locationDk(null, { objectid: this.detailData.objectid });
+        }
+      }
+    },
+    locationDk(index, row) {
+      if (row.objectid) {
+        this.detailShow = false;
+        let arr = [`'${row.objectid}'`];
+        this.$nextTick(()=>{
+          this.$refs.baseMap.locationGlobal(this.visibleLayerId[0],`objectid in (${arr.join()})`);
+        },500);
+        
+      }
+    },
     drawShapeJsonEvent(json){
       if(json){
         this.drawShapeJson = json;

+ 0 - 310
YHYZT/client/src/views/DataManage/nzy/Detail copy 2.vue

@@ -1,310 +0,0 @@
-<template>
-  <div class="xm-detal">
-    <div class="left_tree">
-      <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
-    </div>
-    <div class="right_detail">
-      <div class="tables detail_1" v-if="detailType === '1'">
-        <table>
-          <tr>
-            <th>批次索引</th>
-            <td colspan="3">
-              <el-input
-                v-model="detailData.xm_mc"
-                placeholder="请输入批次索引"
-                clearable
-                :disabled="!jbxxEdit"
-              />
-            </td>
-            <th>项目名称</th>
-            <td colspan="3">
-              <el-input
-                v-model="detailData.xm_mc"
-                placeholder="请输入项目名称"
-                clearable
-                :disabled="!jbxxEdit"
-              />
-            </td>
-          </tr>
-          <tr>
-            <th>项目类型</th>
-            <td colspan="3">
-              <el-input
-                v-model="detailData.xm_mc"
-                placeholder="请输入项目类型"
-                clearable
-                :disabled="!jbxxEdit"
-              />
-            </td>
-            <th>批准文号</th>
-            <td colspan="3">
-              <el-input
-                v-model="detailData.xm_mc"
-                placeholder="请输入批准文号"
-                clearable
-                :disabled="!jbxxEdit"
-              />
-            </td>
-          </tr>
-          <tr>
-            <th>批准日期</th>
-            <td colspan="3">
-              <el-input
-                v-model="detailData.xm_mc"
-                placeholder="请输入批准日期"
-                clearable
-                :disabled="!jbxxEdit"
-              />
-            </td>
-            <th>批次总面积(公顷)</th>
-            <td colspan="3">
-              <el-input
-                v-model="detailData.xm_mc"
-                placeholder="请输入批次总面积(公顷)"
-                clearable
-                :disabled="!jbxxEdit"
-              />
-            </td>
-          </tr>
-        </table>
-      </div>
-      <div class="detail_2" v-else>
-        <el-tabs type="border-card">
-          <el-tab-pane label="项目信息">
-            <div class="tables">
-              <table>
-                <tr>
-                  <th>批次索引</th>
-                  <td colspan="3">
-                    <el-input
-                      v-model="detailData.xm_mc"
-                      placeholder="请输入批次索引"
-                      clearable
-                      :disabled="!jbxxEdit"
-                    />
-                  </td>
-                  <th>项目索引</th>
-                  <td colspan="3">
-                    <el-input
-                      v-model="detailData.xm_mc"
-                      placeholder="请输入项目索引"
-                      clearable
-                      :disabled="!jbxxEdit"
-                    />
-                  </td>
-                </tr>
-                <tr>
-                  <th>项目编号</th>
-                  <td colspan="3">
-                    <el-input
-                      v-model="detailData.xm_mc"
-                      placeholder="请输入项目编号"
-                      clearable
-                      :disabled="!jbxxEdit"
-                    />
-                  </td>
-                  <th>项目名称</th>
-                  <td colspan="3">
-                    <el-input
-                      v-model="detailData.xm_mc"
-                      placeholder="请输入项目名称"
-                      clearable
-                      :disabled="!jbxxEdit"
-                    />
-                  </td>
-                </tr>
-                <tr>
-                  <th>乡镇街道</th>
-                  <td colspan="3">
-                    <el-input
-                      v-model="detailData.xm_mc"
-                      placeholder="请输入乡镇街道"
-                      clearable
-                      :disabled="!jbxxEdit"
-                    />
-                  </td>
-                  <th>土地用途</th>
-                  <td colspan="3">
-                    <el-input
-                      v-model="detailData.xm_mc"
-                      placeholder="请输入土地用途"
-                      clearable
-                      :disabled="!jbxxEdit"
-                    />
-                  </td>
-                </tr>
-                <tr>
-                  <th>土地坐落</th>
-                  <td colspan="3">
-                    <el-input
-                      v-model="detailData.xm_mc"
-                      placeholder="请输入土地坐落"
-                      clearable
-                      :disabled="!jbxxEdit"
-                    />
-                  </td>
-                  <th>项目面积(公顷)</th>
-                  <td colspan="3">
-                    <el-input
-                      v-model="detailData.xm_mc"
-                      placeholder="请输入项目面积(公顷)"
-                      clearable
-                      :disabled="!jbxxEdit"
-                    />
-                  </td>
-                </tr>
-                <tr>
-                  <th>用地主体</th>
-                  <td colspan="3">
-                    <el-input
-                      v-model="detailData.xm_mc"
-                      placeholder="请输入用地主体"
-                      clearable
-                      :disabled="!jbxxEdit"
-                    />
-                  </td>
-                </tr>
-              </table>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="查看地图">
-            <div class="map_box">
-              <base-map ref="baseMap" :overlayShow="true" @drawShapeJson="drawShapeJsonEvent" :visibleLayerIds="visibleLayerId"/>
-            </div>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import BaseMap from "../../../components/common/BaseMap";
-export default {
-  name: "Detail",
-  components: { BaseMap },
-  data() {
-    return {
-      user: JSON.parse(window.sessionStorage.getItem("yzt-user")),
-      visibleLayerId:['YHYZT_NZYDK_NEW'],
-      detailType: '2',  //1 农转用批次信息 2 农转用项目信息
-      detailData: {},
-      treeData: [{
-        label: '一级 1',
-        children: [{
-          label: '二级 1-1',
-          children: [{
-            label: '三级 1-1-1'
-          }]
-        }]
-      }, {
-        label: '一级 2',
-        children: [{
-          label: '二级 2-1',
-          children: [{
-            label: '三级 2-1-1'
-          }]
-        }, {
-          label: '二级 2-2',
-          children: [{
-            label: '三级 2-2-1'
-          }]
-        }]
-      }, {
-        label: '一级 3',
-        children: [{
-          label: '二级 3-1',
-          children: [{
-            label: '三级 3-1-1'
-          }]
-        }, {
-          label: '二级 3-2',
-          children: [{
-            label: '三级 3-2-1'
-          }]
-        }]
-      }],
-      defaultProps: {
-        children: 'children',
-        label: 'label'
-      }
-    };
-  },
-  props: {
-    contentWidth: Number,
-    contentHeight: Number,
-    project: Object,
-  },
-  watch: {
-    
-  },
-  methods: {
-    handleNodeClick (data) {
-      
-    },
-    drawShapeJsonEvent(json){
-      if(json){
-        this.drawShapeJson = json;
-        this.getBpxmList();
-        this.$message.success("绘制结束");
-      }
-    },
-  }
-};
-</script>
-
-<style scoped lang="scss">
-.xm-detal {
-  padding-top: 20px;
-  border: 1px solid #f00;
-  width: 100%;
-  display: flex;
-  align-items: flex-start;
-  >div {
-    border: 1px solid #f00;
-    &.left_tree {
-      width: 260px;
-    }
-    &.right_detail {
-      flex: 1;
-      margin-left: 20px;
-    }
-  }
-  .map_box {
-    height: 500px;
-  }
-  .tables {
-    width: 100%;
-    overflow-y: auto;
-    table {
-      width: 100%;
-      border-collapse: collapse;
-      tr,
-      th,
-      td {
-        border: 1px solid #d6d6d6;
-        height: 40px;
-        font-size: 14px;
-        color: #1f2f47;
-      }
-      th {
-        width: 25%;
-        background: #f4f6f8;
-        font-family: AlibabaPuHuiTiM;
-        font-weight: normal;
-      }
-      td {
-        width: 25%;
-        padding: 0px 5px;
-      }
-    }
-    ::v-deep {
-      .el-input__inner {
-        //border:1px solid #fff;
-        border-radius: 0px;
-        border-color: transparent;
-      }
-    }
-  }
-}
-</style>

+ 0 - 1464
YHYZT/client/src/views/DataManage/nzy/Detail copy.vue

@@ -1,1464 +0,0 @@
-<template>
-  <div class="xm-detal">
-    <el-tabs
-      v-model="activeName"
-      @tab-click="tabClick"
-      :style="{ width: contentWidth + 'px' }"
-    >
-      <el-tab-pane label="报批项目信息" name="first">
-        <div class="content" :style="{ height: contentHeight + 'px' }">
-          <div class="head">
-            <div class="title">
-              <div></div>
-              <span>属性数据</span>
-            </div>
-            <div class="handler-btn">
-              <div
-                v-show="!jbxxEdit"
-                @click="
-                  () => {
-                    jbxxEdit = true;
-                  }
-                "
-              >
-                <i class="iconfont yh-bianji" style="color: #5988ff" />
-                <span>开始编辑</span>
-              </div>
-              <div v-show="jbxxEdit" @click="updateBpxm">
-                <i class="iconfont yh-baocun" style="color: #44cae7" />
-                <span>保存项目</span>
-              </div>
-              <div @click="nzyToPewgHandler('pc')" style="width: 172px">
-                <i class="iconfont yh-guanlian" style="color: #35d173" />
-                <span>批次转批而未供</span>
-              </div>
-              <div @click="deletePc">
-                <i class="iconfont yh-shanchu" style="color: #f0a123" />
-                <span>删除批次</span>
-              </div>
-            </div>
-          </div>
-          <div class="tables">
-            <table>
-              <tr>
-                <th>项目名称</th>
-                <td colspan="3">
-                  <el-input
-                    v-model="currProject.xm_mc"
-                    placeholder="请输入项目名称"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-              </tr>
-              <tr>
-                <th>项目类型</th>
-                <td>
-                  <el-select
-                    v-model="currProject.xm_lx"
-                    placeholder="请选择项目类型"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  >
-                    <el-option
-                      v-for="item in staticData.项目类型"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </td>
-                <th>指标类型</th>
-                <td>
-                  <el-select
-                    v-model="currProject.zb_lx"
-                    placeholder="请选择指标类型"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  >
-                    <el-option
-                      v-for="item in staticData.指标类型"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </td>
-              </tr>
-              <tr>
-                <th>坡地村镇</th>
-                <td>
-                  <el-radio
-                    v-model="currProject.pdcz"
-                    label="是"
-                    :disabled="!jbxxEdit"
-                  />
-                  <el-radio
-                    v-model="currProject.pdcz"
-                    label="否"
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-                <th>项目编号</th>
-                <td>
-                  <el-input
-                    v-model="currProject.xm_bh"
-                    placeholder="请输入项目编号"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-              </tr>
-              <tr>
-                <th>申请单位</th>
-                <td>
-                  <el-input
-                    v-model="currProject.sq_dw"
-                    placeholder="请输入申请单位"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-                <th>批准机关</th>
-                <td>
-                  <el-select
-                    v-model="currProject.zzpz_jg"
-                    placeholder="请选择批准机关"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  >
-                    <el-option
-                      v-for="item in staticData.批准机关"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </td>
-              </tr>
-              <tr>
-                <th>所在市</th>
-                <td>杭州市</td>
-                <th>所属区县</th>
-                <td>
-                  <el-select
-                    v-model="currProject.xs_dm"
-                    placeholder="请输入所属区县"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  >
-                    <el-option
-                      v-for="item in staticData.行政区"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </td>
-              </tr>
-              <tr>
-                <th>指标级别</th>
-                <td>
-                  <el-select
-                    v-model="currProject.zb_jb"
-                    placeholder="请选择指标级别"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  >
-                    <el-option
-                      v-for="item in staticData.指标级别"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </td>
-                <th>指标年度</th>
-                <td>
-                  <div class="block">
-                    <el-date-picker
-                      v-model="currProject.zb_nd"
-                      clearable
-                      :disabled="!jbxxEdit"
-                      type="year"
-                      placeholder="选择指标年度"
-                    >
-                    </el-date-picker>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <th>批准文号</th>
-                <td>
-                  <el-input
-                    v-model="currProject.pf_wh"
-                    placeholder="请输入批准文号"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-                <th>批准日期</th>
-                <td>
-                  <el-date-picker
-                    v-model="currProject.pz_rq"
-                    clearable
-                    :disabled="!jbxxEdit"
-                    type="date"
-                    placeholder="选择批准日期"
-                  >
-                  </el-date-picker>
-                </td>
-              </tr>
-              <tr>
-                <th>市局格式文号</th>
-                <td colspan="3">
-                  <el-input
-                    v-model="currProject.s_pz_wh"
-                    placeholder="请输入市局格式文号"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-              </tr>
-              <tr>
-                <th>申请依据</th>
-                <td>
-                  <el-input
-                    v-model="currProject.sq_yj"
-                    placeholder="请输入申请依据"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-                <th>申请日期</th>
-                <td>
-                  <el-date-picker
-                    v-model="currProject.sq_rq"
-                    clearable
-                    :disabled="!jbxxEdit"
-                    type="date"
-                    placeholder="选择申请日期"
-                  >
-                  </el-date-picker>
-                </td>
-              </tr>
-              <tr>
-                <th>是否村民建房</th>
-                <td>
-                  <el-radio
-                    v-model="currProject.cm_jf"
-                    label="1"
-                    :disabled="!jbxxEdit"
-                    >是</el-radio
-                  >
-                  <el-radio
-                    v-model="currProject.cm_jf"
-                    label="0"
-                    :disabled="!jbxxEdit"
-                    >否</el-radio
-                  >
-                </td>
-                <th>跨县项目上报市局组件</th>
-                <td>
-                  <el-radio
-                    v-model="currProject.kxxmsbsjzj"
-                    label="是"
-                    :disabled="!jbxxEdit"
-                  />
-                  <el-radio
-                    v-model="currProject.kxxmsbsjzj"
-                    label="否"
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-              </tr>
-              <tr>
-                <th>项目面积</th>
-                <td>
-                  <el-input
-                    v-model="currProject.pz_rq"
-                    placeholder="请输入项目面积"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-                <th>汇总表填报单位</th>
-                <td>
-                  <el-input
-                    v-model="currProject.hzb_tbdw"
-                    placeholder="请输入汇总表填报单位"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-              </tr>
-              <tr>
-                <th>该项目批次申请用地范围界</th>
-                <td colspan="3">
-                  <el-input
-                    v-model="currProject.sqydfw"
-                    placeholder="申请用地范围界"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-              </tr>
-              <tr>
-                <th>汇总表填报人</th>
-                <td>
-                  <el-input
-                    v-model="currProject.tbr"
-                    placeholder="请输入汇总表填报人"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-                <th>汇总表审核人</th>
-                <td>
-                  <el-input
-                    v-model="currProject.shr"
-                    placeholder="请输入汇总表审核人"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-              </tr>
-              <tr>
-                <th>是否绿色通道</th>
-                <td>
-                  <el-radio
-                    v-model="currProject.sflstd"
-                    label="是"
-                    :disabled="!jbxxEdit"
-                  />
-                  <el-radio
-                    v-model="currProject.sflstd"
-                    label="否"
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-                <th>投资项目代码</th>
-                <td>
-                  <el-input
-                    v-model="currProject.tzxmdm"
-                    placeholder="请输入投资项目代码"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-              </tr>
-              <tr>
-                <th>征收公告号</th>
-                <td>
-                  <el-input
-                    v-model="currProject.tdzsggh"
-                    placeholder="请输入征收公告号"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-                <th>批次主要用途</th>
-                <td>
-                  <el-input
-                    v-model="currProject.pczyyt"
-                    placeholder="请输入批次主要用途"
-                    clearable
-                    :disabled="!jbxxEdit"
-                  />
-                </td>
-              </tr>
-            </table>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="农转用项目" name="third">
-        <div v-if="xmdkInfo.total > 0">
-          <div class="head">
-            <div class="title">
-              <div />
-              <span>项目数据</span>
-            </div>
-            <div class="handler-btn">
-              <div v-show="!showMap" @click="openXmLoc">
-                <i
-                  class="iconfont yh-dingwei1"
-                  style="font-size: 20px; color: rgb(237 115 5)"
-                />
-                <span>查看位置</span>
-              </div>
-              <div v-show="!showMap" @click="updateNzyDk">
-                <i class="iconfont yh-baocun" style="color: #44cae7" />
-                <span>保存项目</span>
-              </div>
-              <div v-show="showMap" @click="showMap = false">
-                <i
-                  class="iconfont yh-sheshinongyongdi"
-                  style="color: #44cae7"
-                />
-                <span>查看项目</span>
-              </div>
-              <div @click="nzyToPewgHandler('dk')" style="width: 136px">
-                <i class="iconfont yh-guanlian" style="color: #35d173" />
-                <span>项目转批而未供</span>
-              </div>
-              <div @click="delNzyxm">
-                <i class="iconfont yh-shanchu" style="color: #f0a123" />
-                <span>删除项目</span>
-              </div>
-            </div>
-          </div>
-          <div class="content flex" :style="{ height: contentHeight + 'px' }">
-            <div style="width: 24%">
-              <div class="btns">
-                <div
-                  class="btn flex-between"
-                  v-for="(item, index) in xmdkInfo.data"
-                  :key="index"
-                  :class="item.xm_bh == xmdkInfo.xmdkSelected ? 'selected' : ''"
-                  @click="xmdkChange(item)"
-                >
-                  <div class="flex-between flex-align-center">
-                    <img src="@/assets/images/datamanage/fj-s.png" />
-                    {{ item ? item.xm_bh : "" }}
-                  </div>
-                </div>
-              </div>
-              <Page
-                :modelValue="1"
-                :total="xmdkInfo.total"
-                show-total
-                size="small"
-                style="text-align: center"
-              />
-            </div>
-            <div v-if="!showMap" class="files tables" style="width: 76%">
-              <table>
-                <tr>
-                  <th>地块(项目)名称</th>
-                  <td colspan="3">
-                    <el-input
-                      v-model="xmdkInfo.currDk.xm_mc"
-                      placeholder="请输入农转用标识"
-                      clearable
-                    />
-                  </td>
-                </tr>
-                <tr>
-                  <th>项目编号</th>
-                  <td>
-                    <el-input
-                      v-model="xmdkInfo.currDk.xm_bh"
-                      placeholder="请输入农转用项目标识"
-                      clearable
-                    />
-                  </td>
-                  <th>申请单位</th>
-                  <td>
-                    <el-input
-                      v-model="xmdkInfo.currDk.sq_dw"
-                      placeholder="请输入批准文号"
-                      clearable
-                    />
-                  </td>
-                </tr>
-                <tr>
-                  <th>申请日期</th>
-                  <td>
-                    <!--                  <el-input v-model="xmdkInfo.currDk.sq_rq" placeholder="请输入批次名称" clearable />-->
-                    <el-date-picker
-                      v-model="xmdkInfo.currDk.sq_rq"
-                      clearable
-                      type="date"
-                      placeholder="选择申请日期"
-                    >
-                    </el-date-picker>
-                  </td>
-                  <th>指标类型</th>
-                  <td>
-                    <el-select
-                      v-model="xmdkInfo.currDk.zb_lx"
-                      placeholder="请选择指标类型"
-                      clearable
-                    >
-                      <el-option
-                        v-for="item in staticData.指标类型"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      >
-                      </el-option>
-                    </el-select>
-                  </td>
-                </tr>
-                <tr>
-                  <th>所在市</th>
-                  <td>杭州市</td>
-                  <th>所属区县</th>
-                  <td>
-                    <el-select
-                      v-model="xmdkInfo.currDk.xs_dm"
-                      placeholder="请输入所属区县"
-                      clearable
-                    >
-                      <el-option
-                        v-for="item in staticData.行政区"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      >
-                      </el-option>
-                    </el-select>
-                  </td>
-                </tr>
-                <tr>
-                  <th>农转用批准机关</th>
-                  <td>
-                    <el-select
-                      v-model="xmdkInfo.currDk.pz_jg"
-                      placeholder="请选择指标类型"
-                      clearable
-                    >
-                      <el-option
-                        v-for="item in staticData.批准机关"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      >
-                      </el-option>
-                    </el-select>
-                  </td>
-                  <th>规划用途</th>
-                  <td>
-                    <Cascader :data="data" v-model="value" v-width="200" />
-                  </td>
-                </tr>
-                <tr>
-                  <th>所属行业</th>
-                  <td>
-                    <el-input
-                      v-model="xmdkInfo.currDk.hy_fl"
-                      placeholder="请输入所属行业"
-                      clearable
-                    />
-                  </td>
-                  <th>土地坐落</th>
-                  <td>
-                    <el-input
-                      v-model="xmdkInfo.currDk.td_zl"
-                      placeholder="请输入权属性质"
-                      clearable
-                    />
-                  </td>
-                </tr>
-                <tr>
-                  <th>供地方式</th>
-                  <td>
-                    <el-select
-                      v-model="xmdkInfo.currDk.zdxm_jb"
-                      placeholder="请选择重点项目级别"
-                      clearable
-                    >
-                      <el-option
-                        v-for="item in staticData.供地方式"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      >
-                      </el-option>
-                    </el-select>
-                  </td>
-                  <th>重点项目级别</th>
-                  <td>
-                    <el-select
-                      v-model="xmdkInfo.currDk.zdxm_jb"
-                      placeholder="请选择重点项目级别"
-                      clearable
-                    >
-                      <el-option
-                        v-for="item in staticData.重点项目级别"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      >
-                      </el-option>
-                    </el-select>
-                  </td>
-                </tr>
-                <tr>
-                  <th>农转用项目类别</th>
-                  <td>
-                    <el-input
-                      v-model="xmdkInfo.currDk.zdxm_jb"
-                      placeholder="请输入所属区县"
-                      clearable
-                    />
-                  </td>
-                  <th>规定投资强度</th>
-                  <td>
-                    <el-input
-                      v-model="xmdkInfo.currDk.tz_qd"
-                      placeholder="请输入权属性质"
-                      clearable
-                    />
-                  </td>
-                </tr>
-                <tr>
-                  <th>容积率</th>
-                  <td>
-                    <el-input
-                      v-model="xmdkInfo.currDk.ljl"
-                      placeholder="请输入所属区县"
-                      clearable
-                    />
-                  </td>
-                  <th>实际固定资产额</th>
-                  <td>
-                    <el-input
-                      v-model="xmdkInfo.currDk.gd_zc"
-                      placeholder="请输入权属性质"
-                      clearable
-                    />
-                  </td>
-                </tr>
-                <tr>
-                  <th>绿化率</th>
-                  <td>
-                    <el-input
-                      v-model="xmdkInfo.currDk.lhl"
-                      placeholder="请输入所属区县"
-                      clearable
-                    />
-                  </td>
-                  <th>建筑密度</th>
-                  <td>
-                    <el-input
-                      v-model="xmdkInfo.currDk.jz_md"
-                      placeholder="请输入权属性质"
-                      clearable
-                    />
-                  </td>
-                </tr>
-                <tr>
-                  <th>项目类型</th>
-                  <td><el-input placeholder="请输入项目类型" clearable /></td>
-                  <th>项目面积(公顷)</th>
-                  <td>
-                    <el-input
-                      v-model="xmdkInfo.currDk.dk_mj"
-                      placeholder="请输入项目面积"
-                      clearable
-                    />
-                  </td>
-                </tr>
-              </table>
-            </div>
-            <div
-              v-else
-              class="content-map"
-              :style="{
-                height: contentHeight - 100 + 'px',
-                width: contentWidth * 0.76 + 'px',
-              }"
-            >
-              <base-map ref="basemap" :visibleLayerIds="visibleLayerId" />
-            </div>
-          </div>
-        </div>
-        <div v-else class="files">
-          <el-empty description="暂无相关项目" />
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="附件信息" name="second">
-        <div class="content flex" :style="{ height: contentHeight + 'px' }">
-          <div class="btns" style="width: 30%">
-            <div
-              class="btn flex-between"
-              v-for="item in treeList"
-              :key="item.value"
-              :class="item.value == treeSelected ? 'selected' : ''"
-              @click="fileChange(item)"
-            >
-              <div class="flex-between">
-                <img src="@/assets/images/datamanage/folder.png" />
-                {{ item.folderName }}
-              </div>
-              <el-upload
-                class="upload-demo"
-                action=""
-                :before-upload="annexUpload"
-                accept=".pdf,.png,.jpeg,.jpg"
-                :show-file-list="false"
-              >
-                <div
-                  style="
-                    width: 40px;
-                    height: 26px;
-                    border: 1px solid;
-                    line-height: 26px;
-                    border-radius: 4px;
-                  "
-                  title="上传材料"
-                >
-                  <i class="iconfont yh-shangchuan" style="font-size: 20px" />
-                </div>
-              </el-upload>
-            </div>
-          </div>
-          <div class="files" v-if="fileList.length > 0">
-            <div class="file" v-for="(item, index) in fileList" :key="index">
-              <div>
-                <span>{{ item.filename }}</span>
-                <span>{{
-                  new Date(item.createtime).toLocaleDateString("af")
-                }}</span>
-              </div>
-              <div>
-                <i
-                  title="预览"
-                  class="iconfont yh-fujianxiangqing"
-                  @click="viewFile(item)"
-                />
-                <div class="zw" />
-                <i
-                  title="删除"
-                  class="iconfont yh-shanchufujian"
-                  @click="deletefile(item)"
-                />
-              </div>
-            </div>
-          </div>
-          <div class="fileList" style="width: 70%" v-else>
-            <el-empty description="暂无相关附件" />
-          </div>
-        </div>
-      </el-tab-pane>
-    </el-tabs>
-    <Modal v-model="modal" class-name="modalClass" title="操作提醒">
-      <p style="text-align: center">
-        <Icon
-          type="md-alert"
-          style="color: #ff9900; font-size: 20px; margin-right: 3px"
-        />确定对此附件进行【删除】操作?
-      </p>
-    </Modal>
-  </div>
-</template>
-
-<script>
-import BaseMap from "../../../components/common/BaseMap";
-import { isNull } from "../../../utils/CommonUtil";
-export default {
-  name: "Detail",
-  components: { BaseMap },
-  data() {
-    return {
-      user: JSON.parse(window.sessionStorage.getItem("yzt-user")),
-      activeName: "first",
-      jbxxEdit: false,
-      jbxxEditDk: false,
-      visibleLayerId: ["YHYZT_NZYDK_NEW"],
-      treeList: [{ folderName: "附件目录", value: "mzybp" }],
-      treeSelected: "mzybp",
-      fileList: [
-        // {fileName:'一号',url:'112.pdf',time:'2024-01-01 12:00'},
-        // {fileName:'二号',url:'112.pdf',time:'2024-01-01 12:00'},
-      ],
-      modal: false,
-      showMap: false,
-      tableData: [],
-      currProject: {
-        xmmc: "",
-        xmlx: "",
-        zblx: "",
-        pdcz: "",
-        xmbh: "",
-        sqdw: "",
-        pzjg: "",
-        szx: "余杭区",
-        zbjb: "",
-        zbnd: "",
-        pzwh: "",
-        pzrq: "",
-        sjgswh: "",
-        sqyj: "",
-        sqrq: "",
-        sfcmjf: "",
-        kxxmsbsjzj: "",
-        xmmj: 0,
-        tbdw: "",
-        sqydfw: "",
-        tbr: "",
-        shr: "",
-        sflstd: "",
-        tzxmdm: "",
-        zsggh: "",
-        pczyyt: "",
-      },
-      oldProject: {},
-      xmdkInfo: {
-        data: [{ xm_bh: "" }],
-        page: 1,
-        size: 30,
-        total: 0,
-        currDk: {},
-        oldDk: {},
-        xmdkSelected: "",
-      },
-      staticData: window.ApplicationConfig.staticData,
-    };
-  },
-  props: {
-    contentWidth: Number,
-    contentHeight: Number,
-    project: Object,
-  },
-  watch: {
-    project(val) {
-      //this.activeName='first';
-      this.currProject = val;
-      this.oldProject = { ...val };
-    },
-  },
-  methods: {
-    nzyToPewgHandler(type) {
-      this.$confirm(
-        "此操作农转用地块(项目)转入批而未供库, 是否继续?",
-        "提示",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-          center: true,
-        }
-      )
-        .then(() => {
-          const loading = this.$loading({
-            lock: true,
-            text: "正在导入中",
-            spinner: "el-icon-loading",
-            background: "rgba(0, 0, 0, 0.7)",
-          });
-          let params = new FormData();
-          params.append("type", type);
-          
-          console.log(this.currProject);
-          isNull(this.currProject.bpxm_guid)
-            ? this.$message.warning("批次编号为空,请重新选择")
-            : params.append("pcid", this.currProject.bpxm_guid);
-          if (type != "pc") {
-            isNull(this.xmdkInfo.currDk.xm_guid)
-              ? this.$message.warning("批次地块编号为空,请重新选择")
-              : params.append("dkid", this.xmdkInfo.currDk.xm_guid);
-          }
-
-          this.$ajax
-            .post("/api/data/manage/nzy/nzyToPewg", params, this)
-            .then((res) => {
-              loading.close();
-              const { success, data } = res;
-              if (success && data) {
-                this.$message.success("成功转入批而未供库");
-              }
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    deleteFiles(fileid) {
-      let params = new FormData();
-      params.append("fileid", fileid);
-      this.$ajax
-        .post("/api/data/upload/nzy/delfile", params, this)
-        .then((res) => {
-          const { success, data } = res;
-          if (success && data) {
-            this.fileList = data;
-          }
-        });
-    },
-    viewFile(data) {
-      let filetype = data.filename.split(".");
-      let type = filetype[filetype.length - 1].toLowerCase();
-      if (type == "pdf" || type == "doc" || type == "docx" || type == "xls") {
-        this.getPdfStream(data.fileurl, data.filename);
-      }
-      if (type == "jpg" || type == "png" || type == "jpeg") {
-        this.getJpgStream(data.fileurl, data.filename);
-      }
-    },
-    getPdfStream(path) {
-      let params = new FormData();
-      params.append("path", path);
-      this.$ajax
-        .downLoadFile("/api/data/upload/getPdfStream", params, this)
-        .then((res) => {
-          const blob = new Blob([res.data], { type: "application/pdf" });
-          const link = document.createElement("a");
-          link.style.display = "none";
-          link.target = "_blank";
-          link.href = URL.createObjectURL(blob);
-          document.body.appendChild(link);
-          link.click();
-          URL.revokeObjectURL(link.href);
-          document.body.removeChild(link);
-        });
-    },
-    getJpgStream(path) {
-      let params = new FormData();
-      params.append("path", path);
-      this.$ajax
-        .downLoadFile("/api/data/upload/getJpgStream", params, this)
-        .then((res) => {
-          const blob = new Blob([res.data], { type: "image/jpeg" });
-          const link = document.createElement("a");
-          link.style.display = "none";
-          link.target = "_blank";
-          link.href = URL.createObjectURL(blob);
-          document.body.appendChild(link);
-          link.click();
-          URL.revokeObjectURL(link.href);
-          document.body.removeChild(link);
-        });
-    },
-    initFileList() {
-      let params = new FormData();
-      params.append("folderName", this.treeSelected);
-      params.append("xmid", this.currProject.xm_guid);
-      this.fileList = [];
-      this.$ajax
-        .post("/api/data/upload/nzy/getFileList", params, this)
-        .then((res) => {
-          const { success, data } = res;
-          if (success && data) {
-            this.fileList = data;
-          }
-        });
-    },
-    //附件上传
-    annexUpload(file) {
-      if (file) {
-        this.uploadAnnex(file);
-      }
-      return false;
-    },
-    uploadAnnex(file) {
-      let params = new FormData();
-      params.append("file", file);
-      params.append("xmId", this.currProject.xm_guid);
-      params.append("folderName", this.treeSelected);
-      this.$ajax
-        .post("/api/data/upload/nzy/annex", params, this)
-        .then((res) => {
-          const { success, data } = res;
-          if (success && data) {
-            this.$message({ type: "success", message: "上传成功!" });
-            this.initFileList();
-          }
-        });
-    },
-    //删除项目
-    delNzyxm() {
-      this.$confirm("此操作将永久删除该项目, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          let params = new FormData();
-          params.append("xmid", this.xmdkInfo.currDk.xm_guid);
-          this.$ajax
-            .post("/api/data/manage/nzy/delOneXmdk", params, this)
-            .then((res) => {
-              const { success, data } = res;
-              if (success && data > 0) {
-                //this.$message({type: 'success',message: '删除成功!'});
-                this.getBpxmDetail();
-                this.recordInfo(
-                  "del",
-                  "农转用报批项目地块基本信息删除",
-                  this.xmdkInfo.currDk.xm_guid
-                );
-              }
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-    //删除批次
-    deletePc() {
-      this.$confirm("此操作将永久删除该批次, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          let params = new FormData();
-          params.append("pcid", this.currProject.xm_guid);
-          this.$ajax
-            .post("/api/data/manage/nzy/delOneBpxm", params, this)
-            .then((res) => {
-              const { success, data } = res;
-              if (success && data > 0) {
-                //this.$message({type: 'success',message: '删除成功!'});
-                this.$parent.getBpxmList();
-                this.recordInfo(
-                  "del",
-                  "农转用报批项目基本信息删除",
-                  this.currProject.xm_guid
-                );
-              }
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-    tabClick(tab) {
-      if (tab.index == 1) {
-        this.getBpxmDetail();
-      } else if (tab.index == 2) {
-        this.initFileList();
-      }
-    },
-    openXmLoc() {
-      this.showMap = true;
-      let arr = this.xmdkInfo.currDk.xm_guid;
-      let _this = this;
-      setTimeout(() => {
-        _this.$refs.basemap.locationGlobal(
-          "YHYZT_NZYDK_NEW",
-          `index_id = '${arr}'`
-        );
-      }, 500);
-    },
-    getBpxmDetail() {
-      this.jbxxEdit = false;
-      let params = new FormData();
-      params.append("page", this.xmdkInfo.page);
-      params.append("size", this.xmdkInfo.size);
-      params.append("bpxmId", this.currProject.xm_guid);
-      this.xmdkInfo.data = [];
-      this.xmdkInfo.total = 0;
-      let _this = this;
-      this.$ajax
-        .post("/api/data/manage/nzy/getBpxmDetail", params, this, true)
-        .then((res) => {
-          const { success, data } = res;
-          if (success) {
-            this.xmdkInfo.data = data.list;
-            this.xmdkInfo.total = data.total;
-            this.xmdkInfo.currDk = data.list ? this.xmdkInfo.data[0] : {};
-            this.xmdkInfo.xmdkSelected = data.list
-              ? this.xmdkInfo.data[0].xm_bh
-              : "";
-            this.xmdkInfo.oldDk = { ...this.xmdkInfo.data[0] };
-          } else {
-            this.$message.error("查询失败!");
-          }
-        });
-    },
-    updateBpxm() {
-      this.jbxxEdit = false;
-      let params = new FormData();
-      // 提取年份前先复制对象,避免修改原始数据
-      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)
-        .then((res) => {
-          const { success, data } = res;
-          if (success) {
-            this.recordInfo("edit", "农转用报批项目基本信息修改");
-            //this.$message.success("修改成功!");
-          } else {
-            this.$message.error("修改失败!");
-          }
-        });
-    },
-    updateNzyDk() {
-      this.jbxxEdit = false;
-      let params = new FormData();
-      params.append("project", JSON.stringify(this.xmdkInfo.currDk));
-      let _this = this;
-      this.$ajax
-        .post("/api/data/manage/nzy/editOneBpxmDk", params, this, true)
-        .then((res) => {
-          const { success, data } = res;
-          if (success) {
-            this.recordInfo("edit", "农转用报批项目地块基本信息修改");
-          } else {
-            this.$message.error("修改失败!");
-          }
-        });
-    },
-    //地块切换
-    xmdkChange(item) {
-      this.xmdkInfo.xmdkSelected = item.xm_bh;
-      this.xmdkInfo.currDk = item;
-      this.xmdkInfo.oldDk = { ...item };
-      if (this.showMap) {
-        this.openXmLoc();
-      }
-    },
-    //附件材料切换
-    fileChange(item) {
-      this.treeSelected = item.value;
-      this.files = this.fileList[item.value];
-    },
-    //删除材料
-    deletefile(item) {
-      this.$confirm("此操作将永久删除该附件, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          let params = new FormData();
-          params.append("fileid", item.id);
-          params.append("fileUrl", item.fileurl);
-          this.$ajax
-            .post("/api/data/upload/nzy/delfile", params, this)
-            .then((res) => {
-              const { success, data } = res;
-              if (success && data) {
-                this.fileList = data;
-                this.initFileList();
-              }
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-    /**
-     * 表格样式
-     * @param row
-     * @param rowIndex
-     * @returns {string}
-     */
-    tableRowStyle({ row, rowIndex }) {
-      if (rowIndex % 2 === 1) {
-        return "text-align:center;background:#F7F8FA";
-      } else {
-        return "text-align:center;";
-      }
-    },
-    tableHeaderStyle() {
-      return "background:#E5EDFE; font-family:AlibabaPuHuiTiR; font-size:16px; color:rgba(51, 51, 51, 1);text-align:center;";
-    },
-    //处理内容变化记录信息
-    recordInfo(type, name, id) {
-      let info = {};
-      info.re_recorder = this.user.userInfo.orgName;
-      info.table_type = "农转用管理";
-      info.re_content = "";
-      let _this = this;
-      info.re_name = name;
-      if (type == "edit") {
-        Object.keys(this.currProject).forEach(function (key) {
-          if (_this.currProject[key] != _this.oldProject[key]) {
-            info.re_content +=
-              "字段" +
-              key +
-              "内容由" +
-              _this.oldProject[key] +
-              "改为" +
-              _this.currProject[key] +
-              ";";
-          }
-        });
-        Object.keys(this.xmdkInfo.currDk).forEach(function (key) {
-          if (_this.xmdkInfo.currDk[key] != _this.xmdkInfo.oldDk[key]) {
-            info.re_content +=
-              "字段" +
-              key +
-              "内容由" +
-              _this.xmdkInfo.oldDk[key] +
-              "改为" +
-              _this.xmdkInfo.currDk[key] +
-              ";";
-          }
-        });
-      } else if (type == "del") {
-        info.re_content = "删除主键为:" + id;
-      }
-      if (info.re_content == "") {
-        this.$message.success("编辑成功!");
-        return;
-      }
-      let params = new FormData();
-      params.append("data", JSON.stringify(info));
-      //执行持久化操作(记录入库)
-      this.$ajax
-        .post("/api/opera/record/insert", params, this, true)
-        .then((res) => {
-          const { success, data } = res;
-          if (success && type == "edit") {
-            this.$message.success("编辑成功!");
-          } else if (success && type == "del") {
-            this.$message.success("删除成功!");
-          } else {
-            this.$message.error("编辑失败!");
-          }
-        });
-    },
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.xm-detal {
-  padding-top: 20px;
-  ::v-deep {
-    .el-tabs__nav-scroll {
-      display: flex;
-      justify-content: center;
-      .el-tabs__item {
-        padding: 0px 60px;
-        font-size: 16px;
-      }
-      .el-tabs__item.is-active {
-        color: #446ae7;
-        font-weight: bold;
-      }
-      .el-tabs__active-bar {
-        height: 4px;
-        width: 56px;
-        background: #446ae7;
-        border-radius: 0px 0px 0px 0px;
-      }
-    }
-    .el-upload-list {
-      position: absolute;
-      top: 200px;
-      left: 20px;
-    }
-  }
-
-  .head {
-    padding: 0px 20px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    .title {
-      display: flex;
-      align-items: center;
-      div {
-        width: 6px;
-        height: 18px;
-        background: #5988ff;
-        border-radius: 1px 1px 1px 1px;
-      }
-      span {
-        font-family: AlibabaPuHuiTiM;
-        font-weight: 500;
-        font-size: 16px;
-        color: #1f2f47;
-        margin-left: 10px;
-      }
-    }
-    .handler-btn {
-      display: flex;
-      > div {
-        width: 102px;
-        height: 30px;
-        background: #e8f0ff;
-        border-radius: 4px 4px 4px 4px;
-        border: 1px solid #c2d8ff;
-        display: flex;
-        justify-content: space-around;
-        align-items: center;
-        margin-left: 8px;
-        cursor: pointer;
-        i {
-          font-size: 16px;
-        }
-        span {
-          font-family: AlibabaPuHuiTiM;
-          font-weight: normal;
-          font-size: 14px;
-          color: #333333;
-        }
-      }
-    }
-  }
-  .content {
-    .tables {
-      padding: 0px 20px;
-      width: 100%;
-      margin-top: 15px;
-      overflow-y: auto;
-      table {
-        width: 100%;
-        border-collapse: collapse;
-        tr,
-        th,
-        td {
-          border: 1px solid #d6d6d6;
-          height: 40px;
-          font-size: 14px;
-          color: #1f2f47;
-        }
-        th {
-          width: 25%;
-          background: #f4f6f8;
-          font-family: AlibabaPuHuiTiM;
-          font-weight: normal;
-        }
-        td {
-          width: 25%;
-          padding: 0px 5px;
-        }
-      }
-      ::v-deep {
-        .el-input__inner {
-          //border:1px solid #fff;
-          border-radius: 0px;
-          border-color: transparent;
-        }
-      }
-    }
-    .btns {
-      width: 100%;
-      height: calc(92% - 90px);
-      overflow-y: auto;
-      border-right: 1px solid #d2dae6;
-      .btn {
-        display: flex;
-        align-items: center;
-        cursor: pointer;
-        height: 40px;
-        margin: 5px 0px;
-
-        font-family: AlibabaPuHuiTiM;
-        font-weight: normal;
-        font-size: 16px;
-        color: #666666;
-        padding: 0px 10px;
-        img {
-          width: 26px;
-          margin-right: 10px;
-        }
-        &.selected {
-          background: #f0f6fc;
-          border-radius: 4px 4px 4px 4px;
-          color: #446ae7;
-          .el-upload {
-            color: #19be6b;
-          }
-        }
-      }
-    }
-    .files {
-      width: 70%;
-      .file {
-        display: flex;
-        justify-content: space-between;
-        padding: 0px 10px;
-        margin: 20px 0px;
-        > div:first-child {
-          display: flex;
-          display: flex;
-          flex-direction: column;
-          align-items: baseline;
-          line-height: 20px;
-          span:nth-child(1) {
-            font-family: AlibabaPuHuiTiM;
-            font-weight: normal;
-            font-size: 14px;
-            color: #172339;
-            line-height: 16px;
-          }
-          span:nth-child(2) {
-            font-family: AlibabaPuHuiTiR;
-            font-weight: normal;
-            font-size: 12px;
-            color: #91969b;
-          }
-        }
-        > div:nth-child(2) {
-          display: flex;
-          align-items: center;
-          .zw {
-            width: 2px;
-            height: 18px;
-            background: #ccd1dc;
-            margin: 0 8px;
-          }
-          i {
-            color: #8d9093;
-            font-size: 20px;
-            cursor: pointer;
-          }
-        }
-      }
-    }
-  }
-  .content-map {
-    padding: 20px;
-    border-radius: 6px;
-    ::v-deep {
-      .vl-tool-bar {
-        margin: 50px 20px 0 0;
-      }
-    }
-  }
-}
-::v-deep {
-  .modalClass {
-    .ivu-modal-content {
-      border-radius: 12px;
-    }
-    .ivu-modal-header {
-      border-radius: 12px 12px 0px 0px;
-      background: linear-gradient(180deg, #deebff 0%, #ffffff 100%);
-      border-bottom: none;
-      .ivu-modal-header-inner {
-        font-family: AlibabaPuHuiTiM;
-        font-weight: normal;
-        font-size: 18px;
-        color: #181b1f;
-      }
-    }
-    .ivu-modal-body {
-      font-family: AlibabaPuHuiTiM;
-      font-weight: normal;
-      font-size: 18px;
-      color: #000000;
-    }
-    .ivu-modal-close .ivu-icon-ios-close {
-      font-weight: bold;
-      color: #181b1f;
-    }
-    .ivu-modal-footer {
-      border-top: none;
-    }
-  }
-}
-</style>

+ 20 - 1
YHYZT/client/src/views/DataManage/nzy/Detail.vue

@@ -101,7 +101,7 @@
         </div>
       </div>
       <div class="detail_2" v-else>
-        <el-tabs type="border-card" v-model="currentTab">
+        <el-tabs type="border-card" v-model="currentTab" @tab-click="handleTabClick">
           <el-tab-pane label="项目信息" name="tab1">
             <div class="tables">
               <table>
@@ -295,6 +295,7 @@ export default {
     },
     handleNodeClick (data, index, cIndex = null) {
       if (cIndex !== null) {
+        this.currentTab = 'tab1'
         this.cActive = `${index}${cIndex}`
         this.detailType = '2'
         this.projectDetail = this.treeData[index]['children'][cIndex]
@@ -346,6 +347,24 @@ export default {
         }
       })
     },
+    handleTabClick(tab) {
+      if (tab.name === 'tab2') {
+        // 切换到地图tab时,调用地块定位,使用objectid
+        if (this.detailData && this.detailData.objectid) {
+          this.locationDk(null, { objectid: this.detailData.objectid });
+        }
+      }
+    },
+    locationDk(index, row) {
+      if (row.objectid) {
+        this.detailShow = false;
+        let arr = [`'${row.objectid}'`];
+        this.$nextTick(()=>{
+          this.$refs.baseMap.locationGlobal(this.visibleLayerId[0],`objectid in (${arr.join()})`);
+        },500);
+        
+      }
+    },
     drawShapeJsonEvent(json){
       if(json){
         this.drawShapeJson = json;

+ 18 - 7
YHYZT/client/src/views/DataManage/pewg/Detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="xm-detal">
-    <el-tabs type="border-card" v-model="currentTab">
+    <el-tabs type="border-card" v-model="currentTab" @tab-click="handleTabClick">
       <el-tab-pane label="项目信息" name="tab1">
         <div class="tables">
           <div class="title">批次索引</div>
@@ -229,6 +229,8 @@ export default {
     queryDetail (id) {
       if(!id) return
       this.$ajax.get(`/api/pewg/${id}`, null, this, true).then(res => {
+        console.log("res-----------")
+        console.log(res)
         if (res) {
           this.detailData = res
         }
@@ -246,13 +248,22 @@ export default {
         }
       })
     },
-    locationDk(index,row){
-      if(row.pewg_id){
+    handleTabClick(tab) {
+      if (tab.name === 'tab2') {
+        // 切换到地图tab时,调用地块定位,使用objectid
+        if (this.detailData && this.detailData.objectid) {
+          this.locationDk(null, { objectid: this.detailData.objectid });
+        }
+      }
+    },
+    locationDk(index, row) {
+      if (row.objectid) {
         this.detailShow = false;
-        let dkbhArr = row.pewg_id?row.pewg_id.split(","):'';
-        let arr = dkbhArr.map(i=>{return   "'"+i+"'";});
-        this.$vm.$emit('locationGlobal', this.visibleLayerId[0], `xm_guid in (${arr.join()})`)
-        //this.$message.warning("暂无图形")
+        let arr = [`'${row.objectid}'`];
+        this.$nextTick(()=>{
+          this.$refs.baseMap.locationGlobal(this.visibleLayerId[0],`objectid in (${arr.join()})`);
+        },500);
+        
       }
     },
     drawShapeJsonEvent(json){

+ 16 - 7
YHYZT/client/src/views/DataManage/ssnyd/Detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="xm-detal">
-    <el-tabs type="border-card" v-model="currentTab">
+    <el-tabs type="border-card" v-model="currentTab" @tab-click="handleTabClick">
       <el-tab-pane label="项目信息" name="tab1">
         <div class="tables">
           <div class="title">项目索引</div>
@@ -143,13 +143,22 @@ export default {
         }
       })
     },
-    locationDk(index,row){
-      if(row.pewg_id){
+    handleTabClick(tab) {
+      if (tab.name === 'tab2') {
+        // 切换到地图tab时,调用地块定位,使用objectid
+        if (this.detailData && this.detailData.objectid) {
+          this.locationDk(null, { objectid: this.detailData.objectid });
+        }
+      }
+    },
+    locationDk(index, row) {
+      if (row.objectid) {
         this.detailShow = false;
-        let dkbhArr = row.pewg_id?row.pewg_id.split(","):'';
-        let arr = dkbhArr.map(i=>{return   "'"+i+"'";});
-        this.$vm.$emit('locationGlobal', this.visibleLayerId[0], `xm_guid in (${arr.join()})`)
-        //this.$message.warning("暂无图形")
+        let arr = [`'${row.objectid}'`];
+        this.$nextTick(()=>{
+          this.$refs.baseMap.locationGlobal(this.visibleLayerId[0],`objectid in (${arr.join()})`);
+        },500);
+        
       }
     },
     drawShapeJsonEvent(json){