diff --git a/src/components/charts/bar-dimensional/index.js b/src/components/charts/bar-dimensional/index.js
index aecf5aa..c348101 100644
--- a/src/components/charts/bar-dimensional/index.js
+++ b/src/components/charts/bar-dimensional/index.js
@@ -45,7 +45,9 @@ export default {
};
},
mounted () {
- this.initChart();
+ setTimeout(()=>{
+ this.initChart();
+ },2000)
},
computed: {
},
@@ -66,10 +68,14 @@ export default {
chartSetOption () {
let xAxisData = [];
let data = [];
+ let max = [];
this.data.forEach(item => {
xAxisData.push(item.name)
data.push(item.value)
});
+ data.forEach(item => {
+ max.push(Math.max(...data))
+ });
const CubeLeft = echarts.graphic.extendShape({
shape: {
x: 0,
@@ -129,12 +135,8 @@ export default {
echarts.graphic.registerShape("CubeLeft", CubeLeft);
echarts.graphic.registerShape("CubeRight", CubeRight);
echarts.graphic.registerShape("CubeTop", CubeTop);
- const MAX = [
- 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500,
- ];
- const VALUE = [
- 201, 123, 379, 234, 165, 123, 379, 234, 165, 379, 234, 165,
- ];
+ const MAX = max;
+ const VALUE = data;
const option = {
// backgroundColor: "#010d3a",
title: {
@@ -170,15 +172,7 @@ export default {
},
type: "category",
gridIndex: 0,
- data: [
- "A镇",
- "A镇",
- "A镇",
- "A镇",
- "A镇",
- "A镇",
- "A镇"
- ],
+ data: xAxisData,
axisTick: {
alignWithLabel: true,
},
diff --git a/src/components/charts/bar/index.js b/src/components/charts/bar/index.js
index 02b9322..5220e1b 100644
--- a/src/components/charts/bar/index.js
+++ b/src/components/charts/bar/index.js
@@ -46,7 +46,7 @@ export default {
mounted () {
setTimeout(()=>{
this.initChart();
- },1000)
+ },2000)
},
computed: {
},
diff --git a/src/components/charts/pie/index.js b/src/components/charts/pie/index.js
index 8062057..bce4673 100644
--- a/src/components/charts/pie/index.js
+++ b/src/components/charts/pie/index.js
@@ -14,6 +14,10 @@ export default {
type: String,
default: "总债务"
},
+ showTit: {
+ type: Boolean,
+ default: true
+ },
data: {
type: Array,
default: function () {
@@ -48,7 +52,9 @@ export default {
};
},
mounted () {
- this.initChart();
+ setTimeout(()=>{
+ this.initChart();
+ },2000)
},
computed: {
},
@@ -71,6 +77,8 @@ export default {
var echartData = [
...this.data
];
+ var that = this;
+ console.log(echartData)
var rich = {
yellow: {
color: "rgba(185, 211, 235, 1)",
@@ -102,9 +110,13 @@ export default {
},
};
const option = {
+ tooltip: {
+ trigger: "item"
+ },
title: [
{
text: this.title,
+ show: this.showTit,
left: "center",
top: "40%",
padding: [0, 0],
@@ -116,6 +128,7 @@ export default {
},
{
text: this.titleNum,
+ show: this.showTit,
left: "center",
top: "50%",
padding: [0, 0],
@@ -132,7 +145,7 @@ export default {
type: "pie",
radius: ["48%", "70%"],
- color: ["rgba(15, 252, 252, 1)", "rgba(134, 91, 252, 1)", "rgba(49, 129, 246, 1)", "rgba(29, 197, 104, 1)"],
+ color: ["rgba(15, 252, 252, 1)", "rgba(134, 91, 252, 1)", "rgba(49, 129, 246, 1)", "rgba(29, 197, 104, 1)","#ffc72b"],
label: {
normal: {
formatter: function (params, ticket, callback) {
@@ -143,12 +156,9 @@ export default {
});
percent = ((params.value / total) * 100).toFixed(1);
return (
- "{white|" +
- percent + "%" +
- "}\n{blue|" +
- params.name +
- "}\n{hr|}\n{yellow|" +
- params.value + params.data.unit + '}'
+ "{white|" + percent + "%" + "}\n" +
+ "{blue|" + params.name + "}\n" +
+ (that.showTit ? "{hr|}\n{yellow|" + params.value + params.data.unit + '}':'')
);
},
rich: rich,
diff --git a/src/components/pannelNew/header_bg.png b/src/components/pannelNew/header_bg.png
index b145904..965cac1 100644
Binary files a/src/components/pannelNew/header_bg.png and b/src/components/pannelNew/header_bg.png differ
diff --git a/src/components/pannelNew/index.html b/src/components/pannelNew/index.html
index 4540f2b..ccf926e 100644
--- a/src/components/pannelNew/index.html
+++ b/src/components/pannelNew/index.html
@@ -1,7 +1,7 @@
diff --git a/src/views/sanqing/comps/buttom/1/index.js b/src/views/sanqing/comps/buttom/1/index.js
index 66dadbc..9a98dec 100644
--- a/src/views/sanqing/comps/buttom/1/index.js
+++ b/src/views/sanqing/comps/buttom/1/index.js
@@ -5,9 +5,9 @@ export default {
},
props: {
data: {
- type: Array,
+ type: Object,
default: function () {
- return []
+ return {}
}
}
},
diff --git a/src/views/sanqing/comps/buttom/1/index.scss b/src/views/sanqing/comps/buttom/1/index.scss
index 7239e4b..1071e81 100644
--- a/src/views/sanqing/comps/buttom/1/index.scss
+++ b/src/views/sanqing/comps/buttom/1/index.scss
@@ -1,7 +1,11 @@
.buttom2 {
- width: 960px;
+ width: 220px;
display: flex;
justify-content: space-between;
+ position: absolute;
+ top: 100px;
+ left: 460px;
+ z-index: 2;
.flex_main{
background: url("bg.png") no-repeat 10px center;
background-size: calc(100% - 10px) 100%;
diff --git a/src/views/sanqing/comps/buttom/2/bg.png b/src/views/sanqing/comps/buttom/2/bg.png
new file mode 100644
index 0000000..66e819f
Binary files /dev/null and b/src/views/sanqing/comps/buttom/2/bg.png differ
diff --git a/src/views/sanqing/comps/buttom/2/bg2.png b/src/views/sanqing/comps/buttom/2/bg2.png
new file mode 100644
index 0000000..ed83a8a
Binary files /dev/null and b/src/views/sanqing/comps/buttom/2/bg2.png differ
diff --git a/src/views/sanqing/comps/buttom/2/data.js b/src/views/sanqing/comps/buttom/2/data.js
new file mode 100644
index 0000000..68746f0
--- /dev/null
+++ b/src/views/sanqing/comps/buttom/2/data.js
@@ -0,0 +1,34 @@
+export default [
+ [
+ {
+ show: true,
+ name: '农用地(亩)',
+ value: '716'
+ },
+ {
+ show: true,
+ name: '建设用地(亩)',
+ value: '716'
+ },
+ {
+ show: true,
+ name: '未利用地(亩)',
+ value: '716'
+ },
+ {
+ show: true,
+ name: '农用地(宗)',
+ value: '716'
+ },
+ {
+ show: true,
+ name: '建设用地(宗)',
+ value: '716'
+ },
+ {
+ show: true,
+ name: '未利用地(宗)',
+ value: '103'
+ }
+ ]
+]
\ No newline at end of file
diff --git a/src/views/sanqing/comps/buttom/2/index.html b/src/views/sanqing/comps/buttom/2/index.html
new file mode 100644
index 0000000..0212616
--- /dev/null
+++ b/src/views/sanqing/comps/buttom/2/index.html
@@ -0,0 +1,13 @@
+
+
+
+
{{data.xy23}}万元
+
2023年盘活效益
+
+
+
+
{{data.xy24}}万元
+
2024年盘活效益
+
+
+
diff --git a/src/views/sanqing/comps/buttom/2/index.js b/src/views/sanqing/comps/buttom/2/index.js
new file mode 100644
index 0000000..9a98dec
--- /dev/null
+++ b/src/views/sanqing/comps/buttom/2/index.js
@@ -0,0 +1,24 @@
+import BlockValue from '@/components/value/index.vue';
+export default {
+ components: {
+ BlockValue
+ },
+ props: {
+ data: {
+ type: Object,
+ default: function () {
+ return {}
+ }
+ }
+ },
+ data () {
+ return {
+ };
+ },
+ created () {
+ },
+ mounted () {
+ },
+ methods: {
+ }
+};
diff --git a/src/views/sanqing/comps/buttom/2/index.scss b/src/views/sanqing/comps/buttom/2/index.scss
new file mode 100644
index 0000000..646ace8
--- /dev/null
+++ b/src/views/sanqing/comps/buttom/2/index.scss
@@ -0,0 +1,93 @@
+.buttom2 {
+ width: 220px;
+ display: flex;
+ justify-content: space-between;
+ position: absolute;
+ top: 100px;
+ right: 460px;
+ z-index: 2;
+ .flex_main{
+ background: url("bg.png") no-repeat 10px center;
+ background-size: calc(100% - 10px) 100%;
+ width: 220px;
+ height: 150px;
+ padding: 15px 15px 15px 25px;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ margin-bottom: 15px;
+ position: relative;
+ .flex_block{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ p:nth-child(1){
+ color: #e6f1ff;
+ }
+ }
+ .tt{
+ text-shadow: 2px 2px 4px #000000;
+ font-size: 18px;
+ font-weight: bold;
+ }
+ i{
+ display: block;
+ height: 100%;
+ width: 5px;
+ position: absolute;
+ top: 0;
+ left: 0;
+ }
+ &:nth-child(1){
+ i{
+ background-color: #00d6f8;
+ }
+ .flex_block{
+ p:nth-child(2){
+ color: #00d6f8;
+ }
+ }
+ }
+ &:nth-child(2){
+ i{
+ background-color: #f7cc3a;
+ }
+ .flex_block{
+ p:nth-child(2){
+ color: #f7cc3a;
+ }
+ }
+ }
+ &:nth-child(3){
+ i{
+ background-color: #04e26f;
+ }
+ .flex_block{
+ p:nth-child(2){
+ color: #04e26f;
+ }
+ }
+ }
+ }
+
+ .flex_main_right{
+ background: url("bg2.png") no-repeat center;
+ background-size: 100% 100%;
+ width: 220px;
+ height: 100px;
+ margin-bottom: 15px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: space-evenly;
+ p:nth-child(1){
+ color: #01d5f8;
+ font-size: 26px;
+ font-weight: bold;
+ span{
+ font-size: 14px;
+ }
+ }
+ }
+
+}
diff --git a/src/views/sanqing/comps/buttom/2/index.vue b/src/views/sanqing/comps/buttom/2/index.vue
new file mode 100644
index 0000000..b0a7bb3
--- /dev/null
+++ b/src/views/sanqing/comps/buttom/2/index.vue
@@ -0,0 +1,4 @@
+
+
+
diff --git a/src/views/sanqing/comps/left/bottom/1/index.html b/src/views/sanqing/comps/left/bottom/1/index.html
index 2691f24..09d4417 100644
--- a/src/views/sanqing/comps/left/bottom/1/index.html
+++ b/src/views/sanqing/comps/left/bottom/1/index.html
@@ -1,9 +1,10 @@
-
+
diff --git a/src/views/sanqing/comps/left/bottom/1/index.js b/src/views/sanqing/comps/left/bottom/1/index.js
index 828bb7a..6ee86da 100644
--- a/src/views/sanqing/comps/left/bottom/1/index.js
+++ b/src/views/sanqing/comps/left/bottom/1/index.js
@@ -12,18 +12,21 @@ export default {
default: function () {
return []
}
+ },
+ countNum: {
+ type: Number,
+ default: 0
}
},
data () {
return {
- pannelTabData: [],
tabIndex: '1'
};
},
created () {
},
mounted () {
-
+ console.log(this.countNum)
},
methods: {
tabChange (info) {
diff --git a/src/views/sanqing/comps/left/middle/1/index.html b/src/views/sanqing/comps/left/middle/1/index.html
index b92bd2b..4ba98f6 100644
--- a/src/views/sanqing/comps/left/middle/1/index.html
+++ b/src/views/sanqing/comps/left/middle/1/index.html
@@ -1,4 +1,4 @@
-
+
+
+
+
+
-
+
-
+
+
diff --git a/src/views/sanqing/index.js b/src/views/sanqing/index.js
index 3eebf70..a5658a2 100644
--- a/src/views/sanqing/index.js
+++ b/src/views/sanqing/index.js
@@ -11,6 +11,9 @@ import Right11 from './comps/right/top/1/index.vue';
import Right21 from './comps/right/middle/1/index.vue';
import Right31 from './comps/right/bottom/1/index.vue';
import Bottom1 from './comps/buttom/1/index.vue';
+import Bottom2 from './comps/buttom/2/index.vue';
+
+import Popover from './popover/index.vue';
import MainGis from './main-gis/index.vue';
import { comps } from './data.js'
@@ -32,6 +35,8 @@ export default {
Right11,
Right21,
Right31,
+ Popover,
+ Bottom2,
Bottom1
},
data () {
@@ -47,55 +52,66 @@ export default {
}
},
created () {
+ this.currentComp.right[0].data = [];
+ this.currentComp.right[1].data = [];
+ this.currentComp.right[2].data = [];
+
+ this.currentComp.left[0].data = [];
+ this.currentComp.left[1].data = [];
+ this.currentComp.left[2].data = [];
getInfo().then(res => {
getStatistic({ deptId: res.user.deptId }).then((response) => {
response.data.jtzyzcDeptList.map(rr => {
- this.currentComp.left[0].data.push({
+ this.currentComp.right[0].data.push({
name: rr.deptName,
value: rr.ydmj
})
})
response.data.nysssbDeptList.map(rr => {
- this.currentComp.left[1].data.push({
+ this.currentComp.right[1].data.push({
name: rr.deptName,
value: rr.ydmj
})
})
response.data.nhzcDeptList.map(rr => {
- this.currentComp.left[2].data.push({
+ this.currentComp.right[2].data.push({
name: rr.deptName,
value: rr.ydmj
})
})
response.data.jtzyzcTypeList.map(rr => {
- this.currentComp.right[0].data.push({
+ this.currentComp.left[0].data.push({
name: rr.threeDetailType,
value: rr.ydmj
})
})
response.data.nysssbTypeList.map(rr => {
- this.currentComp.right[1].data.push({
+ this.currentComp.left[1].data.push({
name: rr.threeDetailType,
value: rr.ydmj
})
})
response.data.nhzcTypeList.map(rr => {
- this.currentComp.right[2].data.push({
+ this.currentComp.left[2].data.push({
name: rr.threeDetailType,
- value: rr.ydmj
+ value: rr.ydmj,
+ unit: '万元'
})
+ this.currentComp.left[2].countNum += rr.ydmj;
})
this.currentComp.buttom[0].data = {
jtzyzc: response.data.jtzyzc,//集体资源资产
nysssb: response.data.nysssb,//农业设施设备
nhzc: response.data.nhzc,
+ }
+
+ this.currentComp.buttom[1].data = {
xy23: response.data.xy23,
xy24: response.data.xy24
}
-
console.log(this.currentComp)
this.allData = response.data;
});
diff --git a/src/views/sanqing/index.scss b/src/views/sanqing/index.scss
index 5eb23a3..12bb638 100644
--- a/src/views/sanqing/index.scss
+++ b/src/views/sanqing/index.scss
@@ -8,4 +8,5 @@
.buttom_side {
top: 100px;
bottom: auto;
+ left: 685px;
}
diff --git a/src/views/sanqing/main-gis/index.scss b/src/views/sanqing/main-gis/index.scss
index 7ef9f94..f372570 100644
--- a/src/views/sanqing/main-gis/index.scss
+++ b/src/views/sanqing/main-gis/index.scss
@@ -48,20 +48,20 @@
//选择地址
.select_address {
- height: 30px;
width: 300px;
position: absolute;
- left: 480px;
- top: 112px;
+ left: 30px;
+ top: 40px;
z-index: 302;
+ box-shadow: inset 0 0 10px 2px rgba(27, 123, 204, 0.8); /* 添加内发光效果 */
+
//
//
::v-deep {
.el-input--suffix {
// background: url('../../../../assets/images/dataScreen/bigDataMonitoring2/stockCooperative/addText_bg.png') center center no-repeat !important;
background-size: 100% 100% !important;
- height: 35px;
width: 280px;
.el-input__inner {
@@ -71,7 +71,6 @@
font-size: 1.66vh;
text-align: center;
padding: 0;
- padding-top: .9vh;
}
.el-input__icon {
@@ -241,4 +240,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/views/sanqing/popover/icon.png b/src/views/sanqing/popover/icon.png
new file mode 100644
index 0000000..37bb3d9
Binary files /dev/null and b/src/views/sanqing/popover/icon.png differ
diff --git a/src/views/sanqing/popover/index.html b/src/views/sanqing/popover/index.html
new file mode 100644
index 0000000..b5588c1
--- /dev/null
+++ b/src/views/sanqing/popover/index.html
@@ -0,0 +1,79 @@
+
+
B镇详情×
+
+
资产编码
+
11111111
+
资产名称
+
11111111
+
+
+
三清类型
+
11111111
+
资产类型
+
11111111
+
+
+
用地面积
+
11111111
+
建筑面积(㎡)
+
11111111
+
+
+
所在组
+
11111111
+
权属性质
+
11111111
+
+
+
权属是否存在争议
+
11111111
+
权属主体
+
11111111
+
+
+
是否委托代管
+
11111111
+
联系电话
+
11111111
+
+
+
23年盘活方式
+
11111111
+
23年效益(万元)
+
11111111
+
+
+
24年盘活方式
+
11111111
+
24年效益(万元)
+
11111111
+
+
+
盘活情况
+
11111111
+
资产闲置原因
+
11111111
+
+
+
是否能正常使用
+
11111111
+
完善后使用
+
11111111
+
+
+
不能使用
+
11111111
+
盘活措施
+
11111111
+
+
+
盘活时限
+
11111111
+
资产统计年度
+
11111111
+
+
+
diff --git a/src/views/sanqing/popover/index.js b/src/views/sanqing/popover/index.js
new file mode 100644
index 0000000..1d731dd
--- /dev/null
+++ b/src/views/sanqing/popover/index.js
@@ -0,0 +1,21 @@
+export default {
+ props: {
+ data: {
+ type: Array,
+ default: function () {
+ return []
+ }
+ }
+ },
+ data () {
+ return {
+
+ };
+ },
+ created () {
+ },
+ mounted () {
+ },
+ methods: {
+ }
+};
diff --git a/src/views/sanqing/popover/index.scss b/src/views/sanqing/popover/index.scss
new file mode 100644
index 0000000..d485f40
--- /dev/null
+++ b/src/views/sanqing/popover/index.scss
@@ -0,0 +1,45 @@
+.popover_main{
+ width: 800px;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50% , -50%);
+ background-color: rgba(11,36,79,.9);
+ z-index: 99;
+ padding-bottom: 25px;
+ border: 1px solid #0b61b7;
+ h1{
+ background: url("./tit_bg.png") no-repeat center;
+ background-size: 100% 100%;
+ padding: 10px 25px 10px 10px;
+ display: flex;
+ align-items: center;
+ font-size: 18px;
+ font-weight: initial;
+ i{
+ display: block;
+ width: 25px;
+ height: 25px;
+ background: url("./icon.png") no-repeat center;
+ background-size: 200% 200%;
+ }
+ span{
+ margin-left: auto;
+ font-size: 24px;
+ }
+ }
+ div{
+ display: flex;
+ justify-content: space-between;
+ p{
+ width: 25%;
+ padding: 10px 25px;
+ &:nth-child(odd){
+ color: #80aacf;
+ };
+ &:nth-child(even){
+ color: #01d5f8;
+ }
+ }
+ }
+}
diff --git a/src/views/sanqing/popover/index.vue b/src/views/sanqing/popover/index.vue
new file mode 100644
index 0000000..b0a7bb3
--- /dev/null
+++ b/src/views/sanqing/popover/index.vue
@@ -0,0 +1,4 @@
+
+
+
diff --git a/src/views/sanqing/popover/tit_bg.png b/src/views/sanqing/popover/tit_bg.png
new file mode 100644
index 0000000..9bcc498
Binary files /dev/null and b/src/views/sanqing/popover/tit_bg.png differ
diff --git a/vue.config.js b/vue.config.js
index 9211618..bc5a895 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -21,7 +21,7 @@ module.exports = {
// target: `http://192.168.0.105:8090`, // 公网测试环境
changeOrigin: true,
onProxyReq: function (proxyReq, req) {
- //console.log(
+ console.log(
'[HPM] Origin changed from ' +
req.headers.host +
' ~> ' +
@@ -34,7 +34,7 @@ module.exports = {
logLevel: 'debug',
changeOrigin: true,
onProxyReq: function (proxyReq, req) {
- //console.log(
+ console.log(
'[HPM] Origin changed from ' +
req.headers.host +
' ~> ' +