Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
7cacbee6 by yangwei
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

2 parents 57ca965a ec4ff21e
Inline Side-by-side
Showing 10 changed files with 103 additions and 74 deletions
......@@ -36,6 +36,16 @@ class work {
}
})
}
// 新建国有房屋信息
async addhousetotal (code) {
return request({
url: SERVER.SERVERAPI + '/rest/reg/work/addhousetotal',
method: 'get',
params: {
code: code
}
})
}
// 地图区县成功失败统计，code区县编码，汉中为：A20
async submitViews (code) {
return request({
......
......@@ -69,6 +69,7 @@ export default {
position: relative;
left: -10px;
color: #FFFFFF;
// background-color: rgb(155, 200, 200);
}
/deep/.el-breadcrumb__inner {
......
......@@ -27,8 +27,8 @@ export default {
grid: {
// 让图表占满容器
top: "20%",
left: "18%",
right: "10%",
left: "12%",
right: "5%",
bottom: "16%",
},
xAxis: {
......
......@@ -104,8 +104,8 @@ export default {
map: '汉中市',
itemStyle: {
normal: {//阴影
areaColor: '#02D9FD ',
shadowColor: '#01271F',
areaColor: '#5689FD ',
shadowColor: '#21371d',
borderWidth: 0,
shadowOffsetX: 2,
shadowOffsetY: 25
......@@ -125,17 +125,17 @@ export default {
areaColor: 'rgba(19,54,162,.5)',
borderColor: 'rgba(0,242,252,.5)',
borderWidth: 2,
shadowBlur: 7,
borderColor: 'rgba(19,54,162,.1)',
shadowBlur: 1,
borderColor: 'rgb(155, 200, 200)',
shadowColor: '#44f2fc',
},
emphasis: {
areaColor: '#4f7fff',
borderColor: 'rgba(0,242,252,.5)',
borderWidth: 2,
shadowBlur: 10,
shadowColor: '#00f2fc',
},
// emphasis: {
// areaColor: '#4f7fff',
// borderColor: 'rgba(0,242,252,.5)',
// borderWidth: 2,
// shadowBlur: 10,
// shadowColor: '#00f2fc',
// },
},
label: {
formatter: params => {
......
......@@ -37,8 +37,7 @@ export default {
let res = await work.getdjywltotal(p);
// 遍历修改数组键，作为echars图表的参数
res.result.map((item) => {
return (
return (
this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal })
)
......
......@@ -119,7 +119,7 @@ export default {
<style lang="scss" scoped>
.leftcard {
width: 32%;
height: calc(100% -0.5729rem);
height: calc(100% -110px);
display: flex;
flex-direction: column;
......@@ -179,19 +179,21 @@ export default {
.qxjr {
background: url("~@/image/jrl3.png");
background-size: 100% 100%;
}
.sthj {
background: url("~@/image/jh.png");
background-size: 100% 100%;
}
p {
margin: 0 .0156rem .0521rem .0156rem;
font-weight: 700;
width: .125rem;
height: .1875rem;
font-size: .1563rem;
font-size: .1667rem;
width: .195rem;
height: .2475rem;
font-size: .1863rem;
font-size: .1867rem;
}
}
......@@ -202,6 +204,7 @@ export default {
// padding: 35px 20px 20px 20px;
box-sizing: border-box;
color: #e3f1ff;
margin-top: .1263rem;
.cardcontent-left {
width: 60%;
......
......@@ -3,7 +3,8 @@
<div class="card1 cardCon d-center">
<div class="cardhead">新建国有房屋信息</div>
<div class="cardcontent" style="margin-top: .3646rem">
<dv-scroll-board :config="config" class="board" />
<dv-scroll-board v-if="config.data.length>0" :config="config" class="board" />
<div v-else="config.data.length==0" class="nodata">暂无数据</div>
</div>
</div>
<div class="card2 cardCon mt-10">
......@@ -20,6 +21,7 @@
<script>
import columnarsmat from "@/components/Echart/Columnarsmat";
import Rose from "@/components/Echart/Rose";
import work from "@/api/work";
export default {
data () {
return {
......@@ -28,24 +30,34 @@ export default {
oddRowBGC: '#154295',
evenRowBGC: '#154295',
header: ['序号', '用途', '性质', '面积'],
data: [
['住宅', '自建房', '转移登记', '73.94'],
['商业服务', '市场化商品房', '转移登记', '1067.14'],
['住宅', '成本售价房', '转移登记', '601.47'],
['住宅', '市场化商品房', '转移登记', '38111.37'],
['住宅', '移民搬迁安置房', '转移登记', '104.16'],
['办公', '自建房', '转移登记', '14913.86'],
['柴房', '市场化商品房', '转移登记', '615.55'],
['住宅', '经济适用住房', '转移登记', '173.17'],
['车库/车位', '市场化商品房', '转移登记', '105.27'],
['住宅', '房改房', '转移登记', '372.4']
]
data: [],
key:0
}
}
},
components: { columnarsmat, Rose },
mounted () {
this.addhousetotal();
// scroll(tableref.value.$refs.bodyWrapper);//设置滚动
},
methods: {
async addhousetotal () {
try {
let {result:res}= await work.addhousetotal();
console.log("resultssssssssssss",res);
res.map((item,index) => {
console.log("item",item);
console.log("index",index);
return (
this.config.data.push([index,item.fwyt,item.fwxz,item.mj])
)
});
console.log("this.config.data",this.config.data);
} catch (error) {
console.log("error",error);
}
}
}
}
</script>
......@@ -77,6 +89,13 @@ export default {
height: 100%;
display: -webkit-box;
overflow: hidden;
.nodata{
font-size: .1042rem;
color: #02D9FD;
font-weight: bold;
margin:auto;
margin-top: 120px;
}
}
.cardCon {
......@@ -94,8 +113,8 @@ export default {
.board {
width: 90%;
margin: 0 auto;
height: .7031rem;
margin-top: .2083rem;
height: 1.1031rem;
margin-top: .0521rem;
}
}
......
......@@ -86,6 +86,7 @@ export default {
areacode: '',
startTime: '',
endTime: '',
currentPage: 1
},
// 分页
pageData: {
......
......@@ -10,18 +10,6 @@ class data extends filter {
columns () {
return [
{
label: '序号',
type: 'index',
width: '50',
render: (h, scope) => {
return (
<div>
{(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
</div>
)
}
},
{
label: '汇交状态',
width: '110',
render: (h, scope) => {
......
......@@ -26,8 +26,8 @@
<el-col :span="6">
<el-form-item label="至" prop="exchangeStartTime" label-width="35px">
<el-date-picker type="date" class="width100" placeholder="结束日期" clearable
:picker-options="pickerOptionsEnd" v-model="form.exchangeEndTime"
value-format="yyyy-MM-dd HH:mm:ss" @change="endTimeChange"></el-date-picker>
:picker-options="pickerOptionsEnd" v-model="form.exchangeEndTime" value-format="yyyy-MM-dd HH:mm:ss"
@change="endTimeChange"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -91,7 +91,7 @@ import tableMixin from "@/mixins/tableMixin.js";
import dataDetails from "@/components/EditDialog";
import { getDataReportPage } from "@/api/dataReport.js";
//引入日期处理方法
import {timeFormat } from "@/utils/operation";
import { timeFormat } from "@/utils/operation";
export default {
name: "sbbwcx",
mixins: [tableMixin],
......@@ -123,14 +123,14 @@ export default {
qxdm: "", // 行政区
exchangeStartTime: "", // 开始日期
exchangeEndTime: "", // 结束日期
hjjg:"", //汇交状态
hjjg: "", //汇交状态
bdcdyh: "", // 不动产单元号
ywh: "", // 业务号
qllx: "", // 权利类型
djlx: "", // 登记类型
jcjg: "", // 检查结果
rkjg: "", //入库结果
currentPage: 1,
currentPage: 1
},
// 分页
pageData: {
......@@ -141,27 +141,35 @@ export default {
// table数据
tableData: {
// 表头数据
columns: datas.columns().concat([
columns: [
{
label: "操作",
width: "80",
render: (h, scope) => {
return (
<div>
<el-button
size="mini"
type="primary"
onClick={() => {
this.handleDetail(scope.row);
}}
>
详情
</el-button>
</div>
);
},
},
]),
label: "序号",
type: "index",
width: "50",
index: this.indexMethod,
}
]
.concat(datas.columns().concat([
{
label: "操作",
width: "80",
render: (h, scope) => {
return (
<div>
<el-button
size="mini"
type="primary"
onClick={() => {
this.handleDetail(scope.row);
}}
>
详情
</el-button>
</div>
);
},
}
])),
total: 0,
data: [],
},
......@@ -173,8 +181,8 @@ export default {
},
methods: {
//截止日期变化
endTimeChange(val){
this.form.exchangeEndTime = timeFormat(new Date(val),true)
endTimeChange (val) {
this.form.exchangeEndTime = timeFormat(new Date(val), true)
},
// 初始化数据
queryClick () {
......