Browse Source

前端修改

develop
王健 4 years ago
parent
commit
37b9564691
  1. 65
      src/views/company/auction/insert.vue
  2. 203
      src/views/land/api/region.json
  3. 607
      src/views/land/handLand/index.vue
  4. 1617
      src/views/land/handLand/newLand.vue
  5. 1529
      src/views/land/noneHandLand/newLand.vue
  6. 2
      vue.config.js

65
src/views/company/auction/insert.vue

@ -3,34 +3,32 @@
<span class="tipsMy">*数据为必填项</span>
<el-form :model="editForm" class="myForm" :disabled="readOnly">
<el-row>
<el-col :span="6">
<el-form-item label="城市:">
<el-input v-model="editForm.city"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="地块编号:">
<el-input v-model="editForm.landCode"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="地块名称:">
<el-input v-model="editForm.landName"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="城市:">-->
<!-- <el-input v-model="editForm.city"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="地块编号:">-->
<!-- <el-input v-model="editForm.landCode"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="地块名称:">-->
<!-- <el-input v-model="editForm.landName"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-form-item label="成交时间:">
<el-date-picker
type="date"
placeholder="选择成交时间"
v-model="editForm.createDate"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
type="date"
placeholder="选择成交时间"
v-model="editForm.createDate"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="举牌排名:">
<el-input v-model="editForm.ranking"></el-input>
@ -46,13 +44,13 @@
<el-input v-model="editForm.raisePrice"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="名义楼面价(元/㎡):">
<el-input v-model="editForm.nominalFloorPrice"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="无偿移交比例(%)::">
<el-input v-model="editForm.percentUnpaidTransfers"></el-input>
@ -68,13 +66,13 @@
<el-input v-model="editForm.premiumRate"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="最后轮次:">
<el-input v-model="editForm.finalRound"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="竞得企业:">
<el-input v-model="editForm.winnerEnterprises"></el-input>
@ -85,14 +83,15 @@
<div class="dialog_op">
<el-button type="primary" @click="goBack">返回</el-button>
<el-button type="primary" @click="save" v-show="!readOnly"
>保存</el-button
>保存
</el-button
>
</div>
</div>
</template>
<script>
import { putAuction, queryData } from "./api/api";
import {putAuction, queryData} from "./api/api";
export default {
name: "newCity",
@ -259,9 +258,11 @@ export default {
/deep/ .el-collapse-item__header {
padding: 0 20px;
}
/deep/ .el-input {
width: 90%;
}
/deep/ .el-collapse-item {
margin-bottom: 10px;
padding-left: 10px;
@ -271,12 +272,15 @@ export default {
/deep/ .el-collapse-item__wrap {
border-top: 1px solid #e8eaec;
}
/deep/ .upload-demo {
text-align: center;
}
/deep/ .el-upload__tip {
text-align: right;
}
.ti-box {
span {
font-size: 1rem;
@ -294,25 +298,30 @@ export default {
padding: 5px;
z-index: 99999;
}
.tipsMy {
font-size: 11px;
margin-left: 20px;
margin-top: 20px;
display: inline-block;
}
/deep/ .el-row {
padding: 0 20px;
padding-top: 10px;
background-color: white;
box-shadow: 0px 5px 20px 0px rgba(208, 208, 208, 0.18);
}
/deep/ .el-form-item {
display: flex;
padding-top: 20px;
}
/deep/ .el-form-item__label {
width: 180px;
}
.myForm {
flex: 1;
overflow: auto;

203
src/views/land/api/region.json

@ -0,0 +1,203 @@
{
"渝中区": {
"渝中半岛": [
"大坪",
"渝中半岛"
]
},
"江北区": {
"大石坝": [
"寸滩",
"港城工业园"
],
"港城工业园": [
"大石坝"
],
"观音桥": [
"观音桥"
],
"江北农场": [
"江北农场"
],
"江北嘴": [
"江北嘴"
],
"铁山坪": [
"铁山坪"
],
"鱼复工业园": [
"鱼嘴",
"复盛"
]
},
"九龙坡区": {
"白市驿": [
"白市驿",
"金凤",
"含谷"
],
"大杨石": [
"九龙半岛",
"石坪桥",
"石桥铺",
"杨家坪"
],
"二郎双山": [
"二郎",
"双山"
],
"华岩": [
"华岩"
],
"陶家": [
"石板",
"陶家",
"西彭"
]
},
"南岸区": {
"茶园": [
"茶园南",
"茶园北"
],
"弹子石": [
"弹子石"
],
"南坪商圈": [
"南坪商圈"
],
"南山": [
"南山"
],
"新南湖": [
"新南湖"
]
},
"沙坪坝区": {
"大学城": [
"大学城",
"曾家",
"凤凰"
],
"老沙区": [
"沙坪坝",
"凤天路"
],
"双碑": [
"双碑"
],
"西永": [
"西永南",
"西永北",
"土主"
],
"井口": [
"井口"
],
"歌乐山": [
"歌乐山"
]
},
"大渡口区": {
"大渡口老城": [
"大渡口老城"
],
"跳蹬": [
"跳蹬西",
"跳蹬东"
],
"钓鱼嘴": [
"钓鱼嘴"
]
},
"渝北区": {
"大竹林": [
"大竹林"
],
"空港工业园": [
"空港工业园",
"鹿山"
],
"礼嘉": [
"礼嘉"
],
"两路空港": [
"两路",
"空港新城"
],
"汽博中心": [
"汽博",
"人和"
],
"台商-农业园区": [
"台商工业园西",
"农业园区"
],
"新牌坊": [
"新牌坊",
"冉家坝",
"龙头寺"
],
"照母山": [
"照母山"
],
"中央公园": [
"中央公园",
"中央公园北"
],
"龙兴": [
"龙兴"
],
"悦来": [
"悦来"
],
"园博园": [
"园博园"
]
},
"巴南区": {
"界石": [
"界石",
"南彭"
],
"李家沱": [
"李家沱"
],
"龙洲湾": [
"龙洲湾"
],
"鹿角": [
"鹿角"
],
"鱼洞": [
"鱼洞"
],
"高职城": [
"高职城"
]
},
"北碚区": {
"北碚城区": [
"北碚老城",
"歇马",
"东阳",
"澄江"
],
"蔡家": [
"蔡家北",
"蔡家南"
],
"水土": [
"水土南",
"水土北"
],
"静观": [
"静观"
]
},
"重庆市": {
"板块外": [
"板块外"
]
}
}

607
src/views/land/handLand/index.vue

@ -12,11 +12,11 @@
<span class="ti-tag">{{ setTagName(1) }}</span>
<div class="searchBox">
<el-tag
@close="closeTag(item,index)"
v-for="(item,index) in searchTag"
:key="index"
closable>
{{item}}
@close="closeTag(item,index)"
v-for="(item,index) in searchTag"
:key="index"
closable>
{{ item }}
</el-tag>
</div>
</div>
@ -24,134 +24,134 @@
<el-form style="margin-top: 40px;" :inline="true" :model="searchForm" class="demo-form-inline">
<el-form-item label="公告序号:">
<el-input
v-model="searchForm.annoId"
placeholder="请输入"
v-model="searchForm.annoId"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="地块编号:">
<el-input
v-model="searchForm.landCode"
placeholder="请输入"
v-model="searchForm.landCode"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="土地用途:">
<el-input
v-model="searchForm.landUsage"
placeholder="请输入"
v-model="searchForm.landUsage"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="公告日期:" prop="annoDate">
<el-date-picker
type="date"
placeholder="选择公告日期"
v-model="searchForm.annoDate"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
type="date"
placeholder="选择公告日期"
v-model="searchForm.annoDate"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
<el-form-item label="拍卖日期:" prop="auctionDate">
<el-date-picker
type="date"
placeholder="选择拍卖日期"
v-model="searchForm.auctionDate"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
type="date"
placeholder="选择拍卖日期"
v-model="searchForm.auctionDate"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
<el-form-item label="地质灾害:">
<el-input
v-model="searchForm.geologicHazard"
placeholder="请输入"
v-model="searchForm.geologicHazard"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="人防还建:">
<el-input
v-model="searchForm.civilAirDefence"
placeholder="请输入"
v-model="searchForm.civilAirDefence"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="特殊规划:">
<el-input
v-model="searchForm.specialPlan"
placeholder="请输入"
v-model="searchForm.specialPlan"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="勾地形式:">
<el-input
v-model="searchForm.hookForm"
placeholder="请输入"
v-model="searchForm.hookForm"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="勾地企业:">
<el-input
v-model="searchForm.landEnterprises"
placeholder="请输入"
v-model="searchForm.landEnterprises"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="城市:">
<el-input
v-model="searchForm.city"
placeholder="请输入"
></el-input>
</el-form-item>
<el-input
v-model="searchForm.city"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="行政区:">
<el-input
v-model="searchForm.canton"
placeholder="请输入"
v-model="searchForm.canton"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="大组团:">
<el-input
v-model="searchForm.bigGroup"
placeholder="请输入"
v-model="searchForm.bigGroup"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="小组团:">
<el-input
v-model="searchForm.smallGroup"
placeholder="请输入"
></el-input>
</el-form-item>
<el-input
v-model="searchForm.smallGroup"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="受让单位:">
<el-input
v-model="searchForm.assignee"
placeholder="请输入"
v-model="searchForm.assignee"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="拿地企业简称:">
<el-input
v-model="searchForm.landEnterpriseShort"
placeholder="请输入"
v-model="searchForm.landEnterpriseShort"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="参拍企业:">
<el-input
v-model="searchForm.participatingEnterprises"
placeholder="请输入"
v-model="searchForm.participatingEnterprises"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="项目状态:">
<el-input
v-model="searchForm.projectStatus"
placeholder="请输入"
v-model="searchForm.projectStatus"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="楼盘名称:">
<el-input
v-model="searchForm.buildingName"
placeholder="请输入"
v-model="searchForm.buildingName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="操盘企业:">
<el-input
v-model="searchForm.tradingEnterprises"
placeholder="请输入"
v-model="searchForm.tradingEnterprises"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="经营企业:">
<el-input
v-model="searchForm.conductEnterprise"
placeholder="请输入"
v-model="searchForm.conductEnterprise"
placeholder="请输入"
></el-input>
</el-form-item>
@ -163,8 +163,8 @@
</el-collapse-item>
</el-collapse>
<div class="btnGp">
<el-button type="primary" @click="onSubmit">查询</el-button>
<el-button @click="onReset">重置</el-button>
<el-button type="primary" @click="onSubmit">查询</el-button>
<el-button @click="onReset">重置</el-button>
</div>
</div>
</div>
@ -174,7 +174,7 @@
<div class="page_content_head_left">
<div>已挂牌地块列表</div>
<div style="margin-left: 10px">
<img src="@public/img/land/u1343.png" />
<img src="@public/img/land/u1343.png"/>
</div>
<div style="margin-left: 10px">
<span>已选择{{ selectedData.length }}</span>
@ -186,38 +186,41 @@
<div class="page_content_head_right">
<div>
<el-button @click="exportData" v-show="hasSelectData"
><img style="margin-right: 5px;" src="@public/img/land/u1340.png" />导出</el-button
><img style="margin-right: 5px;" src="@public/img/land/u1340.png"/>导出
</el-button
>
</div>
<div>
<el-button v-show="hasSelectData" @click="multiDelete"
><img style="margin-right: 5px;" src="@public/img/land/u1340.png" />批量删除</el-button
><img style="margin-right: 5px;" src="@public/img/land/u1340.png"/>批量删除
</el-button
>
</div>
<div>
<el-upload
class="upload-demo"
action=""
:before-upload="importData"
class="upload-demo"
action=""
:before-upload="importData"
>
<el-button size="medium" type="primary">导入数据</el-button>
</el-upload>
</div>
<div>
<el-tooltip
class="item"
effect="dark"
content="点击此处下载模版"
placement="bottom"
class="item"
effect="dark"
content="点击此处下载模版"
placement="bottom"
>
<el-button @click="downloadTemplate"
><i class="el-icon-download"></i
><i class="el-icon-download"></i
></el-button>
</el-tooltip>
</div>
<div style="margin-right: 0;">
<el-button @click="newItem" type="primary"
><i class="el-icon-plus"></i>新建</el-button
><i class="el-icon-plus"></i>新建
</el-button
>
</div>
</div>
@ -225,134 +228,137 @@
</div>
<div class="page_content_table">
<el-table
:data="tableData"
border
@selection-change="handleSelectionChange"
style="width: 100%"
max-height="630"
ref="multipleTable"
v-loading="loading"
:data="tableData"
border
@selection-change="handleSelectionChange"
style="width: 100%"
max-height="630"
ref="multipleTable"
v-loading="loading"
>
<el-table-column fixed type="selection" width="55"> </el-table-column>
<el-table-column fixed type="selection" width="55"></el-table-column>
<el-table-column label="公告信息">
<el-table-column
v-for="(item, index) in cols.slice(0,20)"
:key="index"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
v-for="(item, index) in cols.slice(0,20)"
:key="index"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>
<el-table-column label="规划条件">
<el-table-column
v-for="(item, index) in cols.slice(20,24)"
:key="index"
:prop="item.prop"
:label="item.label"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
v-for="(item, index) in cols.slice(20,24)"
:key="index"
:prop="item.prop"
:label="item.label"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>
<el-table-column label="建设条件">
<el-table-column
v-for="(item, index) in cols.slice(24,31)"
:key="index"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
v-for="(item, index) in cols.slice(24,31)"
:key="index"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>
<el-table-column label="竞买条件">
<el-table-column
v-for="(item, index) in cols.slice(31,37)"
:key="index"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
v-for="(item, index) in cols.slice(31,37)"
:key="index"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>
<el-table-column label="地理信息">
<el-table-column
v-for="(item, index) in cols.slice(37,45)"
:key="index"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
v-for="(item, index) in cols.slice(37,45)"
:key="index"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>
<el-table-column label="成交信息">
<el-table-column
v-for="(item, index) in cols.slice(45,57)"
:key="index"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
v-for="(item, index) in cols.slice(45,57)"
:key="index"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>
<el-table-column label="项目开发">
<el-table-column
v-for="(item, index) in cols.slice(57,65)"
:key="index"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
v-for="(item, index) in cols.slice(57,65)"
:key="index"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>
<!-- <el-table-column label="项目资料">-->
<!-- <el-table-column-->
<!-- v-for="(item, index) in cols.slice(65,74)"-->
<!-- :key="index"-->
<!-- :label="item.label"-->
<!-- :prop="item.prop"-->
<!-- :width="item.width"-->
<!-- :fixed="item.fixed"-->
<!-- show-overflow-tooltip-->
<!-- >-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="项目资料">-->
<!-- <el-table-column-->
<!-- v-for="(item, index) in cols.slice(65,74)"-->
<!-- :key="index"-->
<!-- :label="item.label"-->
<!-- :prop="item.prop"-->
<!-- :width="item.width"-->
<!-- :fixed="item.fixed"-->
<!-- show-overflow-tooltip-->
<!-- >-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<el-table-column fixed="right" label="操作" width="200">
<template slot-scope="scope">
<el-button title="111" type="text" size="small" @click="viewItem(scope.row)"
>详情</el-button
>详情
</el-button
>
<el-button type="text" size="small" @click="editItem(scope.row)"
>编辑</el-button
>编辑
</el-button
>
<el-button type="text" size="small" @click="delItem(scope.row)"
>删除</el-button
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
<div class="page_page">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-sizes="[10, 20, 30, 40]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-sizes="[10, 20, 30, 40]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
@ -383,8 +389,8 @@ import {
queryRecord,
deleteRecord,
} from "@/views/land/api/land";
import { uploadFile } from "@/views/api/api";
import { downUrlFile } from "@/util/file";
import {uploadFile} from "@/views/api/api";
import {downUrlFile} from "@/util/file";
import fileDownload from "js-file-download";
export default {
@ -401,50 +407,50 @@ export default {
landUsage: "",
//
annoDate: "",
auctionDate:"",//
geologicHazard:"",//
civilAirDefence:"",//
specialPlan:"",//
hookForm:"",//
landEnterprises:"",//
city:"",//
canton:"",//
bigGroup:"",//
smallGroup:"",//
assignee:"",//
landEnterpriseShort:"",//
participatingEnterprises:"",//
projectStatus:"",//
buildingName:"",//
tradingEnterprises:"",//
conductEnterprise:"",//
auctionDate: "",//
geologicHazard: "",//
civilAirDefence: "",//
specialPlan: "",//
hookForm: "",//
landEnterprises: "",//
city: "",//
canton: "",//
bigGroup: "",//
smallGroup: "",//
assignee: "",//
landEnterpriseShort: "",//
participatingEnterprises: "",//
projectStatus: "",//
buildingName: "",//
tradingEnterprises: "",//
conductEnterprise: "",//
},
searchDict:[
{code:'annoId',label:'公告序号'},
{code:'landCode',label:'地块编号'},
{code:'landUsage',label:'土地用途'},
{code:'annoDate',label:'公告日期'},
{code:'auctionDate',label:'拍卖日期'},
searchDict: [
{code: 'annoId', label: '公告序号'},
{code: 'landCode', label: '地块编号'},
{code: 'landUsage', label: '土地用途'},
{code: 'annoDate', label: '公告日期'},
{code: 'auctionDate', label: '拍卖日期'},
{code:'geologicHazard',label:'地质灾害'},
{code:'civilAirDefence',label:'人防还建'},
{code:'specialPlan',label:'特殊规划'},
{code:'hookForm',label:'勾地形式'},
{code:'landEnterprises',label:'勾地企业'},
{code: 'geologicHazard', label: '地质灾害'},
{code: 'civilAirDefence', label: '人防还建'},
{code: 'specialPlan', label: '特殊规划'},
{code: 'hookForm', label: '勾地形式'},
{code: 'landEnterprises', label: '勾地企业'},
{code:'city',label:'城市'},
{code:'canton',label:'行政区'},
{code:'bigGroup',label:'大组团'},
{code:'smallGroup',label:'小组团'},
{code:'assignee',label:'受让单位'},
{code: 'city', label: '城市'},
{code: 'canton', label: '行政区'},
{code: 'bigGroup', label: '大组团'},
{code: 'smallGroup', label: '小组团'},
{code: 'assignee', label: '受让单位'},
{code:'landEnterpriseShort',label:'拿地企业简称'},
{code:'participatingEnterprises',label:'参拍企业'},
{code:'projectStatus',label:'项目状态'},
{code:'buildingName',label:'楼盘名称'},
{code:'tradingEnterprises',label:'操盘企业'},
{code:'conductEnterprise',label:'经营企业'},
{code: 'landEnterpriseShort', label: '拿地企业简称'},
{code: 'participatingEnterprises', label: '参拍企业'},
{code: 'projectStatus', label: '项目状态'},
{code: 'buildingName', label: '楼盘名称'},
{code: 'tradingEnterprises', label: '操盘企业'},
{code: 'conductEnterprise', label: '经营企业'},
],
tableData: [],
@ -784,7 +790,7 @@ export default {
// Form
editForm: {},
activeNames: [],
searchTag:[],
searchTag: [],
//
loading: false,
//
@ -799,13 +805,13 @@ export default {
uploadFiles: [],
rules: {
annoId: [
{ required: true, message: "请输入公告序号", trigger: "blur" },
{required: true, message: "请输入公告序号", trigger: "blur"},
],
landCode: [
{ required: true, message: "请输入地块编号", trigger: "blur" },
{required: true, message: "请输入地块编号", trigger: "blur"},
],
landPosition: [
{ required: true, message: "请输入地块位置", trigger: "blur" },
{required: true, message: "请输入地块位置", trigger: "blur"},
],
},
isLonLatEdit: false,
@ -878,26 +884,26 @@ export default {
setTagName(val) {
let txt = "";
this.activeNames.some((item) => item == val)
? (txt = "收起")
: (txt = "展开");
? (txt = "收起")
: (txt = "展开");
return txt;
},
getList(page, params) {
this.tableLoading = true;
fetchHandLandList(
Object.assign({
current: page.currentPage,
size: page.pageSize,
})
Object.assign({
current: page.currentPage,
size: page.pageSize,
})
)
.then((response) => {
this.tableData = response.data.data.records;
this.page.total = response.data.data.total;
this.loading = false;
})
.catch(() => {
this.loading = false;
});
.then((response) => {
this.tableData = response.data.data.records;
this.page.total = response.data.data.total;
this.loading = false;
})
.catch(() => {
this.loading = false;
});
},
//
@ -905,36 +911,36 @@ export default {
console.log("editItemChange", val);
},
//
closeTag(data,index){
this.searchTag.splice(index,1);
let name=data.split(':')[0];
let code='';
this.searchDict.map(e=>{
if (e.label===name){
code=e.code
closeTag(data, index) {
this.searchTag.splice(index, 1);
let name = data.split(':')[0];
let code = '';
this.searchDict.map(e => {
if (e.label === name) {
code = e.code
}
});
for (let key in this.searchForm){
if (key===code){
this.searchForm[key]=''
for (let key in this.searchForm) {
if (key === code) {
this.searchForm[key] = ''
}
}
this.onSubmit()
},
//
confirmSearch(){
this.activeNames=[];
this.searchTag=[];
let list=[]
for (let key in this.searchForm){
if (this.searchForm[key]!=''&&this.searchForm[key]){
list.push({label:key,value:this.searchForm[key]})
confirmSearch() {
this.activeNames = [];
this.searchTag = [];
let list = []
for (let key in this.searchForm) {
if (this.searchForm[key] != '' && this.searchForm[key]) {
list.push({label: key, value: this.searchForm[key]})
}
}
list.map(e=>{
this.searchDict.map(f=>{
if (e.label==f.code){
this.searchTag.push(f.label+':'+e.value)
list.map(e => {
this.searchDict.map(f => {
if (e.label == f.code) {
this.searchTag.push(f.label + ':' + e.value)
}
})
})
@ -944,11 +950,11 @@ export default {
onSubmit() {
this.loading = true;
let param = Object.assign(
{
current: this.page.currentPage,
size: this.page.pageSize,
},
this.searchForm
{
current: this.page.currentPage,
size: this.page.pageSize,
},
this.searchForm
);
// for(let key in this.searchForm){
// if (this.searchForm[key]==''){
@ -956,14 +962,14 @@ export default {
// }
// }
fetchHandLandList(param)
.then((response) => {
this.tableData = response.data.data.records;
this.page.total = response.data.data.total;
this.loading = false;
})
.catch(() => {
this.loading = false;
});
.then((response) => {
this.tableData = response.data.data.records;
this.page.total = response.data.data.total;
this.loading = false;
})
.catch(() => {
this.loading = false;
});
},
//
@ -971,7 +977,7 @@ export default {
for (let item in this.searchForm) {
this.searchForm[item] = "";
}
this.searchTag=[];
this.searchTag = [];
this.onSubmit()
},
@ -991,7 +997,7 @@ export default {
exportHandLandListExcel(ids.toString()).then((res) => {
// fileDownload(res.data, "kg.xlsx");
const aLink = document.createElement("a");
let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
let blob = new Blob([res.data], {type: "application/vnd.ms-excel"});
aLink.href = URL.createObjectURL(blob);
aLink.setAttribute("download", "kg" + ".xls"); //
aLink.click();
@ -1024,8 +1030,8 @@ export default {
//
viewItem(row) {
let data=row.landListedId
this.$router.push({path:'/land/handLand/newLand',query:{readOnly:'true',isEditOr:'false',data:data}});
let data = row.landListedId
this.$router.push({path: '/land/handLand/newLand', query: {readOnly: 'true', isEditOr: 'false', data: data}});
// this.dialogTitle = "";
// this.readOnly = true;
// this.dialogFormVisible = true;
@ -1037,8 +1043,8 @@ export default {
// this.dialogTitle = "";
// this.readOnly = false;
// this.dialogFormVisible = true;
let data=row.landListedId
this.$router.push({path:'/land/handLand/newLand',query:{readOnly:'false',isEditOr:'true',data:data}});
let data = row.landListedId
this.$router.push({path: '/land/handLand/newLand', query: {readOnly: 'false', isEditOr: 'true', data: data}});
// this.editForm = row;
// this.onlyId = row.landListedId;
// this.queryLonLatList(row.landListedId);
@ -1056,20 +1062,21 @@ export default {
cancelButtonClass: "btn-custom-cancel",
type: "warning",
})
.then(function () {
delHandLandObj(ids).then((res) => {
if (res.data.success) {
me.$message({
type: 'success',
message: '删除成功'
});
me.onSubmit();
} else {
me.$message("删除失败");
}
.then(function () {
delHandLandObj(ids).then((res) => {
if (res.data.success) {
me.$message({
type: 'success',
message: '删除成功'
});
me.onSubmit();
} else {
me.$message("删除失败");
}
});
})
.catch(function () {
});
})
.catch(function () {});
},
//
multiDelete() {
@ -1099,7 +1106,7 @@ export default {
//
newItem() {
this.$router.push({path:'/land/handLand/newLand',query:{readOnly:'false',isEditOr:'false',}});
this.$router.push({path: '/land/handLand/newLand', query: {readOnly: 'false', isEditOr: 'false',}});
// cols
// let newObj = {};
// for (let col of this.cols) {
@ -1150,7 +1157,7 @@ export default {
});
},
queryRecordList(landListedId) {
queryRecord({ landListedId: landListedId }).then((response) => {
queryRecord({landListedId: landListedId}).then((response) => {
if (response.data.success) {
let index = 0;
this.landRecord = response.data.data.records;
@ -1430,10 +1437,10 @@ export default {
uploadRes(row) {
let landListedId = this.editForm.landListedId;
saveLandResFile(
row.fileName,
row.filePath,
this.activeType,
landListedId
row.fileName,
row.filePath,
this.activeType,
landListedId
).then((res) => {
if (res.data.success) {
this.$message({
@ -1493,9 +1500,11 @@ export default {
<style lang="scss" scoped>
//
@import "@/styles/public.scss";
/deep/ .el-dialog {
margin-top: 9vh !important;
}
/deep/ .el-dialog__body {
padding-top: 20px;
height: 80vh;
@ -1504,9 +1513,11 @@ export default {
display: flex;
flex-direction: column;
}
/deep/ .el-input {
width: 90%;
}
/deep/ .el-collapse-item {
margin-bottom: 10px;
padding-left: 10px;
@ -1516,14 +1527,18 @@ export default {
/deep/ .el-collapse-item__wrap {
border-top: 1px solid #e8eaec;
}
/deep/ .upload-demo {
text-align: center;
}
/deep/ .el-upload__tip {
text-align: right;
}
.ti-box {
position: relative;
span {
font-size: 1rem;
}
@ -1539,25 +1554,31 @@ export default {
border-top: 1px solid #e8eaec;
padding: 5px;
}
/deep/ .el-collapse{
border: none;
}
/deep/ .el-form-item__content{
width: 202px;
}
.btnGp{
text-align: right;
margin-top: 20px;
}
/deep/ .el-tag{
margin-right: 8px;
}
/deep/ .el-collapse-item__header{
height: 70px;
line-height: 28px;
}
/deep/ .el-form-item__label{
width: 160px;
}
/deep/ .el-collapse {
border: none;
}
/deep/ .el-form-item__content {
width: 202px;
}
.btnGp {
text-align: right;
margin-top: 20px;
}
/deep/ .el-tag {
margin-right: 8px;
}
/deep/ .el-collapse-item__header {
height: 70px;
line-height: 28px;
}
/deep/ .el-form-item__label {
width: 160px;
}
</style>

1617
src/views/land/handLand/newLand.vue

File diff suppressed because it is too large Load Diff

1529
src/views/land/noneHandLand/newLand.vue

File diff suppressed because it is too large Load Diff

2
vue.config.js

@ -6,7 +6,7 @@ const path = require('path')
function resolve(dir) {
return path.join(__dirname, dir)
}
// const url = 'http://192.168.27.11:9002'; //裴
// const url = 'http://192.168.209.210:9002'; //裴
const url = 'https://yoursairdata.com/api';//生产
module.exports = {
lintOnSave: true,

Loading…
Cancel
Save