bf12ec7e by 任超

Merge branch 'master' into dev

2 parents 68b86f0e acca3b99
......@@ -94,7 +94,7 @@ export default {
// shadowOffsetY: 20,
},
},
},{
}, {
aspectScale: 1, //长宽比
zoom: 1.1,
mapType: "", // 自定义扩展图表类型
......@@ -102,12 +102,12 @@ export default {
left: "10%",
map: "汉中市",
itemStyle: {
color:'#21371d',
color: '#21371d',
areaColor: "#21371d",
borderWidth: 1,
borderColor:"#00A3CB",
borderColor: "#00A3CB",
shadowColor: "#01C5E9",
shadowBlur:10,
shadowBlur: 10,
shadowOffsetX: 0,
shadowOffsetY: -12,
// normal: {
......@@ -117,7 +117,7 @@ export default {
// },
},
emphasis: {
disabled:true
disabled: true
}
}],
series: [
......@@ -138,33 +138,32 @@ export default {
},
emphasis: {
// itemStyle:{
// 地图区域的高亮颜色
areaColor: {
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [{
offset: 0, color: '#4DD1B4' // 0% 处的颜色
}, {
offset: 1, color: '#15BFCE' // 100% 处的颜色
}],
global: false // 缺省为 false
},
borderType: 'dottod',
borderWidth: 0,
borderColor:'#F8F071',
shadowColor: '#000',
shadowBlur: 10,
shadowOffsetY:4
// 地图区域的高亮颜色
areaColor: {
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [{
offset: 0, color: '#4DD1B4' // 0% 处的颜色
}, {
offset: 1, color: '#15BFCE' // 100% 处的颜色
}],
global: false // 缺省为 false
},
borderType: 'dottod',
borderWidth: 0,
borderColor: '#F8F071',
shadowColor: '#000',
shadowBlur: 10,
shadowOffsetY: 4
// }
}
},
label: {
formatter: (params) => {
return `${params.name}\n${params.value + "个"}`;
// return `${params.name}\n${params.value + "个"}`;
},
show: true,
position: "insideRight",
......
......@@ -139,7 +139,7 @@ input[type="number"] {
}
::-webkit-scrollbar-thumb {
background: rgba(69, 138, 207,.3);
background: rgba(69, 138, 207, .6);
background-clip: padding-box;
min-height: 28px;
-webkit-border-radius: 6px;
......@@ -148,13 +148,11 @@ input[type="number"] {
}
::-webkit-scrollbar-thumb:hover {
background: rgba(69, 138, 207,.3);
background: rgba(69, 138, 207, .6);
}
// 滚动条位置
.el-scrollbar__wrap{
// margin-bottom: 0px!important;
margin-right: 0px!important;
}
// element 样式补丁
.el-menu--horizontal {
......@@ -493,9 +491,7 @@ table td {
}
.el-button--text {
display: flex;
align-items: center;
justify-content: center;
line-height: 10px;
}
// 时间组件input框部分
......
......@@ -351,7 +351,7 @@ aside {
color: #02D9FD;
width: 64px;
height: 28px;
background: rgba(255, 255, 255, 0.1);
background: rgba(255, 255, 255, 0.2);
border-radius: 16px;
}
......@@ -362,6 +362,13 @@ aside {
border-radius: 16px;
color: #0097FF;
}
.successColor:hover {
width: 64px;
height: 28px;
background: rgba(255, 255, 255, 0.2);
border-radius: 16px;
color: #0097FF;
}
.configurationbtnColor {
width: 64px;
height: 28px;
......@@ -369,6 +376,13 @@ aside {
border-radius: 16px;
color: #b0e4dd;
}
.configurationbtnColor:hover {
width: 64px;
height: 28px;
background: rgba(255, 255, 255, 0.2);
border-radius: 16px;
color: #b0e4dd;
}
.resetbtnColor {
width: 64px;
height: 28px;
......@@ -376,20 +390,25 @@ aside {
border-radius: 16px;
color: #A5CBDA;
}
.movebtnColor {
.resetbtnColor:hover {
width: 64px;
height: 28px;
background: rgba(255, 255, 255, 0.1);
background: rgba(255, 255, 255, 0.2);
border-radius: 16px;
color: #0097FF;
color: #A5CBDA;
}
.successColor:hover {
.movebtnColor {
width: 64px;
height: 28px;
background: rgba(255, 255, 255, 0.1);
border-radius: 16px;
color: #0097FF;
}
.movebtnColor:hover {
background: rgba(255, 255, 255, 0.2);
border-radius: 16px;
color: #0097FF;
}
.delColor {
width: 64px;
......@@ -402,7 +421,7 @@ aside {
.delColor:hover {
width: 64px;
height: 28px;
background: rgba(255, 255, 255, 0.1);
background: rgba(255, 255, 255, 0.2);
border-radius: 16px;
color: #B06974;
}
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-17 15:13:09
*/
import filter from '@/utils/filter.js'
class data extends filter {
constructor() {
......@@ -54,7 +59,7 @@ class data extends filter {
{
label: "解封机关",
prop: "jfjg",
width: 150,
minWidth: 150,
},
{
label: "解封文号",
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-13 14:22:01
* @LastEditTime: 2023-03-17 15:13:30
*/
import filter from '@/utils/filter.js'
class data extends filter {
......@@ -34,7 +34,8 @@ class data extends filter {
},
{
label: "业务号",
prop: "ywh"
prop: "ywh",
minWidth: 150,
},
{
label: "不动产单元号",
......@@ -62,6 +63,7 @@ class data extends filter {
},
{
label: "登记类型",
minWidth: 100,
render: (h, scope) => {
return (
<div>
......@@ -73,11 +75,12 @@ class data extends filter {
{
label: "被担保主债权数额",
prop: "bdbzzqse",
width: 135,
minWidth: 135,
},
{
label: "最高债权额",
prop: "zgzqse"
prop: "zgzqse",
minWidth: 100,
},
{
label: "登记时间",
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-13 14:23:47
* @LastEditTime: 2023-03-17 15:14:13
*/
import filter from '@/utils/filter.js'
class data extends filter {
......@@ -34,6 +34,7 @@ class data extends filter {
},
{
label: "业务号",
minWidth: 150,
prop: "YWH",
},
{
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-13 14:25:09
* @LastEditTime: 2023-03-17 15:18:26
*/
import filter from '@/utils/filter.js'
class data extends filter {
......@@ -34,7 +34,8 @@ class data extends filter {
},
{
label: "业务号",
prop: "ywh"
prop: "ywh",
minWidth: 150,
},
{
label: "不动产单元号",
......@@ -49,7 +50,7 @@ class data extends filter {
{
label: "权利人",
prop: "qlrmc",
width: 150
minWidth: 100
},
{
label: "用途",
......@@ -57,7 +58,7 @@ class data extends filter {
},
{
label: "权利类型",
width: 150,
minWidth: 160,
render: (h, scope) => {
return (
<div>
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-17 15:18:47
*/
import filter from '@/utils/filter.js'
class data extends filter {
constructor() {
......@@ -30,6 +35,7 @@ class data extends filter {
{
label: "业务号",
prop: "ywh",
minWidth: 150,
},
{
label: "不动产单元号",
......@@ -44,14 +50,16 @@ class data extends filter {
{
label: "权利人",
prop: "qlrmc",
width: 150
minWidth: 70
},
{
label: "用途",
prop: "ytmc"
prop: "ytmc",
minWidth: 70
},
{
label: "权利类型",
minWidth: 170,
render: (h, scope) => {
return (
<div>
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-17 15:15:38
*/
import filter from '@/utils/filter.js'
class data extends filter {
constructor() {
......@@ -51,7 +56,8 @@ class data extends filter {
},
{
label: "用途",
prop: "yt"
prop: "yt",
minWidth: 150,
},
{
label: "权利类型",
......
......@@ -30,17 +30,17 @@ class data extends filter {
{
label: "业务号",
prop: "YWH",
width: 150,
minWidth: 150,
},
{
label: "不动产单元号",
prop: "BDCDYH",
width: 150,
minWidth: 150,
},
{
label: "不动产权证号",
prop: "BDCQZH",
width: 150,
minWidth: 150,
},
{
label: "地籍号",
......
......@@ -12,6 +12,7 @@ class data extends filter {
},
{
label: "预告登记种类",
minWidth: 130,
render: (h, scope) => {
return (
<div>
......@@ -22,7 +23,7 @@ class data extends filter {
},
{
label: "登记类型",
width: 100,
minWidth: 100,
render: (h, scope) => {
return (
<div>
......@@ -33,11 +34,13 @@ class data extends filter {
},
{
label: "不动产单元号",
prop: "BDCDYH"
prop: "BDCDYH",
minWidth: 150,
},
{
label: "不动产登记证明号",
prop: "BDCDJZMH"
prop: "BDCDJZMH",
minWidth: 150,
},
{
label: "登记时间",
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-13 14:37:10
* @LastEditTime: 2023-03-17 15:18:00
*/
import filter from '@/utils/filter.js'
......@@ -45,7 +45,7 @@ class data extends filter {
{
label: "不动产权证号",
prop: "BDCQZH",
width: 150
minWidth: 150
},
{
label: "权利人",
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-16 13:44:11
* @LastEditTime: 2023-03-17 15:10:43
*/
import filter from '@/utils/filter.js'
class data extends filter {
......@@ -75,7 +75,7 @@ class data extends filter {
},
{
prop: "rectypeName",
minWidth: 240,
minWidth: 210,
label: "业务名称",
render: (h, scope) => {
return (
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-13 14:39:14
* @LastEditTime: 2023-03-17 15:11:13
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -31,17 +31,17 @@ class data extends filter {
{
prop: "areacode",
label: "行政区代码",
width: 90,
minWidth: 90,
},
{
prop: "areaName",
label: "行政区名称",
width: 90,
minWidth: 90,
},
{
prop: "bizMsgid",
label: "业务报文ID",
width: 150,
minWidth: 150,
},
{
prop: "createdate",
......@@ -51,22 +51,22 @@ class data extends filter {
{
prop: "recflowid",
label: "业务流水号",
width: 100,
minWidth: 100,
},
{
prop: "estatenum",
label: "不动产单元号",
width: 150,
minWidth: 150,
},
{
prop: "rectype",
label: "业务编码",
width: 90,
minWidth: 90,
},
{
prop: "rectypeName",
label: "业务名称",
minWidth: 240,
minWidth: 190,
},
{
prop: "exchangeDate",
......
......@@ -178,7 +178,6 @@
type="text"
size="mini"
class="configurationbtnColor"
icon="el-icon-video-pause"
onClick={() => {
this.getList(scope.row);
}}
......@@ -200,7 +199,6 @@
type="text"
size="mini"
class='successColor'
icon="el-icon-edit"
onClick={() => {
this.handleAddEdit(scope.row);
}}
......@@ -222,7 +220,6 @@
disabled={scope.row.category === 1}
size="mini"
class='delColor'
icon="el-icon-delete"
// style="color:#F56C6C"
onClick={() => {
this.handleDelete(scope.row.id, scope.row.name);
......