Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
1ac433d1 by 田浩浩
Options

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

2 parents 79f564b9 88ce3f18
Inline Side-by-side
Showing 45 changed files with 249 additions and 112 deletions
......@@ -364,8 +364,9 @@
分摊土地面积： <br />
<p class="label-detail">（FTTDMJ）</p>
</span>
<el-input :disabled="$store.state.business.Edit" : 999999999999999, min: 0, precision: 3 }"
placeholder="分摊土地面积" type="number" v-model.number="ruleForm.fttdmj"></el-input>
<el-input :disabled="$store.state.business.Edit"
v-only-number="{ max: 999999999999999, min: 0, precision: 3 }" placeholder="分摊土地面积" type="number"
v-model.number="ruleForm.fttdmj"></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -68,7 +68,7 @@ export default {
},
// 如果需要自定义 tooltip样式，需要使用formatter
formatter: params => {
return `<div style="">${params.name}:${params.value+"个"}</div>`
return `<div style="">${params.name}:${params.value + "个"}</div>`
}
},
visualMap: {
......@@ -90,23 +90,23 @@ export default {
color: '#737373'
}
},
geo: {
aspectScale: 1, //长宽比
zoom: 1.1,
mapType: '汉中市', // 自定义扩展图表类型
top: '15%',
left: '10%',
map: '汉中市',
itemStyle: {
normal: {//阴影
areaColor: '#02D9FD ',
shadowColor: '#01271F',
borderWidth: 0,
shadowOffsetX: 2,
shadowOffsetY: 25
}
}
},
geo: {
aspectScale: 1, //长宽比
zoom: 1.1,
mapType: '汉中市', // 自定义扩展图表类型
top: '15%',
left: '10%',
map: '汉中市',
itemStyle: {
normal: {//阴影
areaColor: '#02D9FD ',
shadowColor: '#01271F',
borderWidth: 0,
shadowOffsetX: 2,
shadowOffsetY: 25
}
}
},
series: [
{
type: 'map',
......@@ -121,7 +121,7 @@ export default {
borderColor: 'rgba(0,242,252,.5)',
borderWidth: 2,
shadowBlur: 7,
borderColor:'rgba(19,54,162,.1)',
borderColor: 'rgba(19,54,162,.1)',
shadowColor: '#44f2fc',
},
emphasis: {
......@@ -133,9 +133,8 @@ export default {
},
},
label: {
formatter: params => {
return `${params.data.name}\n${params.data.value+"个"}`;
formatter: params => {
return `${params.name}\n${params.value+"个"}`;
},
show: true,
position: 'insideRight',
......
<template>
<Echart :options="options" id="centreLeft1Chart" :key="key" height="225px" width="80%"></Echart>
</template>
<script>
import Echart from '@/common/echart'
export default {
components: {
Echart,
},
data() {
return {
key:0
}
},
props: {
cdata: {
type: Object,
default: () => ({})
},
},
watch: {
cdata: {
handler (newData) {
console.log("newData",newData);
this.options = {
grid: {
right:"1%",
bottom:"4%"
},
color: [
"#37a2da",
"#32c5e9",
"#9fe6b8",
"#ffdb5c",
"#ff9f7f",
"#fb7293",
"#e7bcf3",
"#8378ea"
],
tooltip: {
trigger: "item",
formatter: "{a} <br/>{b} : {c} ({d}%)"
},
toolbox: {
show: true
},
calculable: true,
series: [
{
name: "业务量",
type: "pie",
radius: [40,100],
roseType: "area",
data: newData.seriesData
}
],
}
this.key++
},
immediate: true,
deep: true
}
}
};
</script>
<style lang="scss" scoped>
#centreLeft1Chart {
margin-bottom: 10px;
margin-left: 60px;
}
</style>
<template>
<div>
<Chart :cdata="cdata" />
</div>
</template>
<script>
import Chart from "./Chart";
import work from "@/api/work";
export default {
data () {
return {
cdata: {
seriesData: [],
},
};
},
components: {
Chart,
},
mounted () {
this.getdjywltotal();
},
methods: {
// 获取登记业务量玫瑰图数据
async getdjywltotal () {
try {
let p = {
DJLX: "",
QLLX: "",
XZQDM: "",
};
let res = await work.getdjywltotal(p);
console.log("res",res);
// 遍历修改数组键，作为echars图表的参数
res.result.map((item) => {
return (
this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal })
)
});
} catch (error) {
console.log(error);
}
},
},
};
</script>
<style lang="scss" scoped>
</style>
......@@ -7,11 +7,11 @@ export default {
components: {
Echart,
},
data() {
data () {
return {
key:0
key: 0
}
},
},
props: {
cdata: {
type: Object,
......@@ -21,11 +21,10 @@ export default {
watch: {
cdata: {
handler (newData) {
console.log("newData",newData);
this.options = {
grid: {
right:"1%",
bottom:"4%"
grid: {
right: "1%",
bottom: "4%"
},
color: [
"#37a2da",
......@@ -49,14 +48,14 @@ export default {
{
name: "业务量",
type: "pie",
radius: [40,100],
radius: [0,100],
roseType: "area",
data: newData.seriesData
}
],
}
this.key++
this.key++
},
immediate: true,
deep: true
......
......@@ -19,7 +19,7 @@ export default {
Chart,
},
mounted () {
this.getdjywltotal();
this.getdjywltotal();
},
......@@ -33,16 +33,17 @@ export default {
XZQDM: "",
};
let res = await work.getdjywltotal(p);
console.log("res",res);
// 遍历修改数组键，作为echars图表的参数
res.result.map((item) => {
return (
this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal })
)
});
} catch (error) {
console.log(error);
}
});
} catch (error) {
console.log(error);
}
},
......@@ -51,4 +52,5 @@ export default {
</script>
<style lang="scss" scoped>
</style>
......
......@@ -184,91 +184,91 @@ export const asyncRoutes = [
children: [
{
path: 'tdsyq',
component: () => import('@/views/business-info/tdsyq/index'),
component: () => import('@/views/bdcsj/tdsyq/index'),
name: 'tdsyq',
meta: { title: '土地所有权' }
},
{
path: 'jsydzjdsyq',
component: () => import('@/views/business-info/jsydzjdsyq/index'),
component: () => import('@/views/bdcsj/jsydzjdsyq/index'),
name: 'jsydzjdsyq',
meta: { title: '建设用地、宅基地使用权' }
},
{
path: 'fdcqdz',
component: () => import('@/views/business-info/fdcqdz/index'),
component: () => import('@/views/bdcsj/fdcqdz/index'),
name: 'fdcqdz',
meta: { title: '房地产权（项目内多幢房屋）' }
},
{
path: 'fdcqyz',
component: () => import('@/views/business-info/fdcqyz/index'),
component: () => import('@/views/bdcsj/fdcqyz/index'),
name: 'fdcqyz',
meta: { title: '房地产权（独幢、层、套、间、房屋）' }
},
{
path: 'fdcqqfsyq',
component: () => import('@/views/business-info/fdcqqfsyq/index'),
component: () => import('@/views/bdcsj/fdcqqfsyq/index'),
name: 'fdcqqfsyq',
meta: { title: '建筑物区分所有权业主共有部分' }
},
{
path: 'hysyq',
component: () => import('@/views/business-info/hysyq/index'),
component: () => import('@/views/bdcsj/hysyq/index'),
name: 'hysyq',
meta: { title: '海域(含无居民海岛)使用权' }
},
{
path: 'gzwsyq',
component: () => import('@/views/business-info/gzwsyq/index'),
component: () => import('@/views/bdcsj/gzwsyq/index'),
name: 'gzwsyq',
meta: { title: '构（建）筑物所有权' }
},
{
path: 'nydsyq',
component: () => import('@/views/business-info/nydsyq/index'),
component: () => import('@/views/bdcsj/nydsyq/index'),
name: 'nydsyq',
meta: { title: '农用地使用权（非林地）' }
},
{
path: 'lq',
component: () => import('@/views/business-info/lq/index'),
component: () => import('@/views/bdcsj/lq/index'),
name: 'lq',
meta: { title: '林权' }
},
{
path: 'zxdj',
component: () => import('@/views/business-info/zxdj/index'),
component: () => import('@/views/bdcsj/zxdj/index'),
name: 'zxdj',
meta: { title: '注销登记' }
},
{
path: 'yydj',
component: () => import('@/views/business-info/yydj/index'),
component: () => import('@/views/bdcsj/yydj/index'),
name: 'yydj',
meta: { title: '异议登记' }
},
{
path: 'ygdj',
component: () => import('@/views/business-info/ygdj/index'),
component: () => import('@/views/bdcsj/ygdj/index'),
name: 'ygdj',
meta: { title: '预告登记' }
},
{
path: 'Cfdj',
component: () => import('@/views/business-info/Cfdj/index'),
component: () => import('@/views/bdcsj/cfdj/index'),
name: 'Cfdj',
meta: { title: '查封登记' }
},
{
path: 'dyaq',
component: () => import('@/views/business-info/dyaq/index'),
component: () => import('@/views/bdcsj/dyaq/index'),
name: 'dyaq',
meta: { title: '抵押权登记' }
},
{
path: 'dyiq',
component: () => import('@/views/business-info/dyiq/index'),
component: () => import('@/views/bdcsj/dyiq/index'),
name: 'dyiq',
meta: { title: '地役权登记' }
}
......
......@@ -283,6 +283,24 @@ table td {
// 时间选择框样式
.el-date-picker {
background: url("~@/image/slbg.png") no-repeat;
background-size: 100% 100%;
padding-top: 13px;
padding-bottom: 13px;
border: none;
margin-top: 5px !important;
table {
background: url("~@/image/rqjx.png") no-repeat;
background-size: 100% 100%;
padding: 8px;
}
table td {
box-sizing: border-box;
border-bottom: 0px solid #074487 !important;
}
.el-input__inner {
background-color: #031a46;
}
......@@ -299,18 +317,27 @@ table td {
background-color: #074487;
}
background-color: #031a46;
.el-date-picker__header {
margin-bottom: 0px;
}
.el-date-picker__header-label {
color: #A6CFD6;
}
.el-picker-panel__content {
background-color: #074487;
padding-top: 0px;
margin-top: 0px;
.disabled {
background-color: #074487;
div {
span {
color: rgba(172, 239, 250, .5)
}
}
}
}
......@@ -324,7 +351,7 @@ table td {
}
.el-date-table td span {
color: #A6CFD6;
color: #DBFAFF
}
.el-date-table td.current:not(.disabled) span {
......@@ -419,7 +446,7 @@ table td {
[class^="el-icon-"],
[class*=" el-icon-"] {
display: none;
// display: none;
}
.el-range-separator {
......
......@@ -7,7 +7,7 @@ class data extends filter {
return [
{
label: "行政区",
width: 80,
width: 80,
render: (h, scope) => {
return (
<div>
......@@ -18,7 +18,7 @@ class data extends filter {
},
{
label: "权属状态",
width: 80,
width: 80,
render: (h, scope) => {
return (
<div>
......@@ -26,10 +26,10 @@ class data extends filter {
</div>
)
},
},
},
{
label: "权利类型",
width: 80,
width: 80,
render: (h, scope) => {
return (
<div>
......@@ -40,7 +40,7 @@ class data extends filter {
},
{
label: "登记类型",
width: 80,
width: 80,
render: (h, scope) => {
return (
<div>
......@@ -57,11 +57,12 @@ class data extends filter {
{
label: "不动产单元号",
prop: "BDCDYH",
width: 150,
width: 150,
},
{
label: "不动产权证号",
prop: "BDCQZH"
prop: "BDCQZH",
width: 150,
},
{
label: "权利人",
......@@ -74,13 +75,13 @@ class data extends filter {
{
label: "使用权面积",
prop: "SYQMJ",
width: 90,
width: 90,
},
{
label: "坐落",
prop: "zl"
},
{
label: "登记时间",
width: 140,
......
......@@ -36,11 +36,13 @@ class data extends filter {
},
{
label: "不动产单元号",
prop: "BDCDYH"
prop: "BDCDYH",
width: 150,
},
{
label: "不动产权证号",
prop: "BDCQZH"
prop: "BDCQZH",
width: 150,
},
{
label: "地籍号",
......
......@@ -18,7 +18,7 @@
</p>
<p>
<span>成功率</span>
<span class="cg">{{qxcgl}}</span>
<span class="cg">{{ qxcgl }}</span>
</p>
</div>
</div>
......@@ -41,7 +41,7 @@
</p>
<p>
<span>成功率</span>
<span class="cg">{{stcgl}}</span>
<span class="cg">{{ stcgl }}</span>
</p>
</div>
</div>
......@@ -66,8 +66,8 @@ export default {
stsuccess: "",
qxjrl: "",
stjrl: "",
qxcgl:"",
stcgl:""
qxcgl: "",
stcgl: ""
};
},
mounted () {
......@@ -76,10 +76,10 @@ export default {
components: { columnar },
computed: {
qxjrlList: function () {
return this.qxjrl.toString().split("");
return this.qxjrl && this.qxjrl.toString().split("");
},
stjrlList: function () {
return this.stjrl.toString().split("");
return this.stjrl && this.stjrl.toString().split("");
},
},
methods: {
......@@ -92,9 +92,8 @@ export default {
XZQDM: "",
};
let res = await work.getsthjqxjrtotal(p);
console.log("res",res);
this.stjrl=res.result.sum
this.qxjrl=res.result.sum
this.stjrl=res.result.stsum
this.qxjrl=res.result.qxsum
this.qxerrer=Number(res.result.qxjrerrer)
this.sterrer=Number(res.result.sthjerrer)
if(res.result.sum=="0"){
......@@ -105,8 +104,8 @@ export default {
let stcgl=Number(res.result.sthjsuccess)/this.qxjrl*100
this.qxcgl=qxcglnum.toFixed(2)+"%";
this.stcgl=stcgl.toFixed(2)+"%";
}
}
} catch (error) {
this.$refs.msg.messageShow();
}
......
......@@ -107,7 +107,7 @@ export default {
groupId: item.recType,
});
});
this.$nextTick(() => {
res.length && this.$nextTick(() => {
// 初始化图表
this.echartInit();
this.barChartInit(res[0].recType);
......@@ -209,15 +209,6 @@ export default {
});
//补全无数据行政区后的结果数组
let dealArr = [...this.dicData["A20"]];
// //行政区代码过滤
// res.length > 0 &&
// res.forEach((item) => {
// xzqArr.push(
// this.dicData["A20"].filter((i) => {
// return i.DCODE == item.qxdm;
// })[0].DNAME
// );
// });
let myChartBar = this.$echarts.init(
document.getElementById("myChart-bar")
);
......
......@@ -124,7 +124,7 @@ export default {
});
this.$nextTick(() => {
// 初始化图表
this.echartInit();
this.chartData.length && this.echartInit();
});
},
// 重置
......@@ -144,6 +144,7 @@ export default {
color: ["#fff", "#ff6e6e", "#3f99ff", "#ffaf48"],
tooltip: {
trigger: "axis",
formatter: '{b}<br/>{a0}：{c0}个<br/>{a1}：{c1}个<br/>{a2}：{c2}%',
axisPointer: {
type: "cross",
crossStyle: {
......@@ -153,6 +154,7 @@ export default {
},
legend: {
data: ["成功", "失败", "成功率"],
top: '16',
textStyle: {
show: true,
color: "#fff",
......@@ -217,12 +219,12 @@ export default {
},
{
type: "value",
name: "成功率/%",
name: "成功率",
nameTextStyle: {
color: "#fff",
fontSize: "16",
},
splitNumber:4,
splitNumber:2,
axisLabel: {
formatter: "{value} %",
textStyle: {
......@@ -238,11 +240,6 @@ export default {
name: "成功",
type: "bar",
barMaxWidth: '60',
tooltip: {
valueFormatter: function (value) {
return value + " ml";
},
},
data: this.chartData.map((item) => {
return item.success;
}),
......@@ -251,11 +248,6 @@ export default {
name: "失败",
type: "bar",
barMaxWidth: '60',
tooltip: {
valueFormatter: function (value) {
return value + " ml";
},
},
data: this.chartData.map((item) => {
return item.failure;
}),
......@@ -265,11 +257,6 @@ export default {
type: "line",
barMaxWidth: '60',
yAxisIndex: 1,
tooltip: {
valueFormatter: function (value) {
return value + "%";
},
},
data: this.chartData.map((item) => {
return item.rate;
}),
......
......@@ -120,7 +120,7 @@ export default {
this.chartData = res;
this.$nextTick(() => {
// 初始化图表
this.echartInit(this.chartData)
this.chartData.length && this.echartInit(this.chartData)
});
},
// 重置
......
......@@ -18,14 +18,16 @@
</el-col>
<el-col :span="6">
<el-form-item label="汇交时间" prop="exchangeStartTime">
<el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
clearable v-model="form.exchangeStartTime" value-format="yyyy-MM-dd"></el-date-picker>
<el-date-picker type="date" class="width100" placeholder="开始日期" clearable
:picker-options="pickerOptionsStart" v-model="form.exchangeStartTime"
value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="至" prop="exchangeStartTime" label-width="35px">
<el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
clearable v-model="form.exchangeEndTime" value-format="yyyy-MM-dd"></el-date-picker>
<el-date-picker type="date" class="width100" placeholder="结束日期" clearable
:picker-options="pickerOptionsEnd" v-model="form.exchangeEndTime"
value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
......