diff --git a/src/views/statics/component/barChart.vue b/src/views/statics/component/barChart.vue
new file mode 100644
index 0000000..384eb1c
--- /dev/null
+++ b/src/views/statics/component/barChart.vue
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
diff --git a/src/views/statics/component/lineChart.vue b/src/views/statics/component/lineChart.vue
new file mode 100644
index 0000000..8f830a7
--- /dev/null
+++ b/src/views/statics/component/lineChart.vue
@@ -0,0 +1,197 @@
+
+
+
+
+
+
+
diff --git a/src/views/statics/lease.vue b/src/views/statics/lease.vue
index d06404c..51ca32a 100644
--- a/src/views/statics/lease.vue
+++ b/src/views/statics/lease.vue
@@ -176,20 +176,23 @@ export default {
{
prop: "rate",
label: "出租率",
+ width: 220,
customFn: row => {
function getRate(a,b) {
if (!parseFloat(a) || !parseFloat(b)) {
- return "0.00%"
+ return 0.00
}
- return ((parseFloat(a) / parseFloat(b)) * 100).toFixed(2) + "%"
+ return ((parseFloat(a) / parseFloat(b)) * 100)
}
if (row.land_id) {
return (
- { getRate(row.zulinmianji, row.land_id_lands_id_relation?.shijimianji) }
+
+ // { getRate(row.zulinmianji, row.land_id_lands_id_relation?.shijimianji) }
)
} else {
return (
- { getRate(row.zulingmianji, row.house_id_houses_id_relation?.shijimianji) }
+
+ // { getRate(row.zulinmianji, row.house_id_houses_id_relation?.shijimianji) }
)
}
}
diff --git a/src/views/statics/safetyYear.vue b/src/views/statics/safetyYear.vue
index d6387a2..eb14b45 100644
--- a/src/views/statics/safetyYear.vue
+++ b/src/views/statics/safetyYear.vue
@@ -9,24 +9,32 @@
style="margin-bottom: 10px; border: 0px; margin-top: 15px"
>
-
+
+
+
-
+
+