diff --git a/src/assets/images/business/bg_title.png b/src/assets/images/business/bg_title.png new file mode 100644 index 0000000..946a461 Binary files /dev/null and b/src/assets/images/business/bg_title.png differ diff --git a/src/assets/images/vsualized/mapopup1.png b/src/assets/images/vsualized/mapopup1.png new file mode 100644 index 0000000..d4ccce9 Binary files /dev/null and b/src/assets/images/vsualized/mapopup1.png differ diff --git a/src/components/centerMap.vue b/src/components/centerMap.vue index b2a5afa..92c68bd 100644 --- a/src/components/centerMap.vue +++ b/src/components/centerMap.vue @@ -8,7 +8,8 @@ @@ -203,7 +219,10 @@ div { ::v-deep() { .el-dialog { - background: url('@/assets/images/vsualized/mapopup.png') no-repeat left top; + background: url(iconUrl) no-repeat left top; + background-repeat: no-repeat; + background-size: cover; + border-radius: 8px !important; min-height: 200px; max-height: 500px; overflow-y: auto; diff --git a/src/components/custom-echart-water-droplet/index.vue b/src/components/custom-echart-water-droplet/index.vue index 1a40294..e1082ed 100644 --- a/src/components/custom-echart-water-droplet/index.vue +++ b/src/components/custom-echart-water-droplet/index.vue @@ -7,7 +7,7 @@ import { cloneDeep } from 'lodash'; import { useEcharts } from '@/hooks/useEcharts'; export default { - name: 'customEchartWaterDroplet', + name: 'CustomEchartWaterDroplet', props: { chartData: { type: Array, diff --git a/src/components/custom-scroll-title/index.vue b/src/components/custom-scroll-title/index.vue index def7338..96f1f32 100644 --- a/src/components/custom-scroll-title/index.vue +++ b/src/components/custom-scroll-title/index.vue @@ -54,14 +54,14 @@ const props = defineProps({ type: Array, default() { return [ - { label: '首页', value: 'home' }, - { label: '土地资源', value: 'land' }, - { label: '投入品监管', value: 'inputs' }, - { label: '产出品管理', value: 'entities' }, + { label: '首页', value: '/v2/home' }, + { label: '土地资源', value: '/v2/land' }, + { label: '投入品监管', value: '/v2/inputs' }, + { label: '产出品管理', value: '/v2/entities' }, // { label: '智慧种植监测', value: 'plant' }, // { label: '智慧养殖监测', value: 'breed' }, - { label: '生产经营主体', value: 'business' }, - { label: '农产品溯源', value: 'trace' }, + { label: '生产经营主体', value: '/v2/business' }, + { label: '农产品溯源', value: '/v2/trace' }, // { label: '产业预警决策', value: 'early' }, ]; }, @@ -122,7 +122,7 @@ function handleTitleBtn(t = -1) { function handleTitleClick(val) { activeTitle.value = val; // emit('changeTitle', val); - router.push({ name: val }); + router.push({ path: val }); } diff --git a/src/components/subTop.vue b/src/components/subTop.vue index 90621fa..220914f 100644 --- a/src/components/subTop.vue +++ b/src/components/subTop.vue @@ -171,10 +171,14 @@ const handleCommand = (data) => { top: 50%; transform: translateY(-50%); z-index: 2; - border: 1px solid $color-custom-main; - border-radius: 4px; - padding: 6px; text-align: center; + white-space: nowrap; + + .el-dropdown { + border: 1px solid $color-custom-main; + padding: 6px; + border-radius: 4px; + } } } diff --git a/src/router/modules/v2.js b/src/router/modules/v2.js index e0bdff8..b2f9d12 100644 --- a/src/router/modules/v2.js +++ b/src/router/modules/v2.js @@ -20,13 +20,13 @@ export default { meta: { title: '土地资源', icon: '' }, }, { - path: 'inputs', + path: '/v2/inputs', name: 'inputs', component: () => import('@/views/inputs/index.vue'), meta: { title: '投入品监管', icon: '' }, }, { - path: 'entities', + path: '/v2/entities', name: 'entities', component: () => import('@/views/entities/index.vue'), meta: { title: '产出品管理', icon: '' }, @@ -44,7 +44,7 @@ export default { // meta: { title: '', icon: '' }, // }, { - path: 'business', + path: '/v2/business', name: 'business', component: () => import('@/views/business/index.vue'), meta: { title: '生产经营主体', icon: '' }, diff --git a/src/views/business/components/businessFive.vue b/src/views/business/components/businessFive.vue new file mode 100644 index 0000000..7f92225 --- /dev/null +++ b/src/views/business/components/businessFive.vue @@ -0,0 +1,109 @@ + + + + diff --git a/src/views/business/components/businessFour.vue b/src/views/business/components/businessFour.vue new file mode 100644 index 0000000..47abf05 --- /dev/null +++ b/src/views/business/components/businessFour.vue @@ -0,0 +1,210 @@ + + + diff --git a/src/views/business/components/businessMap.vue b/src/views/business/components/businessMap.vue index a061374..f1f2a64 100644 --- a/src/views/business/components/businessMap.vue +++ b/src/views/business/components/businessMap.vue @@ -1,19 +1,89 @@ @@ -26,37 +96,57 @@ const list = reactive([ { title: '年总产值', value: 3.49, color: '#01FEFD', unit: '亿元' }, { title: '年人均收入', value: 6.98, color: '#FEF906', unit: '万元' }, ]); - +let testInfo = reactive({}); let currentRegion = ref(null); const doMapclick = (data) => { currentRegion.value = data; + if (data.name == '永星食品加工厂') { + testInfo = { + addr: '云南省临沧市耿马傣族佤族自治县孟定镇101号', + user: '张强', + tel: '15331683325', + capital: '500万', + time: '2018年12月1日', + credit: 'AA', + imglist: ['images/vsualized/home1.png', 'images/vsualized/home1.png', 'images/vsualized/home1.png'], + }; + } + if (data.name == '欣欣种源企业') { + testInfo = { + addr: '云南省临沧市耿马傣族佤族自治耿马镇102号', + user: '李欣', + tel: '13713575206', + capital: '600万', + time: '2020年10月1日', + credit: 'AA', + imglist: ['images/vsualized/home1.png', 'images/vsualized/home1.png', 'images/vsualized/home1.png'], + }; + } }; let markerData = reactive([ - [ - // 示例数据点,实际应用中应替换为真实的数据 - { - name: '永星食品加工厂', - value: [99.081993, 23.554045, 150], // 经度, 纬度, 数值 - symbol: 'image://' + getAssetsFile('images/vsualized/marker.png'), - itemStyle: { - color: '#4bffb4', // - }, + // 示例数据点,实际应用中应替换为真实的数据 + { + name: '永星食品加工厂', + value: [99.081993, 23.524045, 150], // 经度, 纬度, 数值 + symbol: 'image://' + getAssetsFile('images/vsualized/marker.png'), + itemStyle: { + color: '#4bffb4', // }, - { - name: '耿马镇', - value: [99.402267, 23.538889, 150], // 经度, 纬度, 数值 - symbol: 'image://' + getAssetsFile('images/vsualized/marker.png'), - itemStyle: { - color: '#4bffb4', // 勐永镇的颜色 - }, + }, + { + name: '欣欣种源企业', + value: [99.402267, 23.538889, 150], // 经度, 纬度, 数值 + symbol: 'image://' + getAssetsFile('images/vsualized/marker.png'), + itemStyle: { + color: '#4bffb4', // 勐永镇的颜色 }, - ], + }, ]);