guolong
/
front-end
0
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

18.02

develop
zhangjy 4 years ago
parent
39bdc86359
commit
f71b806597
8 changed files with 4222 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      src/router/views/index.js
  2. 2
      src/styles/sidebar.scss
  3. 17
      src/views/land/api/land.js
  4. 111
      src/views/land/handLand/index.vue
  5. 2116
      src/views/land/handLand/newLand.vue
  6. 90
      src/views/land/noneHandLand/index.vue
  7. 1933
      src/views/land/noneHandLand/newLand.vue
  8. 2
      vue.config.js

24
src/router/views/index.js
Unescape View File

@ -69,5 +69,27 @@ export default [{
import( /* webpackChunkName: "views" */ '@/views/company/auction/insert')
}, ]
},
{
path: '/land',
component: Layout,
redirect: '/land',
children: [{
path: 'handLand/newLand',
name: '编辑土地',
meta: {
keepAlive: false
},
component: () =>
import( /* webpackChunkName: "views" */ '../../views/land/handLand/newLand')
},
{
path: 'noneHandLand/newLand',
name: '编辑土地',
meta: {
keepAlive: false
},
component: () =>
import( /* webpackChunkName: "views" */ '../../views/land/noneHandLand/newLand')
},]
},
]

2
src/styles/sidebar.scss
Unescape View File

@ -120,7 +120,7 @@
span,
i {
color: rgba(255, 255, 255, 1);
//color: rgba(255, 255, 255, 1);
}
}
}

17
src/views/land/api/land.js
Unescape View File

@ -9,17 +9,28 @@ export function fetchHandLandList(query) {
})
}
// 保存、编辑地块
export function saveHandLandList(param) {
// 保存地块
export function saveHandLandList(param,type) {
return request({
url: '/api/landlisted',
method: 'post',
method: type,
headers: {
'Content-Type': 'application/json'
},
data: param
})
}
// // 编辑地块
// export function putHandLandList(param) {
// return request({
// url: '/api/landlisted',
// method: 'put',
// headers: {
// 'Content-Type': 'application/json'
// },
// data: param
// })
// }
// 字典表查询
export function getDict(data) {
return request({

111
src/views/land/handLand/index.vue
Unescape View File

@ -57,12 +57,12 @@
<div class="page_content_head_right">
<div>
<el-button @click="exportData" v-show="hasSelectData"
><img 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 src="@public/img/land/u1340.png" />批量删除</el-button
><img style="margin-right: 5px;" src="@public/img/land/u1340.png" />批量删除</el-button
>
</div>
<div>
@ -105,15 +105,41 @@
v-loading="loading"
>
<el-table-column fixed type="selection" width="55"> </el-table-column>
<el-table-column
v-for="(item, index) in cols"
:key="index"
:prop="item.prop"
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
>
<el-table-column label="公告信息">
<el-table-column
v-for="(item, index) in cols.slice(0,3)"
:key="index"
:prop="item.prop"
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
>
</el-table-column>
</el-table-column>
<el-table-column label="规划条件">
<el-table-column
v-for="(item, index) in cols.slice(3,40)"
:key="index"
:prop="item.prop"
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
>
</el-table-column>
</el-table-column>
<el-table-column label="建设条件">
<el-table-column
v-for="(item, index) in cols.slice(40,62)"
:key="index"
:prop="item.prop"
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
>
</el-table-column>
</el-table-column>
<el-table-column fixed="right" label="操作" width="200">
<template slot-scope="scope">
@ -1274,7 +1300,6 @@ export default {
label: "土地用途",
prop: "landUsage",
width: 150,
fixed: true,
},
{
label: "土地出让面积(㎡)",
@ -1647,12 +1672,12 @@ export default {
},
computed: {},
watch: {
page: {
handler(newVal, oldVal) {
this.onSubmit();
},
deep: true,
},
// page: {
// handler(newVal, oldVal) {
// this.onSubmit();
// },
// deep: true,
// },
selectedData: {
handler(newVal, oldVal) {
this.hasSelectData = newVal.length > 0 ? true : false;
@ -1709,6 +1734,11 @@ export default {
},
this.searchForm
);
// for(let key in this.searchForm){
// if (this.searchForm[key]==''){
// param.current=1
// }
// }
fetchHandLandList(param)
.then((response) => {
this.tableData = response.data.data.records;
@ -1773,22 +1803,26 @@ export default {
// 查看
viewItem(row) {
this.dialogTitle = "查看数据";
this.readOnly = true;
this.dialogFormVisible = true;
this.editForm = row;
let data=JSON.stringify(row)
this.$router.push({path:'/land/handLand/newLand',query:{readOnly:'true',isEditOr:'false',data:data}});
// this.dialogTitle = "查看数据";
// this.readOnly = true;
// this.dialogFormVisible = true;
// this.editForm = row;
},
// 编辑
editItem(row) {
this.dialogTitle = "编辑数据";
this.readOnly = false;
this.dialogFormVisible = true;
this.editForm = row;
this.onlyId = row.landListedId;
this.queryLonLatList(row.landListedId);
this.queryRecordList(row.landListedId);
this.queryFileList();
// this.dialogTitle = "编辑数据";
// this.readOnly = false;
// this.dialogFormVisible = true;
let data=JSON.stringify(row)
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);
// this.queryRecordList(row.landListedId);
// this.queryFileList();
},
// 删除单个
@ -1838,14 +1872,15 @@ export default {
// 新建
newItem() {
this.$router.push({path:'/land/handLand/newLand',query:{readOnly:'false',isEditOr:'false',}});
// 从cols里面拷贝字段
let newObj = {};
for (let col of this.cols) {
newObj[col.prop] = "";
}
this.editForm = newObj;
this.readOnly = false;
this.dialogFormVisible = true;
// let newObj = {};
// for (let col of this.cols) {
// newObj[col.prop] = "";
// }
// this.editForm = newObj;
// this.readOnly = false;
// this.dialogFormVisible = true;
},
// 下载模板
@ -1858,10 +1893,12 @@ export default {
handleSizeChange(val) {
this.page.pageSize = val;
this.onSubmit();
},
handleCurrentChange(val) {
this.page.currentPage = val;
this.onSubmit();
},
// 清空选中

2116
src/views/land/handLand/newLand.vue
View File

File diff suppressed because it is too large Load Diff

90
src/views/land/noneHandLand/index.vue
Unescape View File

@ -57,12 +57,12 @@
<div class="page_content_head_right">
<div>
<el-button @click="exportData" v-show="hasSelectData"
><img 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 src="@public/img/land/u1340.png" />批量删除</el-button
><img style="margin-right: 5px;" src="@public/img/land/u1340.png" />批量删除</el-button
>
</div>
<div>
@ -104,15 +104,41 @@
v-loading="loading"
>
<el-table-column fixed type="selection" width="55"> </el-table-column>
<el-table-column
v-for="(item, index) in cols"
:key="index"
:prop="item.prop"
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
>
<el-table-column label="公告信息">
<el-table-column
v-for="(item, index) in cols.slice(0,3)"
:key="index"
:prop="item.prop"
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
>
</el-table-column>
</el-table-column>
<el-table-column label="规划条件">
<el-table-column
v-for="(item, index) in cols.slice(3,40)"
:key="index"
:prop="item.prop"
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
>
</el-table-column>
</el-table-column>
<el-table-column label="建设条件">
<el-table-column
v-for="(item, index) in cols.slice(40,62)"
:key="index"
:prop="item.prop"
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
>
</el-table-column>
</el-table-column>
<el-table-column fixed="right" label="操作" width="200">
<template slot-scope="scope">
@ -1173,7 +1199,6 @@ export default {
label: "预计挂牌时间",
prop: "estimatedListingTime",
width: 150,
fixed: true,
},
{
label: "公告序号",
@ -1693,21 +1718,25 @@ export default {
// 查看
viewItem(row) {
this.dialogTitle = "查看数据";
this.readOnly = true;
this.dialogFormVisible = true;
this.editForm = row;
let data=JSON.stringify(row)
this.$router.push({path:'/land/noneHandLand/newLand',query:{readOnly:'true',isEditOr:'false',data:data}});
// this.dialogTitle = "查看数据";
// this.readOnly = true;
// this.dialogFormVisible = true;
// this.editForm = row;
},
// 编辑
editItem(row) {
this.dialogTitle = "编辑数据";
this.readOnly = false;
this.dialogFormVisible = true;
this.editForm = row;
this.onlyId = row.proposedseriaId;
this.queryLonLatList(row.proposedseriaId);
this.queryFileList();
let data=JSON.stringify(row)
this.$router.push({path:'/land/noneHandLand/newLand',query:{readOnly:'false',isEditOr:'true',data:data}});
// this.dialogTitle = "编辑数据";
// this.readOnly = false;
// this.dialogFormVisible = true;
// this.editForm = row;
// this.onlyId = row.proposedseriaId;
// this.queryLonLatList(row.proposedseriaId);
// this.queryFileList();
},
// 删除单个
@ -1735,14 +1764,15 @@ export default {
// 新建
newItem() {
this.$router.push({path:'/land/noneHandLand/newLand',query:{readOnly:'false',isEditOr:'false',}});
// 从cols里面拷贝字段
let newObj = {};
for (let col of this.cols) {
newObj[col.prop] = "";
}
this.editForm = newObj;
this.readOnly = false;
this.dialogFormVisible = true;
// let newObj = {};
// for (let col of this.cols) {
// newObj[col.prop] = "";
// }
// this.editForm = newObj;
// this.readOnly = false;
// this.dialogFormVisible = true;
},
//分布保存

1933
src/views/land/noneHandLand/newLand.vue
View File

File diff suppressed because it is too large Load Diff

2
vue.config.js
Unescape View File

@ -7,7 +7,7 @@
return path.join(__dirname, dir)
}
//const url = 'http://192.168.23.30:9002'
const url = 'http://192.168.28.41:9002';
const url = 'http://192.168.24.3:9002';
// const url = 'http://139.159.180.147:9002'
module.exports = {
lintOnSave: true,

Write Preview
Loading…
Cancel
Save