xiabin

main/src/micro/app.js

@@ -61,7 +61,7 @@ export const rightApps = [
     // entry: VITE_APP_SUB_GSS,
     entry: VITE_APP_SUB_GSR,
     // activeRule: '/sub-government-screen-service',
-    activeRule: '/new-digital-agriculture-screen/v2/land',
+    activeRule: '/new-digital-agriculture-screen',
     title: '数据大屏',
     icon: 'images/platform/icon-screen.png',
   },

main/src/views/index.vue

@@ -35,9 +35,8 @@ import { leftApps, rightApps } from '@/micro/app';
 import { getAssetsFile } from '@/utils';
 
 const gotoPage = (row) => {
-  console.log(row);
+  // window.history.pushState({}, row.name, row.activeRule);
-  console.log(window.history.pushState({}, row.name, row.activeRule));
+  window.location.href = row.activeRule;
-  window.history.pushState({}, row.name, row.activeRule);
 };
 </script>
 <style lang="scss" scoped>

new-digital-agriculture-screen/src/router/index.js

@@ -17,6 +17,70 @@ export const constantRoutes = [
     component: () => import('@/views/error/403.vue'),
     hidden: true,
   },
+  {
+    path: '/new-digital-agriculture-screen',
+    name: 'home',
+    component: Layout,
+    redirect: '/new-digital-agriculture-screen/v2/land', //原home
+    meta: { title: '首页', icon: '' },
+    children: [
+      // {
+      //   path: '/new-digital-agriculture-screen/v2/home',
+      //   component: () => import('@/views/home/index.vue'),
+      //   name: 'home',
+      //   meta: { title: '首页', icon: '' },
+      // },
+      {
+        path: '/new-digital-agriculture-screen/v2/land',
+        component: () => import('@/views/land/index.vue'),
+        name: 'land',
+        meta: { title: '土地资源', icon: '' },
+      },
+      {
+        path: '/new-digital-agriculture-screen/v2/inputs',
+        name: 'inputs',
+        component: () => import('@/views/inputs/index.vue'),
+        meta: { title: '投入品监管', icon: '' },
+      },
+      {
+        path: '/new-digital-agriculture-screen/v2/entities',
+        name: 'entities',
+        component: () => import('@/views/entities/index.vue'),
+        meta: { title: '产出品管理', icon: '' },
+      },
+      // {
+      //   path: 'breed',
+      //   name: 'breed',
+      //   component: () => import('@/views/breed/index.vue'),
+      //   meta: { title: '', icon: '' },
+      // },
+      // {
+      //   path: 'plant',
+      //   name: 'plant',
+      //   component: () => import('@/views/plant/index.vue'),
+      //   meta: { title: '', icon: '' },
+      // },
+      {
+        path: '/new-digital-agriculture-screen/v2/business',
+        name: 'business',
+        component: () => import('@/views/business/index.vue'),
+        meta: { title: '生产经营主体', icon: '' },
+      },
+      {
+        path: '/new-digital-agriculture-screen/v2/trace',
+        name: 'trace',
+        component: () => import('@/views/trace/index.vue'),
+        meta: { title: '农产品溯源', icon: '' },
+      },
+      // {
+      //   path: 'early',
+      //   name: 'early',
+      //   component: () => import('@/views/early/index.vue'),
+      //   meta: { title: '', icon: '' },
+      // },
+    ],
+  },
+
   // {
   //   // 原来的首页默认配置
   //   path: '/new-digital-agriculture-screen',
@@ -34,7 +98,7 @@ export const constantRoutes = [
   //   ],
   // },
   // ...demoRouters,
-  v2,
+  // v2,
   // {
   //   path: '/test',
   //   name: 'test',

sub-operation-service/src/views/dashboard/index.vue

@@ -1,3 +1,6 @@
+<template>
+  <dev></dev>
+</template>
 <!-- <template>
   <div class="data-home-index">
     <el-row style="width: 100%; height: 100%">

sub-operation-service/src/views/smartFarm/components/myTable.vue

@@ -40,8 +40,8 @@ onMounted(() => {
           </tr>
           <tr v-for="(item, index) in data" :key="item.id || index">
             <td v-for="(cell, i) of item" :key="item.id || i">
-              <span style="color: #25bf82" v-if="cell == '开启'">{{ cell }}</span>
+              <span v-if="cell == '开启'" style="color: #25bf82">{{ cell }}</span>
-              <span style="color: #fe4066" v-else-if="cell == '关闭'">{{ cell }}</span>
+              <span v-else-if="cell == '关闭'" style="color: #fe4066">{{ cell }}</span>
               <span v-else>{{ cell }}</span>
             </td>
           </tr>

sub-operation-service/src/views/smartFarm/inspection/bugInspection.vue

@@ -1,13 +1,7 @@
-<script setup>
+<script setup></script>
-
-</script>
 
 <template>
-  <div>
+  <div></div>
-
-  </div>
 </template>
 
-<style scoped lang="scss">
+<style scoped lang="scss"></style>
-
-</style>