diff --git a/main/src/components/custom-table-operate/index.vue b/main/src/components/custom-table-operate/index.vue index 58c70ba..3d7c4f8 100644 --- a/main/src/components/custom-table-operate/index.vue +++ b/main/src/components/custom-table-operate/index.vue @@ -5,15 +5,8 @@ @@ -33,6 +26,14 @@ const onPermission = (row) => { if (row.auth === undefined) return true; return typeof row.auth === 'function' ? row.auth(props.data) : row.auth; }; + +const formatterName = (row) => { + return typeof row.name === 'function' ? row.name(props.data) : row.name; +}; + +const formatterIcon = (row) => { + return typeof row.icon === 'function' ? row.icon(props.data) : row.icon; +}; diff --git a/main/src/components/index.js b/main/src/components/index.js index b95d513..9e092b9 100644 --- a/main/src/components/index.js +++ b/main/src/components/index.js @@ -1,5 +1,6 @@ import SvgIcon from './svg-icon'; import CustomTableOperate from './custom-table-operate'; +import CustomTableTree from './custom-table-tree'; import CustomImportExcel from './custom-import-excel'; import CustomRichEditor from './custom-rich-editor'; import CustomEchartBar from './custom-echart-bar'; @@ -7,4 +8,14 @@ import CustomEchartPie from './custom-echart-pie'; import CustomEchartLine from './custom-echart-line'; import CustomEchartMixin from './custom-echart-mixin'; -export { SvgIcon, CustomTableOperate, CustomImportExcel, CustomRichEditor, CustomEchartBar, CustomEchartPie, CustomEchartLine, CustomEchartMixin }; +export { + SvgIcon, + CustomTableOperate, + CustomTableTree, + CustomImportExcel, + CustomRichEditor, + CustomEchartBar, + CustomEchartPie, + CustomEchartLine, + CustomEchartMixin, +}; diff --git a/sub-government-affairs-service/src/router/index.js b/sub-government-affairs-service/src/router/index.js index 7448b8e..bccde08 100644 --- a/sub-government-affairs-service/src/router/index.js +++ b/sub-government-affairs-service/src/router/index.js @@ -3,17 +3,16 @@ * @Author: zenghua.wang * @Date: 2023-06-20 11:48:41 * @LastEditors: zenghua.wang - * @LastEditTime: 2025-03-06 16:11:29 + * @LastEditTime: 2025-03-11 16:51:49 */ import { createRouter, createWebHistory } from 'vue-router'; import Layout from '@/layouts/index.vue'; import resourceRouter from './modules/resource'; import traceRouter from './modules/trace'; -import landsRoutes from './modules/lands'; -import dictRoutes from './modules/dict'; import productOperateMainRoutes from './modules/productOperateMain'; import inputSuppliesRoutes from './modules/inputSupplies'; +import plantingAndBreedingRouter from './modules/plantingAndBreeding'; export const constantRoutes = [ { @@ -45,10 +44,9 @@ export const constantRoutes = [ }, ...resourceRouter, ...traceRouter, - // ...landsRoutes, - // ...dictRoutes, ...productOperateMainRoutes, ...inputSuppliesRoutes, + ...plantingAndBreedingRouter, ]; /** diff --git a/sub-government-affairs-service/src/router/modules/plantingAndBreeding.js b/sub-government-affairs-service/src/router/modules/plantingAndBreeding.js new file mode 100644 index 0000000..0d951d1 --- /dev/null +++ b/sub-government-affairs-service/src/router/modules/plantingAndBreeding.js @@ -0,0 +1,25 @@ +import Layout from '@/layouts/index.vue'; + +export default [ + { + path: '/sub-government-affairs-service/plantingAndBreeding', + name: 'plantingAndBreeding', + component: Layout, + redirect: '/sub-government-affairs-service/breeding-base-information', + meta: { title: '种养植综合管理', icon: 'Document' }, + children: [ + { + path: '/sub-government-affairs-service/environment-monitor', + name: 'environment-monitor', + component: () => import('@/views/plantingAndBreeding/environment/index.vue'), + meta: { title: '环境监测信息', icon: 'Document' }, + }, + // { + // path: '/sub-government-affairs-service/breeding-base-information', + // name: 'breeding-base-information', + // component: () => import('@/views/plantingAndBreeding/base/index.vue'), + // meta: { title: '种养殖基地信息', icon: 'Document' }, + // }, + ], + }, +]; diff --git a/sub-government-affairs-service/src/views/plantingAndBreeding/environment/index.vue b/sub-government-affairs-service/src/views/plantingAndBreeding/environment/index.vue new file mode 100644 index 0000000..9969db6 --- /dev/null +++ b/sub-government-affairs-service/src/views/plantingAndBreeding/environment/index.vue @@ -0,0 +1,406 @@ + + diff --git a/sub-government-affairs-service/src/views/productOperateMain/home/components/mapSplashed.vue b/sub-government-affairs-service/src/views/productOperateMain/home/components/mapSplashed.vue index 318c8dd..85a1337 100644 --- a/sub-government-affairs-service/src/views/productOperateMain/home/components/mapSplashed.vue +++ b/sub-government-affairs-service/src/views/productOperateMain/home/components/mapSplashed.vue @@ -20,7 +20,7 @@ const initChart = () => { // 配置项 const option = { title: { - text: '耿马县地图散点图', + text: '', left: 'center', }, tooltip: { @@ -33,14 +33,14 @@ const initChart = () => { }, }, toolbox: { - show: true, + show: false, orient: 'vertical', left: 'right', top: 'center', feature: { - dataView: { readOnly: false }, - restore: {}, - saveAsImage: {}, + // dataView: { readOnly: false }, + // restore: {}, + // saveAsImage: {}, }, }, geo: { @@ -72,10 +72,10 @@ const initChart = () => { borderWidth: 1, // 设置镇边界的宽度 areaColor: 'transparent', // 设置背景透明,只显示边界 }, - emphasis: { - borderColor: '#fff', - borderWidth: 2, - }, + // emphasis: { + // borderColor: '#fff', + // borderWidth: 2, + // }, }, }, // 闪烁散点图系列 @@ -113,7 +113,7 @@ const initChart = () => { scale: 3, // 波纹缩放比例 brushType: 'stroke', // 波纹绘制方式:'stroke' 或 'fill' }, - hoverAnimation: true, + hoverAnimation: false, }, ], };