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 { ...@@ -36,6 +36,16 @@ class work {
36 } 36 }
37 }) 37 })
38 } 38 }
39 // 新建国有房屋信息
40 async addhousetotal (code) {
41 return request({
42 url: SERVER.SERVERAPI + '/rest/reg/work/addhousetotal',
43 method: 'get',
44 params: {
45 code: code
46 }
47 })
48 }
39 // 地图区县成功失败统计，code区县编码，汉中为：A20 49 // 地图区县成功失败统计，code区县编码，汉中为：A20
40 async submitViews (code) { 50 async submitViews (code) {
41 return request({ 51 return request({
......
...@@ -69,6 +69,7 @@ export default { ...@@ -69,6 +69,7 @@ export default {
69 position: relative; 69 position: relative;
70 left: -10px; 70 left: -10px;
71 color: #FFFFFF; 71 color: #FFFFFF;
72 // background-color: rgb(155, 200, 200);
72 } 73 }
73 74
74 /deep/.el-breadcrumb__inner { 75 /deep/.el-breadcrumb__inner {
......
...@@ -27,8 +27,8 @@ export default { ...@@ -27,8 +27,8 @@ export default {
27 grid: { 27 grid: {
28 // 让图表占满容器 28 // 让图表占满容器
29 top: "20%", 29 top: "20%",
30 left: "18%", 30 left: "12%",
31 right: "10%", 31 right: "5%",
32 bottom: "16%", 32 bottom: "16%",
33 }, 33 },
34 xAxis: { 34 xAxis: {
......
...@@ -104,8 +104,8 @@ export default { ...@@ -104,8 +104,8 @@ export default {
104 map: '汉中市', 104 map: '汉中市',
105 itemStyle: { 105 itemStyle: {
106 normal: {//阴影 106 normal: {//阴影
107 areaColor: '#02D9FD ', 107 areaColor: '#5689FD ',
108 shadowColor: '#01271F', 108 shadowColor: '#21371d',
109 borderWidth: 0, 109 borderWidth: 0,
110 shadowOffsetX: 2, 110 shadowOffsetX: 2,
111 shadowOffsetY: 25 111 shadowOffsetY: 25
...@@ -125,17 +125,17 @@ export default { ...@@ -125,17 +125,17 @@ export default {
125 areaColor: 'rgba(19,54,162,.5)', 125 areaColor: 'rgba(19,54,162,.5)',
126 borderColor: 'rgba(0,242,252,.5)', 126 borderColor: 'rgba(0,242,252,.5)',
127 borderWidth: 2, 127 borderWidth: 2,
128 shadowBlur: 7, 128 shadowBlur: 1,
129 borderColor: 'rgba(19,54,162,.1)', 129 borderColor: 'rgb(155, 200, 200)',
130 shadowColor: '#44f2fc', 130 shadowColor: '#44f2fc',
131 }, 131 },
132 emphasis: { 132 // emphasis: {
133 areaColor: '#4f7fff', 133 // areaColor: '#4f7fff',
134 borderColor: 'rgba(0,242,252,.5)', 134 // borderColor: 'rgba(0,242,252,.5)',
135 borderWidth: 2, 135 // borderWidth: 2,
136 shadowBlur: 10, 136 // shadowBlur: 10,
137 shadowColor: '#00f2fc', 137 // shadowColor: '#00f2fc',
138 }, 138 // },
139 }, 139 },
140 label: { 140 label: {
141 formatter: params => { 141 formatter: params => {
......
...@@ -37,8 +37,7 @@ export default { ...@@ -37,8 +37,7 @@ export default {
37 let res = await work.getdjywltotal(p); 37 let res = await work.getdjywltotal(p);
38 // 遍历修改数组键，作为echars图表的参数 38 // 遍历修改数组键，作为echars图表的参数
39 res.result.map((item) => { 39 res.result.map((item) => {
40 40 return (
41 return (
42 this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal }) 41 this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal })
43 42
44 ) 43 )
......
...@@ -119,7 +119,7 @@ export default { ...@@ -119,7 +119,7 @@ export default {
119 <style lang="scss" scoped> 119 <style lang="scss" scoped>
120 .leftcard { 120 .leftcard {
121 width: 32%; 121 width: 32%;
122 height: calc(100% -0.5729rem); 122 height: calc(100% -110px);
123 display: flex; 123 display: flex;
124 flex-direction: column; 124 flex-direction: column;
125 125
...@@ -179,19 +179,21 @@ export default { ...@@ -179,19 +179,21 @@ export default {
179 179
180 .qxjr { 180 .qxjr {
181 background: url("~@/image/jrl3.png"); 181 background: url("~@/image/jrl3.png");
182 background-size: 100% 100%;
182 } 183 }
183 184
184 .sthj { 185 .sthj {
185 background: url("~@/image/jh.png"); 186 background: url("~@/image/jh.png");
187 background-size: 100% 100%;
186 } 188 }
187 189
188 p { 190 p {
189 margin: 0 .0156rem .0521rem .0156rem; 191 margin: 0 .0156rem .0521rem .0156rem;
190 font-weight: 700; 192 font-weight: 700;
191 width: .125rem; 193 width: .195rem;
192 height: .1875rem; 194 height: .2475rem;
193 font-size: .1563rem; 195 font-size: .1863rem;
194 font-size: .1667rem; 196 font-size: .1867rem;
195 } 197 }
196 } 198 }
197 199
...@@ -202,6 +204,7 @@ export default { ...@@ -202,6 +204,7 @@ export default {
202 // padding: 35px 20px 20px 20px; 204 // padding: 35px 20px 20px 20px;
203 box-sizing: border-box; 205 box-sizing: border-box;
204 color: #e3f1ff; 206 color: #e3f1ff;
207 margin-top: .1263rem;
205 208
206 .cardcontent-left { 209 .cardcontent-left {
207 width: 60%; 210 width: 60%;
......
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
3 <div class="card1 cardCon d-center"> 3 <div class="card1 cardCon d-center">
4 <div class="cardhead">新建国有房屋信息</div> 4 <div class="cardhead">新建国有房屋信息</div>
5 <div class="cardcontent" style="margin-top: .3646rem"> 5 <div class="cardcontent" style="margin-top: .3646rem">
6 <dv-scroll-board :config="config" class="board" /> 6 <dv-scroll-board v-if="config.data.length>0" :config="config" class="board" />
7 <div v-else="config.data.length==0" class="nodata">暂无数据</div>
7 </div> 8 </div>
8 </div> 9 </div>
9 <div class="card2 cardCon mt-10"> 10 <div class="card2 cardCon mt-10">
...@@ -20,6 +21,7 @@ ...@@ -20,6 +21,7 @@
20 <script> 21 <script>
21 import columnarsmat from "@/components/Echart/Columnarsmat"; 22 import columnarsmat from "@/components/Echart/Columnarsmat";
22 import Rose from "@/components/Echart/Rose"; 23 import Rose from "@/components/Echart/Rose";
24 import work from "@/api/work";
23 export default { 25 export default {
24 data () { 26 data () {
25 return { 27 return {
...@@ -28,24 +30,34 @@ export default { ...@@ -28,24 +30,34 @@ export default {
28 oddRowBGC: '#154295', 30 oddRowBGC: '#154295',
29 evenRowBGC: '#154295', 31 evenRowBGC: '#154295',
30 header: ['序号', '用途', '性质', '面积'], 32 header: ['序号', '用途', '性质', '面积'],
31 data: [ 33 data: [],
32 ['住宅', '自建房', '转移登记', '73.94'], 34 key:0
33 ['商业服务', '市场化商品房', '转移登记', '1067.14'],
34 ['住宅', '成本售价房', '转移登记', '601.47'],
35 ['住宅', '市场化商品房', '转移登记', '38111.37'],
36 ['住宅', '移民搬迁安置房', '转移登记', '104.16'],
37 ['办公', '自建房', '转移登记', '14913.86'],
38 ['柴房', '市场化商品房', '转移登记', '615.55'],
39 ['住宅', '经济适用住房', '转移登记', '173.17'],
40 ['车库/车位', '市场化商品房', '转移登记', '105.27'],
41 ['住宅', '房改房', '转移登记', '372.4']
42 ]
43 } 35 }
44 } 36 }
45 }, 37 },
46 components: { columnarsmat, Rose }, 38 components: { columnarsmat, Rose },
47 mounted () { 39 mounted () {
40 this.addhousetotal();
48 // scroll(tableref.value.$refs.bodyWrapper);//设置滚动 41 // scroll(tableref.value.$refs.bodyWrapper);//设置滚动
42 },
43 methods: {
44 async addhousetotal () {
45 try {
46 let {result:res}= await work.addhousetotal();
47 console.log("resultssssssssssss",res);
48 res.map((item,index) => {
49 console.log("item",item);
50 console.log("index",index);
51 return (
52 this.config.data.push([index,item.fwyt,item.fwxz,item.mj])
53 )
54
55 });
56 console.log("this.config.data",this.config.data);
57 } catch (error) {
58 console.log("error",error);
59 }
60 }
49 } 61 }
50 } 62 }
51 </script> 63 </script>
...@@ -77,6 +89,13 @@ export default { ...@@ -77,6 +89,13 @@ export default {
77 height: 100%; 89 height: 100%;
78 display: -webkit-box; 90 display: -webkit-box;
79 overflow: hidden; 91 overflow: hidden;
92 .nodata{
93 font-size: .1042rem;
94 color: #02D9FD;
95 font-weight: bold;
96 margin:auto;
97 margin-top: 120px;
98 }
80 } 99 }
81 100
82 .cardCon { 101 .cardCon {
...@@ -94,8 +113,8 @@ export default { ...@@ -94,8 +113,8 @@ export default {
94 .board { 113 .board {
95 width: 90%; 114 width: 90%;
96 margin: 0 auto; 115 margin: 0 auto;
97 height: .7031rem; 116 height: 1.1031rem;
98 margin-top: .2083rem; 117 margin-top: .0521rem;
99 } 118 }
100 } 119 }
101 120
......
...@@ -86,6 +86,7 @@ export default { ...@@ -86,6 +86,7 @@ export default {
86 areacode: '', 86 areacode: '',
87 startTime: '', 87 startTime: '',
88 endTime: '', 88 endTime: '',
89 currentPage: 1
89 }, 90 },
90 // 分页 91 // 分页
91 pageData: { 92 pageData: {
......
...@@ -10,18 +10,6 @@ class data extends filter { ...@@ -10,18 +10,6 @@ class data extends filter {
10 columns () { 10 columns () {
11 return [ 11 return [
12 { 12 {
13 label: '序号',
14 type: 'index',
15 width: '50',
16 render: (h, scope) => {
17 return (
18 <div>
19 {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
20 </div>
21 )
22 }
23 },
24 {
25 label: '汇交状态', 13 label: '汇交状态',
26 width: '110', 14 width: '110',
27 render: (h, scope) => { 15 render: (h, scope) => {
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
26 <el-col :span="6"> 26 <el-col :span="6">
27 <el-form-item label="至" prop="exchangeStartTime" label-width="35px"> 27 <el-form-item label="至" prop="exchangeStartTime" label-width="35px">
28 <el-date-picker type="date" class="width100" placeholder="结束日期" clearable 28 <el-date-picker type="date" class="width100" placeholder="结束日期" clearable
29 :picker-options="pickerOptionsEnd" v-model="form.exchangeEndTime" 29 :picker-options="pickerOptionsEnd" v-model="form.exchangeEndTime" value-format="yyyy-MM-dd HH:mm:ss"
30 value-format="yyyy-MM-dd HH:mm:ss" @change="endTimeChange"></el-date-picker> 30 @change="endTimeChange"></el-date-picker>
31 </el-form-item> 31 </el-form-item>
32 </el-col> 32 </el-col>
33 <el-col :span="6"> 33 <el-col :span="6">
...@@ -91,7 +91,7 @@ import tableMixin from "@/mixins/tableMixin.js"; ...@@ -91,7 +91,7 @@ import tableMixin from "@/mixins/tableMixin.js";
91 import dataDetails from "@/components/EditDialog"; 91 import dataDetails from "@/components/EditDialog";
92 import { getDataReportPage } from "@/api/dataReport.js"; 92 import { getDataReportPage } from "@/api/dataReport.js";
93 //引入日期处理方法 93 //引入日期处理方法
94 import {timeFormat } from "@/utils/operation"; 94 import { timeFormat } from "@/utils/operation";
95 export default { 95 export default {
96 name: "sbbwcx", 96 name: "sbbwcx",
97 mixins: [tableMixin], 97 mixins: [tableMixin],
...@@ -123,14 +123,14 @@ export default { ...@@ -123,14 +123,14 @@ export default {
123 qxdm: "", // 行政区 123 qxdm: "", // 行政区
124 exchangeStartTime: "", // 开始日期 124 exchangeStartTime: "", // 开始日期
125 exchangeEndTime: "", // 结束日期 125 exchangeEndTime: "", // 结束日期
126 hjjg:"", //汇交状态 126 hjjg: "", //汇交状态
127 bdcdyh: "", // 不动产单元号 127 bdcdyh: "", // 不动产单元号
128 ywh: "", // 业务号 128 ywh: "", // 业务号
129 qllx: "", // 权利类型 129 qllx: "", // 权利类型
130 djlx: "", // 登记类型 130 djlx: "", // 登记类型
131 jcjg: "", // 检查结果 131 jcjg: "", // 检查结果
132 rkjg: "", //入库结果 132 rkjg: "", //入库结果
133 currentPage: 1, 133 currentPage: 1
134 }, 134 },
135 // 分页 135 // 分页
136 pageData: { 136 pageData: {
...@@ -141,27 +141,35 @@ export default { ...@@ -141,27 +141,35 @@ export default {
141 // table数据 141 // table数据
142 tableData: { 142 tableData: {
143 // 表头数据 143 // 表头数据
144 columns: datas.columns().concat([ 144 columns: [
145 { 145 {
146 label: "操作", 146 label: "序号",
147 width: "80", 147 type: "index",
148 render: (h, scope) => { 148 width: "50",
149 return ( 149 index: this.indexMethod,
150 <div> 150 }
151 <el-button 151 ]
152 size="mini" 152 .concat(datas.columns().concat([
153 type="primary" 153 {
154 onClick={() => { 154 label: "操作",
155 this.handleDetail(scope.row); 155 width: "80",
156 }} 156 render: (h, scope) => {
157 > 157 return (
158 详情 158 <div>
159 </el-button> 159 <el-button
160 </div> 160 size="mini"
161 ); 161 type="primary"
162 }, 162 onClick={() => {
163 }, 163 this.handleDetail(scope.row);
164 ]), 164 }}
165 >
166 详情
167 </el-button>
168 </div>
169 );
170 },
171 }
172 ])),
165 total: 0, 173 total: 0,
166 data: [], 174 data: [],
167 }, 175 },
...@@ -173,8 +181,8 @@ export default { ...@@ -173,8 +181,8 @@ export default {
173 }, 181 },
174 methods: { 182 methods: {
175 //截止日期变化 183 //截止日期变化
176 endTimeChange(val){ 184 endTimeChange (val) {
177 this.form.exchangeEndTime = timeFormat(new Date(val),true) 185 this.form.exchangeEndTime = timeFormat(new Date(val), true)
178 }, 186 },
179 // 初始化数据 187 // 初始化数据
180 queryClick () { 188 queryClick () {
......