{
const num = Mock.Random.float(100, 300, 0, 2);
return num % 1 === 0 ? num : parseFloat(num.toFixed(2));
},
- value: function () {
- // 确保 this.value1 是数字类型，再计算
- const num = Mock.Random.float(100, 300, 0, 2);
- return parseFloat((num / 5).toFixed(2));
- },
+ // value: function () {
+ // // 确保 this.value1 是数字类型，再计算
+ // const num = Mock.Random.float(100, 300, 0, 2);
+ // return parseFloat((num / 5).toFixed(2));
+ // },
},
],
});
diff --git a/new-digital-agriculture-screen/src/views/land/index.vue b/new-digital-agriculture-screen/src/views/land/index.vue
index cd9da7e..989fda4 100644
--- a/new-digital-agriculture-screen/src/views/land/index.vue
+++ b/new-digital-agriculture-screen/src/views/land/index.vue
@@ -277,16 +277,14 @@ const loadData = async () => {
{ value: 80, name: '2025' },
],
four: [
- { value: 58.9, label: '灌溉水田' },
- { value: 56.1, label: '基地' },
{ value: 60.8, label: '水田' },
+ { value: 58.9, label: '旱地' },
{ value: 60.6, label: '水浇地' },
+ { value: 56.1, label: '灌木林地' },
{ value: 32.6, label: '竹林地' },
- { value: 25.8, label: '育苗地' },
{ value: 56.0, label: '果园' },
- { value: 52.4, label: '草地' },
- { value: 6.3, label: '观测用地' },
- { value: 6.1, label: '监测用地' },
+ { value: 25.8, label: '茶园' },
+ { value: 52.4, label: '人工牧草地' },
],
// five: [
// { value: 20, name: '耿马镇' },
@@ -326,7 +324,7 @@ const loadData = async () => {
},
],
basic: [
- { value: '3837km²', title: '政区域面积' },
+ { value: '3837km²', title: '行政区域面积' },
{ value: '9个乡（镇）,3个农场', title: '下辖地区' },
{ value: '27.88万人', title: '常住人口' },
{ value: '18.8℃ - 19.2℃', title: '年均气温' },
diff --git a/new-digital-agriculture-screen/src/views/trace/components/mainPartCharts.vue b/new-digital-agriculture-screen/src/views/trace/components/mainPartCharts.vue
index 3d99405..5461dc6 100644
--- a/new-digital-agriculture-screen/src/views/trace/components/mainPartCharts.vue
+++ b/new-digital-agriculture-screen/src/views/trace/components/mainPartCharts.vue
@@ -21,12 +21,12 @@ import producer from '@/assets/images/trace/producer.png';
import batch from '@/assets/images/trace/batch.png';
import publicize from '@/assets/images/trace/publicize.png';
let valData = reactive([
- { value: 356, name: '扫码统计', unit: '次', bg: all },
+ { value: 47865, name: '扫码统计', unit: '次', bg: all },
{ value: 86, name: '溯源产品', unit: '种', bg: producer },
{ value: 90, name: '溯源批次', unit: '个', bg: batch },
{ value: 136, name: '追溯主体数', unit: '家', bg: publicize },
- { value: 6, name: '发放溯源码', unit: '家', bg: online },
- { value: 63, name: '有效期内溯源码', unit: '人', bg: person },
+ { value: 32654, name: '发放溯源码', unit: '家', bg: online },
+ { value: 23578, name: '有效期内溯源码', unit: '人', bg: person },
]);
onMounted(() => {});
@@ -43,11 +43,12 @@ onMounted(() => {});
._item {
display: flex;
align-items: center;
- width: 45%;
+ justify-content: flex-start;
+ width: 47%;
height: calc((100% / 3) - 16px);
color: #fff;
&:nth-child(2n + 2) {
- justify-content: flex-end;
+ //justify-content: flex-end;
}
._value {
> span {
diff --git a/sub-operation-service/src/layouts/component/Header/index.vue b/sub-operation-service/src/layouts/component/Header/index.vue
index 6d84170..d15c656 100644
--- a/sub-operation-service/src/layouts/component/Header/index.vue
+++ b/sub-operation-service/src/layouts/component/Header/index.vue
@@ -74,10 +74,10 @@ const router = useRouter();
const keyword = ref('');
const meuns = ref([
- {
- label: '综合看板',
- path: '/sub-operation-service/dashboard',
- },
+ // {
+ // label: '综合看板',
+ // path: '/sub-operation-service/dashboard',
+ // },
{
label: '智慧种植',
path: '/sub-operation-service/smartFarm',