Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev

new-digital-agriculture-screen/src/views/business/components/businessMap.vue

@@ -100,7 +100,7 @@ let testInfo = reactive({});
 let currentRegion = ref(null);
 const doMapclick = (data) => {
   currentRegion.value = data;
-  if (data.name == '永星食品加工厂') {
+  if (data.name == '永星食品合作社') {
     testInfo = {
       addr: '云南省临沧市耿马傣族佤族自治县孟定镇101号',
       user: '张强',
@@ -111,13 +111,13 @@ const doMapclick = (data) => {
       imglist: ['images/business/b1-1.png', 'images/business/b1-2.png', 'images/business/b1-3.png'],
     };
   }
-  if (data.name == '欣欣种源企业') {
+  if (data.name == '耿马原生茶叶种植专业合作社') {
     testInfo = {
-      addr: '云南省临沧市耿马傣族佤族自治耿马镇102号',
+      addr: '云南省临沧市耿马傣族佤族自治县',
-      user: '李欣',
+      user: '李伟荣',
       tel: '13713575206',
-      capital: '600万',
+      capital: '400万',
-      time: '2020年10月1日',
+      time: '2013年08月26日',
       credit: 'AA',
       imglist: ['images/business/b2-1.png', 'images/business/b1-2.png', 'images/business/b1-2.png'],
     };
@@ -127,7 +127,7 @@ const doMapclick = (data) => {
 let markerData = reactive([
   // 示例数据点，实际应用中应替换为真实的数据
   {
-    name: '永星食品加工厂',
+    name: '永星食品合作社',
     value: [99.081993, 23.524045, 150], // 经度, 纬度, 数值
     symbol: 'image://' + getAssetsFile('images/vsualized/marker.png'),
     itemStyle: {
@@ -135,7 +135,7 @@ let markerData = reactive([
     },
   },
   {
-    name: '欣欣种源企业',
+    name: '耿马原生茶叶种植专业合作社',
     value: [99.402267, 23.538889, 150], // 经度, 纬度, 数值
     symbol: 'image://' + getAssetsFile('images/vsualized/marker.png'),
     itemStyle: {

new-digital-agriculture-screen/src/views/entities/components/categoryCharts.vue

@@ -10,7 +10,7 @@ const chartRef = ref(null);
 // #region
 const data = ref([
   {
-    name: ' 企业',
+    name: '农企/合作社',
     value: 10.8,
     itemStyle: { color: '#5b7bc7', opacity: 0.8 },
   },
@@ -25,7 +25,7 @@ const data = ref([
   //   itemStyle: { color: '#65be97', opacity: 0.8 },
   // },
   {
-    name: ' 个体',
+    name: '农户',
     value: 23.7,
     itemStyle: { color: '#f0c94d', opacity: 0.8 },
   },

new-digital-agriculture-screen/src/views/entities/components/entitiesStatistics.vue

@@ -42,7 +42,6 @@ const state = reactive({
         let str = `<div class="custom-echarts-tips">
           <span>${params.name}</span><br/>
           <span>${params.marker} ${params.data} 万吨</span><br />
-          <span>${data[1].marker} ${data[1].data} 万吨</span>
         </div>`;
         return str;
       },
@@ -144,7 +143,7 @@ const state = reactive({
         fontSize: 16,
         color: '#fff',
       },
-      data: ['总产量（吨）', '平均产量（吨）'],
+      data: ['总产量（吨）'],
       selectedMode: false,
     },
     series: [

new-digital-agriculture-screen/src/views/entities/index.vue

@@ -3,7 +3,7 @@
     <el-col :span="6" class="left-charts">
       <div class="left-charts-item">
         <customBack
-          top-title="全县历年产值对比"
+          top-title="全县各乡镇产值对比"
           :top-postion="'left'"
           :down-title="'全县'"
           :label-field="'label'"
@@ -109,11 +109,11 @@ const thirdRes = () => {
           const num = Mock.Random.float(100, 300, 0, 2);
           return num % 1 === 0 ? num : parseFloat(num.toFixed(2));
         },
-        value: function () {
+        // value: function () {
-          // 确保 this.value1 是数字类型，再计算
+        //   // 确保 this.value1 是数字类型，再计算
-          const num = Mock.Random.float(100, 300, 0, 2);
+        //   const num = Mock.Random.float(100, 300, 0, 2);
-          return parseFloat((num / 5).toFixed(2));
+        //   return parseFloat((num / 5).toFixed(2));
-        },
+        // },
       },
     ],
   });

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: 25.8, label: '茶园' },
-      { value: 6.3, label: '观测用地' },
+      { value: 52.4, label: '人工牧草地' },
-      { value: 6.1, 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: '年均气温' },

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: 32654, name: '发放溯源码', unit: '家', bg: online },
-  { value: 63, name: '有效期内溯源码', unit: '人', bg: person },
+  { 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 {

sub-operation-service/src/layouts/component/Header/index.vue

@@ -74,10 +74,10 @@ const router = useRouter();
 const keyword = ref('');
 
 const meuns = ref([
-  {
+  // {
-    label: '综合看板',
+  //   label: '综合看板',
-    path: '/sub-operation-service/dashboard',
+  //   path: '/sub-operation-service/dashboard',
-  },
+  // },
   {
     label: '智慧种植',
     path: '/sub-operation-service/smartFarm',