修改黑屏问题

夏滨接入主应用
2025-05-14 17:10:59 +08:00 · 2025-05-14 15:15:59 +08:00
30 changed files with 7096 additions and 23741 deletions
--- a/.env.development
+++ b/.env.development
@ -1,6 +1,19 @@
 # 开发环境
-VITE_PORT = 9000
-VITE_APP_NAME = 'digital-agriculture-screen'
+# VITE_PORT = 9530
+# VITE_APP_NAME = 'new-digital-agriculture-screen'
+# VITE_APP_TITLE = '政务云数字农业智慧大屏'
+# VITE_APP_BASE_API = '/apis' 
+# VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
+
+
+# 开发环境
+VITE_PORT = 9530
+VITE_MODE = 'DEV'
 VITE_APP_TITLE = '政务云数字农业智慧大屏'
+VITE_APP_MIAN = 'daimp-front-main'
+VITE_APP_MIAN_URL = 'http://localhost:9530'
+VITE_APP_NAME = 'new-digital-agriculture-screen'
 VITE_APP_BASE_API = '/apis' 
 VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
+VITE_APP_UPLOAD_API = '/uploadApis'
+VITE_APP_UPLOAD_URL = 'http://192.168.18.99:9300'
--- a/.env.production
+++ b/.env.production
@ -1,5 +1,14 @@
 # 生产环境
-VITE_APP_NAME = 'digital-agriculture-screen'
-VITE_APP_TITLE = '政务云数字农业智慧大屏'
+# VITE_APP_NAME = 'new-digital-agriculture-screen'
+# VITE_APP_TITLE = '政务云数字农业智慧大屏'
+# VITE_APP_BASE_API = '/apis' 
+# VITE_APP_BASE_URL = ''
+
+VITE_APP_MIAN = 'daimp-front-main'
+VITE_APP_MIAN_URL = 'http://47.109.205.240:88'
+VITE_APP_NAME = 'new-digital-agriculture-screen'
+# 接口
 VITE_APP_BASE_API = '/apis' 
-VITE_APP_BASE_URL = ''
+VITE_APP_BASE_URL = ''
+VITE_APP_UPLOAD_API = '/uploadApis'
+VITE_APP_UPLOAD_URL = ''
--- a/.env.test
+++ b/.env.test
@ -1,5 +0,0 @@
-# 测试环境
-VITE_APP_NAME = 'digital-agriculture-screen'
-VITE_APP_TITLE = '政务云数字农业智慧大屏'
-VITE_APP_BASE_API = '/apis' 
-VITE_APP_BASE_URL = ''
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,2 +0,0 @@
-{
-}
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@ -1 +0,0 @@
-nodeLinker: node-modules
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -17,8 +17,6 @@
  "dependencies": {
    "@element-plus/icons-vue": "^2.3.1",
    "@smallwei/avue": "^3.6.2",
-    "@vuemap/vue-amap": "^2.0",
-    "@vuemap/vue-amap-loca": "^2.0",
    "@wangeditor/editor": "^5.1.23",
    "@wangeditor/editor-for-vue": "^5.1.12",
    "animate.css": "^4.1.1",
@ -27,6 +25,8 @@
    "echarts-gl": "^2.0.9",
    "echarts-liquidfill": "^3.1.0",
    "echarts-wordcloud": "^2.1.0",
+    "@vuemap/vue-amap": "^2.0",
+    "@vuemap/vue-amap-loca": "^2.0",
    "element-plus": "^2.7.2",
    "js-base64": "^3.7.6",
    "lodash": "^4.17.21",
--- a/src/assets/images/basic/tagBG-small.png
+++ b/src/assets/images/basic/tagBG-small.png
--- a/src/components/custom-echart-triangle/index.vue
+++ b/src/components/custom-echart-triangle/index.vue
@ -36,10 +36,10 @@ export default {
    const { setOptions, getInstance, resize, startAutoPlay } = useEcharts(chartRef);
    const option = reactive({
      tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-          type: 'shadow',
-        },
+        // trigger: 'axis',
+        // axisPointer: {
+        //   type: 'shadow',
+        // },
        backgroundColor: 'rgba(18, 55, 85, 0.8);',
        borderColor: '#35d0c0',
        formatter: (data) => {
@ -62,7 +62,7 @@ export default {
          gap: 0,
          label: {
            show: true,
-            position: 'outside',
+            position: 'right',
            width: '200px',
            align: 'right',
            formatter: function (params) {
@ -74,29 +74,9 @@ export default {
              a: { color: '#fff', fontSize: '16px' },
              b: { color: '#05FCC6', fontSize: '16px' },
            },
-            verticalAlign: 'middle',
-            padding: [5, 10], // 增加标签内边距
          },
          labelLine: {
-            show: true,
-            length: 20,
-            length2: 30,
-            smooth: true,
-            lineStyle: {
-              width: 2,
-              color: '#ffffff',
-              opacity: 1,
-              type: 'solid',
-            },
-            // 自定义折线路径（从标签到数据点的像素坐标）
-            // 参数：idx-数据索引, params-包含标签位置信息的对象
-            // formatter: function (idx, params) {
-            //   return [
-            //     [params.labelRect.x, params.labelRect.y], // 起点（标签位置）
-            //     [params.labelRect.x + 20, params.labelRect.y], // 水平线段
-            //     [params.labelRect.x + 20, params.dataCoord[1]]  // 垂直线段
-            //   ];
-            // },
+            show: false,
          },
          itemStyle: {
            show: false,
--- 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: '/v2/home' },
-        { label: '土地资源', value: '/v2/land' },
-        { label: '投入品监管', value: '/v2/inputs' },
-        { label: '产出品管理', value: '/v2/entities' },
+        { 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' },
        // { label: '智慧种植监测', value: 'plant' },
        // { label: '智慧养殖监测', value: 'breed' },
-        { label: '生产经营主体', value: '/v2/business' },
-        { label: '农产品溯源', value: '/v2/trace' },
+        { label: '生产经营主体', value: '/new-digital-agriculture-screen/v2/business' },
+        { label: '农产品溯源', value: '/new-digital-agriculture-screen/v2/trace' },
        // { label: '产业预警决策', value: 'early' },
      ];
    },
@ -69,7 +69,7 @@ const props = defineProps({
 });
 const titleContentW = ref('0');
 const itemW = ref('1');
-const gap = ref(1);
+const gap = ref(24);
 const leftNum = ref(0);
 const position = ref(0);
 const right = ref(null);
@ -133,7 +133,7 @@ function handleTitleClick(val) {
 .header_title {
  background-color: #000;
  position: relative;
-  padding: 0 40px;
+  padding: 0 68px;
  display: flex;
  justify-content: space-between;
  width: 100vw;
@ -174,7 +174,7 @@ function handleTitleClick(val) {
  .left_titles_container,
  .right_titles_container {
    position: relative;
-    width: 31%;
+    width: 30%;
    height: 100%;
    overflow: hidden;
    line-height: 90px;
@ -182,10 +182,10 @@ function handleTitleClick(val) {
      position: absolute;
      top: 10px;
      width: var(--titleContentW);
-      height: 56px;
+      height: 40px;
      transition: all 0.4s ease;
-      font-size: 24px;
-      // font-weight: bold;
+      font-size: 20px;
+      font-weight: bold;
      .active {
        color: #fff;
        opacity: 1 !important;
@ -194,9 +194,9 @@ function handleTitleClick(val) {
      .title_item {
        margin-right: var(--gap);
        display: inline-block;
-        min-width: var(--itemW);
-        height: 56px;
-        line-height: 56px;
+        width: var(--itemW);
+        height: 40px;
+        line-height: 40px;
        text-align: center;
        color: #f5fffe;
        cursor: pointer;
--- a/src/components/subTop.vue
+++ b/src/components/subTop.vue
@ -9,7 +9,7 @@
    ></div>
    <span class="title-top-content" :style="{ 'text-align': props.left }">{{ topTitle || '--' }}</span>
    <div v-if="isDown" class="down-list" :style="{ width: downWidth }">
-      <el-dropdown :hide-on-click="true" trigger="click" @command="handleCommand">
+      <el-dropdown :hide-on-click="true" :style="{ width: '90%' }" trigger="click" @command="handleCommand">
        <span class="el-dropdown-link">
          {{ currentVal && currentVal[labelField] ? currentVal[labelField] : downTitle }}<el-icon class="el-icon--right"><arrow-down /></el-icon>
        </span>
@ -147,8 +147,8 @@ const handleCommand = (data) => {
  }
  .title-top-content {
    line-height: 38px;
-    font-size: 20px;
-    // font-weight: bold;
+    font-size: 14px;
+    font-weight: bold;
    display: inline-block;
    transform: skewX(-13deg);
    background: linear-gradient(to bottom, '#ff7e5f', '#548fff');
@ -167,7 +167,7 @@ const handleCommand = (data) => {
  .down-list {
    display: inline-block;
    position: absolute;
-    right: 0;
+    right: 32px;
    top: 50%;
    transform: translateY(-50%);
    z-index: 2;
@ -178,8 +178,6 @@ const handleCommand = (data) => {
      border: 1px solid $color-custom-main;
      padding: 6px;
      border-radius: 4px;
-      padding-left: 10px;
-      padding-right: 10px;
    }
  }
 }
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@ -74,7 +74,6 @@ onMounted(() => {
  }
  .base-laytout-header {
    height: 90px;
-    margin-bottom: 50px;
  }
 }
 </style>
--- a/src/main.js
+++ b/src/main.js
@ -1,3 +1,10 @@
+/**
+ * @Description:
+ * @Author: zenghua.wang
+ * @Date: 2024-01-24 17:14:41
+ * @LastEditors: zenghua.wang
+ * @LastEditTime: 2024-03-22 10:11:34
+ */
 import 'virtual:svg-icons-register';
 import { createApp, nextTick } from 'vue';
 import App from './App.vue';
@ -5,30 +12,23 @@ import router from './router';
 import pinia from './store';
 import ElementPlus from 'element-plus';
 import 'element-plus/dist/index.css';
-import 'animate.css';
+import Avue from '@smallwei/avue';
+import '@smallwei/avue/lib/index.css';
 import './utils/permission';
-import { registerDirective } from './directives';
-import { registerElIcons } from './plugins/icon';
 import VueAMap, { initAMapApiLoader } from '@vuemap/vue-amap';
-import '@vuemap/vue-amap/dist/style.css';
-
-// 初始化高德地图 API
-initAMapApiLoader({
-  key: 'c843a50db7157faf295c6fa37c48719f',
-  securityJsCode: 'f09302d3ed65110614bdb26e44717ddf', // 新版key需要配合安全密钥使用
-  version: '2.0',
-  Loca: {
-    version: '2.0',
-  },
-  AMapUI: {
-    plugins: ['misc/PathSimplifier'],
-  },
-  plugins: ['AMap.MapType'],
-});
+import { registerDirective } from './directives';
+import { registerGlobalComponents } from './plugins/globalComponents';
+import { registerElIcons } from './plugins/icon';
+import { registerMicroApps } from './plugins/micro';

 const app = createApp(App);
+// 注册 Vue3 Scroll Seamless 组件
+// app.component('Vue3ScrollSeamless', vue3ScrollSeamless);
+// app.use(pinia).use(router).use(ElementPlus).use(Avue);
+app.use(pinia).use(router).use(ElementPlus).use(Avue).use(VueAMap);
 nextTick(() => {
+  registerGlobalComponents(app);
  registerElIcons(app);
  registerDirective(app);
+  registerMicroApps(app);
 });
-app.use(pinia).use(router).use(ElementPlus).use(VueAMap).mount('#app');
--- a/src/plugins/globalComponents.js
+++ b/src/plugins/globalComponents.js
@ -0,0 +1,8 @@
+import * as components from '../../../main/src/components';
+
+// 全局注册组件
+export const registerGlobalComponents = (app) => {
+  Object.keys(components).forEach((key) => {
+    app.component(key, components[key]);
+  });
+};
--- a/src/plugins/micro.js
+++ b/src/plugins/micro.js
@ -0,0 +1,26 @@
+import { renderWithQiankun, qiankunWindow } from 'vite-plugin-qiankun/dist/helper';
+
+export const registerMicroApps = async (app) => {
+  const initQiankun = () => {
+    renderWithQiankun({
+      bootstrap() {
+        console.log('bootstrap');
+      },
+      mount(props) {
+        console.log('mount', props);
+        render(props);
+      },
+      update(props) {
+        console.log('update', props);
+      },
+      unmount(props) {
+        console.log('unmount', props);
+      },
+    });
+  };
+  const render = async ({ container }) => {
+    await new Promise((resolve) => setTimeout(resolve, 1000));
+    app.mount(container ? container.querySelector('#app') : '#app');
+  };
+  qiankunWindow.__POWERED_BY_QIANKUN__ ? initQiankun() : render({});
+};
--- a/src/plugins/splitpanes.js
+++ b/src/plugins/splitpanes.js
@ -0,0 +1,7 @@
+import { Splitpanes, Pane } from 'splitpanes';
+import 'splitpanes/dist/splitpanes.css';
+
+export const registerSplitpanes = (app) => {
+  app.component('Splitpanes', Splitpanes);
+  app.component('Pane', Pane);
+};
--- a/src/router/index.js
+++ b/src/router/index.js
@ -11,18 +11,26 @@ export const constantRoutes = [
  //   component: () => import('@/views/error/404.vue'),
  //   hidden: true,
  // },
-  // {
-  //   path: '/403',
-  //   name: '403',
-  //   component: () => import('@/views/error/403.vue'),
-  //   hidden: true,
-  // },
  {
-    path: '/',
+    path: '/new-digital-agriculture-screen/403',
+    name: '403',
+    component: () => import('@/views/error/403.vue'),
+    hidden: true,
+  },
+  {
+    path: '/new-digital-agriculture-screen',
    name: 'layout',
    component: Layout,
-    redirect: '/v2/land',
+    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,
@ -38,9 +46,9 @@ export const constantRoutes = [
 * @Title notFoundRouter(找不到路由)
 */
 export const notFoundRouter = {
-  path: '/:pathMatch(.*)',
+  path: '/new-digital-agriculture-screen/:pathMatch(.*)',
  name: 'notFound',
-  redirect: '/404',
+  redirect: '/new-digital-agriculture-screen/404',
 };

 const router = createRouter({
--- a/src/router/modules/demo.js
+++ b/src/router/modules/demo.js
@ -2,20 +2,20 @@ import Layout from '@/layouts/index.vue';

 export default [
  {
-    path: '/demo',
+    path: '/new-digital-agriculture-screen/demo',
    name: 'demo',
    component: Layout,
-    redirect: '/scrollBoard',
+    redirect: '/new-digital-agriculture-screen/scrollBoard',
    meta: { title: '案例', icon: 'document' },
    children: [
      {
-        path: '/demo/scrollBoard',
+        path: '/new-digital-agriculture-screen/demo/scrollBoard',
        name: 'scrollBoard',
        component: () => import('@/views/demo/scrollBoard.vue'),
        meta: { title: '轮播列表', icon: 'document' },
      },
      {
-        path: '/demo/rank',
+        path: '/new-digital-agriculture-screen/demo/rank',
        name: 'rank',
        component: () => import('@/views/demo/rank.vue'),
        meta: { title: '滚动排名列表', icon: 'document' },
--- a/src/router/modules/v2.js
+++ b/src/router/modules/v2.js
@ -1,32 +1,32 @@
 import Layout from '@/layouts/index.vue';

 export default {
-  path: '/v2',
-  name: 'v2',
+  path: '/new-digital-agriculture-screen',
+  name: 'layout',
  component: Layout,
-  redirect: '/v2/home',
+  redirect: '/new-digital-agriculture-screen/v2/home',
  meta: { title: '首页', icon: '' },
  children: [
    {
-      path: '/v2/home',
+      path: '/new-digital-agriculture-screen/v2/home',
      component: () => import('@/views/home/index.vue'),
      name: 'home',
      meta: { title: '首页', icon: '' },
    },
    {
-      path: '/v2/land',
+      path: '/new-digital-agriculture-screen/v2/land',
      component: () => import('@/views/land/index.vue'),
      name: 'land',
      meta: { title: '土地资源', icon: '' },
    },
    {
-      path: '/v2/inputs',
+      path: '/new-digital-agriculture-screen/v2/inputs',
      name: 'inputs',
      component: () => import('@/views/inputs/index.vue'),
      meta: { title: '投入品监管', icon: '' },
    },
    {
-      path: '/v2/entities',
+      path: '/new-digital-agriculture-screen/v2/entities',
      name: 'entities',
      component: () => import('@/views/entities/index.vue'),
      meta: { title: '产出品管理', icon: '' },
@ -44,13 +44,13 @@ export default {
    //   meta: { title: '', icon: '' },
    // },
    {
-      path: '/v2/business',
+      path: '/new-digital-agriculture-screen/v2/business',
      name: 'business',
      component: () => import('@/views/business/index.vue'),
      meta: { title: '生产经营主体', icon: '' },
    },
    {
-      path: 'trace',
+      path: '/new-digital-agriculture-screen/trace',
      name: 'trace',
      component: () => import('@/views/trace/index.vue'),
      meta: { title: '农产品溯源', icon: '' },
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@ -35,6 +35,11 @@ router.beforeEach(async (to, from, next) => {
          accessRoutes.forEach((item) => router.addRoute(item));
          return next({ ...to, replace: true });
        } else {
+          if (from.path.includes('/new') && to.path.includes('/platform')) {
+            window.location.reload();
+            return;
+          }
+          next();
          next();
        }
      } catch (error) {
--- a/src/views/entities/components/benefitCharts.vue
+++ b/src/views/entities/components/benefitCharts.vue
@ -145,7 +145,6 @@ function handleChange(n) {
      top: 8px;
      width: 24px;
      height: 24px;
-      text-shadow: 2px 0px 10px 0px #01eeff;
    }
    .left_btn {
      left: 6px;
--- a/src/views/entities/components/categoryCharts.vue
+++ b/src/views/entities/components/categoryCharts.vue
@ -1,60 +1,39 @@
 <template>
-  <customEchartHyalineCake ref="chartRef" :chart-data="data" height="100%" :option="option" />
+  <customEchartHyalineCake :chart-data="data" height="100%" :option="option" />
 </template>

 <script lang="ts" setup>
-import { reactive, ref, onMounted } from 'vue';
-const chartRef = ref(null);
+import { reactive, ref } from 'vue';

-/* --------------- data右上侧饼图 --------------- */
+/* --------------- data --------------- */
 // #region
 const data = ref([
  {
-    name: ' 企业',
+    name: '企业',
    value: 10.8,
-    itemStyle: { color: '#3c5fc4', opacity: 0.8 },
  },
  {
-    name: ' 合作社',
-    value: 18.4,
-    itemStyle: { color: '#8fd8ff', opacity: 0.8 },
+    name: '合作社',
+    value: 8.4,
  },
  {
-    name: ' 村集体',
-    value: 14.3,
-    itemStyle: { color: '#55d9a4', opacity: 0.8 },
+    name: '村集体',
+    value: 4.3,
  },
  {
-    name: ' 个体',
-    value: 23.7,
-    itemStyle: { color: '#d2a823', opacity: 0.8 },
+    name: '个体',
+    value: 3.7,
  },
 ]);
-
-let itemGapWith = ref(0);
-const getChartrefWith = () => {
-  let len = data.value.length * 2;
-  return chartRef.value.$refs.chartRef.offsetWidth / len + 8;
-};
-
 const option = reactive({
  k: 0.2,
-  opacity: 0.4,
+  opacity: 0.6,
  itemGap: 0,
  autoItemHeight: 3,
  legend: {
-    type: 'plain',
    orient: 'horizontal',
-    width: '100%',
    bottom: 10,
    left: 'center',
-    itemWidth: 16,
-    itemHeight: 16,
-    itemGap: itemGapWith.value ? itemGapWith.value : 50,
-    textStyle: {
-      color: '#fff',
-      fontSize: '16px',
-    },
  },
  title: {
    text: '23亿元',
@ -68,18 +47,18 @@ const option = reactive({
      color: '#02FD94',
      fontSize: '18px',
    },
-    top: '26%',
+    top: 'center',
    left: 'center',
  },
  grid3D: {
    show: false,
-    boxHeight: 3,
-    top: '-15%', //调整距离顶部距离，0是在中间
+    boxHeight: 5,
+    top: 'center',
    left: 'center',
    viewControl: {
      //3d效果可以放大、旋转等，请自己去查看官方配置
-      alpha: 36, //角度(这个很重要 调节角度的)
-      distance: 130, //调整视角到主体的距离，类似调整zoom(这是整体大小)
+      alpha: 30, //角度(这个很重要 调节角度的)
+      distance: 160, //调整视角到主体的距离，类似调整zoom(这是整体大小)
      rotateSensitivity: 10, //设置旋转灵敏度，为0无法旋转
      zoomSensitivity: 10, //设置缩放灵敏度，为0无法缩放
      panSensitivity: 10, //设置平移灵敏度，0无法平移
@ -94,10 +73,6 @@ const option = reactive({
 // #region

 // #endregion
-onMounted(() => {
-  itemGapWith.value = getChartrefWith();
-  option.legend.itemGap = itemGapWith.value ? itemGapWith.value : 50;
-});
 </script>

 <style lang="scss" scoped></style>
--- a/src/views/entities/components/entitiesCategoryCharts.vue
+++ b/src/views/entities/components/entitiesCategoryCharts.vue
@ -1,21 +1,34 @@
 <template>
-  <custom-echart-line :chart-data="state.data" height="100%" :option="state.option" />
+  <custom-echart-line :chart-data="dataList" height="100%" :option="state.option" />
 </template>
 <script setup>
-import { reactive, watch } from 'vue';
-import { isEmpty, sleep } from '@/utils';
-
-const props = defineProps({
-  data: {
-    type: Array,
-    default: () => [],
+import { reactive } from 'vue';
+let dataList = reactive([
+  {
+    value: 10,
+    name: '2020',
  },
-  query: {
-    type: String,
-    default: '',
+  {
+    value: 66,
+    name: '2021',
  },
-});
-
+  {
+    value: 100,
+    name: '2022',
+  },
+  {
+    value: 120,
+    name: '2023',
+  },
+  {
+    value: 150,
+    name: '2024',
+  },
+  {
+    value: 80,
+    name: '2025',
+  },
+]);
 const state = reactive({
  option: {
    color: ['#35D0C0'],
@ -63,12 +76,12 @@ const state = reactive({
      // name: '',
    },
  },
-  data: [],
+  data: dataList,
 });

 const refresData = () => {
-  // console.info('landPatrol********************refresData');
-  state.data = reactive([
+  console.info('landPatrol********************refresData');
+  state.data = dataList = reactive([
    {
      value: 20,
      name: '2020',
@ -95,53 +108,7 @@ const refresData = () => {
    },
  ]);
 };
-const loadData = async (code = '') => {
-  state.loading = true;
-  // GetInputsInfo()
-  //   .then((res) => {
-  //     if (res.code === 200) {
-  //       state.data = res.data;
-  //     }
-  //   })
-  //   .catch((err) => {
-  //     app.$message.error(err.msg);
-  //   });
-  await sleep(500);
-  state.data = [
-    { value: 5, name: '2020' },
-    { value: 36, name: '2021' },
-    { value: 70, name: '2022' },
-    { value: 56, name: '2023' },
-    { value: 70, name: '2024' },
-    { value: 20, name: '2025' },
-  ];
-};

-watch(
-  () => props.data,
-  (val) => {
-    if (!isEmpty(val)) {
-      state.data = val;
-    }
-  },
-  {
-    deep: true,
-    immediate: true,
-  }
-);
-
-watch(
-  () => props.query,
-  (val) => {
-    if (!isEmpty(val)) {
-      loadData(val);
-    }
-  },
-  {
-    deep: true,
-    immediate: true,
-  }
-);
 defineExpose({
  refresData,
 });
--- a/src/views/entities/components/entitiesStatistics.vue
+++ b/src/views/entities/components/entitiesStatistics.vue
@ -2,23 +2,21 @@
  <custom-echart-column-line :chart-data="state.data" height="100%" :option="state.option" />
 </template>
 <script setup>
-import { reactive, watch } from 'vue';
-import { isEmpty, sleep } from '@/utils';
+import { reactive } from 'vue';
 import * as echarts from 'echarts';

-const props = defineProps({
-  data: {
-    type: Array,
-    default: () => [],
-  },
-  query: {
-    type: String,
-    default: '',
-  },
-});
-
 const state = reactive({
-  data: [],
+  data: [
+    { value: 103, value1: 208, name: '耿马镇' },
+    { value: 72, value1: 157, name: '勐撒镇' },
+    { value: 50, value1: 125, name: '勐永镇' },
+    { value: 60, value1: 146, name: '孟定镇' },
+    { value: 40, value1: 86, name: '勐简乡' },
+    { value: 111, value1: 172, name: '贺派乡' },
+    { value: 81, value1: 180, name: '四排山乡' },
+    { value: 55, value1: 99, name: '芒洪乡' },
+    { value: 68, value1: 84, name: '大兴乡' },
+  ],
  option: {
    grid: {
      left: '3%',
@ -28,7 +26,6 @@ const state = reactive({
      containLabel: true,
    },
    tooltip: {
-      show: true,
      trigger: 'axis',
      axisPointer: {
        type: 'shadow',
@ -40,8 +37,8 @@ const state = reactive({
        const params = data[0];
        let str = `<div class="custom-echarts-tips">
          <span>${params.name}</span><br/>
-          <span>${params.marker} ${params.data} 万吨</span><br />
-          <span>${data[1].marker} ${data[1].data} 万吨</span>
+          <span>${params.marker} ${params.data} 万</span><br />
+          <span>${data[1].marker} ${data[1].data} 万</span>
        </div>`;
        return str;
      },
@ -202,55 +199,4 @@ const state = reactive({
    ],
  },
 });
-
-const loadData = async (code = '') => {
-  state.loading = true;
-  // GetInputsInfo()
-  //   .then((res) => {
-  //     if (res.code === 200) {
-  //       state.data = res.data;
-  //     }
-  //   })
-  //   .catch((err) => {
-  //     app.$message.error(err.msg);
-  //   });
-  await sleep(500);
-  state.data = [
-    { value: 103, value1: 208, name: '耿马镇' },
-    { value: 72, value1: 157, name: '勐撒镇' },
-    { value: 50, value1: 125, name: '勐永镇' },
-    { value: 60, value1: 146, name: '孟定镇' },
-    { value: 40, value1: 86, name: '勐简乡' },
-    { value: 111, value1: 172, name: '贺派乡' },
-    { value: 81, value1: 180, name: '四排山乡' },
-    { value: 55, value1: 99, name: '芒洪乡' },
-    { value: 68, value1: 84, name: '大兴乡' },
-  ];
-};
-
-watch(
-  () => props.data,
-  (val) => {
-    if (!isEmpty(val)) {
-      state.data = val;
-    }
-  },
-  {
-    deep: true,
-    immediate: true,
-  }
-);
-
-watch(
-  () => props.query,
-  (val) => {
-    if (!isEmpty(val)) {
-      loadData(val);
-    }
-  },
-  {
-    deep: true,
-    immediate: true,
-  }
-);
 </script>
--- a/src/views/entities/components/entitieslist.vue
+++ b/src/views/entities/components/entitieslist.vue
@ -1,40 +1,34 @@
 <template>
-  <customEchartHyalineCake :chart-data="dataList" height="100%" :option="option" />
+  <customEchartHyalineCake :chart-data="data" height="100%" :option="option" />
 </template>

 <script lang="ts" setup>
 import { reactive, ref } from 'vue';

-/* --------------- 左中饼图 --------------- */
+/* --------------- data --------------- */
 // #region
-const dataList = ref([
+const data = ref([
  {
    name: '烟草',
    value: 60.8,
-    money: 100,
  },
  {
    name: '甘蔗',
    value: 44.4,
-    money: 88,
  },
  {
    name: '核桃',
    value: 24.3,
-    money: 92,
  },
  {
    name: '蔬菜',
    value: 32.7,
-    money: 56,
  },
  {
    name: '其他',
    value: 32.9,
-    money: 18,
  },
 ]);
-
 const option = reactive({
  k: 0.3,
  opacity: 1,
@ -42,13 +36,13 @@ const option = reactive({
  autoItemHeight: 2,
  grid3D: {
    show: false,
-    boxHeight: 4, //厚度
-    top: '0', //距离顶部的距离
+    boxHeight: 5,
+    top: '0',
    left: '-20%',
    viewControl: {
      //3d效果可以放大、旋转等，请自己去查看官方配置
      alpha: 30, //角度(这个很重要 调节角度的)
-      distance: 200, //调整视角到主体的距离，类似调整zoom(这是整体大小)
+      distance: 160, //调整视角到主体的距离，类似调整zoom(这是整体大小)
      rotateSensitivity: 10, //设置旋转灵敏度，为0无法旋转
      zoomSensitivity: 10, //设置缩放灵敏度，为0无法缩放
      panSensitivity: 10, //设置平移灵敏度，0无法平移
@ -56,41 +50,6 @@ const option = reactive({
      autoRotateAfterStill: 2, //在鼠标静止操作后恢复自动旋转的时间间隔,在开启 autoRotate 后有效
    },
  },
-  // series: [
-  //   // 透明的 2D 饼图（仅用于生成标签折线）
-  //   {
-  //     type: 'pie',
-  //     radius: ['30%', '70%'],
-  //     center: ['40%', '50%'],
-  //     startAngle: -40, // 调整角度与 3D 图形对齐
-  //     clockwise: false,
-  //     label: {
-  //       show: true,
-  //       position: 'outside',
-  //       formatter: (params) => {
-  //         console.log(params);
-  //         return `{a|${params.data.name}}\n{b|${params.data.money}万元}`;
-  //       },
-  //       rich: {
-  //         a: { color: '#ffffff' },
-  //         b: { color: '#79F5AF' },
-  //       },
-  //     },
-  //     labelLine: {
-  //       show: true,
-  //       length: 10,
-  //       length2: 15,
-  //       lineStyle: {
-  //         color: '#ffffff',
-  //         width: 1,
-  //       },
-  //     },
-  //     data: dataList,
-  //     itemStyle: {
-  //       opacity: 1, // 隐藏扇区，仅保留标签和折线
-  //     },
-  //   },
-  // ],
 });
 // #endregion

--- a/src/views/entities/components/hotCharts.vue
+++ b/src/views/entities/components/hotCharts.vue
@ -1,10 +1,5 @@
 <template>
  <div ref="chartsWarp" class="hot-charts">
-    <section class="_top_btns">
-      <span class="left_btn" @click="handleChange(-1)"></span>
-      <span class="right_btn" @click="handleChange(1)"></span>
-      {{ current.info.name }}
-    </section>
    <custom-echart-triangle :chart-data="data" height="100%" :option="option" />
  </div>
 </template>
@ -18,72 +13,9 @@ const data = ref([
 ]);
 const option = reactive({});
 onMounted(() => {});
-
-const list = ref([
-  {
-    name: '茶叶',
-    value: '1',
-  },
-  {
-    name: '核桃',
-    value: '2',
-  },
-  {
-    name: '玉米',
-    value: '3',
-  },
-]);
-const current = reactive({
-  index: 0,
-  length: list.value.length - 1,
-  info: {
-    name: '茶叶',
-    value: '20',
-  },
-});
-function handleChange(n) {
-  if (current.index == 0 && n == -1) {
-    current.index = current.length;
-  } else if (current.index == current.length && n == 1) {
-    current.index = 0;
-  } else {
-    current.index += n;
-  }
-  current.info = list.value[current.index];
-}
 </script>
 <style lang="scss" scoped>
 .hot-charts {
-  width: 100%;
  height: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  ._top_btns {
-    position: relative;
-    height: 40px;
-    width: 30%;
-    font-size: 20px;
-    text-align: center;
-    color: #fff;
-    line-height: 40px;
-    background: url('../../../assets/images/basic/tagBG-small.png') no-repeat center center / cover;
-    span {
-      display: block;
-      position: absolute;
-      top: 8px;
-      width: 24px;
-      height: 24px;
-      text-shadow: 2px 0px 10px 0px #01eeff;
-    }
-    .left_btn {
-      left: -10px;
-      background: url('../../../assets/images/basic/leftArrowIcon.png') no-repeat center center / cover;
-    }
-    .right_btn {
-      right: -10px;
-      background: url('../../../assets/images/basic/rightArrowIcon.png') no-repeat center center / cover;
-    }
-  }
 }
 </style>
--- a/src/views/entities/index.vue
+++ b/src/views/entities/index.vue
@ -2,29 +2,9 @@
  <el-row class="data-home-index">
    <el-col :span="6" class="left-charts">
      <div class="left-charts-item">
-        <customBack
-          top-title="全县历年产值对比"
-          :top-postion="'left'"
-          :down-title="'全县'"
-          :label-field="'label'"
-          :value-field="'value'"
-          :down-width="''"
-          :options="[
-            { label: '全县', value: '530926' },
-            { label: '耿马镇', value: '42611' },
-            { label: '勐撒镇', value: '9259' },
-            { label: '勐永镇', value: '17787' },
-            { label: '孟定镇', value: '42610' },
-            { label: '勐简乡', value: '17788' },
-            { label: '贺派乡', value: '40161' },
-            { label: '四排山乡', value: '40163' },
-            { label: '大兴乡', value: '40159' },
-          ]"
-          :is-down="true"
-          @command="handleCommand"
-        >
+        <customBack top-title="全县历年产值对比" :top-postion="'left'">
          <template #back>
-            <entitiesCategoryCharts ref="oneRef" :data="state.data.one" :query="state.queryCode"></entitiesCategoryCharts>
+            <entitiesCategoryCharts></entitiesCategoryCharts>
          </template>
        </customBack>
      </div>
@ -36,25 +16,9 @@
        </customBack>
      </div>
      <div class="left-charts-item">
-        <customBack
-          top-title="全县作物产量对比"
-          :top-postion="'left'"
-          :down-title="'烟草'"
-          :label-field="'label'"
-          :value-field="'value'"
-          :down-width="''"
-          :options="[
-            { label: '烟草', value: 1 },
-            { label: '甘蔗', value: 2 },
-            { label: '核桃', value: 3 },
-            { label: '蔬菜', value: 4 },
-            { label: '其他', value: 5 },
-          ]"
-          :is-down="true"
-          @command="handleContrast"
-        >
+        <customBack top-title="全县作物产量对比" :top-postion="'left'">
          <template #back>
-            <entitiesStatistics ref="thirdRef" :data="state.data.third" :query="state.contrastCode"></entitiesStatistics>
+            <entitiesStatistics></entitiesStatistics>
          </template>
        </customBack>
      </div>
@ -88,7 +52,6 @@
  </el-row>
 </template>
 <script setup>
-import { nextTick, reactive, ref } from 'vue';
 import centerMap from '@/components/centerMap.vue';
 import categoryCharts from './components/categoryCharts.vue';
 import entitieslist from './components/entitieslist.vue';
@ -97,58 +60,6 @@ import benefitCharts from './components/benefitCharts.vue';
 import entitiesStatistics from './components/entitiesStatistics.vue';
 import entitiesCategoryCharts from './components/entitiesCategoryCharts.vue';
 import entitiesMap from './components/entitiesMap.vue';
-import { sleep } from '@/utils';
-
-const oneRef = ref(null);
-const thirdRef = ref(null);
-
-const state = reactive({
-  loading: false,
-  data: {},
-  queryCode: '',
-  contrastCode: '',
-});
-const loadData = async () => {
-  state.loading = true;
-  await sleep(500);
-  state.data = {
-    one: [
-      { value: 5, name: '2020' },
-      { value: 36, name: '2021' },
-      { value: 70, name: '2022' },
-      { value: 56, name: '2023' },
-      { value: 70, name: '2024' },
-      { value: 20, name: '2025' },
-    ],
-    third: [
-      { value: 78, value1: 128, name: '耿马镇' },
-      { value: 55, value1: 117, name: '勐撒镇' },
-      { value: 65, value1: 145, name: '勐永镇' },
-      { value: 60, value1: 126, name: '孟定镇' },
-      { value: 40, value1: 86, name: '勐简乡' },
-      { value: 81, value1: 152, name: '贺派乡' },
-      { value: 41, value1: 130, name: '四排山乡' },
-      { value: 63, value1: 109, name: '芒洪乡' },
-      { value: 79, value1: 184, name: '大兴乡' },
-    ],
-  };
-};
-loadData();
-
-const handleCommand = (data) => {
-  state.queryCode = data.value;
-  // console.info('data=', data);
-  // nextTick(() => {
-  //   oneRef.value && oneRef.value.refresData();
-  // });
-};
-const handleContrast = (data) => {
-  state.contrastCode = data.value;
-  // console.info('data=', data);
-  nextTick(() => {
-    thirdRef.value && thirdRef.value.refresData();
-  });
-};
 </script>
 <style lang="scss" scoped>
 .data-home-index {
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@ -2,8 +2,8 @@
  <div class="data-home-index">
    <template v-for="(n, index) in homeList" :key="n.name">
      <div class="home-enter-item" :style="n.style" @click="itemClick(index)">
-        <div class="name" :style="n.nameStyle">
-          <span :style="n.spanStyle">{{ n.title || '--' }}</span>
+        <div class="name">
+          <span>{{ n.title || '--' }}</span>
        </div>
        <div class="img-icon" :style="n.imgstyle"><img :src="getAssetsFile(n.img)" /></div>
      </div>
@ -32,43 +32,35 @@ let homeList = reactive([
    linkType: 0,
    url: '',
    img: 'images/vsualized/home1.png',
-    style: 'left: 21%;bottom:300px;',
+    style: 'left: 20%;bottom:320px;',
    imgstyle: 'width:100px;height:100px',
-    nameStyle: 'padding: 0 16px;margin: 16px 0;',
-    spanStyle: 'font-size: 20px;',
  },
  {
-    title: '产业运营平台',
+    title: '农业产业运营服务平台',
    name: 'operation',
    linkType: 0,
    url: '',
    img: 'images/vsualized/home2.png',
-    style: 'left: 22%;bottom: 24px;',
+    style: 'left: 20%;bottom: 64px;',
    imgstyle: 'width:160px;height:160px',
-    nameStyle: 'padding: 0 22px;margin: 24px 0;border-radius: 16px;',
-    spanStyle: 'font-size: 28px;line-height: 66px',
  },
  {
    title: '数字大屏',
    name: 'dataV',
    linkType: 1,
-    url: '/v2/land',
+    url: '/new-digital-agriculture-screen/v2/land',
    img: 'images/vsualized/home3.png',
-    style: 'right: 23%;bottom:300px;',
+    style: 'right: 20%;bottom:320px;',
    imgstyle: 'width:100px;height:100px',
-    nameStyle: 'padding: 0 16px;margin: 16px 0;',
-    spanStyle: 'font-size: 20px;',
  },
  {
-    title: '政务云平台',
+    title: '农业产业政务服务平台',
    name: 'gov',
    linkType: 0,
    url: '',
    img: 'images/vsualized/home4.png',
-    style: 'right: 24%;bottom: 24px;',
+    style: 'right: 20%;bottom: 64px;',
    imgstyle: 'width:160px;height:160px',
-    nameStyle: 'padding: 0 22px;margin: 24px 0;border-radius: 16px;',
-    spanStyle: 'font-size: 28px;line-height: 66px',
  },
  // 更多项...
 ]);
@ -78,6 +70,7 @@ const itemClick = (index) => {
    let val = homeList[index] || null;
    if (val && val.url != '') {
      if (val.linkType == 1) {
+        // router.push({ name: val.url });
        router.push({ path: val.url });
      }
    }
@ -114,24 +107,17 @@ const itemClick = (index) => {
    .name {
      color: #fff;
      font-family: 'JinBuTi';
+      margin: 24px 0;
+      background: linear-gradient(180deg, #01fefd, rgba(1, 254, 253, 0));
      border: 2px solid #01fefd;
      border-radius: 8px;
-      backdrop-filter: blur(8px);
-      &::before {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        background: linear-gradient(180deg, #01fefd, rgba(1, 254, 253, 0));
-        opacity: 0.16; // 仅背景透明
-        z-index: -1; // 将背景置于底层
-        border-radius: 6px; // 比主元素小，避免覆盖边框
-      }
+
+      padding: 0 24px;
      span {
+        backdrop-filter: blur(8px);
        line-height: 40px;
        text-shadow: 0px 4px 8px 0px #01fefd;
+        font-size: 28px;
      }
    }
    .img-icon {
--- a/vite.config.js
+++ b/vite.config.js
@ -3,12 +3,12 @@
 * @Author: zenghua.wang
 * @Date: 2022-09-18 21:24:29
 * @LastEditors: zenghua.wang
- * @LastEditTime: 2025-04-18 15:41:11
+ * @LastEditTime: 2025-02-28 11:04:41
 */

 import { defineConfig, loadEnv } from 'vite';
 import vue from '@vitejs/plugin-vue';
-// import qiankun from 'vite-plugin-qiankun';
+import qiankun from 'vite-plugin-qiankun';
 import eslintPlugin from 'vite-plugin-eslint';
 import vueSetupExtend from 'vite-plugin-vue-setup-extend';
 import { createSvgIconsPlugin } from 'vite-plugin-svg-icons';
@ -23,9 +23,9 @@ import { resolve } from 'path';
 const useDevMode = true;

 export default defineConfig(({ command, mode }) => {
-  const { VITE_PORT, VITE_APP_NAME, VITE_APP_BASE_API, VITE_APP_BASE_URL } = loadEnv(mode, process.cwd());
+  const { VITE_APP_MIAN_URL, VITE_PORT, VITE_APP_NAME, VITE_APP_BASE_API, VITE_APP_BASE_URL, VITE_APP_UPLOAD_API, VITE_APP_UPLOAD_URL } = loadEnv(mode, process.cwd());
  const config = {
-    base: '/',
+    base: '/new-digital-agriculture-screen/',
    build: {
      target: 'ESNext',
      outDir: 'dist',
@ -36,6 +36,7 @@ export default defineConfig(({ command, mode }) => {
      port: VITE_PORT,
      open: true,
      https: false,
+      origin: VITE_APP_MIAN_URL,
      headers: {
        'Access-Control-Allow-Origin': '*',
      },
@ -45,11 +46,17 @@ export default defineConfig(({ command, mode }) => {
          changeOrigin: true,
          rewrite: (path) => path.replace(/^\/apis/, ''),
        },
+        [VITE_APP_UPLOAD_API]: {
+          target: VITE_APP_UPLOAD_URL,
+          changeOrigin: true,
+          rewrite: (path) => path.replace(/^\/uploadApis/, ''),
+        },
      },
    },
    resolve: {
      alias: {
        '@': resolve(__dirname, 'src'),
+        '#': resolve(__dirname, '../main/src'),
      },
      extensions: ['.js', '.vue', '.json', '.ts'],
    },
@ -71,7 +78,7 @@ export default defineConfig(({ command, mode }) => {
    },
    plugins: [
      vue(),
-      // qiankun(VITE_APP_NAME, { useDevMode }),
+      qiankun(VITE_APP_NAME, { useDevMode }),
      vueSetupExtend(),
      eslintPlugin({
        include: ['src/**/*.ts', 'src/**/*.vue', 'src/*.ts', 'src/*.vue'],
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
13713575202	a6d04d22ad	修改黑屏问题	2025-05-14 17:10:59 +08:00
13713575202	5ec53f7fd0	夏滨接入主应用	2025-05-14 15:15:59 +08:00