Browse Source

15.39

develop
zhangjy 4 years ago
parent
commit
611cf3d831
  1. 3
      src/App.vue
  2. 6
      src/styles/public.scss
  3. 2
      src/views/bigdata/city/index.vue
  4. 15
      src/views/bigdata/city/newCity.vue
  5. 2
      src/views/company/auction/index.vue
  6. 15
      src/views/company/auction/insert.vue
  7. 2
      src/views/houseList/page/FormatInfo.vue
  8. 2
      src/views/houseList/page/detail.vue
  9. 2
      src/views/houseList/page/houseInfo.vue
  10. 2
      src/views/houseList/page/index.vue
  11. 2
      src/views/housingestates/index.vue
  12. 36
      src/views/land/handLand/index.vue
  13. 14
      src/views/land/handLand/newLand.vue
  14. 6
      src/views/land/noneHandLand/index.vue
  15. 7
      src/views/land/noneHandLand/newLand.vue
  16. 10
      src/views/message/api/api.js
  17. 15
      src/views/message/feedBack.vue
  18. 212
      src/views/message/index.vue
  19. 2
      src/views/sale/index.vue
  20. 4
      vue.config.js

3
src/App.vue

@ -73,5 +73,8 @@ export default {
.el-tabs__nav-wrap::after{
display: none!important;
}
.el-table .cell{
white-space: nowrap!important;
}
</style>

6
src/styles/public.scss

@ -167,7 +167,13 @@
}
.page_content_table {
min-height: 600px;
padding-bottom: 40px;
position: relative;
.page_page {
position: absolute;
bottom: 0;
width: 100%;
text-align: center;
}
}

2
src/views/bigdata/city/index.vue

@ -104,7 +104,7 @@
:prop="item.prop"
:label="item.label"
:width="item.width"
:show-overflow-tooltip="item.hideMore"
show-overflow-tooltip
>
</el-table-column>
<el-table-column fixed="right" label="操作" width="200">

15
src/views/bigdata/city/newCity.vue

@ -3,7 +3,7 @@
<span class="tipsMy">*数据为必填项</span>
<el-form
:model="editForm"
style="flex: 1; overflow: auto; margin: 20px;width: calc(100% - 40px);margin-top: 0;"
class="myForm"
:disabled="readOnly">
<el-row>
<el-col :span="8">
@ -90,7 +90,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row style="margin-bottom: 40px;">
<el-row>
<el-col :span="8">
<el-form-item label="房地产占比:">
<el-input v-model="editForm.perRealestate"></el-input>
@ -443,7 +443,6 @@
}
/deep/ .el-row{
padding: 0 20px;
margin-top: 20px;
padding-top: 10px;
background-color: white;
box-shadow: 0px 5px 20px 0px rgba(208, 208, 208, 0.18);
@ -455,4 +454,14 @@
/deep/ .el-form-item__label{
width: 180px;
}
.myForm{
flex: 1;
overflow: auto;
margin: 20px;
padding: 20px 0;
width: calc(100% - 40px);
/*margin-top: 0;*/
background-color: white;
box-shadow: 0px 5px 20px 0px rgba(208, 208, 208, 0.18);
}
</style>

2
src/views/company/auction/index.vue

@ -105,7 +105,7 @@
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
show-overflow-tooltip
>
</el-table-column>
<el-table-column fixed="right" label="操作" width="200">

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

@ -3,7 +3,7 @@
<span class="tipsMy">*数据为必填项</span>
<el-form
:model="editForm"
style="flex: 1; overflow: auto; margin: 20px;width: calc(100% - 40px);margin-top: 0;"
class="myForm"
:disabled="readOnly">
<el-row>
<el-col :span="8">
@ -79,7 +79,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row style="margin-bottom: 40px;">
<el-row>
<el-col :span="8">
<el-form-item label="竞得企业:">
<el-input v-model="editForm.winnerEnterprises"></el-input>
@ -435,7 +435,6 @@
}
/deep/ .el-row{
padding: 0 20px;
margin-top: 20px;
padding-top: 10px;
background-color: white;
box-shadow: 0px 5px 20px 0px rgba(208, 208, 208, 0.18);
@ -447,4 +446,14 @@
/deep/ .el-form-item__label{
width: 180px;
}
.myForm{
flex: 1;
overflow: auto;
margin: 20px;
padding: 20px 0;
width: calc(100% - 40px);
/*margin-top: 0;*/
background-color: white;
box-shadow: 0px 5px 20px 0px rgba(208, 208, 208, 0.18);
}
</style>

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

@ -125,7 +125,7 @@
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
show-overflow-tooltip
>
</el-table-column>
<el-table-column fixed="right" label="操作" width="250">

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

@ -137,7 +137,7 @@
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
show-overflow-tooltip
>
</el-table-column>
<el-table-column fixed="right" label="操作" width="250">

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

@ -109,7 +109,7 @@
:prop="item.prop"
:label="item.label"
:width="item.width"
:show-overflow-tooltip="item.hideMore"
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="操作" width="150">

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

@ -149,7 +149,7 @@
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
show-overflow-tooltip
>
</el-table-column>
<el-table-column fixed="right" label="操作" width="250">

2
src/views/housingestates/index.vue

@ -68,7 +68,7 @@
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
show-overflow-tooltip
>
</el-table-column>
</el-table>

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

@ -106,16 +106,16 @@
>
<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,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
v-for="(item, index) in cols.slice(0,3)"
: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
@ -125,7 +125,7 @@
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>
@ -133,17 +133,17 @@
<el-table-column
v-for="(item, index) in cols.slice(40,62)"
:key="index"
:prop="item.prop"
:label="item.label"
:prop="item.prop"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>
<el-table-column fixed="right" label="操作" width="200">
<template slot-scope="scope">
<el-button type="text" size="small" @click="viewItem(scope.row)"
<el-button title="111" type="text" size="small" @click="viewItem(scope.row)"
>详情</el-button
>
<el-button type="text" size="small" @click="editItem(scope.row)"
@ -1278,11 +1278,19 @@ export default {
landLonLat: [],
//
cols: [
{
label: "已挂牌序号",
prop: "annoId",
width: 150,
fixed: true,
hideMore:true
},
{
label: "公告序号",
prop: "annoId",
width: 150,
fixed: true,
hideMore:true
},
{
label: "地块编号",

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

@ -940,13 +940,14 @@
>+添加一行</el-button
>
</el-row>
<el-row style="text-align: center">
<el-button type="text" style="color: gray">导入</el-button>
</el-row>
<!-- <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
>
@ -1095,13 +1096,14 @@
>+添加一行</el-button
>
</el-row>
<el-row style="text-align: center">
<el-button type="text" style="color: gray">导入</el-button>
</el-row>
<!-- <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
>

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

@ -112,7 +112,7 @@
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>
@ -124,7 +124,7 @@
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>
@ -136,7 +136,7 @@
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
show-overflow-tooltip
>
</el-table-column>
</el-table-column>

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

@ -980,13 +980,14 @@
>+添加一行</el-button
>
</el-row>
<el-row style="text-align: center">
<el-button type="text" style="color: gray">导入</el-button>
</el-row>
<!-- <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
>

10
src/views/message/api/api.js

@ -0,0 +1,10 @@
import request from '@/router/axios'
// 查询列表(意见反馈)
export function feedBackList(param) {
return request({
url: '/api/feedback/page',
method: 'get',
params: param
})
}

15
src/views/message/feedBack.vue

@ -0,0 +1,15 @@
<template>
<div>
5555
</div>
</template>
<script>
export default {
name: "feedBack"
}
</script>
<style scoped>
</style>

212
src/views/message/index.vue

@ -1,14 +1,206 @@
<template>
<div class="flat">
开发中
</div>
<div class="normal_page">
<div class="page_search">
<div>
<el-form :inline="true" :model="searchForm" class="demo-form-inline">
<el-form-item label="联系人:">
<el-input
v-model="searchForm.contact"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="联系方式:">
<el-input
v-model="searchForm.contactDetail"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
</el-form-item>
<el-form-item>
<el-button @click="onReset">重置</el-button>
</el-form-item>
</el-form>
</div>
</div>
<div class="page_content">
<div class="page_content_head">
<div style="display: flex; justify-content: space-between">
<div class="page_content_head_left">
<div>意见反馈</div>
</div>
</div>
</div>
<div class="page_content_table">
<el-table
:data="tableData"
border
style="width: 100%"
v-loading="loading"
>
<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
>
</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"
>
</el-pagination>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'MessageCenter'
};
<script>
import {feedBackList} from "./api/api";
export default {
name: "BigData",
data() {
return {
searchForm: {
//
contact: "",
//
contactDetail: "",
},
tableData: [],
//
cols: [
{
label: "序号",
prop: "feedbackId",
width: 150,
fixed: true,
},
{
label: "联系人",
prop: "contact",
width: 150,
fixed: true,
},
{
label: "联系方式",
prop: "contactDetail",
width: 150,
fixed: true,
},
{
label: "反馈意见",
prop: "suggestion",
},
{
label: "附件",
prop: "attachment",
width: 150,
},
],
//
loading: true,
//
selectedData: [],
page: {
total: 0, //
currentPage: 1, //
pageSize: 10, //
},
//
readOnly: true,
//
hasSelectData: false,
//
dialogFormVisible: false,
dialogTitle: "新增数据",
// Form
editForm: {},
};
},
methods: {
//
onSubmit() {
this.loading = true;
let param = Object.assign(
{
current: this.page.currentPage,
size: this.page.pageSize,
},
this.searchForm
);
feedBackList(param).then((response) => {
this.tableData = response.data.data.records;
this.page.total = response.data.data.total;
this.loading = false;
});
},
//
onReset() {
for (let item in this.searchForm) {
this.searchForm[item] = "";
}
},
handleSizeChange(val) {
this.page.pageSize = val;
this.onSubmit()
},
handleCurrentChange(val) {
this.page.currentPage = val;
this.onSubmit()
},
//
newItem() {
this.$router.push({path:'/company/auction/insert',query:{readOnly:'false',isEditOr:'false',}});
},
//
editItem(row) {
let data=JSON.stringify(row)
this.$router.push({path:'/company/auction/insert',query:{readOnly:'false',isEditOr:'true',data:data}});
},
//
delItem(row) {
delData(row.data_id).then((res) => {
console.debug(res);
});
},
//
viewItem(row) {
let data=JSON.stringify(row)
this.$router.push({path:'/company/auction/insert',query:{readOnly:'true',isEditOr:'false',data:data}});
},
},
mounted() {
this.onSubmit();
},
};
</script>
<style>
<style lang="scss" scoped>
//
@import "@/styles/public.scss";
/deep/ .el-input {
width: 90%;
}
</style>

2
src/views/sale/index.vue

@ -100,7 +100,7 @@
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:show-overflow-tooltip="item.hideMore"
show-overflow-tooltip
>
</el-table-column>
<el-table-column

4
vue.config.js

@ -7,8 +7,8 @@
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://139.159.180.147:9002'
module.exports = {
lintOnSave: true,
productionSourceMap: false,

Loading…
Cancel
Save