Compare commits
No commits in common. "608ddee02c61dbaffa805eb4b8ad482a911e8909" and "2e057d701448db529ca330bb1b859e91b4327e5d" have entirely different histories.
608ddee02c
...
2e057d7014
@ -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',
|
||||
activeRule: '/new-digital-agriculture-screen/v2/land',
|
||||
title: '数据大屏',
|
||||
icon: 'images/platform/icon-screen.png',
|
||||
},
|
||||
|
||||
@ -35,8 +35,9 @@ import { leftApps, rightApps } from '@/micro/app';
|
||||
import { getAssetsFile } from '@/utils';
|
||||
|
||||
const gotoPage = (row) => {
|
||||
// window.history.pushState({}, row.name, row.activeRule);
|
||||
window.location.href = row.activeRule;
|
||||
console.log(row);
|
||||
console.log(window.history.pushState({}, row.name, row.activeRule));
|
||||
window.history.pushState({}, row.name, row.activeRule);
|
||||
};
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
|
||||
17620
main/yarn.lock
17620
main/yarn.lock
File diff suppressed because it is too large
Load Diff
@ -17,70 +17,6 @@ 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',
|
||||
@ -98,7 +34,7 @@ export const constantRoutes = [
|
||||
// ],
|
||||
// },
|
||||
// ...demoRouters,
|
||||
// v2,
|
||||
v2,
|
||||
// {
|
||||
// path: '/test',
|
||||
// name: 'test',
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 601 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 40 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 601 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 42 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
@ -1,6 +1,3 @@
|
||||
<template>
|
||||
<dev></dev>
|
||||
</template>
|
||||
<!-- <template>
|
||||
<div class="data-home-index">
|
||||
<el-row style="width: 100%; height: 100%">
|
||||
|
||||
@ -33,18 +33,22 @@ onMounted(() => {
|
||||
<div class="my-table-title" style="">{{ title }}</div>
|
||||
<div style="height: 170px">
|
||||
<table border="0" cellspacing="0" cellpadding="8">
|
||||
<tr class="my-table-th">
|
||||
<th v-for="(item, index) in column" :key="item.prop || index">
|
||||
{{ item?.label || '' }}
|
||||
</th>
|
||||
</tr>
|
||||
<tr v-for="(item, index) in data" :key="item.id || index">
|
||||
<td v-for="(cell, i) of item" :key="item.id || i">
|
||||
<span v-if="cell == '开启'" style="color: #25bf82">{{ cell }}</span>
|
||||
<span v-else-if="cell == '关闭'" style="color: #fe4066">{{ cell }}</span>
|
||||
<span v-else>{{ cell }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<thead>
|
||||
<tr class="my-table-th">
|
||||
<th v-for="(item, index) in column" :key="item.prop || index">
|
||||
{{ item?.label || '' }}
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(item, index) in data" :key="item.id || index">
|
||||
<td v-for="(cell, i) of item" :key="item.id || i">
|
||||
<span v-if="cell == '开启'" style="color: #25bf82">{{ cell }}</span>
|
||||
<span v-else-if="cell == '关闭'" style="color: #fe4066">{{ cell }}</span>
|
||||
<span v-else>{{ cell }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
@ -1,7 +1,227 @@
|
||||
<script setup></script>
|
||||
<script setup>
|
||||
import Devices from '@/views/smartFarm/components/devices.vue';
|
||||
import Common from '@/views/smartFarm/components/common.vue';
|
||||
import stream from '@/views/smartFarm/components/stream.vue';
|
||||
import { ref, onMounted, onBeforeUnmount } from 'vue';
|
||||
import { getAssetsFile } from '@/utils/index.js';
|
||||
import * as echarts from 'echarts';
|
||||
import BugData from '@/views/smartFarm/components/bugData.vue';
|
||||
import SickData from '@/views/smartFarm/components/sickData.vue';
|
||||
|
||||
const currentDevice = ref(0);
|
||||
const devices = ref([
|
||||
{
|
||||
name: 'A-001',
|
||||
icon: 'temp',
|
||||
detail: 'A区-监控设备1',
|
||||
status: '1',
|
||||
id: 0,
|
||||
},
|
||||
{
|
||||
name: 'A-002',
|
||||
icon: 'temp',
|
||||
detail: 'A区-监控设备2',
|
||||
status: '1',
|
||||
id: 1,
|
||||
},
|
||||
{
|
||||
name: 'A-003',
|
||||
icon: 'ph',
|
||||
detail: 'A区-监控设备3',
|
||||
status: '1',
|
||||
id: 2,
|
||||
},
|
||||
{
|
||||
name: 'A-004',
|
||||
icon: 'ph',
|
||||
detail: 'A区-监控设备4',
|
||||
status: '-1',
|
||||
id: 3,
|
||||
},
|
||||
{
|
||||
name: 'A-005',
|
||||
icon: 'O2',
|
||||
detail: 'A区-监控设备5',
|
||||
status: '1',
|
||||
id: 4,
|
||||
},
|
||||
{
|
||||
name: 'A-006',
|
||||
icon: 'elect',
|
||||
detail: 'A区-监控设备6',
|
||||
status: '0',
|
||||
id: 5,
|
||||
},
|
||||
{
|
||||
name: 'B-001',
|
||||
icon: 'light',
|
||||
detail: 'B区-监控设备1',
|
||||
status: '1',
|
||||
id: 6,
|
||||
},
|
||||
{
|
||||
name: 'B-002',
|
||||
icon: 'elect',
|
||||
detail: 'B区-监控设备2',
|
||||
status: '-1',
|
||||
id: 7,
|
||||
},
|
||||
{
|
||||
name: 'B-003',
|
||||
icon: 'dust',
|
||||
detail: 'B区-监控设备3',
|
||||
status: '1',
|
||||
id: 8,
|
||||
},
|
||||
{
|
||||
name: 'B-004',
|
||||
icon: 'dust',
|
||||
detail: 'B区-监控设备4',
|
||||
status: '1',
|
||||
id: 9,
|
||||
},
|
||||
{
|
||||
name: 'B-005',
|
||||
icon: 'float',
|
||||
detail: 'B区-监控设备5',
|
||||
status: '1',
|
||||
id: 10,
|
||||
},
|
||||
{
|
||||
name: 'B-006',
|
||||
icon: 'float',
|
||||
detail: 'B区-监控设备6',
|
||||
status: '1',
|
||||
id: 11,
|
||||
},
|
||||
]);
|
||||
const rules = ref([
|
||||
{
|
||||
name: '温度',
|
||||
icon: 'temp',
|
||||
unit: '℃',
|
||||
goat: '15',
|
||||
status: '1',
|
||||
},
|
||||
{
|
||||
name: 'PH值',
|
||||
icon: 'ph',
|
||||
unit: '',
|
||||
goat: '6.5',
|
||||
status: '1',
|
||||
},
|
||||
{
|
||||
name: '溶解氧',
|
||||
icon: 'O2',
|
||||
goat: '0.4',
|
||||
unit: 'mg/L',
|
||||
status: '1',
|
||||
},
|
||||
{
|
||||
name: '色度',
|
||||
icon: 'light',
|
||||
goat: '15',
|
||||
unit: 'PCU',
|
||||
status: '1',
|
||||
},
|
||||
{
|
||||
name: '浊度',
|
||||
icon: 'dust',
|
||||
goat: '1.5',
|
||||
unit: 'NTU',
|
||||
status: '1',
|
||||
},
|
||||
{
|
||||
name: '导电率',
|
||||
icon: 'elect',
|
||||
goat: '3000',
|
||||
unit: 'μS/cm',
|
||||
status: '1',
|
||||
},
|
||||
{
|
||||
name: '悬浮物',
|
||||
icon: 'float',
|
||||
goat: '9000',
|
||||
unit: 'mg/L',
|
||||
status: '0',
|
||||
},
|
||||
]);
|
||||
const isFullscreen = ref(false);
|
||||
const toggleFullscreen = () => {
|
||||
isFullscreen.value = !isFullscreen.value;
|
||||
};
|
||||
|
||||
const chooseIcon = (type) => {
|
||||
switch (type) {
|
||||
case 'light':
|
||||
return '分光器.png';
|
||||
case 'float':
|
||||
return '悬浮物.png';
|
||||
case 'O2':
|
||||
return '水质溶解氧.png';
|
||||
case 'elect':
|
||||
return '水质电导率.png';
|
||||
case 'dust':
|
||||
return '浊度.png';
|
||||
case 'temp':
|
||||
return '温度.png';
|
||||
case 'ph':
|
||||
return '酸碱度.png';
|
||||
}
|
||||
};
|
||||
|
||||
// #endregion
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div></div>
|
||||
<div>
|
||||
<common>
|
||||
<template #main>
|
||||
<div>
|
||||
<devices :title="'病虫害监测设备'" :devices="devices"></devices>
|
||||
</div>
|
||||
<div style="margin-top: 10px; display: flex; justify-content: space-between">
|
||||
<div style="display: flex; justify-content: space-between; margin-top: 10px">
|
||||
<stream :title="'病害监测实时监控'" :devices="devices" style="width: 60%; height: fit-content"></stream>
|
||||
<div style="width: 38%">
|
||||
<el-card style="border-radius: 16px; padding: 10px">
|
||||
<div style="font-size: 16px; font-weight: bold; text-align: left; color: #000">虫害数据</div>
|
||||
<sick-data style="width: 38%; min-width: 300px"></sick-data>
|
||||
</el-card>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="margin-top: 10px; display: flex; justify-content: space-between">
|
||||
<div style="display: flex; justify-content: space-between; margin-top: 10px; width: 100%">
|
||||
<stream :title="'虫害监测实时监控'" :devices="devices" style="width: 60%; height: fit-content"></stream>
|
||||
<div style="width: 38%">
|
||||
<el-card style="border-radius: 16px; padding: 10px">
|
||||
<div style="font-size: 16px; font-weight: bold; text-align: left; color: #000">虫害数据</div>
|
||||
<bug-data style="width: 38%; min-width: 300px"></bug-data>
|
||||
</el-card>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</common>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped lang="scss"></style>
|
||||
<style scoped lang="scss">
|
||||
.rates {
|
||||
margin: 10px 0;
|
||||
height: 100px;
|
||||
font-size: 14px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
background-size: 80%;
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
width: 25%;
|
||||
img {
|
||||
height: 20px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user