Merge branch 'main' of http://47.109.205.240:3000/Web/digital-agriculture-screen

src/components/custom-scroll-title/index.vue

@@ -48,7 +48,7 @@ const props = defineProps({
       return [
         { label: '首页', value: 'home' },
         { label: '土地资源', value: 'land' },
-        { label: '投入品', value: 'inputs' },
+        { label: '投入品监管', value: 'inputs' },
         { label: '生产经营主体', value: 'entities' },
         // { label: '智慧种植监测', value: 'plant' },
         // { label: '智慧养殖监测', value: 'breed' },

src/router/modules/demo.js

@@ -20,12 +20,6 @@ export default [
         component: () => import('@/views/demo/rank.vue'),
         meta: { title: '滚动排名列表', icon: 'document' },
       },
-      // {
-      //   path: '/page',
-      //   component: () => import('@/views/demo/test.vue'),
-      //   name: 'page',
-      //   meta: { title: '测试', icon: 'document' },
-      // },
     ],
   },
 ];

src/router/modules/v2.js

@@ -5,55 +5,55 @@ export default {
   name: 'v2',
   component: Layout,
   redirect: '/v2/home',
-  meta: { title: '首页', icon: 'House' },
+  meta: { title: '首页', icon: '' },
   children: [
     // {
     //   path: '/v2/home',
     //   component: () => import('@/views/home/index.vue'),
     //   name: 'home',
-    //   meta: { title: '首页', icon: 'House' },
+    //   meta: { title: '首页', icon: '' },
     // },
     {
       path: '/v2/land',
       component: () => import('@/views/land/index.vue'),
       name: 'land',
-      meta: { title: '土地资源', icon: 'House' },
+      meta: { title: '土地资源', icon: '' },
+    },
+    {
+      path: 'inputs',
+      name: 'inputs',
+      component: () => import('@/views/inputs/index.vue'),
+      meta: { title: '投入品监管', icon: '' },
     },
-    // {
-    //   path: 'inputs',
-    //   name: 'inputs',
-    //   component: () => import('@/views/inputs/index.vue'),
-    //   hidden: true,
-    // },
     // {
     //   path: 'entities',
     //   name: 'entities',
     //   component: () => import('@/views/entities/index.vue'),
-    //   hidden: true,
+    //   meta: { title: '', icon: '' },
     // },
     // {
     //   path: 'breed',
     //   name: 'breed',
     //   component: () => import('@/views/breed/index.vue'),
-    //   hidden: true,
+    //   meta: { title: '', icon: '' },
     // },
     // {
     //   path: 'plant',
     //   name: 'plant',
     //   component: () => import('@/views/plant/index.vue'),
-    //   hidden: true,
+    //   meta: { title: '', icon: '' },
     // },
     // {
     //   path: 'trace',
     //   name: 'trace',
     //   component: () => import('@/views/trace/index.vue'),
-    //   hidden: true,
+    //   meta: { title: '', icon: '' },
     // },
     // {
     //   path: 'early',
     //   name: 'early',
     //   component: () => import('@/views/early/index.vue'),
-    //   hidden: true,
+    //   meta: { title: '', icon: '' },
     // },
   ],
 };

src/views/inputs/index.vue

@@ -1,23 +1,22 @@
 <template>
-  <div class="data-home-index">
+  <el-row class="data-home-index">
-    <el-row style="width: 100%; height: 100%">
     <el-col :span="6" class="left-charts">
       <div class="left-charts-item">
-          <customBack top-title="投入品分类统计" :top-postion="'left'">
+        <customBack top-title="投入品监管体系建设" :top-postion="'left'">
           <template #back>
             <inputsType></inputsType>
           </template>
         </customBack>
       </div>
       <div class="left-charts-item">
-          <customBack top-title="投入品生产企业统计" :top-postion="'left'">
+        <customBack top-title="投入品检测监管" :top-postion="'left'">
           <template #back>
             <inputsGmp></inputsGmp>
           </template>
         </customBack>
       </div>
       <div class="left-charts-item">
-          <customBack top-title="种养殖数据统计" :top-postion="'left'">
+        <customBack top-title="农资监管" :top-postion="'left'">
           <template #back>
             <landbreedCharts></landbreedCharts>
           </template>
@@ -29,21 +28,21 @@
     </el-col>
     <el-col :span="6" class="right-charts">
       <div class="right-charts-item">
-          <customBack top-title="案件次数" :top-postion="'right'">
+        <customBack top-title="生产主体统计" :top-postion="'right'">
           <template #back>
             <casesAlerts></casesAlerts>
           </template>
         </customBack>
       </div>
       <div class="right-charts-item">
-          <customBack top-title="投入品月度使用统计" :top-postion="'right'">
+        <customBack top-title="历年投入品规模对比" :top-postion="'right'">
           <template #back>
             <monthlyuseCharts></monthlyuseCharts>
           </template>
         </customBack>
       </div>
       <div class="right-charts-item">
-          <customBack top-title="投入品经销商分布" :top-postion="'right'">
+        <customBack top-title="投入品白名单/黑名单" :top-postion="'right'">
           <template #back>
             <dealerDistributionCharts></dealerDistributionCharts>
           </template>
@@ -51,7 +50,6 @@
       </div>
     </el-col>
   </el-row>
-  </div>
 </template>
 <script setup>
 import centerMap from '@/components/centerMap.vue';
@@ -64,6 +62,9 @@ import inputsType from './components/inputsType.vue';
 </script>
 <style lang="scss" scoped>
 .data-home-index {
+  width: 100%;
+  height: 100%;
+
   .left-charts {
     display: flex;
     justify-content: space-around;