diff --git a/main/src/micro/app.js b/main/src/micro/app.js index d8c045d..36f7b87 100644 --- a/main/src/micro/app.js +++ b/main/src/micro/app.js @@ -57,11 +57,11 @@ export const rightApps = [ }, { // name: 'sub-government-screen-service', - name: 'new-digital-agriculture-screen', + name: 'new-digital-agriculture-screen/v2/land', // entry: VITE_APP_SUB_GSS, entry: VITE_APP_SUB_GSR, // activeRule: '/sub-government-screen-service', - activeRule: '/new-digital-agriculture-screen', + activeRule: '/new-digital-agriculture-screen/v2/land', title: '数据大屏', icon: 'images/platform/icon-screen.png', }, diff --git a/new-digital-agriculture-screen/src/components/baseBg.vue b/new-digital-agriculture-screen/src/components/baseBg.vue index 3808d40..2787213 100644 --- a/new-digital-agriculture-screen/src/components/baseBg.vue +++ b/new-digital-agriculture-screen/src/components/baseBg.vue @@ -28,7 +28,7 @@ const props = defineProps({ }); const titles = ref([ - { label: '首页', value: 'home' }, + // { label: '首页', value: 'home' }, { label: '土地资源', value: 'land' }, { label: '投入品', value: 'inputs' }, { label: '生产经营主体', value: 'entities' }, diff --git a/new-digital-agriculture-screen/src/components/custom-scroll-title/index.vue b/new-digital-agriculture-screen/src/components/custom-scroll-title/index.vue index 166f4e9..86d8906 100644 --- a/new-digital-agriculture-screen/src/components/custom-scroll-title/index.vue +++ b/new-digital-agriculture-screen/src/components/custom-scroll-title/index.vue @@ -54,7 +54,7 @@ const props = defineProps({ type: Array, default() { return [ - { label: '首页', value: '/new-digital-agriculture-screen/v2/home' }, + // { label: '首页', value: '/new-digital-agriculture-screen/v2/home' }, { label: '土地资源', value: '/new-digital-agriculture-screen/v2/land' }, { label: '投入品监管', value: '/new-digital-agriculture-screen/v2/inputs' }, { label: '产出品管理', value: '/new-digital-agriculture-screen/v2/entities' }, diff --git a/new-digital-agriculture-screen/src/layouts/index.vue b/new-digital-agriculture-screen/src/layouts/index.vue index 2dbc94f..649e476 100644 --- a/new-digital-agriculture-screen/src/layouts/index.vue +++ b/new-digital-agriculture-screen/src/layouts/index.vue @@ -58,10 +58,10 @@ onMounted(() => { user-select: none; box-sizing: border-box; width: 100%; - height: 100; + height: 100%; background: - url('@/assets/images/basic/containerBG.png') no-repeat center 100%, - url('@/assets/images/basic/containerBotBG.png') no-repeat bottom center; + url('../assets/images/basic/containerBG.png') no-repeat center 100%, + url('../assets/images/basic/containerBotBG.png') no-repeat bottom center; &-header { width: 100%; margin-bottom: 16px; diff --git a/new-digital-agriculture-screen/src/router/index.js b/new-digital-agriculture-screen/src/router/index.js index a256543..b775f4a 100644 --- a/new-digital-agriculture-screen/src/router/index.js +++ b/new-digital-agriculture-screen/src/router/index.js @@ -17,21 +17,22 @@ export const constantRoutes = [ component: () => import('@/views/error/403.vue'), hidden: true, }, - { - path: '/new-digital-agriculture-screen', - name: 'layout', - component: Layout, - redirect: '/new-digital-agriculture-screen/v2/home', - meta: { title: '首页', icon: 'House' }, - children: [ - { - path: '/new-digital-agriculture-screen/v2/home', - component: () => import('@/views/home/index.vue'), - name: 'home', - meta: { title: '首页', icon: '' }, - }, - ], - }, + // { + // // 原来的首页默认配置 + // path: '/new-digital-agriculture-screen', + // name: 'layout', + // component: Layout, + // redirect: '/new-digital-agriculture-screen/v2/home', + // meta: { title: '首页', icon: 'House' }, + // children: [ + // { + // path: '/new-digital-agriculture-screen/v2/home', + // component: () => import('@/views/home/index.vue'), + // name: 'home', + // meta: { title: '首页', icon: '' }, + // }, + // ], + // }, // ...demoRouters, v2, // { diff --git a/new-digital-agriculture-screen/src/router/modules/v2.js b/new-digital-agriculture-screen/src/router/modules/v2.js index 914f818..6a60597 100644 --- a/new-digital-agriculture-screen/src/router/modules/v2.js +++ b/new-digital-agriculture-screen/src/router/modules/v2.js @@ -4,7 +4,7 @@ export default { path: '/new-digital-agriculture-screen', name: 'layout', component: Layout, - redirect: '/new-digital-agriculture-screen/v2/home', + redirect: '/new-digital-agriculture-screen/v2/land', //原home meta: { title: '首页', icon: '' }, children: [ { diff --git a/sub-operation-service/package.json b/sub-operation-service/package.json index 5b02f67..95b5182 100644 --- a/sub-operation-service/package.json +++ b/sub-operation-service/package.json @@ -23,6 +23,7 @@ "axios": "^1.6.5", "echarts": "^5.6.0", "element-plus": "^2.7.2", + "hls.js": "^1.6.2", "js-base64": "^3.7.6", "lodash": "^4.17.21", "moment": "^2.30.1", diff --git a/sub-operation-service/src/assets/images/smartFarm/灌溉控制.png b/sub-operation-service/src/assets/images/smartFarm/灌溉控制.png new file mode 100644 index 0000000..915a7f0 Binary files /dev/null and b/sub-operation-service/src/assets/images/smartFarm/灌溉控制.png differ diff --git a/sub-operation-service/src/assets/images/smartFarm/病虫害.png b/sub-operation-service/src/assets/images/smartFarm/病虫害.png new file mode 100644 index 0000000..b32d07c Binary files /dev/null and b/sub-operation-service/src/assets/images/smartFarm/病虫害.png differ diff --git a/sub-operation-service/src/assets/images/smartFarm/育苗.png b/sub-operation-service/src/assets/images/smartFarm/育苗.png new file mode 100644 index 0000000..0d0589d Binary files /dev/null and b/sub-operation-service/src/assets/images/smartFarm/育苗.png differ diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js index 10bb445..456aa81 100644 --- a/sub-operation-service/src/router/index.js +++ b/sub-operation-service/src/router/index.js @@ -63,6 +63,12 @@ export const constantRoutes = [ name: 'fieldInspection', meta: { title: '田间检测' }, }, + { + path: '/sub-operation-service/smartFarm/growSeedlings', + component: () => import('@/views/smartFarm/growSeedlings/index.vue'), + name: 'growSeedlings', + meta: { title: '一体育苗' }, + }, ], }, { diff --git a/sub-operation-service/src/views/smartFarm/components/common.vue b/sub-operation-service/src/views/smartFarm/components/common.vue index 8062d88..dc530b3 100644 --- a/sub-operation-service/src/views/smartFarm/components/common.vue +++ b/sub-operation-service/src/views/smartFarm/components/common.vue @@ -48,12 +48,19 @@ const menus = reactive([ ], }, { - name: 'purchaser', + name: 'control', title: '生产管理控制', icon: 'menu3.png', path: '/sub-operation-service/ecommerce-purchaser', isOpen: false, - children: [], + children: [ + { + name: 'control', + title: '一体育苗', + icon: 'menu3.png', + path: '/sub-operation-service/smartFarm/growSeedlings', + }, + ], }, ]); diff --git a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue index d04774e..cac5253 100644 --- a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue +++ b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue @@ -76,12 +76,19 @@ const leftMenu = reactive([ ], }, { - name: 'purchaser', + name: 'control', title: '生产管理控制', icon: 'menu3.png', - path: '/sub-operation-service/ecommerce-purchaser', + path: '/sub-operation-service/smartFarm/main', isOpen: false, - children: [], + children: [ + { + name: 'control', + title: '一体育苗', + icon: 'menu3.png', + path: '/sub-operation-service/smartFarm/growSeedlings', + }, + ], }, ]); @@ -108,9 +115,12 @@ const toLink = (index) => { } }; const toLinkSub = (index, c) => { + console.info('index', index); + console.info('c', c); currentCIndex.value = c; let path = leftMenu[index].children[c].path; if (path) { + console.info('path', path); router.push(path); } }; diff --git a/sub-operation-service/src/views/smartFarm/components/myTable.vue b/sub-operation-service/src/views/smartFarm/components/myTable.vue new file mode 100644 index 0000000..68c8f68 --- /dev/null +++ b/sub-operation-service/src/views/smartFarm/components/myTable.vue @@ -0,0 +1,79 @@ + + + + + + {{ title }} + + + + + {{ item?.label || '' }} + + + + + {{ cell }} + {{ cell }} + {{ cell }} + + + + + + + + + diff --git a/sub-operation-service/src/views/smartFarm/components/produceDevices.vue b/sub-operation-service/src/views/smartFarm/components/produceDevices.vue new file mode 100644 index 0000000..fd2e168 --- /dev/null +++ b/sub-operation-service/src/views/smartFarm/components/produceDevices.vue @@ -0,0 +1,158 @@ + + + + + + {{ title }} + + + 正常 + 离线 + 故障 + + + + + + + {{ item.name }} + {{ item.serial }} + + + + + + 开启 + 关闭 + + + 开启 + 关闭 + + + 待机中... + 运作中... + + + + + + + + + diff --git a/sub-operation-service/src/views/smartFarm/growSeedlings/index.vue b/sub-operation-service/src/views/smartFarm/growSeedlings/index.vue new file mode 100644 index 0000000..24cb0e8 --- /dev/null +++ b/sub-operation-service/src/views/smartFarm/growSeedlings/index.vue @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + + + diff --git a/sub-operation-service/yarn.lock b/sub-operation-service/yarn.lock index 74c0f4d..4d6a32f 100644 --- a/sub-operation-service/yarn.lock +++ b/sub-operation-service/yarn.lock @@ -4417,6 +4417,13 @@ __metadata: languageName: node linkType: hard +"hls.js@npm:^1.6.2": + version: 1.6.2 + resolution: "hls.js@npm:1.6.2" + checksum: 10c0/c8700d88610afa85bf441cd624f6d548c1fea59c0e510fb05be02f9a33660b8a46cb17910ea5179b9d1307ce9242f4e904d8aa98d7f63d0df750d6d0f6e85134 + languageName: node + linkType: hard + "hookified@npm:^1.6.0": version: 1.6.0 resolution: "hookified@npm:1.6.0" @@ -8512,6 +8519,7 @@ __metadata: eslint-config-prettier: "npm:^9.1.0" eslint-plugin-prettier: "npm:^5.1.3" eslint-plugin-vue: "npm:^9.20.1" + hls.js: "npm:^1.6.2" js-base64: "npm:^3.7.6" lodash: "npm:^4.17.21" mockjs: "npm:^1.1.0"