Browse Source

Merge branch 'develop' of http://139.159.180.147/air/front-end into develop

# Conflicts:
#	vue.config.js
develop
zhangjy 4 years ago
parent
commit
39bdc86359
  1. 8
      src/views/admin/role/index.vue
  2. 4
      src/views/houseList/page/houseInfo.vue
  3. 2
      src/views/houseList/page/index.vue
  4. 8
      src/views/housingestates/api.js
  5. 35
      src/views/land/api/noLand.js
  6. 40
      src/views/land/handLand/index.vue
  7. 84
      src/views/land/noneHandLand/index.vue
  8. 2
      src/views/sale/index.vue
  9. 2
      vue.config.js

8
src/views/admin/role/index.vue

@ -2,7 +2,7 @@
<div class="app-container calendar-list-container">
<basic-container class="basicC bs m20">
<span class="pageTitle">角色管理</span>
<!-- <avue-crud
<avue-crud
ref="crud"
:option="tableOption"
:data="list"
@ -70,14 +70,14 @@
>权限</el-button
>
</template>
</avue-crud> -->
<avue-crud :data="data" :option="option">
</avue-crud>
<!-- <avue-crud :data="data" :option="option">
<template slot-scope="{ type, size }" slot="menu">
<el-button icon="el-icon-check" :size="size" :type="type"
>自定义菜单按钮</el-button
>
</template>
</avue-crud>
</avue-crud> -->
</basic-container>
<el-dialog
:visible.sync="dialogPermissionVisible"

4
src/views/houseList/page/houseInfo.vue

@ -437,7 +437,7 @@ export default {
info(data) {
//
console.log(data);
this.$router.push({path:"/houseList/page/detail",query:{id:data.housingEstatesId,blockId:data.blockId}});
this.$router.push({path:"/houseList/page/detail",query:{id:data.housingEstateId,blockId:data.blockId}});
},
//
submitForm(formName) {
@ -499,7 +499,7 @@ export default {
size: this.page.pageSize,
},
);
this.$route.query.housingEstateId?this.$set(param,'housingEstatesId',this.$route.query.housingEstateId):this.$set(param,'housingEstatesId',this.$route.query.id);
this.$route.query.housingEstateId?this.$set(param,'housingEstateId',this.$route.query.housingEstateId):this.$set(param,'housingEstateId',this.$route.query.id);
this.$route.query.largeFormat?this.$set(param,'largeFormat',this.$route.query.largeFormat):false;
this.$route.query.format?this.$set(param,'format',this.$route.query.format):false;
api.blocksList(param)

2
src/views/houseList/page/index.vue

@ -643,7 +643,7 @@ export default {
handle(item) {
this.dialogFormVisible = true;
this.dialogLoad=true;
api.houseById(item.housingEstatesId).then(res=>{
api.houseById(item.housingEstateId).then(res=>{
this.ruleForm = res.data.data.housingEstates;
this.dialogLoad=false;
}).catch((e)=>{this.dialogLoad=false;})

8
src/views/housingestates/api.js

@ -30,17 +30,17 @@ export function updateHousingEstates(param) {
}
// 通过id查询楼盘
export function queryHousingEstatesByID(housingEstatesId) {
export function queryHousingEstatesByID(housingEstateId) {
return request({
url: '/api/housingestates/'+housingEstatesId,
url: '/api/housingestates/'+housingEstateId,
method: 'get'
})
}
// 通过id删除楼盘
export function delHousingEstatesByID(housingEstatesId) {
export function delHousingEstatesByID(housingEstateId) {
return request({
url: '/api/housingestates/'+housingEstatesId,
url: '/api/housingestates/'+housingEstateId,
method: 'delete'
})
}

35
src/views/land/api/noLand.js

@ -112,9 +112,9 @@ export function updateLonLat(param) {
}
// 通过ID删除拟挂牌地块
export function delLandLonLat(proposedseriaId, landCode) {
export function delLandLonLat(landListedId) {
return request({
url: '/api/landtolistlonlat/' + proposedseriaId + "/" + landCode,
url: '/api/landtolistlonlat/' + landListedId,
method: 'delete'
})
}
@ -167,4 +167,35 @@ export function importFile(data) {
method: 'post',
data: data,
})
}
//新增编辑参拍
export function updateRecord(data) {
return request({
url: '/api/auction_record',
method: 'post',
data: data,
})
}
//查询参拍
export function queryRecord(data) {
return request({
url: '/api/auction_record/list',
method: 'get',
params: data,
})
}
//删除参拍
export function deleteRecord(data) {
return request({
url: '/api/auction_record/' + data,
method: 'delete',
})
}
//保存已挂牌地块文件
export function allFileUpload(data) {
return request({
url: '/api/landToListAttachment',
method: 'post',
data:data
})
}

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

@ -25,7 +25,7 @@
<el-date-picker
type="date"
placeholder="选择公告日期"
v-model="editForm.annoDate"
v-model="searchForm.annoDate"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
></el-date-picker>
@ -66,10 +66,13 @@
>
</div>
<div>
<!-- <el-button @click="importData"
><img src="@public/img/land/u1401.png" />导入</el-button
> -->
<input type="file" @change="importData" />
<el-upload
class="upload-demo"
action=""
:before-upload="importData"
>
<el-button size="medium" type="primary">导入数据</el-button>
</el-upload>
</div>
<div>
<el-tooltip
@ -1061,9 +1064,11 @@
>
<el-tab-pane label="红线图" name="redLineMap">
<el-upload
class="upload-demo"
drag
action
list-type="picture-card"
:http-request="uploadFile"
multiple
>
<i class="el-icon-plus"></i>
</el-upload>
@ -1746,16 +1751,17 @@ export default {
},
//
importData(e) {
const file = e.target.files[0];
const file = e;
let formData = new FormData();
formData.append("uploadFile", file);
importFile(formData).then((res) => {
console.log(res);
if (res.data.success) {
this.$message("导入成功");
this.onSubmit();
return true
} else {
this.$message("导入失败");
return false
}
});
},
@ -1782,7 +1788,7 @@ export default {
this.onlyId = row.landListedId;
this.queryLonLatList(row.landListedId);
this.queryRecordList(row.landListedId);
this.queryFileList()
this.queryFileList();
},
//
@ -2087,7 +2093,7 @@ export default {
}
let param = {
landListedId: landListedId,
// fileType: this.activeType,
fileType: this.activeType,
};
queryFileList(param).then((res) => {
if (res.data.success) {
@ -2106,8 +2112,8 @@ export default {
tabChange() {
// console.log(this.activeType);
//
// this.uploadFiles = [];
// this.queryFileList();
this.uploadFiles = [];
this.queryFileList();
},
//
@ -2124,16 +2130,16 @@ export default {
filePath: tempData.path,
fileType: this.activeType,
// uploadProcess: 0,
landListedId:this.onlyId
landListedId: this.onlyId,
});
}
});
},
//
allUpload(){
allFileUpload(this.uploadFiles).then(res =>{
this.queryFileList()
})
allUpload() {
allFileUpload(this.uploadFiles).then((res) => {
this.queryFileList();
});
},
//
uploadRes(row) {

84
src/views/land/noneHandLand/index.vue

@ -66,9 +66,13 @@
>
</div>
<div>
<el-button
><img src="@public/img/land/u1401.png" />导入</el-button
<el-upload
class="upload-demo"
action=""
:before-upload="importData"
>
<el-button size="medium" type="primary">导入数据</el-button>
</el-upload>
</div>
<div>
<el-tooltip
@ -956,11 +960,19 @@
>
<el-tab-pane label="红线图" name="redLineMap">
<el-upload
class="upload-demo"
drag
action
list-type="picture-card"
:http-request="uploadFile"
multiple
>
<i class="el-icon-plus"></i>
<i class="el-icon-upload"></i>
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
</div>
<div class="el-upload__tip" slot="tip">
只支持上传docdocxpdfpptpptx文件且不超过10M
</div>
</el-upload>
</el-tab-pane>
<el-tab-pane label="控规图" name="controlChart">
@ -1079,8 +1091,8 @@
<el-col :span="8"> </el-col>
<el-col :span="8"> </el-col>
<el-col :span="8" style="text-align: right">
<el-button v-show="!readOnly" @click="save" type="primary"
>保存</el-button
<el-button v-show="!readOnly" @click="allUpload" type="primary"
>全部上传</el-button
>
</el-col>
</el-row>
@ -1098,6 +1110,7 @@
<script>
import {
allFileUpload,
getDict,
fetchNoHandLandList,
saveNoHandLandList,
@ -1122,6 +1135,7 @@ export default {
name: "NoHandLand",
data() {
return {
onlyId: "",
searchForm: {
//
annoId: "",
@ -1572,6 +1586,8 @@ export default {
handler(newVal, oldVal) {
if (newVal) {
this.queryFileList();
} else {
this.onSubmit();
}
},
},
@ -1689,7 +1705,9 @@ export default {
this.readOnly = false;
this.dialogFormVisible = true;
this.editForm = row;
this.onlyId = row.proposedseriaId;
this.queryLonLatList(row.proposedseriaId);
this.queryFileList();
},
//
@ -1729,8 +1747,16 @@ export default {
//
save() {
if (!this.editForm.landName) {
this.$message.error("请输入地块名称");
if (!this.editForm.landCode) {
this.$message.error("请输入地块编号");
return;
}
if (!this.editForm.annoId) {
this.$message.error("请输入公告序号");
return;
}
if (!this.editForm.landPosition) {
this.$message.error("请输入地块位置");
return;
}
if (!this.editForm.proposedseriaId) {
@ -1773,7 +1799,13 @@ export default {
queryLonLatList(proposedseriaId) {
queryLonLatList(proposedseriaId).then((response) => {
if (response.data.success) {
let index = 0;
this.landLonLat = response.data.data;
this.landLonLat.forEach((item) => {
item.edit = false;
item.index = index;
index++;
});
} else {
this.landLonLat = [];
}
@ -1797,13 +1829,13 @@ export default {
this.isLonLatEdit = false;
let index = 0;
this.landLonLat.forEach((item) => {
item.edit = true;
item.edit = false;
item.index = index;
index++;
});
this.landLonLat.push({
// annoId: this.editForm.annoId,
proposedseriaId: this.editForm.proposedseriaId,
// proposedseriaId: this.editForm.proposedseriaId,
landCode: "",
landLonLat: "",
lineColor: "#FF0000",
@ -1818,7 +1850,7 @@ export default {
//
handleLonLatDelClick(row) {
delLandLonLat(row.proposedseriaId, row.landCode).then((res) => {
delLandLonLat(row.latId).then((res) => {
if (res.data.success) {
this.$message("删除成功");
this.queryLonLatList(row.proposedseriaId);
@ -1828,13 +1860,19 @@ export default {
});
},
//
//
handleLonLatOKClick(row) {
if(!row.landCode) {
this.$message.error("请输入地块编号")
return
if (!this.readOnly && !this.onlyId) {
this.$message.error("请先填写公告信息");
return;
}
if (!row.landCode) {
this.$message.error("请输入宗地编号");
return;
}
row.edit = false;
this.$set(row, "proposedseriaId", this.onlyId);
this.$set(row, "annoId", this.editForm.annoId);
if (this.isLonLatEdit) {
updateLonLat(row).then((res) => {
if (res.data.success) {
@ -1867,7 +1905,7 @@ export default {
//
handleLonLatCancelClick(row, index) {
this.landLonLat.splice(index,1)
this.landLonLat.splice(index, 1);
},
//
multiDelete() {
@ -1936,14 +1974,18 @@ export default {
//
uploadFile(file) {
if (!this.onlyId) {
this.$message.error("请先填写公告信息");
return;
}
uploadFile(file).then((res) => {
if (res.data.success) {
let tempData = res.data.data;
this.uploadFiles.push({
id: -1,
fileName: tempData.fileName,
filePath: tempData.path,
uploadProcess: 0,
fileType: this.activeType,
proposedseriaId: this.onlyId,
});
}
});
@ -1966,6 +2008,12 @@ export default {
}
});
},
//
allUpload() {
allFileUpload(this.uploadFiles).then((res) => {
this.queryFileList();
});
},
//
delRes(row) {

2
src/views/sale/index.vue

@ -494,7 +494,7 @@ export default {
submitForm(formName) {
for (let i=0;i<this.nameList.length;i++){
if (this.ruleForm.name==this.nameList[i].name){
this.$set(this.params,'housingEstatesId',this.nameList[i].housingEstateId)
this.$set(this.params,'housingEstateId',this.nameList[i].housingEstateId)
}
}
this.$set(this.params,'name',this.ruleForm.name)

2
vue.config.js

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

Loading…
Cancel
Save