Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/YZT_YUHANG

# Conflicts:
#	YHYZT/server/.idea/jarRepositories.xml

YHYZT/client/src/views/DataManage/Gd.vue

@@ -1,82 +1,87 @@
 <template>
-  <div class="page-gd-manage">
-    <div v-show="menusShow" class="page-left" :style="{height:contentHeight+'px',width:menusWidth+'px'}">
+  <div class="page-nzy-manage">
+    <div class="page-left" :style="{height:contentHeight+'px',width:contentWidth+'px'}">
       <div class="nzy-tools">
-        <div class="panels">
-          <div class="panel-dropdown" style="background: #F5FBFF">
-            <el-dropdown>
-              <div class="el-dropdown-link">
-                <img src="@/assets/images/datamanage/sc.png"/>
-                导入文件
-                <img src="@/assets/images/datamanage/sc-i.png"/>
+        <el-form label-width="138px" :model="paramsList">
+          <el-row :gutter="0">
+            <el-col :span="4">
+              <el-form-item label="做地主体：">
+                <el-input v-model="paramsList.pzwh" placeholder="请输入做地主体" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="用地性质：">
+                <el-input v-model="paramsList.pcmc" placeholder="请输入用地性质"  clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <span></span>
+              <el-form-item label="挂牌出让地块：">
+                <el-input v-model="paramsList.pcmc" placeholder="请输入挂牌出让地块"  clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="竞得单位：">
+                <el-input v-model="paramsList.pcmc" placeholder="请输入竞得单位"  clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="土地面积（亩）：">
+                <el-input v-model="paramsList.pcmc" placeholder="请输入土地面积（亩）"  clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="土地坐落：">
+                <el-input v-model="paramsList.pcmc" placeholder="请输入土地坐落"  clearable></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4">
+              <el-form-item label="出让金是否已缴清：">
+                <el-select>
+                  <el-option value="1" label="是"></el-option>
+                  <el-option value="0" label="否"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="合同是否已备案：">
+                <el-select>
+                  <el-option value="1" label="是"></el-option>
+                  <el-option value="0" label="否"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <div class="btn-group" style="margin-left: 20px;">
+                <el-button type="primary" @click="getBpxmList">查询</el-button>
+                <div class="panel-dropdown">
+                  <el-dropdown>
+                    <el-button type="success">
+                      导入文件<i class="el-icon-arrow-down el-icon--right"></i>
+                    </el-button>
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item>
+                        <el-upload
+                            class="upload-demo"
+                            action=""
+                            :before-upload="beforeUpload"
+                            multiple
+                            :limit="3"
+                            :on-exceed="2"
+                            accept=".zip">
+                        &nbsp;&nbsp;批量导入&nbsp;&nbsp;
+                        </el-upload>
+                      </el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
+                </div>
               </div>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item>
-                  <el-upload
-                      class="upload-demo"
-                      action=""
-                      :before-upload="beforeUpload"
-                      multiple
-                      :limit="3"
-                      :on-exceed="2"
-                      accept=".zip">
-                    &nbsp;&nbsp;批量导入&nbsp;&nbsp;
-                  </el-upload>
-                </el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </div>
-          <div class="panel-dropdown" style="background: #FFFBF1">
-            <el-dropdown>
-              <div class="el-dropdown-link">
-                <img src="@/assets/images/datamanage/xz.png"/>
-                导出文件
-                <img src="@/assets/images/datamanage/xz-i.png"/>
-              </div>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item>
-                  <div @click="doExportExcel">
-                    导出项目Excel
-                  </div>
-                </el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </div>
-        </div>
-        <div class="panels">
-          <div class="panel-input">
-            <span>批准文号：</span>
-            <el-input v-model="paramsList.dkbh" placeholder="请输入内容" clearable></el-input>
-          </div>
-          <div class="panel-input">
-            <span>地块名称：</span>
-            <el-input v-model="paramsList.dkmc" placeholder="请输入内容" clearable></el-input>
-          </div>
-        </div>
-        <div class="panels">
-          <div class="panel-input">
-            <span>绘制范围：</span>
-            <div class="fw"  title="框选绘制" @click="createBoxEvent">
-              <i style="font-size: 20px" class="iconfont yh-Frame"/>
-            </div>
-            <div class="fw" title="自定义绘制"  @click="createDrawInteraction">
-              <i style="font-size: 24px" class="iconfont yh-huizhi1"/>
-            </div>
-            <div class="fw" title="图斑拾取" @click="sqFeatrue">
-              <i style="font-size: 24px" class="iconfont  yh-shiqu"/>
-            </div>
-            <div class="fw" title="清除绘制" @click="clearLayer">
-              清除
-            </div>
-          </div>
-          <div class="panel-input">
-            <span>缓冲距离：</span>
-            <el-input placeholder="请输入内容" v-model="input2">
-              <template slot="append">米</template>
-            </el-input>
-            <el-button type="primary"  style="margin-left: 8px;height: 36px" @click="getBpxmList">查询</el-button>
-          </div>
-        </div>
+            </el-col>
+          </el-row>
+        </el-form>
+
       </div>
       <div class="nzy-table">
         <el-table
@@ -87,49 +92,70 @@
             :cell-style="tableRowStyle"
             :row-click="rowClick"
             ref="report-table"
-        >
+            >
           <el-table-column
               type="index"
               width="80"
               label="序号">
           </el-table-column>
           <el-table-column
-              prop="djklx"
-              label="供地类型">
+              prop="pf_wh"
+              label="做地主体">
+          </el-table-column>
+          <el-table-column
+              prop="pf_wh"
+              label="用地性质">
           </el-table-column>
           <el-table-column
-              prop="szfpzgdpwh"
-              label="批准文号">
+              prop="pf_wh"
+              label="挂牌出让地块">
           </el-table-column>
           <el-table-column
-              prop="dkmc"
-              label="地块名称"
-              width="100">
+              prop="pf_wh"
+              label="竞得单位">
           </el-table-column>
           <el-table-column
-              prop="dkbh"
-              label="地块编号">
+              prop="pf_wh"
+              label="土地面积（亩）">
+          </el-table-column>
+          <el-table-column
+              prop="pf_wh"
+              label="土地坐落">
+          </el-table-column>
+          <el-table-column
+              prop="pf_wh"
+              label="出让金是否已缴清">
+          </el-table-column>
+          <el-table-column
+              prop="pf_wh"
+              label="合同是否已备案">
           </el-table-column>
           <el-table-column
               width="150"
+
               label="操作">
             <template slot-scope="scope">
               <div style="line-height: 34px;">
                 <el-button
-                    @click.native.prevent="openDetail(scope.$index, scope.row)"
-                    plain
-                    type="primary"
-                    size="mini">
+                  @click.native.prevent="openDetail(scope.$index, scope.row)"
+                  style="margin-right: 10px;"
+                  plain
+                  type="primary"
+                  size="mini">
                   查看
                 </el-button>
-                <el-button
-                    v-show="scope.row.xm_guid"
+                <el-popconfirm
+                  title="该条数据确定删除吗？"
+                >
+                  <el-button
                     @click.native.prevent="locationDk(scope.$index, scope.row)"
                     plain
-                    type="success"
+                    type="danger"
+                    slot="reference"
                     size="mini">
-                  定位
-                </el-button>
+                    删除
+                  </el-button>
+                </el-popconfirm>
               </div>
             </template>
           </el-table-column>
@@ -143,37 +169,14 @@
               show-sizer />
       </div>
     </div>
-    <div @click="()=>{menusWidth =0;menusShow=false;detailShow=false;$refs.baseMap.resetSize();}"
-         style="top: calc(50% - 30px);left: calc( 700px - 20px);"
-         title="收起"
-         v-show="menusShow"
-         class="menus-open"
-    >
-      <i class="iconfont yh-Frame2"/>
-    </div>
-    <div @click="()=>{menusWidth =700;menusShow=true;$refs.baseMap.resetSize();}"
-         style="top: calc(50% - 30px);left: 0px;"
-         title="展开"
-         v-show="!menusShow"
-         class="menus-open"
+    <el-dialog
+      :visible.sync="detailShow"
+      title="项目详情"
+      top="5vh"
+      width="80%"
     >
-      <!--      <img src="@/assets/images/datamanage/zd.png"/>-->
-      <i class="iconfont yh-xiangyou"/>
-    </div>
-    <div v-show="detailShow" class="page-detail" :style="{height:contentHeight+'px',width:contentWidth-menusWidth+'px',left:menusWidth+'px'}">
       <detail ref="details" @initBpxm="getBpxmList" :contentWidth="contentWidth-menusWidth" :contentHeight="contentHeight" :project="currProject"/>
-    </div>
-    <div @click="()=>{detailShow=false;}"
-         style="top: calc(50% - 30px);right: 0px"
-         title="展开"
-         v-show="detailShow"
-         class="menus-open"
-    >
-      <i class="iconfont yh-Frame2"/>
-    </div>
-    <div class="page-map" :style="{height:contentHeight+'px',width: contentWidth-menusWidth-30+'px'}" >
-      <base-map ref="baseMap" :overlayShow="true" @showDetail="showDetail" @drawShapeJson="drawShapeJsonEvent" :visibleLayerIds="visibleLayerId"/>
-    </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -182,15 +185,15 @@ import Detail from "./gd/Detail";
 import {Geometry as WkxGeometry} from "wkx";
 import JSZip from 'jszip'
 import mapshaper from 'mapshaper';
-import { saveAs } from 'file-saver';
-import * as XLSX from 'xlsx'
+import { saveAs } from 'file-saver'
+import * as XLSX from "xlsx";
 const {
   importContent,
   setDatasetCRS,
   exportFileContent
 } = mapshaper.internal
 export default {
-  name: "Gd",
+  name: "Nzy",
   props:{
     contentWidth:Number,
     contentHeight:Number
@@ -198,20 +201,17 @@ export default {
   components:{BaseMap,Detail},
   data() {
     return {
-      input2:null,
       compName: 'data-manage',
-      visibleLayerId:['YHYZT_ST_GDDK_NEW'],
       menus:JSON.parse(window.sessionStorage.getItem('yzt-user')),
       menusWidth:700,
-      menusShow:true,
       detailShow:false,
       tableData:{
         data:[],
       },
       currProject:null,
-      paramsList:{dkbh:'',dkmc:'',page:1,size:15,total:0},
+      paramsList:{pzwh:'',pcmc:'',page:1,size:15,total:0},
       fullscreenLoading: false,
-      drawShapeJson:null
+      drawShapeJson:null,
     }
   },
   mounted(){
@@ -222,7 +222,7 @@ export default {
     recordInfo(type,name,content){
       let info = {};
       info.re_recorder = this.menus.userInfo.orgName;
-      info.table_type = '供地导入';
+      info.table_type = '农转用导入';
       info.re_content='';
       let _this = this;
       info.re_name = name;
@@ -243,29 +243,6 @@ export default {
         }
       })
     },
-    createBoxEvent(){
-      this.$refs.baseMap.createBoxEvent();
-    },
-    sqFeatrue(){
-      this.$refs.baseMap.sqFeatrue();
-    },
-    //自定义绘制分析
-    createDrawInteraction(){
-      this.$refs.baseMap.drawInteractionEvent();
-    },
-    //清除绘制图层
-    clearLayer(){
-      this.$refs.baseMap.cleanLayer();
-      this.drawShapeJson = null;
-      this.getBpxmList();
-    },
-    drawShapeJsonEvent(json){
-      if(json){
-        this.drawShapeJson = json;
-        this.getBpxmList();
-        this.$message.success("绘制结束");
-      }
-    },
     pageChange:function (page){
       this.paramsList.page=page;
       this.getBpxmList()
@@ -277,15 +254,15 @@ export default {
     //查询报批项目信息
     getBpxmList(){
       let params = new FormData();
+      params.append("pzwh",this.paramsList.pzwh);
+      params.append("pcmc",this.paramsList.pcmc);
       params.append("page",this.paramsList.page);
       params.append("size",this.paramsList.size);
-      params.append("dkbh",this.paramsList.dkbh);
-      params.append("dkmc",this.paramsList.dkmc);
       if(this.drawShapeJson){
         params.append("shapes",JSON.stringify(this.drawShapeJson));
       }
       let _this = this;
-      this.$ajax.post('/api/data/manage/gd/getGdxx', params, this, true).then(res => {
+      this.$ajax.post('/api/data/manage/nzy/getBpxm', params, this, true).then(res => {
         const {success,data} = res;
         if(success){
           _this.tableData.data =[];
@@ -303,25 +280,18 @@ export default {
     },
     openDetail(index,row){
       this.currProject = row;
-      this.detailShow =true;
-      this.$refs.details.activeName='first';
-    },
-    showDetail(item){
-      let params = new FormData();
-      params.append("guid",item.index_id);
-      this.$ajax.post('/api/data/manage/gd/getGdDetail', params, this, true).then(res => {
-        const {success,data} = res;
-        if(success){
-          this.openDetail(0,data);
-        }
+      this.detailShow = true;
+      this.$nextTick(()=>{
+        console.log(this.$refs['details'])
+        this.$refs['details'].initDetailData()
       })
     },
     locationDk(index,row){
-      if(row.xm_guid){
+      if(row.dk_bh){
         this.detailShow = false;
-        let dkbhArr = row.xm_guid?row.xm_guid.split(","):'';
+        let dkbhArr = row.dk_bh?row.dk_bh.split(","):'';
         let arr = dkbhArr.map(i=>{return   "'"+i+"'";});
-        this.$vm.$emit('locationGlobal', 'YHYZT_ST_GDDK_NEW', `xm_guid in (${arr.join()})`)
+        this.$vm.$emit('locationGlobal', 'YHYZT_NZYDK_NEW', `index_id in (${arr.join()})`)
         //this.$message.warning("暂无图形")
       }
     },
@@ -361,44 +331,19 @@ export default {
         }
       })
     },
-    doExportExcel(){
-      try {
-        const $e = this.$refs['report-table'].$el
-        let $table = $e.querySelector('.el-table__fixed')
-        if(!$table) {
-          $table = $e
-        }
-        const wb = XLSX.utils.table_to_book($table, {raw:true})
-        const wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST:true, type: 'array'})
-        saveAs(
-            new Blob([wbout],{type: 'application/octet-stream'}),
-            `供地项目列表.xlsx`,
-        )
-        this.recordInfo("export","供地成果导出","供地项目列表.xlsx")
-      } catch (e) {
-        if (typeof console !== 'undefined') console.error(e)
-      }
-    },
     doExport(){
       let params = new FormData();
-      params.append("dkbh",this.paramsList.dkbh);
-      params.append("dkmc",this.paramsList.dkmc);
-      if(this.drawShapeJson){
-        params.append("shapes",JSON.stringify(this.drawShapeJson));
-      }
+      params.append("pzwh",this.paramsList.pzwh);
+      params.append("pcmc",this.paramsList.pcmc);
       const loading = this.$loading({
         lock: true,
         text: '正在导出',
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       });
-      this.$ajax.post('/api/data/manage/gd/exportGdShapeFile', params, this).then(res => {
+      this.$ajax.post('/api/data/manage/nzy/exportShapeFile', params, this).then(res => {
         const {success, data} = res;
         if(success){
-          if(data.length<=0) {
-            loading.close();
-            return;
-          };
           const geos = {
             'type': 'FeatureCollection',
             'features': []
@@ -416,7 +361,8 @@ export default {
             geoT['properties'] = i
             geos.features.push(geoT)
           })
-          const dataset = importContent({ json: { filename: '供地项目.json', content: JSON.stringify(geos) }})
+          console.log(geos)
+          const dataset = importContent({ json: { filename: '农转用项目.json', content: JSON.stringify(geos) }})
           setDatasetCRS(dataset, { prj: 'GEOGCS["GCS_China_Geodetic_Coordinate_System_2000",DATUM["D_China_2000",SPHEROID["CGCS2000",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]' })
           this.saveDataset(dataset);
           loading.close();
@@ -436,7 +382,7 @@ export default {
       fileContent.forEach(i => {
         zip.file(i.filename, i.content)
       })
-      zip.file('供地项目.cpg', 'UTF-8')
+      zip.file('农转用项目.cpg', 'UTF-8')
       zip.generateAsync({ type: 'blob' }, function updateCallback(metadata) {
         var msg = 'progression : ' + metadata.percent.toFixed(2) + ' %'
         if (metadata.currentFile) {
@@ -445,7 +391,7 @@ export default {
         console.log(msg)
       }).then((blob) => {
         // see FileSaver.js
-        saveAs(blob, '供地项目.zip')
+        saveAs(blob, '农转用项目.zip')
         console.log('done !')
       })
           .catch(error => console.error(error.stack))
@@ -454,7 +400,7 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-.page-gd-manage{
+.page-nzy-manage{
   position: relative;
   display: flex;
   .page-left{
@@ -464,63 +410,14 @@ export default {
     padding: 20px;
     border-right:2px solid #e9e3e3;
     .nzy-tools{
-      .panels{
-        width: 100%;
+      .btn-group {
         display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-bottom: 20px;
       }
       .panel-dropdown{
-        width: 49%;
+        margin-left: 10px;
         border-radius: 4px 4px 4px 4px;
         .el-dropdown{
           width: 100%;
-          .el-dropdown-link{
-            cursor: pointer;
-            width: 100%;
-            display: flex;
-            align-items: center;
-            justify-content: space-around;
-
-            font-family: AlibabaPuHuiTiM;
-            font-weight: normal;
-            font-size: 16px;
-            color: #3C4859;
-            line-height: 20px;
-            text-align: center;
-          }
-        }
-      }
-      .panel-input{
-        width: 49%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        span{
-          font-family: AlibabaPuHuiTiM;
-          font-size: 14px;
-          color: #404A5B;
-          text-align: center;
-          width: 130px;
-        }
-        .fw{
-          width: 60px;
-          height: 36px;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          border-radius: 4px;
-          border: 1px solid #CCD1DC;
-          color: #446AE7;
-          margin-left: 8px;
-          cursor: pointer;
-        }
-        ::v-deep{
-          .el-input__inner{
-            height: 36px;
-            line-height: 36px;
-          }
         }
       }
     }
@@ -532,24 +429,6 @@ export default {
     z-index: 999;
     right: 0px;
   }
-  .menus-open{
-    width: 32px;
-    height: 62px;
-    background: #E8EEFF;
-    box-shadow: 0px 2px 2px 0px rgba(55,90,178,0.2);
-    border-radius: 4px 0px 0px 4px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 6px;
-    position: absolute;
-    cursor: pointer;
-    z-index: 999;
-    i{
-      color: #4880FF;
-      font-size: 26px;
-    }
-  }
   .page-map{
     //position: absolute;
     //background:#434;

YHYZT/client/src/views/DataManage/Nzy.vue

@@ -1,87 +1,70 @@
 <template>
   <div class="page-nzy-manage">
-    <div v-show="menusShow" class="page-left" :style="{height:contentHeight+'px',width:menusWidth+'px'}">
+    <div class="page-left" :style="{height:contentHeight+'px',width:contentWidth+'px'}">
       <div class="nzy-tools">
-        <div class="panels">
-          <div class="panel-dropdown" style="background: #F5FBFF">
-            <el-dropdown>
-              <div class="el-dropdown-link">
-                <img src="@/assets/images/datamanage/sc.png"/>
-                导入文件
-                <img src="@/assets/images/datamanage/sc-i.png"/>
+        <el-form label-width="120px" :model="paramsList">
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item label="批次索引：">
+                <el-input v-model="paramsList.pzwh" placeholder="请输入批次索引" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="项目名称：">
+                <el-input v-model="paramsList.pcmc" placeholder="请输入项目名称"  clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <span></span>
+              <el-form-item label="项目类型：">
+                <el-input v-model="paramsList.pcmc" placeholder="请输入项目类型"  clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="批准文号：">
+                <el-input v-model="paramsList.pcmc" placeholder="请输入批准文号"  clearable></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item label="批准日期：">
+                <el-input v-model="paramsList.pcmc" placeholder="请输入批准日期"  clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="批次总面积：">
+                <el-input v-model="paramsList.pcmc" placeholder="请输入批次总面积（公顷）"  clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="btn-group">
+                <el-button type="primary" @click="getBpxmList">查询</el-button>
+                <div class="panel-dropdown">
+                  <el-dropdown>
+                    <el-button type="success">
+                      导入文件<i class="el-icon-arrow-down el-icon--right"></i>
+                    </el-button>
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item>
+                        <el-upload
+                            class="upload-demo"
+                            action=""
+                            :before-upload="beforeUpload"
+                            multiple
+                            :limit="3"
+                            :on-exceed="2"
+                            accept=".zip">
+                        &nbsp;&nbsp;批量导入&nbsp;&nbsp;
+                        </el-upload>
+                      </el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
+                </div>
               </div>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item>
-                  <el-upload
-                      class="upload-demo"
-                      action=""
-                      :before-upload="beforeUpload"
-                      multiple
-                      :limit="3"
-                      :on-exceed="2"
-                      accept=".zip">
-                  &nbsp;&nbsp;批量导入&nbsp;&nbsp;
-                  </el-upload>
-                </el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </div>
-          <div class="panel-dropdown" style="background: #FFFBF1">
-            <el-dropdown>
-              <div class="el-dropdown-link">
-                <img src="@/assets/images/datamanage/xz.png"/>
-                导出文件
-                <img src="@/assets/images/datamanage/xz-i.png"/>
-              </div>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item>
-                  <div @click="doExportExcel">
-                    导出项目Excel
-                  </div>
-                </el-dropdown-item>
-<!--                <el-dropdown-item>
-                  <div @click="doExport">
-                    导出项目shp
-                  </div>
-                </el-dropdown-item>-->
-              </el-dropdown-menu>
-            </el-dropdown>
-          </div>
-        </div>
-        <div class="panels">
-          <div class="panel-input">
-              <span>批准文号：</span>
-              <el-input v-model="paramsList.pzwh" placeholder="请输入内容" clearable></el-input>
-          </div>
-          <div class="panel-input">
-            <span>项目名称：</span>
-            <el-input v-model="paramsList.pcmc" placeholder="请输入内容"  clearable></el-input>
-          </div>
-        </div>
-        <div class="panels">
-          <div class="panel-input">
-            <span>绘制范围：</span>
-            <div class="fw"  title="框选绘制" @click="createBoxEvent">
-              <i style="font-size: 20px" class="iconfont yh-Frame"/>
-            </div>
-            <div class="fw" title="自定义绘制"  @click="createDrawInteraction">
-              <i style="font-size: 24px" class="iconfont yh-huizhi1"/>
-            </div>
-            <div class="fw" title="图斑拾取" @click="sqFeatrue">
-              <i style="font-size: 24px" class="iconfont  yh-shiqu"/>
-            </div>
-            <div class="fw" title="清除绘制" @click="clearLayer">
-              清除
-            </div>
-          </div>
-          <div class="panel-input">
-            <span>缓冲距离：</span>
-            <el-input placeholder="请输入内容" v-model="input2">
-              <template slot="append">米</template>
-            </el-input>
-          </div><span  style="width:100px"></span>
-          <el-button type="primary"  size="mini" @click="getBpxmList">查询</el-button>
-        </div>
+            </el-col>
+          </el-row>
+        </el-form>
 
       </div>
       <div class="nzy-table">
@@ -101,7 +84,11 @@
           </el-table-column>
           <el-table-column
               prop="pf_wh"
-              label="批准文号">
+              label="批次索引">
+          </el-table-column>
+          <el-table-column
+              prop="pf_wh"
+              label="项目名称">
           </el-table-column>
           <el-table-column
               prop="xm_lx"
@@ -115,11 +102,15 @@
           </el-table-column>
           <el-table-column
               prop="xm_bh"
-              label="项目编号">
+              label="批准文号">
           </el-table-column>
           <el-table-column
               prop="xm_mc"
-              label="项目名称">
+              label="批准日期">
+          </el-table-column>
+          <el-table-column
+              prop="xm_mc"
+              label="批次总面积（公顷）">
           </el-table-column>
           <el-table-column
               width="150"
@@ -128,20 +119,25 @@
             <template slot-scope="scope">
               <div style="line-height: 34px;">
                 <el-button
-                    @click.native.prevent="openDetail(scope.$index, scope.row)"
-                    plain
-                    type="primary"
-                    size="mini">
+                  @click.native.prevent="openDetail(scope.$index, scope.row)"
+                  style="margin-right: 10px;"
+                  plain
+                  type="primary"
+                  size="mini">
                   查看
                 </el-button>
-                <el-button
-                    v-show="scope.row.dk_bh"
+                <el-popconfirm
+                  title="该条数据确定删除吗？"
+                >
+                  <el-button
                     @click.native.prevent="locationDk(scope.$index, scope.row)"
                     plain
-                    type="success"
+                    type="danger"
+                    slot="reference"
                     size="mini">
-                  定位
-                </el-button>
+                    删除
+                  </el-button>
+                </el-popconfirm>
               </div>
             </template>
           </el-table-column>
@@ -155,37 +151,14 @@
               show-sizer />
       </div>
     </div>
-    <div @click="()=>{menusWidth =0;menusShow=false;detailShow=false;$refs.baseMap.resetSize();}"
-         style="top: calc(50% - 30px);left: calc( 700px - 20px);"
-         title="收起"
-         v-show="menusShow"
-         class="menus-open"
-    >
-      <i class="iconfont yh-Frame2"/>
-    </div>
-    <div @click="()=>{menusWidth =700;menusShow=true;$refs.baseMap.resetSize();}"
-         style="top: calc(50% - 30px);left: 0px;"
-         title="展开"
-         v-show="!menusShow"
-         class="menus-open"
+    <el-dialog
+      :visible.sync="detailShow"
+      title="项目详情"
+      top="5vh"
+      width="80%"
     >
-      <!--      <img src="@/assets/images/datamanage/zd.png"/>-->
-      <i class="iconfont yh-xiangyou"/>
-    </div>
-    <div v-show="detailShow" class="page-detail" :style="{height:contentHeight+'px',width:contentWidth-menusWidth+'px',left:menusWidth+'px'}">
       <detail ref="details" @initBpxm="getBpxmList" :contentWidth="contentWidth-menusWidth" :contentHeight="contentHeight" :project="currProject"/>
-    </div>
-    <div @click="()=>{detailShow=false;}"
-         style="top: calc(50% - 30px);right: 0px"
-         title="展开"
-         v-show="detailShow"
-         class="menus-open"
-    >
-      <i class="iconfont yh-Frame2"/>
-    </div>
-    <div class="page-map" :style="{height:contentHeight+'px',width: contentWidth-menusWidth-30+'px'}" >
-      <base-map ref="baseMap" :overlayShow="true" @drawShapeJson="drawShapeJsonEvent" :visibleLayerIds="visibleLayerId"/>
-    </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -210,12 +183,9 @@ export default {
   components:{BaseMap,Detail},
   data() {
     return {
-      input2:null,//缓冲距离
       compName: 'data-manage',
-      visibleLayerId:['YHYZT_NZYDK_NEW'],
       menus:JSON.parse(window.sessionStorage.getItem('yzt-user')),
       menusWidth:700,
-      menusShow:true,
       detailShow:false,
       tableData:{
         data:[],
@@ -255,29 +225,6 @@ export default {
         }
       })
     },
-    createBoxEvent(){
-      this.$refs.baseMap.createBoxEvent();
-    },
-    sqFeatrue(){
-      this.$refs.baseMap.sqFeatrue();
-    },
-    //自定义绘制分析
-    createDrawInteraction(){
-      this.$refs.baseMap.drawInteractionEvent();
-    },
-    //清除绘制图层
-    clearLayer(){
-      this.$refs.baseMap.cleanLayer();
-      this.drawShapeJson = null;
-      this.getBpxmList();
-    },
-    drawShapeJsonEvent(json){
-      if(json){
-        this.drawShapeJson = json;
-        this.getBpxmList();
-        this.$message.success("绘制结束");
-      }
-    },
     pageChange:function (page){
       this.paramsList.page=page;
       this.getBpxmList()
@@ -315,8 +262,8 @@ export default {
     },
     openDetail(index,row){
       this.currProject = row;
-      this.detailShow =true;
-      this.$refs.details.activeName='first';
+      this.detailShow = true;
+      this.$refs['details'].initDetailData()
     },
     locationDk(index,row){
       if(row.dk_bh){
@@ -365,24 +312,6 @@ export default {
          }
        })
     },
-    doExportExcel(){
-      try {
-        const $e = this.$refs['report-table'].$el
-        let $table = $e.querySelector('.el-table__fixed')
-        if(!$table) {
-          $table = $e
-        }
-        const wb = XLSX.utils.table_to_book($table, {raw:true})
-        const wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST:true, type: 'array'})
-        saveAs(
-            new Blob([wbout],{type: 'application/octet-stream'}),
-            `农转用项目列表.xlsx`,
-        )
-        this.recordInfo("export","农转用成果导出","农转用项目列表.xlsx")
-      } catch (e) {
-        if (typeof console !== 'undefined') console.error(e)
-      }
-    },
     doExport(){
       let params = new FormData();
       params.append("pzwh",this.paramsList.pzwh);
@@ -425,8 +354,6 @@ export default {
       })
     },
     saveDataset(dataset, type = 'shapefile') {
-      // format=shapefile|geojson|topojson|json|dbf|csv|tsv|svg
-      // , encoding: 'gb2312'
       const fileContent = exportFileContent(dataset, { format: type })
       this.saveFileContent(fileContent)
     },
@@ -464,63 +391,14 @@ export default {
     padding: 20px;
     border-right:2px solid #e9e3e3;
     .nzy-tools{
-      .panels{
-        width: 100%;
+      .btn-group {
         display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-bottom: 20px;
       }
       .panel-dropdown{
-          width: 49%;
-          border-radius: 4px 4px 4px 4px;
-          .el-dropdown{
-            width: 100%;
-            .el-dropdown-link{
-              cursor: pointer;
-              width: 100%;
-              display: flex;
-              align-items: center;
-              justify-content: space-around;
-
-              font-family: AlibabaPuHuiTiM;
-              font-weight: normal;
-              font-size: 16px;
-              color: #3C4859;
-              line-height: 20px;
-              text-align: center;
-            }
-          }
-      }
-      .panel-input{
-        width: 49%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        span{
-          font-family: AlibabaPuHuiTiM;
-          font-size: 14px;
-          color: #404A5B;
-          text-align: center;
-          width: 130px;
-        }
-        .fw{
-          width: 60px;
-          height: 36px;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          border-radius: 4px;
-          border: 1px solid #CCD1DC;
-          color: #446AE7;
-          margin-left: 8px;
-          cursor: pointer;
-        }
-        ::v-deep{
-          .el-input__inner{
-            height: 36px;
-            line-height: 36px;
-          }
+        margin-left: 10px;
+        border-radius: 4px 4px 4px 4px;
+        .el-dropdown{
+          width: 100%;
         }
       }
     }
@@ -532,24 +410,6 @@ export default {
     z-index: 999;
     right: 0px;
   }
-  .menus-open{
-    width: 32px;
-    height: 62px;
-    background: #E8EEFF;
-    box-shadow: 0px 2px 2px 0px rgba(55,90,178,0.2);
-    border-radius: 4px 0px 0px 4px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 6px;
-    position: absolute;
-    cursor: pointer;
-    z-index: 999;
-    i{
-      color: #4880FF;
-      font-size: 26px;
-    }
-  }
   .page-map{
     //position: absolute;
     //background:#434;

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

@@ -1,890 +1,754 @@
 <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">
-          <div class="head">
-            <div class="title">
-              <div></div>
-              <span>属性数据</span>
-            </div>
-            <div class="handler-btn">
-              <div v-show="showMap" @click="showMap=false">
-                <i class="iconfont yh-sheshinongyongdi"  style="color: #44CAE7"/>
-                <span>查看项目</span>
-              </div>
-              <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="!jbxxEdit && !showMap" @click="()=>{jbxxEdit=true;}">
-                  <i class="iconfont yh-bianji" style="color: #5988FF"/>
-                  <span>开始编辑</span>
-              </div>
-              <div  v-show="jbxxEdit && !showMap" @click="updateBpxm">
-                <i class="iconfont yh-baocun"  style="color: #44CAE7"/>
-                <span>保存项目</span>
-              </div>
-              <div v-show="!showMap" @click="deletePc">
-                <i class="iconfont yh-shanchu"  style="color: #F0A123"/>
-                <span>删除项目</span>
-              </div>
-            </div>
-          </div>
-          <div v-if="!showMap" class="tables" :style="{height:contentHeight-140+'px'}">
-            <table>
-              <tr>
-                <th>地块名称</th>
-                <td colspan="3"><el-input v-model="currProject.dkmc" placeholder="请输入地块名称" clearable :disabled="!jbxxEdit" /></td>
-              </tr>
-              <tr>
-                <th>测绘编号</th>
-                <td><el-input v-model="currProject.chbh" placeholder="请输入测绘编号" clearable :disabled="!jbxxEdit" /></td>
-                <th>项目类型</th>
-                <td>
-                  <el-select v-model="currProject.djklx" 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-input v-model="currProject.dkbh" placeholder="请输入地块编号" clearable :disabled="!jbxxEdit"/></td>
-                <th>土地用途</th>
-                <td><el-input v-model="currProject.tdyt" placeholder="请输入土地用途" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>用地单位名称</th>
-                <td><el-input v-model="currProject.dwmc" placeholder="请输入用地单位名称" clearable :disabled="!jbxxEdit"/></td>
-                <th>行政区名称</th>
-                <td><el-input v-model="currProject.xzqmc" placeholder="请输入行政区名称" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>所属乡镇</th>
-                <td><el-input v-model="currProject.ssxz" placeholder="请输入所属乡镇" clearable :disabled="!jbxxEdit"/></td>
-                <th>土地坐落</th>
-                <td><el-input v-model="currProject.tdzl" placeholder="请输入土地坐落" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>地块面积（公顷）</th>
-                <td><el-input v-model="currProject.dkmj" placeholder="请输入地块面积" clearable :disabled="!jbxxEdit"/></td>
-                <th>供地时间</th>
-                <td>
-                  <div class="block">
-                    <el-date-picker
-                        v-model="currProject.gdsj"
-                        clearable :disabled="!jbxxEdit"
-                        type="date"
-                        placeholder="选择供地时间">
-                    </el-date-picker>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <th>合同编号</th>
-                <td><el-input v-model="currProject.htydpzbh" placeholder="请输入合同编号" clearable :disabled="!jbxxEdit"/></td>
-                <th>合同时间</th>
-                <td>
-                  <el-date-picker
-                      v-model="currProject.htsj"
-                      clearable :disabled="!jbxxEdit"
-                      type="date"
-                      placeholder="选择合同时间">
-                  </el-date-picker>
-                </td>
-              </tr>
-              <tr>
-                <th>土地使用年限</th>
-                <td><el-input v-model="currProject.tdsynx" placeholder="请输入土地使用年限" clearable :disabled="!jbxxEdit"/></td>
-                <th>供地方式</th>
-                <td><el-input v-model="currProject.gdfs" placeholder="请输入供地方式" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>容积率</th>
-                <td>
-                  <el-input v-model="currProject.rjl" placeholder="请输入容积率" clearable :disabled="!jbxxEdit"/>
-                </td>
-                <th>设定容积率</th>
-                <td>
-                  <el-input v-model="currProject.sdrjl1" placeholder="请输入设定容积率" clearable :disabled="!jbxxEdit"/>
-                </td>
-              </tr>
-              <tr>
-                <th>合同总金额</th>
-                <td>
-                  <el-input v-model="currProject.htjzje" placeholder="请输入合同总金额" clearable :disabled="!jbxxEdit"/>
-                </td>
-                <th>合同调整后总金额</th>
-                <td><el-input v-model="currProject.httzhzje" placeholder="请输入合同调整后总金额" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>出让底价</th>
-                <td><el-input v-model="currProject.crdj" placeholder="请输入出让底价" clearable :disabled="!jbxxEdit"/></td>
-                <th>土地单价</th>
-                <td><el-input v-model="currProject.tddj" placeholder="请输入土地单价" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>转征用批准时间</th>
-                <td>
-                  <el-date-picker
-                      v-model="currProject.zzypzsj"
-                      clearable :disabled="!jbxxEdit"
-                      type="date"
-                      placeholder="选择转征用批准时间">
-                  </el-date-picker>
-                </td>
-                <th>建筑面积</th>
-                <td><el-input v-model="currProject.jzmj" placeholder="请输入建筑面积" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>权属性质</th>
-                <td><el-input v-model="currProject.qsxz" placeholder="请输入权属性质" clearable :disabled="!jbxxEdit"/></td>
-                <th>批准供地批文号</th>
-                <td><el-input v-model="currProject.szfpzgdpwh" placeholder="请输入批准供地批文号" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>土地用途代码</th>
-                <td><el-input v-model="currProject.tdytdm" placeholder="请输入土地用途代码" clearable :disabled="!jbxxEdit"/></td>
-                <th>总用地面积</th>
-                <td><el-input v-model="currProject.zydmj" placeholder="请输入总用地面积" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>实际供地面积</th>
-                <td><el-input v-model="currProject.sjtdmj" placeholder="请输入实际供地面积" clearable :disabled="!jbxxEdit"/></td>
-                <th>带征土地面积</th>
-                <td><el-input v-model="currProject.dztdmj" placeholder="请输入带征土地面积" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>供地批准文号</th>
-                <td><el-input v-model="currProject.gdpzwh2" placeholder="请输入供地批准文号" clearable :disabled="!jbxxEdit"/></td>
-                <th>总投资规模</th>
-                <td><el-input v-model="currProject.ztzgm" placeholder="请输入总投资规模" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>固定资产投资规模</th>
-                <td><el-input v-model="currProject.gdzctzgm" placeholder="请输入固定资产投资规模" clearable :disabled="!jbxxEdit"/></td>
-                <th>绿化率</th>
-                <td><el-input v-model="currProject.lhl" 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>
-              <tr>
-                <th>投资主体性质</th>
-                <td><el-input v-model="currProject.tzztxz" placeholder="请输入投资主体性质" clearable :disabled="!jbxxEdit"/></td>
-                <th>建筑项目所属行业分类名称</th>
-                <td><el-input v-model="currProject.sshymc" placeholder="请输入建筑项目所属行业分类名称" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>非生产经营用地配置百分比</th>
-                <td><el-input v-model="currProject.fscjyydpzbfb" placeholder="请输入非生产经营用地配置百分比" clearable :disabled="!jbxxEdit"/></td>
-                <th>土地等级</th>
-                <td><el-input v-model="currProject.tdlevel" placeholder="请输入土地等级" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>规划分区</th>
-                <td><el-input v-model="currProject.ghfq" placeholder="请输入规划分区" clearable :disabled="!jbxxEdit"/></td>
-                <th>出让方式</th>
-                <td><el-input v-model="currProject.crfs" placeholder="请输入出让方式" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>出让面积</th>
-                <td><el-input v-model="currProject.crmj" placeholder="请输入出让面积" clearable :disabled="!jbxxEdit"/></td>
-                <th>出让起价</th>
-                <td><el-input v-model="currProject.crqj" placeholder="请输入出让起价" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>总起价</th>
-                <td><el-input v-model="currProject.zqj" placeholder="请输入总起价" clearable :disabled="!jbxxEdit"/></td>
-                <th>受让人</th>
-                <td><el-input v-model="currProject.srr" placeholder="请输入受让人" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>开工日期</th>
-                <td>
-                  <el-date-picker
-                      v-model="currProject.kgrq"
-                      clearable :disabled="!jbxxEdit"
-                      type="date"
-                      placeholder="选择请输入开工日期">
-                  </el-date-picker>
-                </td>
-                <th>竣工日期</th>
-                <td>
-                  <el-date-picker
-                      v-model="currProject.jgrq"
-                      clearable :disabled="!jbxxEdit"
-                      type="date"
-                      placeholder="选择请输入竣工日期">
-                  </el-date-picker>
-                </td>
-              </tr>
-              <tr>
-                <th>补偿协议受让人</th>
-                <td><el-input v-model="currProject.bcxysrr" placeholder="请输入补偿协议受让人" clearable :disabled="!jbxxEdit"/></td>
-                <th>补偿协议签订时间</th>
-                <td><el-input v-model="currProject.bcxyqdsj" placeholder="请输入补偿协议签订时间" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>项目依据</th>
-                <td colspan="3"><el-input v-model="currProject.xmyj" placeholder="请输入项目依据" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>电子监管号</th>
-                <td><el-input v-model="currProject.dzjgh" placeholder="请输入电子监管号" clearable :disabled="!jbxxEdit"/></td>
-                <th>批准供地单位</th>
-                <td><el-input v-model="currProject.pzgddw" placeholder="请输入批准供地单位" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-              <tr>
-                <th>宗地编号</th>
-                <td><el-input v-model="currProject.zdbh" placeholder="请输入宗地编号" clearable :disabled="!jbxxEdit"/></td>
-                <th>划拨决定书编号</th>
-                <td><el-input v-model="currProject.hbjdsbh" placeholder="请输入划拨决定书编号" clearable :disabled="!jbxxEdit"/></td>
-              </tr>
-            </table>
-          </div>
-          <div v-else class="content-map" :style="{height:contentHeight-100+'px',width: contentWidth+'px'}" >
-            <el-radio-group v-model="radio1" style="    position: absolute;
-    z-index: 1;
-    right: 36px;
-    top: 65px;" @change="radioChange"  size="medium">
-              <el-radio-button label="YHYZT_PEWG_NEW">批而未供</el-radio-button>
-              <el-radio-button label="YHYZT_ST_GDDK_NEW">供地地块</el-radio-button>
-            </el-radio-group>
-            <base-map  ref="basemap" :visibleLayerIds="visibleLayerId" :overlayShow="true" @showDetail="pewgDetail"/>
-          </div>
+    <el-tabs type="border-card" v-model="currentTab">
+      <el-tab-pane label="项目信息" name="tab1">
+        <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>90平方米住房占地面积</th>
+              <td colspan="3">
+                <el-input
+                  v-model="detailData.xm_mc"
+                  placeholder="请输入90平方米住房占地面积"
+                  clearable
+                  :disabled="!jbxxEdit"
+                />
+              </td>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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>
+              <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="附件信息" 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>
+      <el-tab-pane label="查看地图" name="tab2">
+        <div class="map_box">
+          <base-map ref="baseMap" v-if="currentTab === 'tab2'" :overlayShow="true" @drawShapeJson="drawShapeJsonEvent" :visibleLayerIds="visibleLayerId"/>
         </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";
 export default {
-name: "Detail",
-  components:{BaseMap},
-  data(){
-  return{
-    user:JSON.parse(window.sessionStorage.getItem('yzt-user')),
-    activeName:'first',
-    jbxxEdit:false,
-    visibleLayerId:['YHYZT_PEWG_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:{},
-      xmdkSelected:'',
-    },
-    staticData:window.ApplicationConfig.staticData,
-    radio1:'YHYZT_ST_GDDK_NEW',
-  }
+  name: "Detail",
+  components: { BaseMap },
+  data() {
+    return {
+      user: JSON.parse(window.sessionStorage.getItem("yzt-user")),
+      currentTab: 'tab1',
+      visibleLayerId:['YHYZT_ST_GDDK_NEW'],
+      detailData: {},
+    };
   },
-  props:{
-    contentWidth:Number,
-    contentHeight:Number,
-    project:Object
+  props: {
+    contentWidth: Number,
+    contentHeight: Number,
+    project: Object,
   },
-  watch:{
-    project(val){
-      this.currProject = val;
-      this.oldProject = { ...val };
-    }
+  watch: {
+    
   },
-  methods:{
-    radioChange(value){
-      this.visibleLayerId=[];
-      this.visibleLayerId.push(value);
-      if(value==='YHYZT_PEWG_NEW'){
-        this.$refs.basemap.sqFeatrue();
-        this.$refs.basemap.isPewgCk= true;
-      }
-    },
-    pewgDetail(item){
-      let params = new FormData();
-      params.append("gdId",this.currProject.gdqkid);
-      params.append("pewg",JSON.stringify(item));
-      this.$ajax.post('/api/data/manage/gd/doGyck', params, this).then(res => {
-        const {success, data} = res;
-        if(success && data>0){
-          this.$message.success("成功出库！")
-        }
-      })
-    },
-    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();
-        }
-      })
-    },
-    //删除批次
-    deletePc(){
-      this.$confirm('此操作将永久删除该项目, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        center: true
-      }).then(() => {
-        let params = new FormData();
-        params.append("xmid",this.currProject.xm_guid);
-        this.$ajax.post('/api/data/manage/gd/delOneGdxx', params, this).then(res => {
-          const {success, data} = res;
-          if(success && data>0){
-            //this.$message({type: 'success',message: '删除成功!'});
-            this.recordInfo('del','供地项目删除',this.currProject.xm_guid);
-            this.$parent.getBpxmList();
-          }
-        })
-      }).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.currProject.xm_guid;
-      let _this = this;
-      setTimeout(() => {
-        _this.$refs.basemap.locationGlobal('YHYZT_ST_GDDK_NEW',`xm_guid = '${arr}'`);
-        _this.$refs.basemap.sqFeatrue();
-        _this.$refs.basemap.isPewgCk=true;
-      }, 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:'';
-        }else{
-          this.$message.error("查询失败！")
-        }
-      })
-    },
-    updateBpxm(){
-      this.jbxxEdit = false;
-      let params = new FormData();
-      params.append("project",JSON.stringify(this.currProject));
-      let _this = this;
-      this.$ajax.post('/api/data/manage/gd/editOneGdxx', params, this, true).then(res => {
-        const {success,data} = res;
-        if(success){
-         this.initBpxm();
-         //this.$message.success("修改成功！");
-         this.recordInfo('edit','供地项目修改');
-        }else{
-          this.$message.error("修改失败！")
-        }
-      })
-    },
-    initBpxm(){},
-    //附件材料切换
-    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: '已取消删除'
-        });
-      });
+  methods: {
+    initDetailData () {
+      this.currentTab = 'tab1'
     },
-    /**
-     * 表格样式
-     * @param row
-     * @param rowIndex
-     * @returns {string}
-     */
-    tableRowStyle({row, rowIndex}) {
-      if (rowIndex%2 === 1) {
-        return 'text-align:center;background:#F7F8FA';
-      }else{
-        return 'text-align:center;';
+    drawShapeJsonEvent(json){
+      if(json){
+        this.drawShapeJson = json;
+        this.getBpxmList();
+        this.$message.success("绘制结束");
       }
     },
-    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]+';';
-          }
-        });
-      }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{
-      .vl-tool-bar{
-        display: none;
-      }
-      .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;
-        }
-      }
-    }
+.xm-detal {
+  width: 100%;
+  .map_box {
+    width: 100%;
+    height: 600px;
   }
-  ::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;
-        }
+  .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;
+        padding: 0px 10px;
       }
-      .ivu-modal-body{
+      th {
+        width: 155px;
+        background: #f4f6f8;
         font-family: AlibabaPuHuiTiM;
         font-weight: normal;
-        font-size: 18px;
-        color: #000000;
       }
-      .ivu-modal-close .ivu-icon-ios-close{
-        font-weight: bold;
-        color: #181B1F;
+      td {
+        padding: 0px 5px;
       }
-      .ivu-modal-footer{
-        border-top: none;
+    }
+    ::v-deep {
+      .el-input__inner {
+        //border:1px solid #fff;
+        border-radius: 0px;
+        border-color: transparent;
       }
     }
   }
+}
 </style>

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

@@ -0,0 +1,310 @@
+<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>

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

@@ -0,0 +1,1464 @@
+<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>

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

@@ -1,815 +1,234 @@
 <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 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"
               />
-            </div>
-            <div v-if="!showMap" class="files tables" style="width: 76%">
+            </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" v-model="currentTab">
+          <el-tab-pane label="项目信息" name="tab1">
+            <div class="tables">
               <table>
                 <tr>
-                  <th>地块（项目）名称</th>
+                  <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="请输入所属行业"
+                      v-model="detailData.xm_mc"
+                      placeholder="请输入批次索引"
                       clearable
+                      :disabled="!jbxxEdit"
                     />
                   </td>
-                  <th>土地坐落</th>
-                  <td>
+                  <th>项目索引</th>
+                  <td colspan="3">
                     <el-input
-                      v-model="xmdkInfo.currDk.td_zl"
-                      placeholder="请输入权属性质"
+                      v-model="detailData.xm_mc"
+                      placeholder="请输入项目索引"
                       clearable
+                      :disabled="!jbxxEdit"
                     />
                   </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>
+                  <th>项目编号</th>
+                  <td colspan="3">
                     <el-input
-                      v-model="xmdkInfo.currDk.zdxm_jb"
-                      placeholder="请输入所属区县"
+                      v-model="detailData.xm_mc"
+                      placeholder="请输入项目编号"
                       clearable
+                      :disabled="!jbxxEdit"
                     />
                   </td>
-                  <th>规定投资强度</th>
-                  <td>
+                  <th>项目名称</th>
+                  <td colspan="3">
                     <el-input
-                      v-model="xmdkInfo.currDk.tz_qd"
-                      placeholder="请输入权属性质"
+                      v-model="detailData.xm_mc"
+                      placeholder="请输入项目名称"
                       clearable
+                      :disabled="!jbxxEdit"
                     />
                   </td>
                 </tr>
                 <tr>
-                  <th>容积率</th>
-                  <td>
+                  <th>乡镇街道</th>
+                  <td colspan="3">
                     <el-input
-                      v-model="xmdkInfo.currDk.ljl"
-                      placeholder="请输入所属区县"
+                      v-model="detailData.xm_mc"
+                      placeholder="请输入乡镇街道"
                       clearable
+                      :disabled="!jbxxEdit"
                     />
                   </td>
-                  <th>实际固定资产额</th>
-                  <td>
+                  <th>土地用途</th>
+                  <td colspan="3">
                     <el-input
-                      v-model="xmdkInfo.currDk.gd_zc"
-                      placeholder="请输入权属性质"
+                      v-model="detailData.xm_mc"
+                      placeholder="请输入土地用途"
                       clearable
+                      :disabled="!jbxxEdit"
                     />
                   </td>
                 </tr>
                 <tr>
-                  <th>绿化率</th>
-                  <td>
+                  <th>土地坐落</th>
+                  <td colspan="3">
                     <el-input
-                      v-model="xmdkInfo.currDk.lhl"
-                      placeholder="请输入所属区县"
+                      v-model="detailData.xm_mc"
+                      placeholder="请输入土地坐落"
                       clearable
+                      :disabled="!jbxxEdit"
                     />
                   </td>
-                  <th>建筑密度</th>
-                  <td>
+                  <th>项目面积（公顷）</th>
+                  <td colspan="3">
                     <el-input
-                      v-model="xmdkInfo.currDk.jz_md"
-                      placeholder="请输入权属性质"
+                      v-model="detailData.xm_mc"
+                      placeholder="请输入项目面积（公顷）"
                       clearable
+                      :disabled="!jbxxEdit"
                     />
                   </td>
                 </tr>
                 <tr>
-                  <th>项目类型</th>
-                  <td><el-input placeholder="请输入项目类型" clearable /></td>
-                  <th>项目面积（公顷）</th>
-                  <td>
+                  <th>用地主体</th>
+                  <td colspan="3">
                     <el-input
-                      v-model="xmdkInfo.currDk.dk_mj"
-                      placeholder="请输入项目面积"
+                      v-model="detailData.xm_mc"
+                      placeholder="请输入用地主体"
                       clearable
+                      :disabled="!jbxxEdit"
                     />
                   </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>
+          </el-tab-pane>
+          <el-tab-pane label="查看地图" name="tab2">
+            <div class="map_box">
+              <base-map ref="baseMap" v-if="detailType && currentTab === 'tab2'" :overlayShow="true" @drawShapeJson="drawShapeJsonEvent" :visibleLayerIds="visibleLayerId"/>
             </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>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
   </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,
+      currentTab: 'tab1',
+      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: {
@@ -818,647 +237,75 @@ export default {
     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: "已取消删除",
-          });
-        });
+    initDetailData () {
+      this.currentTab = 'tab1'
     },
-    //删除批次
-    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: "已取消删除",
-          });
-        });
+    handleNodeClick (data) {
+      
     },
-    tabClick(tab) {
-      if (tab.index == 1) {
-        this.getBpxmDetail();
-      } else if (tab.index == 2) {
-        this.initFileList();
+    drawShapeJsonEvent(json){
+      if(json){
+        this.drawShapeJson = json;
+        this.getBpxmList();
+        this.$message.success("绘制结束");
       }
     },
-    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;
-      }
+  width: 100%;
+  display: flex;
+  align-items: flex-start;
+  >div {
+    &.left_tree {
+      width: 260px;
     }
-    .el-upload-list {
-      position: absolute;
-      top: 200px;
-      left: 20px;
+    &.right_detail {
+      flex: 1;
+      margin-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;
-        }
-      }
-    }
+  .map_box {
+    height: 600px;
   }
-  .content {
-    .tables {
-      padding: 0px 20px;
+  .tables {
+    width: 100%;
+    overflow-y: auto;
+    table {
       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;
+      border-collapse: collapse;
+      tr,
+      th,
+      td {
+        border: 1px solid #d6d6d6;
         height: 40px;
-        margin: 5px 0px;
-
+        font-size: 14px;
+        color: #1f2f47;
+      }
+      th {
+        width: 25%;
+        background: #f4f6f8;
         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;
-          }
-        }
+      td {
+        width: 25%;
+        padding: 0px 5px;
       }
     }
-  }
-  .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;
+      .el-input__inner {
+        //border:1px solid #fff;
+        border-radius: 0px;
+        border-color: transparent;
       }
     }
-    .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>