xiabin

main/src/micro/app.js

@@ -90,7 +90,9 @@ export const defaultApps = [
 
 // export const microApps = [...defaultApps, ...leftApps, ...rightApps];
 export const microApps = [...defaultApps];
+console.log(microApps);
 
+debugger;
 const apps = microApps.map((item) => {
   return {
     ...item,

main/src/views/index.vue

@@ -3,10 +3,10 @@
     <h2 class="platform-title">数字农业产业管理平台</h2>
     <div class="platform-panel">
       <div class="platform-panel-item">
-        <div class="icon"><img :src="getAssetsFile('images/platform/icon-yy.png')" /></div>
+        <div class="icon"><img :src="getAssetsFile('images/platform/icon-zw.png')" /></div>
-        <b>农业产业运营服务平台</b>
+        <b>农业产业政务服务平台</b>
         <ul class="entry">
-          <li v-for="item in leftApps" :key="item.name" @click="gotoPage(item)">
+          <li v-for="item in rightApps" :key="item.name" @click="gotoPage(item)">
             <span class="entry-icon">
               <img :src="getAssetsFile(item.icon)" />
             </span>
@@ -15,10 +15,10 @@
         </ul>
       </div>
       <div class="platform-panel-item">
-        <div class="icon"><img :src="getAssetsFile('images/platform/icon-zw.png')" /></div>
+        <div class="icon"><img :src="getAssetsFile('images/platform/icon-yy.png')" /></div>
-        <b>农业产业政务服务平台</b>
+        <b>农业产业运营服务平台</b>
         <ul class="entry">
-          <li v-for="item in rightApps" :key="item.name" @click="gotoPage(item)">
+          <li v-for="item in leftApps" :key="item.name" @click="gotoPage(item)">
             <span class="entry-icon">
               <img :src="getAssetsFile(item.icon)" />
             </span>

sub-admin/src/views/tool/build/index.vue

@@ -18,7 +18,7 @@
           >
             <div v-for="(element, index) in inputComponents" :key="index" class="components-item" @click="addComponent(element)">
               <div class="components-body">
-                <svg-icon :icon-class="element.tagIcon" />
+                <svg-icon v-if="element.tagIcon != ''" :icon-class="element.tagIcon" />
                 {{ element.label }}
               </div>
             </div>
@@ -35,7 +35,7 @@
           >
             <div v-for="(element, index) in selectComponents" :key="index" class="components-item" @click="addComponent(element)">
               <div class="components-body">
-                <svg-icon :icon-class="element.tagIcon" />
+                <svg-icon v-if="element.tagIcon != ''" :icon-class="element.tagIcon" />
                 {{ element.label }}
               </div>
             </div>
@@ -52,7 +52,7 @@
           >
             <div v-for="(element, index) in layoutComponents" :key="index" class="components-item" @click="addComponent(element)">
               <div class="components-body">
-                <svg-icon :icon-class="element.tagIcon" />
+                <svg-icon v-if="element.tagIcon != ''" :icon-class="element.tagIcon" />
                 {{ element.label }}
               </div>
             </div>

sub-government-affairs-service/.env.development

@@ -1,8 +1,8 @@
 # 开发环境
 VITE_PORT = 9528
 VITE_MODE = 'DEV'
-VITE_APP_MIAN = 'daimp-front-main'
+VITE_APP_MIAN = 'platform'
-VITE_APP_MIAN_URL = 'http://localhost:9000'
+VITE_APP_MIAN_URL = 'http://192.168.18.99:88'
 VITE_APP_NAME = 'sub-government-affairs-service'
 VITE_APP_BASE_API = '/apis' 
 VITE_APP_BASE_URL = 'http://192.168.18.99:8080'

sub-government-affairs-service/.stylelintrc.cjs

@@ -11,10 +11,10 @@ module.exports = {
   extends: [
     'stylelint-config-standard', 
     'stylelint-config-standard-scss',
-    'stylelint-config-prettier', 
     'stylelint-config-html/vue', 
     'stylelint-config-recommended-vue',
-    'stylelint-config-recommended-scss'
+    'stylelint-config-recommended-scss',
+    'stylelint-config-prettier'
   ],
   overrides: [
     {

sub-government-affairs-service/auto-imports.d.ts

@@ -0,0 +1,75 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// noinspection JSUnusedGlobalSymbols
+// Generated by unplugin-auto-import
+export {}
+declare global {
+  const EffectScope: typeof import('vue')['EffectScope']
+  const computed: typeof import('vue')['computed']
+  const createApp: typeof import('vue')['createApp']
+  const customRef: typeof import('vue')['customRef']
+  const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
+  const defineComponent: typeof import('vue')['defineComponent']
+  const effectScope: typeof import('vue')['effectScope']
+  const getCurrentInstance: typeof import('vue')['getCurrentInstance']
+  const getCurrentScope: typeof import('vue')['getCurrentScope']
+  const h: typeof import('vue')['h']
+  const inject: typeof import('vue')['inject']
+  const isProxy: typeof import('vue')['isProxy']
+  const isReactive: typeof import('vue')['isReactive']
+  const isReadonly: typeof import('vue')['isReadonly']
+  const isRef: typeof import('vue')['isRef']
+  const markRaw: typeof import('vue')['markRaw']
+  const nextTick: typeof import('vue')['nextTick']
+  const onActivated: typeof import('vue')['onActivated']
+  const onBeforeMount: typeof import('vue')['onBeforeMount']
+  const onBeforeRouteLeave: typeof import('vue-router')['onBeforeRouteLeave']
+  const onBeforeRouteUpdate: typeof import('vue-router')['onBeforeRouteUpdate']
+  const onBeforeUnmount: typeof import('vue')['onBeforeUnmount']
+  const onBeforeUpdate: typeof import('vue')['onBeforeUpdate']
+  const onDeactivated: typeof import('vue')['onDeactivated']
+  const onErrorCaptured: typeof import('vue')['onErrorCaptured']
+  const onMounted: typeof import('vue')['onMounted']
+  const onRenderTracked: typeof import('vue')['onRenderTracked']
+  const onRenderTriggered: typeof import('vue')['onRenderTriggered']
+  const onScopeDispose: typeof import('vue')['onScopeDispose']
+  const onServerPrefetch: typeof import('vue')['onServerPrefetch']
+  const onUnmounted: typeof import('vue')['onUnmounted']
+  const onUpdated: typeof import('vue')['onUpdated']
+  const onWatcherCleanup: typeof import('vue')['onWatcherCleanup']
+  const provide: typeof import('vue')['provide']
+  const reactive: typeof import('vue')['reactive']
+  const readonly: typeof import('vue')['readonly']
+  const ref: typeof import('vue')['ref']
+  const resolveComponent: typeof import('vue')['resolveComponent']
+  const shallowReactive: typeof import('vue')['shallowReactive']
+  const shallowReadonly: typeof import('vue')['shallowReadonly']
+  const shallowRef: typeof import('vue')['shallowRef']
+  const toRaw: typeof import('vue')['toRaw']
+  const toRef: typeof import('vue')['toRef']
+  const toRefs: typeof import('vue')['toRefs']
+  const toValue: typeof import('vue')['toValue']
+  const triggerRef: typeof import('vue')['triggerRef']
+  const unref: typeof import('vue')['unref']
+  const useAttrs: typeof import('vue')['useAttrs']
+  const useCssModule: typeof import('vue')['useCssModule']
+  const useCssVars: typeof import('vue')['useCssVars']
+  const useId: typeof import('vue')['useId']
+  const useLink: typeof import('vue-router')['useLink']
+  const useModel: typeof import('vue')['useModel']
+  const useRoute: typeof import('vue-router')['useRoute']
+  const useRouter: typeof import('vue-router')['useRouter']
+  const useSlots: typeof import('vue')['useSlots']
+  const useTemplateRef: typeof import('vue')['useTemplateRef']
+  const watch: typeof import('vue')['watch']
+  const watchEffect: typeof import('vue')['watchEffect']
+  const watchPostEffect: typeof import('vue')['watchPostEffect']
+  const watchSyncEffect: typeof import('vue')['watchSyncEffect']
+}
+// for type re-export
+declare global {
+  // @ts-ignore
+  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  import('vue')
+}

sub-government-affairs-service/components.d.ts

@@ -0,0 +1,14 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-components
+// Read more: https://github.com/vuejs/core/pull/3399
+export {}
+
+declare module 'vue' {
+  export interface GlobalComponents {
+    CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default']
+    RouterLink: typeof import('vue-router')['RouterLink']
+    RouterView: typeof import('vue-router')['RouterView']
+  }
+}

sub-government-affairs-service/src/layouts/component/Menu/Icon.vue

@@ -6,8 +6,8 @@
  * @LastEditTime: 2024-04-12 21:12:01
 -->
 <template>
-  <el-icon v-if="icon.includes('icon')" :class="`iconfont ${icon}`" :size="size" />
+  <el-icon v-if="icon.includes('icon') && icon !== ''" :class="`iconfont ${icon}`" :size="size" />
-  <el-icon v-else :size="size"> <component :is="icon" /></el-icon>
+  <el-icon v-if="!icon.includes('icon') && icon !== ''" :size="size"> <component :is="icon" /></el-icon>
 </template>
 <script setup name="layout-icon">
 defineProps({

sub-government-affairs-service/src/router/modules/annualplan.js

@@ -6,20 +6,20 @@ const annualplanRoutes = [
     name: 'annualPlan',
     component: Views,
     redirect: '/sub-government-affairs-service/annualPlans',
-    meta: { title: '年度计划', icon: 'Document' },
+    meta: { title: '年度种植计划', icon: '' },
     children: [
       {
         path: '/sub-government-affairs-service/annualPlans',
         name: 'annualPlans',
         component: () => import('@/views/annualPlan/component/annualPlans/index.vue'),
-        meta: { title: '年度计划', icon: 'Document' },
+        meta: { title: '年度种植计划', icon: '' },
-      },
-      {
-        path: '/sub-government-affairs-service/plantings',
-        name: 'plantings',
-        component: () => import('@/views/annualPlan/component/plantings/index.vue'),
-        meta: { title: '网格种植进度', icon: 'Document' },
       },
+      // {
+      //   path: '/sub-government-affairs-service/plantings',
+      //   name: 'plantings',
+      //   component: () => import('@/views/annualPlan/component/plantings/index.vue'),
+      //   meta: { title: '网格种植进度', icon: 'Document' },
+      // },
     ],
   },
 ];

sub-government-affairs-service/src/router/modules/dict.js

@@ -7,31 +7,31 @@ const dictRoutes = [
     name: 'dict',
     component: Views,
     redirect: '/sub-government-affairs-service/region',
-    meta: { title: '基础信息维护', icon: 'Document' },
+    meta: { title: '基础信息维护', icon: 'DocumentRemove' },
     children: [
       {
         path: '/sub-government-affairs-service/region',
         name: 'region',
         component: () => import('@/views/dict/component/region/index.vue'),
-        meta: { title: '行政区域信息', icon: 'Document' },
+        meta: { title: '行政区域信息', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/landCassification',
         name: 'landCassification',
         component: () => import('@/views/dict/component/landCassification/index.vue'),
-        meta: { title: '土地分类', icon: 'Document' },
+        meta: { title: '土地分类', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/dictCrop',
         name: 'dictCrop',
         component: () => import('@/views/dict/component/dictCrop/index.vue'),
-        meta: { title: '种植产物信息', icon: 'Document' },
+        meta: { title: '种植产物信息', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/soilClassification',
         name: 'soilClassification',
         component: () => import('@/views/dict/component/soilClassification/index.vue'),
-        meta: { title: '土壤分类', icon: 'Document' },
+        meta: { title: '土壤分类', icon: '' },
       },
     ],
   },

sub-government-affairs-service/src/router/modules/inputSupplies/index.js

@@ -7,7 +7,7 @@ const inputSuppliesRoutes = [
     name: 'inputSuppliesManage',
     component: Layout,
     redirect: '/sub-government-affairs-service/materialManage',
-    meta: { title: '投入品监管平台', icon: 'Document' },
+    meta: { title: '投入品监管平台', icon: 'FullScreen' },
     children: [
       // {
       //   path: '/sub-government-affairs-service/inputDataView',
@@ -26,37 +26,37 @@ const inputSuppliesRoutes = [
         name: 'material',
         component: Views,
         redirect: '/sub-government-affairs-service/material/pesticide',
-        meta: { title: '物资管理', icon: 'Document' },
+        meta: { title: '投入品管理', icon: 'OfficeBuilding' },
         children: [
           {
             path: '/sub-government-affairs-service/material/pesticide',
             name: 'input-supplies-pesticide',
             component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'),
-            meta: { title: '农药管理', icon: 'Document' },
+            meta: { title: '农药管理', icon: '' },
           },
           {
             path: '/sub-government-affairs-service/material/fertilizer',
             name: 'input-supplies-fertilizer',
             component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'),
-            meta: { title: '肥料管理', icon: 'Document' },
+            meta: { title: '肥料管理', icon: '' },
           },
           {
             path: '/sub-government-affairs-service/material/ratPoison',
             name: 'input-supplies-ratPoison',
             component: () => import('@/views/inputSuppliesManage/material/ratPoison/index.vue'),
-            meta: { title: '兽药管理', icon: 'Document' },
+            meta: { title: '兽药管理', icon: '' },
           },
           {
             path: '/sub-government-affairs-service/material/seed',
             name: 'input-supplies-seed',
             component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'),
-            meta: { title: '种源管理', icon: 'Document' },
+            meta: { title: '种源管理', icon: '' },
           },
           {
             path: '/sub-government-affairs-service/material/farmMachinery',
             name: 'input-supplies-farmMachinery',
             component: () => import('@/views/inputSuppliesManage/material/farmMachinery/index.vue'),
-            meta: { title: '农机管理', icon: 'Document' },
+            meta: { title: '农机管理', icon: '' },
           },
         ],
       },
@@ -64,7 +64,7 @@ const inputSuppliesRoutes = [
         path: '/sub-government-affairs-service/productionDealer',
         name: 'productionDealer',
         component: () => import('@/views/inputSuppliesManage/productionDealer/index.vue'),
-        meta: { title: '企业经销商管理', icon: 'Document' },
+        meta: { title: '企业经销商管理', icon: '' },
       },
       // {
       //   path: '/sub-government-affairs-service/enterpriseDealerCheck',
@@ -76,25 +76,25 @@ const inputSuppliesRoutes = [
         path: '/sub-government-affairs-service/useSupervise',
         name: 'useSupervise',
         component: () => import('@/views/inputSuppliesManage/useSupervise/index.vue'),
-        meta: { title: '使用监管', icon: 'Document' },
+        meta: { title: '使用监管', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/leaseSupervise',
         name: 'leaseSupervise',
         component: () => import('@/views/inputSuppliesManage/leaseSupervise/index.vue'),
-        meta: { title: '农机租赁监管', icon: 'Document' },
+        meta: { title: '农机租赁监管', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/redBlackRank',
         name: 'redBlackRank',
         component: () => import('@/views/inputSuppliesManage/redBlackRank/index.vue'),
-        meta: { title: '企业红黑榜', icon: 'Document' },
+        meta: { title: '企业红黑榜', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/knowledgeManage',
         name: 'knowledgeManage',
         component: () => import('@/views/inputSuppliesManage/knowledgeManage/index.vue'),
-        meta: { title: '知识库', icon: 'Document' },
+        meta: { title: '知识库', icon: '' },
       },
       // {
       //   path: '/sub-government-affairs-service/patrolCaseManage',

sub-government-affairs-service/src/router/modules/lands.js

@@ -7,37 +7,37 @@ const landsRoutes = [
     name: 'landManage',
     component: Views,
     redirect: '/sub-government-affairs-service/landsManage',
-    meta: { title: '土地管理', icon: 'Document' },
+    meta: { title: '土地管理', icon: 'Grape' },
     children: [
       {
         path: '/sub-government-affairs-service/landsManage',
         name: 'landsManage',
         component: () => import('@/views/landManage/component/landsManage/index.vue'),
-        meta: { title: '土地信息登记', icon: 'Document' },
+        meta: { title: '土地信息登记', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/plantPlan',
         name: 'plantPlan',
         component: () => import('@/views/landManage/component/plantPlan/index.vue'),
-        meta: { title: '种植规划', icon: 'Document' },
+        meta: { title: '种植规划', icon: '' },
-      },
-      {
-        path: '/sub-government-affairs-service/landPartol',
-        name: 'landPartol',
-        component: () => import('@/views/landManage/component/landPartol/index.vue'),
-        meta: { title: '土地巡查', icon: 'Document' },
-      },
-      {
-        path: '/sub-government-affairs-service/illegalHandle',
-        name: 'illegalHandle',
-        component: () => import('@/views/landManage/component/illegalHandle/index.vue'),
-        meta: { title: '土地违法处理', icon: 'Document' },
       },
       {
         path: '/sub-government-affairs-service/operationRecord',
         name: 'operationRecord',
         component: () => import('@/views/landManage/component/operationRecord/index.vue'),
-        meta: { title: '作业记录', icon: 'Document' },
+        meta: { title: '作业记录', icon: '' },
+      },
+      {
+        path: '/sub-government-affairs-service/landPartol',
+        name: 'landPartol',
+        component: () => import('@/views/landManage/component/landPartol/index.vue'),
+        meta: { title: '土地巡查', icon: '' },
+      },
+      {
+        path: '/sub-government-affairs-service/illegalHandle',
+        name: 'illegalHandle',
+        component: () => import('@/views/landManage/component/illegalHandle/index.vue'),
+        meta: { title: '土地违法处理', icon: '' },
       },
     ],
   },

sub-government-affairs-service/src/router/modules/plantingAndBreeding.js

@@ -6,38 +6,38 @@ export default [
     name: 'plantingAndBreeding',
     component: Layout,
     redirect: '/sub-government-affairs-service/environment-monitor',
-    meta: { title: '种养植综合管理', icon: 'Document' },
+    meta: { title: '种养植综合管理', icon: 'Monitor' },
     children: [
       {
         path: '/sub-government-affairs-service/environment-monitor',
         name: 'environment-monitor',
         component: () => import('@/views/plantingAndBreeding/environment/index.vue'),
-        meta: { title: '环境监测信息', icon: 'Document' },
+        meta: { title: '环境监测信息', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/threshold-value-setting',
         name: 'threshold-value-setting',
         component: () => import('@/views/plantingAndBreeding/threshold/index.vue'),
         hidden: true,
-        meta: { title: '阀值设置', icon: 'Document' },
+        meta: { title: '阀值设置', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/pest-monitor',
         name: 'pest-monitor',
         component: () => import('@/views/plantingAndBreeding/pest/index.vue'),
-        meta: { title: '病虫害监测信息', icon: 'Document' },
+        meta: { title: '病虫害监测信息', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/epidemic-disease-monitor',
         name: 'epidemic-disease-monitor',
         component: () => import('@/views/plantingAndBreeding/epidemicDisease/index.vue'),
-        meta: { title: '疫病监测信息', icon: 'Document' },
+        meta: { title: '疫病监测信息', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/breeding-base-information',
         name: 'breeding-base-information',
         component: () => import('@/views/plantingAndBreeding/base/index.vue'),
-        meta: { title: '种养殖基地', icon: 'Document' },
+        meta: { title: '种养殖基地', icon: '' },
       },
     ],
   },

sub-government-affairs-service/src/router/modules/productOperateMain.js

@@ -12,43 +12,43 @@ export default [
         path: '/sub-government-affairs-service/mainHome',
         component: () => import('@/views/productOperateMain/home/index.vue'),
         name: 'mainHome',
-        meta: { title: '数据可视化管理', icon: 'Document' },
+        meta: { title: '数据可视化管理', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/individual',
         component: () => import('@/views/productOperateMain/individual/index.vue'),
         name: 'individual',
-        meta: { title: '个体户', icon: 'Document' },
+        meta: { title: '个体户', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/collective',
         component: () => import('@/views/productOperateMain/collective/index.vue'),
         name: 'collective',
-        meta: { title: '村集体', icon: 'Document' },
+        meta: { title: '村集体', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/coop',
         component: () => import('@/views/productOperateMain/coOp/index.vue'),
         name: 'coop',
-        meta: { title: '合作社', icon: 'Document' },
+        meta: { title: '合作社', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/enterprise',
         component: () => import('@/views/productOperateMain/enterprise/index.vue'),
         name: 'enterprise',
-        meta: { title: '经营企业', icon: 'Document' },
+        meta: { title: '经营企业', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/examineList',
         component: () => import('@/views/productOperateMain/examine/list.vue'),
         name: 'examineList',
-        meta: { title: '主体审核管理', icon: 'Document' },
+        meta: { title: '主体审核管理', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/examineRecord',
         component: () => import('@/views/productOperateMain/examine/record.vue'),
         name: 'examineRecord',
-        meta: { title: '主体审核历史', icon: 'Document' },
+        meta: { title: '主体审核历史', icon: '' },
       },
     ],
   },

sub-government-affairs-service/src/router/modules/resource.js

@@ -16,7 +16,7 @@ export default [
         path: '/sub-government-affairs-service/grid',
         component: () => import('@/views/resource/grid/index.vue'),
         name: 'grid',
-        meta: { title: '网格化管理', icon: 'Document' },
+        meta: { title: '网格化管理', icon: '' },
       },
       ...annualplanRouters,
       ...landsRoutes,

sub-government-affairs-service/src/router/modules/statisticAnalysis.js

@@ -12,19 +12,19 @@ export default [
         path: '/sub-government-affairs-service/analysis-land',
         component: () => import('@/views/resource/statisticAnalysis/land/index.vue'),
         name: 'analysis-land',
-        meta: { title: '土地利用与规划分析', icon: 'Document' },
+        meta: { title: '土地利用与规划分析', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/analysis-agriculture',
         name: 'analysis-agriculture',
         component: () => import('@/views/resource/statisticAnalysis/agriculture/index.vue'),
-        meta: { title: '农业生产效率分析', icon: 'Document' },
+        meta: { title: '农业生产效率分析', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/analysis-environment',
         name: 'analysis-environment',
         component: () => import('@/views/resource/statisticAnalysis/environment/index.vue'),
-        meta: { title: '环境影响与经济效益分析', icon: 'Document' },
+        meta: { title: '环境影响与经济效益分析', icon: '' },
       },
     ],
   },

sub-government-affairs-service/src/router/modules/system.js

@@ -6,25 +6,25 @@ export default [
     name: 'system',
     component: Layout,
     redirect: '/sub-government-affairs-service/system-dict',
-    meta: { title: '系统管理', icon: 'Document' },
+    meta: { title: '系统管理', icon: 'Setting' },
     children: [
       {
         path: '/sub-government-affairs-service/system-dict-type',
         component: () => import('@/views/system/dict/type.vue'),
         name: 'system-dict-type',
-        meta: { title: '字典类型', icon: 'Document' },
+        meta: { title: '字典类型', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/system-dict',
         component: () => import('@/views/system/dict/index.vue'),
         name: 'system-dict',
-        meta: { title: '字典管理', icon: 'Document' },
+        meta: { title: '字典管理', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/system-menu',
         component: () => import('@/views/system/menu/index.vue'),
         name: 'system-menu',
-        meta: { title: '菜单管理', icon: 'Document' },
+        meta: { title: '菜单管理', icon: '' },
       },
       // {
       //   path: '/sub-government-affairs-service/system-dept',

sub-government-affairs-service/src/router/modules/trace.js

@@ -7,26 +7,26 @@ export default [
     name: 'trace',
     component: Layout,
     redirect: '/sub-government-affairs-service/trace-home',
-    meta: { title: '溯源管理', icon: 'Document' },
+    meta: { title: '溯源管理', icon: 'Connection' },
     children: [
       {
         path: '/sub-government-affairs-service/record',
         name: 'record',
         component: Views,
-        meta: { title: '种养植档案', icon: 'Document' },
+        meta: { title: '种养植档案', icon: 'Tickets' },
         redirect: '/sub-government-affairs-service/record-base',
         children: [
           {
             path: '/sub-government-affairs-service/record-base',
             component: () => import('@/views/trace/record/base/index.vue'),
             name: 'record-base',
-            meta: { title: '基地档案', icon: 'Document' },
+            meta: { title: '基地档案', icon: '' },
           },
           {
             path: '/sub-government-affairs-service/record-seed',
             component: () => import('@/views/trace/record/seed/index.vue'),
             name: 'record-seed',
-            meta: { title: '种源档案', icon: 'Document' },
+            meta: { title: '种源档案', icon: '' },
           },
         ],
       },
@@ -34,20 +34,20 @@ export default [
         path: '/sub-government-affairs-service/agricultural',
         name: 'agricultural',
         component: Views,
-        meta: { title: '农事管理', icon: 'Document' },
+        meta: { title: '农事管理', icon: 'SetUp' },
         redirect: '/sub-government-affairs-service/agricultural-coding',
         children: [
           {
             path: '/sub-government-affairs-service/agricultural-coding',
             component: () => import('@/views/trace/agricultural/coding/index.vue'),
             name: 'agricultural-coding',
-            meta: { title: '采收与赋码管理', icon: 'Document' },
+            meta: { title: '采收与赋码管理', icon: '' },
           },
           {
             path: '/sub-government-affairs-service/agricultural-quality',
             component: () => import('@/views/trace/agricultural/quality/index.vue'),
             name: 'agricultural-quality',
-            meta: { title: '产品质检管理', icon: 'Document' },
+            meta: { title: '产品质检管理', icon: '' },
           },
         ],
       },
@@ -55,20 +55,20 @@ export default [
         path: '/sub-government-affairs-service/trace-search',
         name: 'trace-search',
         component: () => import('@/views/trace/search/index.vue'),
-        meta: { title: '溯源查询', icon: 'Document' },
+        meta: { title: '溯源查询', icon: '' },
       },
       {
         path: '/sub-government-affairs-service/trace-info',
         name: 'trace-info',
         component: () => import('@/views/trace/search/info.vue'),
-        meta: { title: '溯源详情', icon: 'Document' },
+        meta: { title: '溯源详情', icon: '' },
         hidden: true,
       },
       {
         path: '/sub-government-affairs-service/trace-statistic',
         name: 'trace-statistic',
         component: () => import('@/views/trace/statistic/index.vue'),
-        meta: { title: '溯源统计', icon: 'Document' },
+        meta: { title: '溯源统计', icon: '' },
       },
     ],
   },

sub-government-affairs-service/src/store/modules/user.js

@@ -5,7 +5,7 @@ import { isEmpty, encode, decode } from '@/utils';
 export const useUserStore = defineStore({
   id: GenKey('userStore'),
   state: () => ({
-    token: null,
+    token: '',
     userInfo: {},
     currentOrg: null,
     orgList: [],

sub-government-affairs-service/src/utils/axios.js

@@ -55,6 +55,9 @@ publicAxios.interceptors.request.use(async (config) => {
       config.baseURL = VITE_APP_BASE_API;
     }
   }
+
+  config.headers['authorization'] =
+    'eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6ImNjZDA2ZjY0LWY5YzUtNDg0YS05MDk0LTM5MjcyYzEyYTkxOSIsInVzZXJuYW1lIjoiYWRtaW4ifQ.Jvn5ksEeGXKzZyTt79qKm1zaQima4s7QkCEX-MeTVOEVtkQps0gzskh4DHVNlGZ95DuWmRX5IWYNs3WRAcR-HQ';
   if (UserStore.hasToken()) {
     config.headers['authorization'] = config.headers['authorization'] ?? UserStore.token;
     config.headers['cache-control'] = 'no-cache';

sub-government-affairs-service/src/utils/permission.js

@@ -24,11 +24,10 @@ router.beforeEach(async (to, from, next) => {
 
   const userStore = useUserStore();
   const hasToken = userStore.hasToken();
-  console.log('sub', hasToken);
+  if (!hasToken) {
-  if (hasToken) {
     if (to.path === '/login') {
       next({ path: '/' });
-    } else {
+    } else { 
       try {
         const PermissionStore = usePermissionStore();
         if (!PermissionStore.routes.length) {

sub-government-affairs-service/src/views/annualPlan/component/plantings/index.vue

@@ -35,7 +35,7 @@ import { CRUD_OPTIONS } from '@/config';
 import { isEmpty, downloadFile } from '@/utils';
 import { useUserStore } from '@/store/modules/user';
 import { compact } from 'lodash';
-import { GetEntityList, AddEntity, UpdateEntity, DeleteEntity, ExportEntity } from '@/apis/grid';
+import { GetEntityList, AddEntity, UpdateEntity, DeleteEntity, ExportEntity } from '@/apis/resource/grid';
 
 const { VITE_APP_BASE_API } = import.meta.env;
 const app = useApp();
@@ -86,26 +86,28 @@ const state = reactive({
 
 // 加载
 const loadData = () => {
-  // state.loading = true;
+  debugger;
-  // GetEntityList(state.query)
+  state.loading = true;
-  //   .then((res) => {
+  GetEntityList(state.query)
-  //     if (res.code === 200) {
+    .then((res) => {
-  //       const { current, size, total, records } = res.data;
+      if (res.code === 200) {
-  //       state.data = records;
+        console.log(res);
-  //       state.pageData = {
+        const { current, size, total, records } = res.data;
-  //         currentPage: current || 1,
+        state.data = records;
-  //         pageSize: size || 10,
+        state.pageData = {
-  //         total: total,
+          currentPage: current || 1,
-  //       };
+          pageSize: size || 10,
-  //     }
+          total: total,
-  //   })
+        };
-  //   .catch((err) => {
+      }
-  //     app.$message.error(err.msg);
+    })
-  //     state.data = [];
+    .catch((err) => {
-  //   })
+      app.$message.error(err.msg);
-  //   .finally(() => {
+      state.data = [];
-  //     state.loading = false;
+    })
-  //   });
+    .finally(() => {
+      state.loading = false;
+    });
 };
 
 loadData();

sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue

@@ -134,7 +134,7 @@ const option = reactive({
       editDisplay: false,
     },
     {
-      label: '地块名',
+      label: '地块名称',
       prop: 'landName',
       search: true,
       addDisplay: false,
@@ -151,12 +151,13 @@ const option = reactive({
       width: 300,
     },
     {
-      label: '产权人',
+      label: '经营主体',
       prop: 'owner',
       search: true,
       addDisplay: false,
       display: false,
       editDisplay: false,
+      width: 100,
     },
     {
       label: '所属网格',
@@ -334,7 +335,7 @@ const option = reactive({
           prop: 'area',
         },
         {
-          label: '产权人',
+          label: '经营主体',
           prop: 'owner',
         },
         {
@@ -363,11 +364,11 @@ const option = reactive({
       prop: 'baseGroup',
       column: [
         {
-          label: '产权人姓名',
+          label: '经营主体姓名',
           prop: 'propertyName',
         },
         {
-          label: '产权人联系电话',
+          label: '经营主体联系电话',
           prop: 'propertyPhone',
         },
         {

sub-government-affairs-service/src/views/landManage/component/operationRecord/index.vue

@@ -172,7 +172,7 @@ const state = reactive({
         },
       },
       {
-        label: '产物',
+        label: '种植作物',
         prop: 'crop',
         disabled: false,
         rules: {
@@ -213,7 +213,7 @@ const state = reactive({
       },
     ],
     searchColumn: [
-      { label: '地块名', prop: 'landName', search: true },
+      { label: '地块名称', prop: 'landName', search: true },
       { label: '种植产物', prop: 'crop', search: true },
       {
         label: '作业类型',

sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue

@@ -112,7 +112,7 @@ const state = reactive({
     searchMenuPosition: 'center',
     column: [
       {
-        label: '地块名',
+        label: '地块名称',
         type: 'input',
         prop: 'landName',
         search: true,
@@ -139,7 +139,7 @@ const state = reactive({
         },
       },
       {
-        label: '产权人',
+        label: '经营主体',
         type: 'input',
         prop: 'owner',
         search: true,

sub-government-affairs-service/src/views/plantingAndBreeding/base/index-bak.vue

@@ -111,7 +111,7 @@ const state = reactive({
         },
       },
       {
-        label: '地块名',
+        label: '地块名称',
         prop: 'landName',
         width: 200,
         type: 'select',

sub-government-affairs-service/src/views/plantingAndBreeding/base/index.vue

@@ -92,7 +92,7 @@ const state = reactive({
         },
       },
       {
-        label: '地块名',
+        label: '地块名称',
         prop: 'landName',
         width: 200,
         addDisplay: false,
@@ -101,7 +101,7 @@ const state = reactive({
         overHidden: true,
       },
       {
-        label: '地块名',
+        label: '地块名称',
         prop: 'landId',
         width: 200,
         type: 'select',

sub-operation-service/.env.development

@@ -4,7 +4,7 @@ VITE_MODE = 'DEV'
 VITE_APP_MIAN = 'daimp-front-main'
 VITE_APP_MIAN_URL = 'http://localhost:9000'
 VITE_APP_NAME = 'sub-operation-service'
-VITE_APP_BASE_API = '/apis' 
+VITE_APP_BASE_API = '/platform' 
-VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
+VITE_APP_BASE_URL = 'http://192.168.18.99:88'
 VITE_APP_UPLOAD_API = '/uploadApis'
 VITE_APP_UPLOAD_URL = 'http://192.168.18.99:9300'

sub-operation-service/src/router/index.js

@@ -101,7 +101,7 @@ export const constantRoutes = [
       },
     ],
   },
-  ...demo,
+  // ...demo,
 ];
 
 /**

sub-operation-service/src/utils/axios.js

@@ -12,7 +12,6 @@ import { isEmpty } from '@/utils';
 import { useUserStore } from '@/store/modules/user';
 
 const { VITE_APP_BASE_API, VITE_APP_UPLOAD_API } = import.meta.env;
-
 /**
  * 创建axios实例
  */