余杭一张图样式调整和BUG修复

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

@@ -96,7 +96,7 @@
               label="未供原因">
           </el-table-column>
           <el-table-column
-              width="150"
+              width="180"
               label="操作">
             <template slot-scope="scope">
               <div style="line-height: 34px;">

YHYZT/client/src/views/DataManage/common.scss

@@ -0,0 +1,6 @@
+.el-input.is-disabled .el-input__inner,
+.el-textarea.is-disabled .el-textarea__inner {
+  background: none;
+  border: 0px;
+  color: #333;
+}

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

@@ -1,718 +0,0 @@
-<template>
-  <div class="xm-detal">
-    <el-tabs type="border-card" v-model="currentTab">
-      <el-tab-pane label="项目信息" name="tab1">
-        <div class="tables_grid">  
-          <div class="title">供地索引</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.gdsy"
-              placeholder="请输入供地索引"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">做地主体</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.zdzt"
-              placeholder="请输入做地主体"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">属地镇街</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.sdzj"
-              placeholder="请输入属地镇街"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">计划情况</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.jhqk"
-              placeholder="请输入计划情况"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">地块名称</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.dkMc"
-              placeholder="请输入地块名称"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">挂牌出让地块</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.dkbh"
-              placeholder="请输入挂牌出让地块"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">竞得单位</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.dwMc"
-              placeholder="请输入竞得单位"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">项目公司</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.xmgs"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">土地坐落</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.tdZl"
-              placeholder="请输入土地坐落"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">土地面积（平方米）</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.tdmj"
-              placeholder="请输入土地面积（平方米）"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">土地面积（亩）</div>
-          <div class="content">
-            <el-input
-              :value="detailData.tdmj * 0.0015"
-              placeholder="请输入土地面积（亩）"
-              clearable
-              :disabled="true"
-            />
-          </div>
-          <div class="title">容积率</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.rjl"
-              placeholder="请输入容积率"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">建筑体量</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.jztl"
-              placeholder="请输入建筑体量"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">用地性质</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.xxz"
-              placeholder="请输入用地性质"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">出让方式</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.crfs"
-              placeholder="请输入出让方式"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">公告时间</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.ggsj"
-              placeholder="请输入公告时间"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">挂牌报价时间</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.gpbjsj"
-              placeholder="请输入挂牌报价时间"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">评估价（万元）</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.pgj"
-              placeholder="请输入评估价（万元）"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">起挂价(万元)</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.qgj"
-              placeholder="请输入起挂价(万元)"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">起挂亩价（万元/亩）</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.qgmj"
-              placeholder="请输入起挂亩价（万元/亩）"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">起挂楼面价（元/平方米）</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.qglmj"
-              placeholder="请输入起挂楼面价（元/平方米）"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">保证金(万元)</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.bzj"
-              placeholder="请输入保证金(万元)"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">实际缴纳定金（万元）</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.sjjndj"
-              placeholder="请输入实际缴纳定金（万元）"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">竞得价(万元)</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.jdj"
-              placeholder="请输入竞得价(万元)"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">竞得亩价（万元/亩）</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.jdmj"
-              placeholder="请输入竞得亩价（万元/亩）"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">竞得楼面价（元/平方米）</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.jdlmj"
-              placeholder="请输入竞得楼面价（元/平方米）"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">自持比例</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.zcbl"
-              placeholder="请输入自持比例"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">自持面积</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.zcmj"
-              placeholder="请输入自持面积"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">养老用房（平方米）</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.ylyf"
-              placeholder="请输入养老用房（平方米）"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">无偿返还村集体建筑面积（平方米）</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.wcfh"
-              placeholder="请输入无偿返还村集体建筑面积（平方米）"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">溢价率</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.yjl"
-              placeholder="请输入溢价率"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">已交出让金(万元)</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.yjcrj"
-              placeholder="请输入已交出让金(万元)"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">应交而欠交</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.yjeqj"
-              placeholder="请输入应交而欠交"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">第一期出让金额（含保证金）</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.dyqcrj"
-              placeholder="请输入第一期出让金额（含保证金）"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">第一期出让金约定支付日期</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.dyqydzfrq"
-              placeholder="请输入第一期出让金约定支付日期"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">第一期出让金实际支付日期</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.dyqsjzfrq"
-              placeholder="请输入第一期出让金实际支付日期"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">到期提醒</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.dyqdqtx"
-              placeholder="请输入到期提醒"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">第二期出让金额</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.deqcrj"
-              placeholder="请输入第二期出让金额"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">第二期出让金约定支付日期</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.deqydzfrq"
-              placeholder="请输入第二期出让金约定支付日期"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">第二期出让金实际支付日期</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.deqsjzfrq"
-              placeholder="请输入第二期出让金实际支付日期"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">到期提醒</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.deqdqtx"
-              placeholder="请输入到期提醒"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">交地协议书约定交地时间</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.ydjdsj"
-              placeholder="请输入交地协议书约定交地时间"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">合同约定动工时间</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.yddgsj"
-              placeholder="请输入合同约定动工时间"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">合同约定竣工时间</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.ydjgsj"
-              placeholder="请输入合同约定竣工时间"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">合同号</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.hth"
-              placeholder="请输入合同号"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">合同签约时间</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.htqysj"
-              placeholder="请输入合同签约时间"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">批次号</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.pch"
-              placeholder="请输入批次号"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">国有存量用地面积（平方米）</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.gycl"
-              placeholder="请输入国有存量用地面积（平方米）"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">省厅系统实际录入情况</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.stsjlr"
-              placeholder="请输入省厅系统实际录入情况"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">限制性条件情况</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.xzxtjqk"
-              placeholder="请输入限制性条件情况"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">供地批复号</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.gdpfh"
-              placeholder="请输入供地批复号"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">跟踪管理卡号</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.gzglkh"
-              placeholder="请输入跟踪管理卡号"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">公租房配建</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.gzfpj"
-              placeholder="请输入公租房配建"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">90平方米住房占地面积</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.zfzdmj"
-              placeholder="请输入90平方米住房占地面积"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">最大建筑体量(平方米)</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.zdjztl"
-              placeholder="请输入最大建筑体量(平方米)"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">住宅用地面积（平方米）</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.zzydmj"
-              placeholder="请输入住宅用地面积（平方米）"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">住宅建筑体量（平方米）</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.zzjztl"
-              placeholder="请输入住宅建筑体量（平方米）"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">实际已缴滞纳金(万元)</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.sjyjznj"
-              placeholder="请输入实际已缴滞纳金(万元)"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">滞纳金缴纳时间</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.znjjnsj"
-              placeholder="请输入滞纳金缴纳时间"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">印刷份数</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.yffs"
-              placeholder="请输入印刷份数"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">联系人</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.lxr"
-              placeholder="请输入联系人"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">是否勾地单位拿地</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.gddwnd"
-              placeholder="请输入是否勾地单位拿地"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">房屋销售限价</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.fwxsxj"
-              placeholder="请输入房屋销售限价"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">做地成本</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.zdcb"
-              placeholder="请输入做地成本"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">备注</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.bz"
-              placeholder="请输入备注"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">出让金是否已缴清</div>
-          <div class="content">
-            <el-select v-model="detailData.crjsfyjq" style="width: 100%;" :disabled="!editor">
-              <el-option value="是" label="是"></el-option>
-              <el-option value="否" label="否"></el-option>
-            </el-select>
-          </div>
-          <div class="title">合同是否已备案</div>
-          <div class="content">
-            <el-select v-model="detailData.htsfyba" style="width: 100%;" :disabled="!editor">
-              <el-option value="是" label="是"></el-option>
-              <el-option value="否" label="否"></el-option>
-            </el-select>
-          </div>
-          <div class="title"></div>
-          <div class="content"></div>
-        </div>
-        <div class="btn-group">
-          <el-button type="primary" @click="onSavePcHandle">保存</el-button>
-        </div>
-      </el-tab-pane>
-      <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>
-  </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")),
-      currentTab: 'tab1',
-      visibleLayerId:['YHYZT_ST_GDDK_NEW'],
-      detailData: {},
-      editor: false
-    };
-  },
-  props: {
-    contentWidth: Number,
-    contentHeight: Number,
-    project: Object,
-  },
-  watch: {
-    
-  },
-  methods: {
-    initDetailData (row, isEditor = false) {
-      this.currentTab = 'tab1'
-      this.editor = isEditor
-      this.detailData = row
-      this.queryDetail(row['objectid'])
-    },
-    //查询报批项目信息
-    queryDetail (id) {
-      if(!id) return
-      this.$ajax.get(`/api/stgddk/${id}`, null, this, true).then(res => {
-        if (res) {
-          this.detailData = res
-        }
-      })
-    },
-    onSavePcHandle () {
-      const sendData = {
-        ...this.detailData
-      }
-      delete sendData['shape']
-      this.$ajax.postJson('/api/stgddk/update', sendData, this, true).then(res => {
-        if (res.data) {
-          this.$Message.success('更新成功！')
-          this.$emit('init')
-        }
-      })
-    },
-    drawShapeJsonEvent(json){
-      if(json){
-        this.drawShapeJson = json;
-        this.getBpxmList();
-        this.$message.success("绘制结束");
-      }
-    },
-  }
-};
-</script>
-
-<style scoped lang="scss">
-.xm-detal {
-  width: 100%;
-  .map_box {
-    width: 100%;
-    height: 600px;
-  }
-  .btn-group {
-    margin-top: 20px;
-    text-align: right;
-  }
-  $t_w: 155px;
-  .tables_grid {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between; /* 可选的对齐方式 */
-    border-top: 1px solid #d6d6d6;
-    border-right: 1px solid #d6d6d6;
-    display: grid;
-    grid-template-columns: repeat(4, $t_w 1fr);
-    >div {
-      border-left: 1px solid #d6d6d6;
-      border-bottom: 1px solid #d6d6d6;
-      padding: 8px 10px;
-      display: inline-block;
-      color: #1f2f47;
-      &.title {
-        width: $t_w;
-        background: #f4f6f8;
-        font-family: AlibabaPuHuiTiM;
-        font-weight: normal;
-        text-align: center;
-      }
-    }
-  }
-}
-</style>

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

@@ -2,153 +2,164 @@
   <div class="xm-detal">
     <el-tabs type="border-card" v-model="currentTab" @tab-click="handleTabClick">
       <el-tab-pane label="项目信息" name="tab1">
-        <div class="tables_grid">  
-          <div class="title">地块索引</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.gdsy"
-              placeholder="请输入地块索引"
-              clearable
-              :disabled="!editor"
-            />
+        <div class="table_box">
+          <div class="tables_grid">  
+            <div class="title">地块索引</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.gdsy"
+                placeholder="请输入地块索引"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">项目名称</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.dkMc"
+                placeholder="请输入项目名称"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">出让合同/划拨决定书编号</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.htydpzbh"
+                placeholder="请输入出让合同/划拨决定书编号"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">项目类型</div>
+            <div class="content">
+              <el-select 
+                v-model="detailData.djklx" 
+                style="width: 100%;"
+                :disabled="!editor">
+                <el-option label="出让" value="出让"></el-option>
+                <el-option label="划拨" value="划拨"></el-option>
+                <el-option label="集体土地" value="集体土地"></el-option>
+              </el-select>
+            </div>
+            <div class="title">批准文号</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.dkBh"
+                placeholder="请输入批准文号"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">签订日期</div>
+            <div class="content">
+              <el-date-picker
+                v-model="detailData.htsj"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择签订日期"
+                style="width: 100%;"
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">项目面积（公顷）</div>
+            <div class="content">
+              <el-input
+                v-model="dkMjHa"
+                placeholder="请输入项目面积（公顷）"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">用地单位</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.dwMc"
+                placeholder="请输入用地单位"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">土地坐落</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.tdZl"
+                placeholder="请输入土地坐落"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">土地用途</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.dkYt"
+                placeholder="请输入土地用途"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">所属平台</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.pt"
+                placeholder="请输入所属平台"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">容积率</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.rjl"
+                placeholder="请输入容积率"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">出让金/划拨价款（万元）</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.crj"
+                placeholder="请输入出让金/划拨价款（万元）"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">约定开工时间</div>
+            <div class="content">
+              <el-date-picker
+                v-model="detailData.ydkgsj"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择约定开工时间"
+                :disabled="!editor"
+                style="width: 100%;"
+              />
+            </div>
+            <div class="title">约定竣工时间</div>
+            <div class="content">
+              <el-date-picker
+                v-model="detailData.ydjgsj"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择约定约定竣工时间"
+                :disabled="!editor"
+                style="width: 100%;"
+              />
+            </div>
+            <div class="title">备注</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.bz"
+                placeholder="请输入备注"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
           </div>
-          <div class="title">项目名称</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.dkMc"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="!editor"
-            />
+          <div class="btn-group" v-if="editor">
+            <el-button type="primary" @click="onSavePcHandle">保存</el-button>
           </div>
-          <div class="title">出让合同/划拨决定书编号</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.htydpzbh"
-              placeholder="请输入出让合同/划拨决定书编号"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">项目类型</div>
-          <div class="content">
-            <el-select v-model="detailData.djklx">
-              <el-option label="出让" value="出让"></el-option>
-              <el-option label="划拨" value="划拨"></el-option>
-              <el-option label="集体土地" value="集体土地"></el-option>
-            </el-select>
-          </div>
-          <div class="title">批准文号</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.dkBh"
-              placeholder="请输入批准文号"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">签订日期</div>
-          <div class="content">
-            <el-date-picker
-              v-model="detailData.htsj"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择签订日期"
-            />
-          </div>
-          <div class="title">项目面积（公顷）</div>
-          <div class="content">
-            <el-input
-              v-model="dkMjHa"
-              placeholder="请输入项目面积（公顷）"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">用地单位</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.dwMc"
-              placeholder="请输入用地单位"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">土地坐落</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.tdZl"
-              placeholder="请输入土地坐落"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">土地用途</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.dkYt"
-              placeholder="请输入土地用途"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">所属平台</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.pt"
-              placeholder="请输入所属平台"
-              clearable
-              :disabled="true"
-            />
-          </div>
-          <div class="title">容积率</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.rjl"
-              placeholder="请输入容积率"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">出让金/划拨价款（万元）</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.crj"
-              placeholder="请输入出让金/划拨价款（万元）"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">约定开工时间</div>
-          <div class="content">
-            <el-date-picker
-              v-model="detailData.ydkgsj"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择约定开工时间"
-            />
-          </div>
-          <div class="title">约定竣工时间</div>
-          <div class="content">
-            <el-date-picker
-              v-model="detailData.ydjgsj"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择约定约定竣工时间"
-            />
-          </div>
-          <div class="title">备注</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.bz"
-              placeholder="请输入备注"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-        </div>
-        <div class="btn-group">
-          <el-button type="primary" @click="onSavePcHandle">保存</el-button>
         </div>
       </el-tab-pane>
       <el-tab-pane label="查看地图" name="tab2">
@@ -258,17 +269,24 @@ export default {
 </script>
 
 <style scoped lang="scss">
+@import url("../common.scss");
 .xm-detal {
   width: 100%;
-  .map_box {
+  .map_box, .table_box {
     width: 100%;
     height: 600px;
   }
+  .table_box {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    overflow-y: auto;
+  }
   .btn-group {
     margin-top: 20px;
     text-align: right;
   }
-  $t_w: 155px;
+  $t_w: 185px;
   .tables_grid {
     display: flex;
     flex-wrap: wrap;
@@ -276,7 +294,7 @@ export default {
     border-top: 1px solid #d6d6d6;
     border-right: 1px solid #d6d6d6;
     display: grid;
-    grid-template-columns: repeat(4, $t_w 1fr);
+    grid-template-columns: repeat(2, $t_w 1fr);
     >div {
       border-left: 1px solid #d6d6d6;
       border-bottom: 1px solid #d6d6d6;
@@ -289,6 +307,9 @@ export default {
         font-family: AlibabaPuHuiTiM;
         font-weight: normal;
         text-align: center;
+        display: flex;
+        align-items: center;
+        justify-content: center;
       }
     }
   }

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

@@ -2,128 +2,138 @@
   <div class="xm-detal">
     <el-tabs type="border-card" v-model="currentTab" @tab-click="handleTabClick">
       <el-tab-pane label="项目信息" name="tab1">
-        <div class="tables">
-          <div class="title">项目索引</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.xmbh"
-              placeholder="请输入项目索引"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">项目名称</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.xmmc"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">批复文号</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.pzwh"
-              placeholder="请输入批复文号"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">用地单位</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.yddw"
-              placeholder="请输入用地单位"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">批准面积</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.pzmj"
-              placeholder="请输入批准面积"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">批准单位</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.pzdw"
-              placeholder="请输入批准单位"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">坐落位置</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.zlwz"
-              placeholder="请输入坐落位置"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">入库年份</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.rknf"
-              placeholder="请输入入库年份"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">批准时间</div>
-          <div class="content">
-            <el-date-picker
-              v-model="detailData.pzsj"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择批准时间"
+        <div class="table_box">
+          <div class="tables">
+            <div class="title">项目索引</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.xmbh"
+                placeholder="请输入项目索引"
+                clearable
+                :disabled="!editor"
               />
-          </div>
-          <div class="title">到期时间</div>
-          <div class="content">
-            <el-date-picker
-              v-model="detailData.dqsj"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择到期时间"
+            </div>
+            <div class="title">项目名称</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.xmmc"
+                placeholder="请输入项目名称"
+                clearable
+                :disabled="!editor"
               />
-          </div>
-          <div class="title">入库时间</div>
-          <div class="content">
-            <el-date-picker
-              v-model="detailData.rksj"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请输入入库时间"
+            </div>
+            <div class="title">批复文号</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.pzwh"
+                placeholder="请输入批复文号"
+                clearable
+                :disabled="!editor"
               />
+            </div>
+            <div class="title">用地单位</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.yddw"
+                placeholder="请输入用地单位"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">批准面积</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.pzmj"
+                placeholder="请输入批准面积"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">批准单位</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.pzdw"
+                placeholder="请输入批准单位"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">坐落位置</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.zlwz"
+                placeholder="请输入坐落位置"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">入库年份</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.rknf"
+                placeholder="请输入入库年份"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">批准时间</div>
+            <div class="content">
+              <el-date-picker
+                v-model="detailData.pzsj"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择批准时间"
+                :disabled="!editor"
+                style="width: 100%;"
+                />
+            </div>
+            <div class="title">到期时间</div>
+            <div class="content">
+              <el-date-picker
+                v-model="detailData.dqsj"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择到期时间"
+                :disabled="!editor"
+                style="width: 100%;"
+                />
+            </div>
+            <div class="title">入库时间</div>
+            <div class="content">
+              <el-date-picker
+                v-model="detailData.rksj"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请输入入库时间"
+                :disabled="!editor"
+                style="width: 100%;"
+                />
+            </div>
+            <div class="title">入库人员</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.rkry"
+                placeholder="请输入入库人员"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">备注</div>
+            <div class="content" style="grid-column: 2 / -1;">
+              <el-input
+                v-model="detailData.bz"
+                placeholder="请输入备注"
+                type="textarea"
+                rows="4"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
           </div>
-          <div class="title">入库人员</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.rkry"
-              placeholder="请输入入库人员"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">备注</div>
-          <div class="content" style="grid-column: 2 / -1;">
-            <el-input
-              v-model="detailData.bz"
-              placeholder="请输入备注"
-              clearable
-              :disabled="!editor"
-            />
+          <div class="btn-group" v-if="editor">
+            <el-button type="primary" @click="onSavePcHandle">保存</el-button>
           </div>
         </div>
-        <div class="btn-group">
-          <el-button type="primary" @click="onSavePcHandle">保存</el-button>
-        </div>
       </el-tab-pane>
       <el-tab-pane label="查看地图" name="tab2">
         <div class="map_box">
@@ -209,17 +219,24 @@ export default {
 </script>
 
 <style scoped lang="scss">
+@import url("../common.scss");
 .xm-detal {
   width: 100%;
-  .map_box {
+  .map_box, .table_box {
     width: 100%;
     height: 600px;
   }
+  .table_box {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    overflow-y: auto;
+  }
   .btn-group {
     margin-top: 20px;
     text-align: right;
   }
-  $t_w: 155px;
+  $t_w: 185px;
   .tables {
     display: flex;
     flex-wrap: wrap;
@@ -227,7 +244,7 @@ export default {
     border-top: 1px solid #d6d6d6;
     border-right: 1px solid #d6d6d6;
     display: grid;
-    grid-template-columns: repeat(4, $t_w 1fr);
+    grid-template-columns: repeat(2, $t_w 1fr);
     >div {
       border-left: 1px solid #d6d6d6;
       border-bottom: 1px solid #d6d6d6;
@@ -240,6 +257,9 @@ export default {
         font-family: AlibabaPuHuiTiM;
         font-weight: normal;
         text-align: center;
+        display: flex;
+        align-items: center;
+        justify-content: center;
       }
     }
   }

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

@@ -378,12 +378,12 @@ export default {
 </script>
 
 <style scoped lang="scss">
+@import url("../common.scss");
 .xm-detal {
   width: 100%;
   display: flex;
   align-items: flex-start;
   >div {
-      max-height: 580px;
     .btn-group {
       margin-top: 20px;
       text-align: right;
@@ -449,11 +449,14 @@ export default {
       margin-left: 20px;
     }
   }
-  .map_box {
-    height: 510px;
+  .map_box,.tables {
+    height: 600px;
   }
   .tables {
     width: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
     overflow-y: auto;
     table {
       width: 100%;

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

@@ -2,190 +2,196 @@
   <div class="xm-detal">
     <el-tabs type="border-card" v-model="currentTab" @tab-click="handleTabClick">
       <el-tab-pane label="项目信息" name="tab1">
-        <div class="tables">
-          <div class="title">批次索引</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.pcbh"
-              placeholder="请输入批次索引"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">批次名称</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.pch"
-              placeholder="请输入批次名称"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">项目编号</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.dkBh"
-              placeholder="请输入项目编号"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">项目名称</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.dkMc"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">剩余面积(平方米)</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.area"
-              placeholder="请输入剩余面积(平方米)"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">乡镇街道</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.xzz"
-              placeholder="请输入乡镇街道"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">土地用途</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.dkYt"
-              placeholder="请输入土地用途"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">土地坐落</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.tdZl"
-              placeholder="请输入土地坐落"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">项目面积(公顷)</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.dkMj"
-              placeholder="请输入项目面积(公顷)"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">用地主体</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.dkQs"
-              placeholder="请输入用地主体"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">类型</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.lx"
-              placeholder="请输入类型"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">批准文号</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.pwh"
-              placeholder="请输入批准文号"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">批准日期</div>
-          <div class="content">
-            <el-date-picker
-              v-model="detailData.pzrq"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择拟批准日期"
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">批次总面积（公顷）</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.pzMj"
-              placeholder="请输入批次总面积（公顷）"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">是否农民建房</div>
-          <div class="content">
-            <el-select v-model="detailData.nmjf" :disabled="!editor">
-              <el-option value="是" label="是" />
-              <el-option value="否" label="否" />
-            </el-select>
-         </div>
-          <div class="title">备注</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.bz"
-              placeholder="请输入备注"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">未供原因</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.wgyy"
-              placeholder="请输入未供原因"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">有无利用价值</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.lyjz"
-              placeholder="请输入有无利用价值"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">拟处置方式</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.nczfs"
-              placeholder="请输入拟处置方式"
-              clearable
-              :disabled="!editor"
-            />
-         </div>
-          <div class="title">拟处置时间</div>
-          <div class="content">
-            <el-date-picker
-              v-model="detailData.nczsj"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择拟处置时间"
-              :disabled="!editor"
-            />
+        <div class="table_box">
+          <div class="tables">
+            <div class="title">批次索引</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.pcbh"
+                placeholder="请输入批次索引"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">批次名称</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.pch"
+                placeholder="请输入批次名称"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">项目编号</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.dkBh"
+                placeholder="请输入项目编号"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">项目名称</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.dkMc"
+                placeholder="请输入项目名称"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">剩余面积(平方米)</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.area"
+                placeholder="请输入剩余面积(平方米)"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">乡镇街道</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.xzz"
+                placeholder="请输入乡镇街道"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">土地用途</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.dkYt"
+                placeholder="请输入土地用途"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">土地坐落</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.tdZl"
+                placeholder="请输入土地坐落"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">项目面积(公顷)</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.dkMj"
+                placeholder="请输入项目面积(公顷)"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">用地主体</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.dkQs"
+                placeholder="请输入用地主体"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">类型</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.lx"
+                placeholder="请输入类型"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">批准文号</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.pwh"
+                placeholder="请输入批准文号"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">批准日期</div>
+            <div class="content">
+              <el-date-picker
+                v-model="detailData.pzrq"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择拟批准日期"
+                :disabled="!editor"
+                style="width: 100%;"
+              />
+          </div>
+            <div class="title">批次总面积（公顷）</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.pzMj"
+                placeholder="请输入批次总面积（公顷）"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">是否农民建房</div>
+            <div class="content">
+              <el-select v-model="detailData.nmjf" 
+                :disabled="!editor" 
+                style="width: 100%;">
+                <el-option value="是" label="是" />
+                <el-option value="否" label="否" />
+              </el-select>
+          </div>
+            <div class="title">备注</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.bz"
+                placeholder="请输入备注"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">未供原因</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.wgyy"
+                placeholder="请输入未供原因"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">有无利用价值</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.lyjz"
+                placeholder="请输入有无利用价值"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">拟处置方式</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.nczfs"
+                placeholder="请输入拟处置方式"
+                clearable
+                :disabled="!editor"
+              />
+          </div>
+            <div class="title">拟处置时间</div>
+            <div class="content">
+              <el-date-picker
+                v-model="detailData.nczsj"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择拟处置时间"
+                :disabled="!editor"
+                style="width: 100%;"
+              />
+            </div>
+          </div>
+          <div class="btn-group">
+            <el-button type="primary" @click="onSavePcHandle">保存</el-button>
           </div>
-        </div>
-        <div class="btn-group">
-          <el-button type="primary" @click="onSavePcHandle">保存</el-button>
         </div>
       </el-tab-pane>
       <el-tab-pane label="查看地图" name="tab2">
@@ -229,8 +235,6 @@ export default {
     queryDetail (id) {
       if(!id) return
       this.$ajax.get(`/api/pewg/${id}`, null, this, true).then(res => {
-        console.log("res-----------")
-        console.log(res)
         if (res) {
           this.detailData = res
         }
@@ -278,17 +282,24 @@ export default {
 </script>
 
 <style scoped lang="scss">
+@import url("../common.scss");
 .xm-detal {
   width: 100%;
-  .map_box {
+  .map_box, .table_box {
     width: 100%;
     height: 600px;
   }
+  .table_box {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    overflow-y: auto;
+  }
   .btn-group {
     margin-top: 20px;
     text-align: right;
   }
-  $t_w: 155px;
+  $t_w: 185px;
   .tables {
     display: flex;
     flex-wrap: wrap;
@@ -296,7 +307,7 @@ export default {
     border-top: 1px solid #d6d6d6;
     border-right: 1px solid #d6d6d6;
     display: grid;
-    grid-template-columns: repeat(4, $t_w 1fr);
+    grid-template-columns: repeat(2, $t_w 1fr);
     >div {
       border-left: 1px solid #d6d6d6;
       border-bottom: 1px solid #d6d6d6;

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

@@ -2,92 +2,98 @@
   <div class="xm-detal">
     <el-tabs type="border-card" v-model="currentTab" @tab-click="handleTabClick">
       <el-tab-pane label="项目信息" name="tab1">
-        <div class="tables">
-          <div class="title">项目索引</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.xmbh"
-              placeholder="请输入项目索引"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">项目名称</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.xmmc"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">市</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.szs"
-              placeholder="请输入市"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">县区</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.xzq"
-              placeholder="请输入项目县区"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">备案号</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.bah"
-              placeholder="请输入备案号"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">备案面积</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.bamj"
-              placeholder="请输入备案面积"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">备案时间</div>
-          <div class="content">
-            <el-date-picker
-              v-model="detailData.basj"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请输入备案时间"
+        <div class="table_box">
+          <div class="tables">
+            <div class="title">项目索引</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.xmbh"
+                placeholder="请输入项目索引"
+                clearable
+                :disabled="!editor"
               />
+            </div>
+            <div class="title">项目名称</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.xmmc"
+                placeholder="请输入项目名称"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">市</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.szs"
+                placeholder="请输入市"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">县区</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.xzq"
+                placeholder="请输入项目县区"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">备案号</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.bah"
+                placeholder="请输入备案号"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">备案面积</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.bamj"
+                placeholder="请输入备案面积"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">备案时间</div>
+            <div class="content">
+              <el-date-picker
+                v-model="detailData.basj"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请输入备案时间"
+                :disabled="!editor"
+                style="width: 100%;"
+                />
+            </div>
+            <div class="title">用途</div>
+            <div class="content">
+              <el-input
+                v-model="detailData.yt"
+                placeholder="请输入用途"
+                clearable
+                :disabled="!editor"
+              />
+            </div>
+            <div class="title">备注</div>
+            <div class="content" style="grid-column: 2 / -1;">
+              <el-input
+                type="textarea"
+                rows="4"
+                v-model="detailData.bz"
+                placeholder=""
+                clearable
+                :disabled="!editor"
+              />
+            </div>
           </div>
-          <div class="title">用途</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.yt"
-              placeholder="请输入用途"
-              clearable
-              :disabled="!editor"
-            />
-          </div>
-          <div class="title">备注</div>
-          <div class="content">
-            <el-input
-              v-model="detailData.bz"
-              placeholder="请输入备注"
-              clearable
-              :disabled="!editor"
-            />
+          <div class="btn-group" v-if="editor">
+            <el-button type="primary" @click="onSavePcHandle">保存</el-button>
           </div>
         </div>
-        <div class="btn-group">
-          <el-button type="primary" @click="onSavePcHandle">保存</el-button>
-        </div>
       </el-tab-pane>
       <el-tab-pane label="查看地图" name="tab2">
         <div class="map_box">
@@ -173,17 +179,24 @@ export default {
 </script>
 
 <style scoped lang="scss">
+@import url("../common.scss");
 .xm-detal {
   width: 100%;
-  .map_box {
+  .map_box, .table_box {
     width: 100%;
     height: 600px;
   }
+  .table_box {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    overflow-y: auto;
+  }
   .btn-group {
     margin-top: 20px;
     text-align: right;
   }
-  $t_w: 155px;
+  $t_w: 185px;
   .tables {
     display: flex;
     flex-wrap: wrap;
@@ -191,7 +204,7 @@ export default {
     border-top: 1px solid #d6d6d6;
     border-right: 1px solid #d6d6d6;
     display: grid;
-    grid-template-columns: repeat(3, $t_w 1fr);
+    grid-template-columns: repeat(2, $t_w 1fr);
     >div {
       border-left: 1px solid #d6d6d6;
       border-bottom: 1px solid #d6d6d6;
@@ -204,6 +217,9 @@ export default {
         font-family: AlibabaPuHuiTiM;
         font-weight: normal;
         text-align: center;
+        display: flex;
+        align-items: center;
+        justify-content: center;
       }
     }
   }

YHYZT/client/src/views/SubMenu.vue

@@ -86,7 +86,7 @@ export default {
     &:not(:first-child) {
       // margin-top: 10px;
     }
-    &:hover, &.active  {
+    &.active  {
       background: #F3FBFF;
       cursor: pointer;
       .menu-name {