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

18.05

develop
zhangjy 4 years ago
parent
786e7e2165
commit
7f01b56c34
11 changed files with 701 additions and 2214 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. 2
      src/router/views/index.js
  2. 14
      src/styles/public.scss
  3. 12
      src/views/bigdata/city/index.vue
  4. 32
      src/views/houseList/page/index.vue
  5. 15
      src/views/land/api/land.js
  6. 1377
      src/views/land/handLand/index.vue
  7. 182
      src/views/land/handLand/newLand.vue
  8. 1231
      src/views/land/noneHandLand/index.vue
  9. 34
      src/views/land/noneHandLand/newLand.vue
  10. 10
      src/views/message/editMessage.vue
  11. 6
      vue.config.js

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

@ -84,7 +84,7 @@ export default [{
},
{
path: 'noneHandLand/newLand',
name: '编辑土地',
name: '编辑土地拟',
meta: {
keepAlive: false
},

14
src/styles/public.scss
Unescape View File

@ -178,4 +178,18 @@
}
}
}
}
.searchBox{
position: absolute;
//border: 1px solid red;
height: 48px;
width: 85%;
top: 0;
left: 0;
bottom: 0;
right: 0;
margin: 0 auto;
overflow-x: auto;
overflow-y: hidden;
display: flex;
}

12
src/views/bigdata/city/index.vue
Unescape View File

@ -41,7 +41,7 @@
<div class="page_content_head">
<div style="display: flex; justify-content: space-between">
<div class="page_content_head_left">
<div>已挂牌地块列表</div>
<div>宏观数据列表</div>
<div style="margin-left: 10px">
<img src="@public/img/land/u1343.png" />
</div>
@ -476,7 +476,10 @@ export default {
addData(this.editForm).then((res) => {
this.dialogFormVisible = false;
if (res.success) {
this.$message("保存成功");
this.$message({
type: 'success',
message: '保存成功'
});
this.dialogFormVisible = false;
} else {
console.debug(res);
@ -486,7 +489,10 @@ export default {
} else if (this.dialogTitle == "编辑数据") {
updateData(this.editForm).then((res) => {
if (res.success) {
this.$message("保存成功");
this.$message({
type: 'success',
message: '保存成功'
});
this.dialogFormVisible = false;
} else {
console.debug(res);

32
src/views/houseList/page/index.vue
Unescape View File

@ -64,14 +64,28 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="日期：" prop="annoDate">
<el-date-picker
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
v-model="searchForm.createDate"
></el-date-picker>
</el-form-item>
<!-- <el-form-item label="业态：">-->
<!-- <el-input-->
<!-- style="width: 100%"-->
<!-- v-model="searchForm.annoId"-->
<!-- placeholder="请输入"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="区域：">-->
<!-- <el-input-->
<!-- style="width: 100%"-->
<!-- v-model="searchForm.annoId"-->
<!-- placeholder="请输入"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="日期：" prop="annoDate">-->
<!-- <el-date-picker-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择日期"-->
<!-- v-model="searchForm.createDate"-->
<!-- ></el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
</el-form-item>
@ -425,8 +439,6 @@ export default {
bigGroup:'',
smallGroup:'',
name:'',
// 公告日期
createDate: "",
},
tableData: [],
loading: false,

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

@ -248,6 +248,21 @@ export function importFile(data) {
data: data,
})
}
// 导入土地拍卖
export function importLand(data) {
return request({
url: '/api/auction_record/importRecordExcel',
method: 'post',
data: data,
})
}
export function saveLandMulti(data) {
return request({
url: '/api/auction_record/multi',
method: 'post',
data: data,
})
}
//新增编辑参拍
export function updateRecord(data) {
return request({

1377
src/views/land/handLand/index.vue
View File

File diff suppressed because it is too large Load Diff

182
src/views/land/handLand/newLand.vue
Unescape View File

@ -182,7 +182,7 @@
<el-collapse-item name="12">
<template slot="title">
<div class="ti-box">
<span>建筑配建计容</span>
<span>建设规划</span>
<span class="ti-tag">{{ setTagName(12) }}</span>
</div>
</template>
@ -274,15 +274,6 @@
>+添加一行</el-button
>
</el-row>
<el-row>
<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-col>
</el-row>
</el-collapse-item>
<el-collapse-item name="3">
<template slot="title">
@ -530,7 +521,7 @@
<el-input v-model="editForm.lonLatBd"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" style="text-align: right">
<el-col :span="8" style="text-align: right;padding-top:20px">
<el-button v-show="!readOnly" @click="save" type="primary"
>保存</el-button
>
@ -799,15 +790,6 @@
>+添加一行</el-button
>
</el-row>
<el-row>
<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-col>
</el-row>
</el-collapse-item>
<el-collapse-item name="8">
<template slot="title">
@ -943,16 +925,6 @@
<!-- <el-row style="text-align: center">-->
<!-- <el-button type="text" style="color: gray">导入</el-button>-->
<!-- </el-row>-->
<el-row>
<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" type="primary">导入</el-button>
<el-button v-show="!readOnly" @click="save" type="primary"
>保存</el-button
>
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item name="9">
<template slot="title">
@ -1102,11 +1074,16 @@
<el-row>
<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" type="primary">导入</el-button>
<el-button v-show="!readOnly" @click="save" type="primary"
>保存</el-button
<el-col :span="8" style="display: flex;justify-content: flex-end">
<el-upload
v-show="!readOnly"
style="margin-right: 10px;"
action=""
accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
:before-upload="uploadExcel"
>
<el-button size="medium" type="primary">导入</el-button>
</el-upload>
</el-col>
</el-row>
</el-collapse-item>
@ -1311,6 +1288,8 @@
addConstructionPlan,
updateConstructionPlan,
delConstructionPlan,
importLand,
saveLandMulti
} from "@/views/land/api/land";
import { uploadFile } from "@/views/api/api";
import { downUrlFile } from "@/util/file";
@ -1741,15 +1720,16 @@
newObj[col.prop] = "";
}
this.editForm = newObj;
if (this.$route.query.readOnly==='true'){
// console.log(this.$route);
if (this.$route.params.readOnly==='true'){
this.readOnly = true;
let row=JSON.parse(this.$route.query.data)
let row=JSON.parse(this.$route.params.data)
this.editForm = row;
}else {
this.readOnly = false;
}
if (this.$route.query.isEditOr==='true'){
let row=JSON.parse(this.$route.query.data)
if (this.$route.params.isEditOr==='true'){
let row=JSON.parse(this.$route.params.data)
this.editForm = row;
this.onlyId = row.landListedId;
this.queryLonLatList(row.landListedId);
@ -1765,6 +1745,7 @@
this.activeNames.some((item) => item == val)
? (txt = "收起")
: (txt = "展开");
txt='';
return txt;
},
getList(page, params) {
@ -1787,7 +1768,7 @@
// 编辑项
editItemChange(val) {
console.log("editItemChange", val);
},
// 查询
@ -1847,7 +1828,10 @@
formData.append("uploadFile", file);
importFile(formData).then((res) => {
if (res.data.success) {
this.$message("导入成功");
this.$message({
type: 'success',
message: '导入成功'
});
this.onSubmit();
return true
} else {
@ -1921,7 +1905,10 @@
}
multiDeteleList(ids).then((res) => {
if (res.data.success) {
this.$message("删除成功");
this.$message({
type: 'success',
message: '删除成功'
});
this.onSubmit();
} else {
this.$message("删除失败");
@ -2043,10 +2030,13 @@
// 保存所有数据
saveAllData() {
let type='';
this.$route.query.isEditOr==='true'?type='put':type='post';
this.$route.params.isEditOr==='true'?type='put':type='post';
saveHandLandList(JSON.stringify(this.editForm),type).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.$message({
type: 'success',
message: '保存成功'
});
window.history.back()
} else {
this.$message.error("保存失败");
@ -2146,7 +2136,10 @@
if (type==='企业'){
delConductenter(row.conductEnterpriseId).then((res) => {
if (res.data.success) {
this.$message("删除成功");
this.$message({
type: 'success',
message: '删除成功'
});
this.conductenterList(row.landListedId);
} else {
this.$message.error("删除失败");
@ -2156,7 +2149,10 @@
// console.log(row);
delConstructionPlan(row.constructionPlanId).then((res) => {
if (res.data.success) {
this.$message("删除成功");
this.$message({
type: 'success',
message: '删除成功'
});
this.getPlanList(row.landListedId);
} else {
this.$message.error("删除失败");
@ -2165,7 +2161,10 @@
}else {
delLandLonLat(row.latId).then((res) => {
if (res.data.success) {
this.$message("删除成功");
this.$message({
type: 'success',
message: '删除成功'
});
this.queryLonLatList(row.landListedId);
} else {
this.$message.error("删除失败");
@ -2176,7 +2175,10 @@
handelDeleteRecord(row) {
deleteRecord(row.auctionRecordId).then((res) => {
if (res.data.success) {
this.$message("删除成功");
this.$message({
type: 'success',
message: '删除成功'
});
this.queryRecordList(row.landListedId);
} else {
this.$message.error("删除失败");
@ -2196,7 +2198,10 @@
if (this.companyEdit) {
updateConductenter(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.$message({
type: 'success',
message: '保存成功'
});
this.conductenterList(row.landListedId);
} else {
this.$message.error("保存失败");
@ -2205,7 +2210,10 @@
} else {
addConductenter(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.$message({
type: 'success',
message: '保存成功'
});
this.conductenterList(row.landListedId);
} else {
this.$message.error("保存失败");
@ -2216,7 +2224,10 @@
if (this.planEdit) {
updateConstructionPlan(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.$message({
type: 'success',
message: '保存成功'
});
this.getPlanList(row.landListedId);
} else {
this.$message.error("保存失败");
@ -2225,7 +2236,10 @@
} else {
addConstructionPlan(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.$message({
type: 'success',
message: '保存成功'
});
this.getPlanList(row.landListedId);
} else {
this.$message.error("保存失败");
@ -2241,7 +2255,10 @@
if (this.isLonLatEdit) {
updateLonLat(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.$message({
type: 'success',
message: '保存成功'
});
row.edit = false;
this.queryLonLatList(row.landListedId);
} else {
@ -2251,7 +2268,10 @@
} else {
addLonLat(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.$message({
type: 'success',
message: '保存成功'
});
row.edit = false;
this.queryLonLatList(row.landListedId);
} else {
@ -2276,7 +2296,10 @@
if (this.isLonLatEdit) {
updateRecord(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.$message({
type: 'success',
message: '保存成功'
});
this.queryRecordList(row.landListedId);
} else {
this.$message.error("保存失败");
@ -2285,7 +2308,10 @@
} else {
updateRecord(row).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.$message({
type: 'success',
message: '保存成功'
});
this.queryRecordList(row.landListedId);
} else {
this.$message.error("保存失败");
@ -2422,7 +2448,10 @@
landListedId
).then((res) => {
if (res.data.success) {
this.$message("上传成功");
this.$message({
type: 'success',
message: '上传成功'
});
this.queryFileList();
} else {
this.$message("上传失败");
@ -2434,13 +2463,45 @@
delRes(row) {
delLandResFile(row.id).then((res) => {
if (res.data.success) {
this.$message("删除成功");
this.$message({
type: 'success',
message: '删除成功'
});
this.queryFileList();
} else {
this.$message("删除失败");
}
});
},
uploadExcel(e){
const file = e;
let formData = new FormData();
formData.append("uploadFile", file);
importLand(formData).then((res) => {
if (res.data.success) {
let data=res.data.data;
data.forEach((item) => {
item.landListedId=this.onlyId;
});
saveLandMulti(data).then(res=>{
if (res.data.success){
this.queryRecordList(this.onlyId);
this.$message({
type: 'success',
message: '导入成功'
});
}else {
this.$message.error("保存失败");
}
})
return false
} else {
this.$message.error("导入失败");
return false
}
});
return false
},
//分布保存
save() {
if (!this.editForm.landCode) {
@ -2456,10 +2517,13 @@
return;
}
let type='';
this.$route.query.isEditOr==='true'?type='put':type='post';
this.$route.params.isEditOr==='true'?type='put':type='post';
saveHandLandList(JSON.stringify(this.editForm),type).then((res) => {
if (res.data.success) {
this.$message("保存成功");
this.$message({
type: 'success',
message: '保存成功'
});
this.onlyId = res.data.data;
// window.history.back()
// this.dialogFormVisible = false;

1231
src/views/land/noneHandLand/index.vue
View File

File diff suppressed because it is too large Load Diff

34
src/views/land/noneHandLand/newLand.vue
Unescape View File

@ -55,7 +55,7 @@
type="date"
placeholder="选择预计挂牌日期"
v-model="editForm.estimatedListingTime"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
@ -335,15 +335,6 @@
>+添加一行</el-button
>
</el-row>
<el-row>
<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-col>
</el-row>
</el-collapse-item>
<el-collapse-item name="4">
<template slot="title">
@ -591,7 +582,7 @@
<el-input v-model="editForm.lonLatBd"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" style="text-align: right">
<el-col :span="8" style="text-align: right;padding-top: 20px;">
<el-button v-show="!readOnly" @click="save" type="primary"
>保存</el-button
>
@ -780,15 +771,6 @@
>+添加一行</el-button
>
</el-row>
<el-row>
<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-col>
</el-row>
</el-collapse-item>
<el-collapse-item name="8">
<template slot="title">
@ -988,9 +970,6 @@
<el-col :span="8"> </el-col>
<el-col :span="8" style="text-align: right">
<el-button v-show="!readOnly" type="primary">导入</el-button>
<el-button v-show="!readOnly" @click="save" type="primary"
>保存</el-button
>
</el-col>
</el-row>
</el-collapse-item>
@ -1653,15 +1632,15 @@
newObj[col.prop] = "";
}
this.editForm = newObj;
if (this.$route.query.readOnly==='true'){
if (this.$route.params.readOnly==='true'){
this.readOnly = true;
let row=JSON.parse(this.$route.query.data)
let row=JSON.parse(this.$route.params.data)
this.editForm = row;
}else {
this.readOnly = false;
}
if (this.$route.query.isEditOr==='true'){
let row=JSON.parse(this.$route.query.data)
if (this.$route.params.isEditOr==='true'){
let row=JSON.parse(this.$route.params.data)
console.log(row);
this.editForm = row;
this.onlyId = row.proposedseriaId;
@ -1722,6 +1701,7 @@
this.activeNames.some((item) => item == val)
? (txt = "收起")
: (txt = "展开");
txt='';
return txt;
},
getList(page, params) {

10
src/views/message/editMessage.vue
Unescape View File

@ -107,7 +107,10 @@
this.$set(data,'messageId',this.id)
editMessage(data).then(res=>{
if (res.data.success){
this.$message("保存成功");
this.$message({
type: 'success',
message: '保存成功'
});
window.history.back()
}else {
this.$message.error("保存失败");
@ -116,7 +119,10 @@
}else {
newMessage(data).then(res=>{
if (res.data.success){
this.$message("保存成功");
this.$message({
type: 'success',
message: '保存成功'
});
window.history.back()
}else {
this.$message.error("保存失败");

6
vue.config.js
Unescape View File

@ -6,9 +6,9 @@
function resolve(dir) {
return path.join(__dirname, dir)
}
//const url = 'http://192.168.23.30:9002'
// const url = 'http://192.168.24.3:9002';
const url = 'http://139.159.180.147:9002'
const url = 'http://192.168.24.3:9002'; //裴
// const url = 'http://192.168.28.41:9002';//尔伯
// const url = 'http://139.159.180.147:9002';//生产
module.exports = {
lintOnSave: true,
productionSourceMap: false,

Write Preview
Loading…
Cancel
Save