Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev

2025-04-14 10:59:20 +08:00 · 2025-04-14 10:59:20 +08:00 · 76207aade8
commit 76207aade8
parent 6613a3bb56 d24c5d0737
47 changed files with 1292 additions and 179 deletions
--- a/main/.env.pre
+++ b/main/.env.pre
@ -0,0 +1,13 @@
+# 本地环境
+VITE_APP_NAME = 'daimp-front-main'
+VITE_APP_TITLE = '数字农业产业管理平台'
+VITE_APP_SUB_OS = '//localhost:8090/sub-operation-service/'
+VITE_APP_SUB_OA = '//localhost:8090/sub-operation-admin/'
+VITE_APP_SUB_GAS = '//localhost:8090/sub-government-affairs-service/'
+VITE_APP_SUB_GAA = '//localhost:8090/sub-government-admin/'
+VITE_APP_SUB_GSS = '//localhost:8090/sub-government-screen-service/'
+# 接口
+VITE_APP_BASE_API = '/apis' 
+VITE_APP_BASE_URL = ''
+VITE_APP_UPLOAD_API = '/uploadApis'
+VITE_APP_UPLOAD_URL = ''
--- a/sub-government-affairs-service/.env.pre
+++ b/sub-government-affairs-service/.env.pre
@ -0,0 +1,9 @@
+# 本地环境
+VITE_APP_MIAN = 'daimp-front-main'
+VITE_APP_MIAN_URL = 'http://localhost:8090'
+VITE_APP_NAME = 'sub-government-affairs-service'
+# 接口
+VITE_APP_BASE_API = '/apis' 
+VITE_APP_BASE_URL = ''
+VITE_APP_UPLOAD_API = '/uploadApis'
+VITE_APP_UPLOAD_URL = ''
--- a/sub-government-affairs-service/package.json
+++ b/sub-government-affairs-service/package.json
@ -7,7 +7,7 @@
    "dev": "vite --mode development",
    "build": "vite build --mode production",
    "test": "vite build --mode test",
-    "local": "vite build --mode local",
+    "pre": "vite build --mode pre",
    "preview": "vite preview",
    "format": "prettier --write 'src/**/*.{vue,ts,tsx,js,jsx,css,less,scss,json,md}'",
    "eslint": "npx eslint --init",
@ -21,6 +21,7 @@
    "@wangeditor/editor": "^5.1.23",
    "@wangeditor/editor-for-vue": "^5.1.12",
    "axios": "^1.6.5",
+    "dayjs": "^1.11.13",
    "echarts": "^5.6.0",
    "element-plus": "^2.7.2",
    "js-base64": "^3.7.6",
--- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
+++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
@ -23,10 +23,10 @@ const inputSuppliesRoutes = [
        meta: { title: '物资管理', icon: 'Document' },
        children: [
          {
-            path: '/sub-government-affairs-service/material/pesticide',
-            name: 'input-supplies-pesticide',
-            component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'),
-            meta: { title: '农药管理', icon: 'Document' },
+            path: '/sub-government-affairs-service/material/seed',
+            name: 'input-supplies-seed',
+            component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'),
+            meta: { title: '种源管理', icon: 'Document' },
          },
          {
            path: '/sub-government-affairs-service/material/fertilizer',
@ -34,18 +34,18 @@ const inputSuppliesRoutes = [
            component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'),
            meta: { title: '肥料管理', icon: 'Document' },
          },
+          {
+            path: '/sub-government-affairs-service/material/pesticide',
+            name: 'input-supplies-pesticide',
+            component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'),
+            meta: { title: '农药管理', icon: 'Document' },
+          },
          {
            path: '/sub-government-affairs-service/material/ratPoison',
            name: 'input-supplies-ratPoison',
            component: () => import('@/views/inputSuppliesManage/material/ratPoison/index.vue'),
            meta: { title: '兽药管理', icon: 'Document' },
          },
-          {
-            path: '/sub-government-affairs-service/material/seed',
-            name: 'input-supplies-seed',
-            component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'),
-            meta: { title: '种源管理', icon: 'Document' },
-          },
          {
            path: '/sub-government-affairs-service/material/farmMachinery',
            name: 'input-supplies-farmMachinery',
@ -90,12 +90,12 @@ const inputSuppliesRoutes = [
        component: () => import('@/views/inputSuppliesManage/knowledgeManage/index.vue'),
        meta: { title: '知识库', icon: 'Document' },
      },
-      // {
-      //   path: '/sub-government-affairs-service/patrolCaseManage',
-      //   name: 'patrolCaseManage',
-      //   component: () => import('@/views/inputSuppliesManage/patrolCaseManage/index.vue'),
-      //   meta: { title: '巡查与案件管理', icon: 'Document' },
-      // },
+      {
+        path: '/sub-government-affairs-service/patrolCaseManage',
+        name: 'patrolCaseManage',
+        component: () => import('@/views/inputSuppliesManage/patrolCaseManage/index.vue'),
+        meta: { title: '巡查与案件管理', icon: 'Document' },
+      },
    ],
  },
 ];
--- a/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/common/RecordModal.vue
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/common/RecordModal.vue
@ -0,0 +1,66 @@
+<template>
+  <el-dialog v-model="visible" title="Tips" width="500" draggable>
+    <avue-radio v-model="radio" :dic="radioDic" :button="true" class="top_radio"></avue-radio>
+    <br />
+    <avue-form v-model="data" :option="option"> </avue-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="visible = false">Cancel</el-button>
+        <el-button type="primary" @click="visible = false"> Confirm </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref, defineExpose, reactive, onMounted } from 'vue';
+import { customRules } from '@/config';
+import dayjs from 'dayjs';
+
+const data = ref({});
+const visible = ref(false);
+const radio = ref('1');
+const radioDic = reactive([
+  { label: '执法消息', value: '1' },
+  { label: '被询问人信息', value: '2' },
+  { label: '询问内容', value: '3' },
+]);
+const option = reactive({
+  column: [
+    {
+      label: '询问时间',
+      prop: 'time',
+      type: 'date',
+      format: 'YYYY-MM-DD HH:mm',
+      valueFormat: 'YYYY-MM-DD HH:mm',
+      span: 24,
+      disabled: true,
+    },
+    { label: '询问地点', prop: 'address', span: 24 },
+    { label: '询问机关', prop: 'unit', span: 24 },
+    { label: '询问人', prop: 'person', span: 24 },
+    { label: '记录人', prop: 'recordPerson', span: 24 },
+  ],
+});
+
+function handleRecordOpen(obj = {}) {
+  visible.value = Object.keys(obj).length ? true : false;
+  if (visible.value) {
+    data.value = Object.assign({}, obj);
+    option.column[0].value = dayjs().format('YYYY-MM-DD HH:mm');
+  }
+}
+onMounted(() => {
+  console.log('dayjs', dayjs().format('YYYY-MM-DD HH-mm'));
+  option.column[0].value = dayjs().format('YYYY-MM-DD HH:mm');
+});
+defineExpose({
+  handleRecordOpen,
+});
+</script>
+
+<style lang="scss" scoped>
+.top_radio {
+  text-align: center;
+}
+</style>
--- a/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/index.vue
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/index.vue
@ -1,19 +1,354 @@
 <template>
-  <section class="custom-page">巡查与案件</section>
+  <section class="custom-page">
+    <avue-crud ref="crudRef" v-model:search="searchCondition" v-model:page="pageData" :data="data" :option="option">
+      <template #menu="scpoe">
+        <custom-table-operate :actions="actions" :data="scpoe" />
+      </template>
+      <template #sceneProof-form="{ row, type }">
+        <section class="proof_content_">
+          <span v-if="type == 'add'">（照片、视频）</span>
+          <Attrs v-model:attrs="examineForm.proof" :type="type" :limit="5" :file-num="5" accept="image/*,video/*" />
+        </section>
+      </template>
+      <template #documentAttrs-form="{ row, type }">
+        <FileUpload v-model:attrs="examineForm.documentAttrs" :format="['rar', 'zip', 'doc', 'docx', 'pdf']" :type="type" />
+      </template>
+      <template #c2-form="{ type }">
+        <section class="record_content">
+          <FileUpload v-model:attrs="examineForm.documentAttrs" :type="type" />
+          <span>填写笔录</span>
+        </section>
+      </template>
+    </avue-crud>
+    <RecordModal ref="recordModalRef" />
+  </section>
 </template>

 <script setup>
-import { ref } from 'vue';
+import { ref, reactive, onMounted, watch } from 'vue';
+import { getRegion as GetRegion } from '@/apis';
+import { GetEntityList as GetUserList } from '@/apis/system/user';
+import { GetEntityList as GetDict } from '@/apis/system/dict';
+import { CRUD_OPTIONS, pageData, customRules } from '@/config';
+import { useUserStore } from '@/store/modules/user';
+import FileUpload from '@/views/landManage/component/illegalHandle/common/FileUpload.vue';
+import Attrs from '@/views/inputSuppliesManage/common/Attrs.vue';
+import RecordModal from './common/RecordModal.vue';

+const UserStore = useUserStore();
+const { VITE_APP_BASE_API } = import.meta.env;
+onMounted(() => {
+  getRegion();
+  getMumber();
+});
 /* --------------- data --------------- */
 // #region
-
+const regionData = ref([]);
+const memberData = ref([]);
+const crudRef = ref(null);
+const searchCondition = reactive({
+  keyword: '',
+});
+const data = ref([{}]);
+const option = reactive({
+  ...CRUD_OPTIONS,
+  selection: false,
+  dialogWidth: '50%',
+  column: [
+    {
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      label: '任务编号',
+      prop: 'text1',
+    },
+    {
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      label: '任务名称',
+      prop: 'text2',
+    },
+    {
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      label: '单位名称',
+      prop: 'text3',
+    },
+    {
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      label: '统一社会信用代码',
+      prop: 'text4',
+    },
+    {
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      label: '法定代表人',
+      prop: 'text5',
+    },
+    {
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      label: '联系电话',
+      prop: 'text6',
+    },
+    {
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      label: '区域',
+      prop: 'text7',
+    },
+  ],
+  group: [
+    {
+      label: '任务信息',
+      prop: 'taskInfo',
+      column: [
+        {
+          label: '任务名称',
+          prop: 'taskName',
+        },
+        {
+          label: '任务编号',
+          prop: 'taskNumber',
+        },
+        {
+          label: '任务巡查时限',
+          type: 'date',
+          format: 'yyyy-MM-dd',
+          valueFormat: 'yyyy-MM-dd',
+          prop: 'taskTime',
+        },
+        {
+          label: '任务巡查类型',
+          prop: 'taskType',
+          type: 'select',
+          value: '1',
+          clearable: false,
+          dicData: [
+            {
+              label: '指定事项巡查',
+              value: '1',
+            },
+            {
+              label: '定期巡查',
+              value: '2',
+            },
+            {
+              label: '全面巡查',
+              value: '3',
+            },
+          ],
+        },
+        {
+          label: '执法区域',
+          prop: 'region',
+          type: 'cascader',
+          dicData: [],
+          props: {
+            label: 'areaName',
+            value: 'areaCode',
+            children: 'areaChildVOS',
+          },
+        },
+        {
+          label: '小组成员',
+          prop: 'groupMember',
+          type: 'select',
+          dicData: [],
+          multiple: true,
+          props: {
+            label: 'nickName',
+            value: 'userId',
+          },
+        },
+      ],
+    },
+    {
+      label: '执法对象',
+      prop: 'checkObject',
+      column: [
+        {
+          label: '单位名称',
+          prop: 'b1',
+        },
+        {
+          label: '社会统一信用代码',
+          prop: 'b2',
+        },
+        {
+          label: '法定代表人',
+          prop: 'b3',
+        },
+        {
+          label: '联系电话',
+          prop: 'phone',
+        },
+        {
+          label: '所在区域',
+          prop: 'region1',
+          type: 'cascader',
+          dicData: [],
+          props: {
+            label: 'areaName',
+            value: 'areaCode',
+            children: 'areaChildVOS',
+          },
+        },
+        {
+          label: '详细地址',
+          prop: 'addressDetail',
+        },
+      ],
+    },
+    {
+      label: '登记核查信息',
+      prop: 'registerCheckInfo',
+      column: [
+        {
+          label: '案情记录',
+          prop: 'record',
+          span: 24,
+          type: 'textarea',
+        },
+        {
+          label: '现场取证',
+          prop: 'sceneProof',
+          span: 24,
+        },
+        {
+          label: '执法文书',
+          prop: 'c1',
+        },
+        {
+          label: '',
+          prop: 'documentAttrs',
+          span: 24,
+        },
+        {
+          label: '巡查笔录',
+          prop: 'c2',
+        },
+      ],
+    },
+    {
+      label: '案件处理',
+      prop: '_caseResult',
+      column: [
+        {
+          label: '案件处理结果',
+          prop: 'caseResult',
+          span: 24,
+          type: 'radio',
+          dicUrl: `${VITE_APP_BASE_API}/system/dict/data/list`,
+          dicQuery: {
+            dictType: 'sys_law_case_result',
+            current: 1,
+            size: 9999,
+          },
+          dicHeaders: {
+            authorization: UserStore.token,
+          },
+          props: {
+            label: 'dictLabel',
+            value: 'dictValue',
+          },
+          dicFormatter: (res) => res?.data?.records ?? [],
+        },
+      ],
+    },
+  ],
+});
+const actions = reactive([
+  {
+    name: '详情',
+    icon: 'view',
+    event: ({ row }) => {},
+  },
+  {
+    name: '编辑',
+    icon: 'edit',
+    event: ({ row }) => {
+      crudRef.value.rowEdit(row);
+    },
+  },
+  {
+    name: '登记核查信息',
+    icon: 'clock',
+    event: ({ row }) => {
+      option.group[0].editDisplay = false;
+      option.group[1].column.forEach((v) => (v.editDisabled = true));
+      crudRef.value.rowEdit(row);
+    },
+  },
+  {
+    type: 'danger',
+    name: '删除',
+    icon: 'delete',
+    event: ({ row }) => {},
+  },
+]);
+const examineForm = reactive({
+  caseId: '',
+  proof: [],
+  documentAttrs: [],
+});
+watch(
+  () => examineForm,
+  () => {
+    console.log('examineForm', examineForm.attrs);
+  },
+  {
+    deep: true,
+    immediate: true,
+  }
+);
+const recordModalRef = ref(null);
 // #endregion

 /* --------------- methods --------------- */
 // #region
+async function getRegion() {
+  let res = await GetRegion();
+  if (res.code == 200) {
+    regionData.value = res?.data ?? [];
+    option.group[0].column[4].dicData = regionData.value;
+    option.group[1].column[4].dicData = regionData.value;
+  }
+}
+async function getMumber() {
+  let res = await GetUserList({
+    current: 1,
+    size: 99999,
+    deptId: 105,
+  });
+  if (res.code == 200) {
+    memberData.value = res?.data?.records ?? [];
+    option.group[0].column[5].dicData = memberData.value;
+    console.log('regionData.value', memberData.value);
+  }
+}
+async function getDictData(dicType) {
+  let res = await GetDict({
+    current: 1,
+    size: 99999,
+    dictType: dicType,
+  });
+  if (res.code == 200) {
+    option.group[0].column[3].dicData = res?.data?.records ?? [];
+  }
+}

 // #endregion
 </script>
-
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.record_content {
+  display: flex;
+}
+</style>
--- a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue
+++ b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue
@ -2,7 +2,7 @@
  <el-upload ref="upload" :file-list="fileList" class="upload-demo" :limit="props.limit" :auto-upload="false" :on-change="fileChange">
    <el-button type="primary" :disabled="fileList.length == 5">点击上传</el-button>
    <template #tip>
-      <div v-if="props.format.length" class="el-upload__tip">只能上传{{ props.format.join() }} 文件，且不超过20MB</div>
+      <div v-if="props.format.length && props.tips" class="el-upload__tip">只能上传{{ props.format.join() }} 文件，且不超过20MB</div>
    </template>
    <template #file="{ file }">
      <section class="file_line">
@ -41,6 +41,10 @@ const props = defineProps({
    type: String,
    default: 'view',
  },
+  tips: {
+    type: Boolean,
+    default: true,
+  },
 });

 /* --------------- data --------------- */
--- a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue
+++ b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue
@ -422,16 +422,7 @@ const examineForm = reactive({
  proof: [],
  attrs: [],
 });
-watch(
-  () => examineForm,
-  () => {
-    console.log('examineForm', examineForm.attrs);
-  },
-  {
-    deep: true,
-    immediate: true,
-  }
-);
+
 // #endregion

 /* --------------- methods --------------- */
--- a/sub-government-screen-service/.env.pre
+++ b/sub-government-screen-service/.env.pre
@ -0,0 +1,9 @@
+# 本地环境
+VITE_APP_MIAN = 'daimp-front-main'
+VITE_APP_MIAN_URL = 'http://localhost:8090'
+VITE_APP_NAME = 'sub-government-screen-service'
+# 接口
+VITE_APP_BASE_API = '/apis' 
+VITE_APP_BASE_URL = ''
+VITE_APP_UPLOAD_API = '/uploadApis'
+VITE_APP_UPLOAD_URL = ''
--- a/sub-government-screen-service/package.json
+++ b/sub-government-screen-service/package.json
@ -7,7 +7,7 @@
    "dev": "vite --mode development",
    "build": "vite build --mode production",
    "test": "vite build --mode test",
-    "local": "vite build --mode local",
+    "pre": "vite build --mode pre",
    "preview": "vite preview",
    "format": "prettier --write 'src/**/*.{vue,ts,tsx,js,jsx,css,less,scss,json,md}'",
    "eslint": "npx eslint --init",
--- a/sub-operation-admin/.env.pre
+++ b/sub-operation-admin/.env.pre
@ -0,0 +1,9 @@
+# 本地环境
+VITE_APP_MIAN = 'daimp-front-main'
+VITE_APP_MIAN_URL = 'http://localhost:8090'
+VITE_APP_NAME = 'sub-operation-admin'
+# 接口
+VITE_APP_BASE_API = '/apis' 
+VITE_APP_BASE_URL = ''
+VITE_APP_UPLOAD_API = '/uploadApis'
+VITE_APP_UPLOAD_URL = ''
--- a/sub-operation-service/.env.development
+++ b/sub-operation-service/.env.development
@ -1,9 +1,8 @@
 # 开发环境
-VITE_PORT = 9526
-VITE_MODE = 'DEV'
+VITE_PORT = 9527
 VITE_APP_MIAN = 'daimp-front-main'
 VITE_APP_MIAN_URL = 'http://localhost:9000'
-VITE_APP_NAME = 'sub-operation-service'
+VITE_APP_NAME = 'sub-operation-admin'
 VITE_APP_BASE_API = '/apis' 
 VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
 VITE_APP_UPLOAD_API = '/uploadApis'
--- a/sub-operation-service/.env.pre
+++ b/sub-operation-service/.env.pre
@ -0,0 +1,9 @@
+# 本地环境
+VITE_APP_MIAN = 'daimp-front-main'
+VITE_APP_MIAN_URL = 'http://localhost:8090'
+VITE_APP_NAME = 'sub-operation-admin'
+# 接口
+VITE_APP_BASE_API = '/apis' 
+VITE_APP_BASE_URL = ''
+VITE_APP_UPLOAD_API = '/uploadApis'
+VITE_APP_UPLOAD_URL = ''
--- a/sub-operation-service/.env.production
+++ b/sub-operation-service/.env.production
@ -1,9 +1,9 @@
 # 生产环境
 VITE_APP_MIAN = 'daimp-front-main'
 VITE_APP_MIAN_URL = 'http://47.109.205.240'
-VITE_APP_NAME = 'sub-operation-service'
+VITE_APP_NAME = 'sub-operation-admin'
 # 接口
-VITE_APP_BASE_API = '/apis'
+VITE_APP_BASE_API = '/apis' 
 VITE_APP_BASE_URL = ''
 VITE_APP_UPLOAD_API = '/uploadApis'
 VITE_APP_UPLOAD_URL = ''
--- a/sub-operation-service/.env.test
+++ b/sub-operation-service/.env.test
@ -1,7 +1,7 @@
 # 测试环境
 VITE_APP_MIAN = 'daimp-front-main'
 VITE_APP_MIAN_URL = 'http://192.168.18.99:88'
-VITE_APP_NAME = 'sub-operation-service'
+VITE_APP_NAME = 'sub-operation-admin'
 # 接口
 VITE_APP_BASE_API = '/apis'
 VITE_APP_BASE_URL = ''
--- a/sub-operation-service/package.json
+++ b/sub-operation-service/package.json
@ -1,5 +1,5 @@
 {
-  "name": "sub-operation-service",
+  "name": "sub-operation-admin",
  "private": true,
  "version": "0.0.1",
  "type": "module",
@ -7,7 +7,7 @@
    "dev": "vite --mode development",
    "build": "vite build --mode production",
    "test": "vite build --mode test",
-    "local": "vite build --mode local",
+    "pre": "vite build --mode pre",
    "preview": "vite preview",
    "format": "prettier --write 'src/**/*.{vue,ts,tsx,js,jsx,css,less,scss,json,md}'",
    "eslint": "npx eslint --init",
@ -21,7 +21,7 @@
    "@wangeditor/editor": "^5.1.23",
    "@wangeditor/editor-for-vue": "^5.1.12",
    "axios": "^1.6.5",
-    "echarts": "^5.5.0",
+    "echarts": "^5.6.0",
    "element-plus": "^2.7.2",
    "js-base64": "^3.7.6",
    "lodash": "^4.17.21",
@ -31,6 +31,7 @@
    "pinia": "^2.1.7",
    "pinia-plugin-persistedstate": "^3.2.1",
    "screenfull": "^6.0.2",
+    "splitpanes": "^4.0.3",
    "vue": "^3.3.11",
    "vue-router": "^4.2.5"
  },
--- a/sub-operation-service/src/App.vue
+++ b/sub-operation-service/src/App.vue
@ -3,7 +3,7 @@
 * @Author: zenghua.wang
 * @Date: 2024-01-24 18:54:01
 * @LastEditors: zenghua.wang
- * @LastEditTime: 2024-01-26 22:57:34
+ * @LastEditTime: 2025-02-28 11:31:12
 -->
 <template>
  <el-config-provider :size="size" :locale="zhCn">
@ -23,46 +23,5 @@ const size = computed(() => SettingStore.themeConfig.globalComSize);
 </script>

 <style lang="scss">
-@import './styles/style.scss';
-@import './styles/global.scss';
-@import '@/styles/iconfont.css';
-
-body {
-  div {
-    box-sizing: border-box;
-  }
-  --el-color-primary: #25bf82;
-  --el-color-primary-light-3: #45dda1;
-  --el-color-primary-light-5: #8cddbd;
-  --el-color-primary-light-9: rgba(37, 191, 130, 0.1);
-  --el-color-primary-light-8: rgba(37, 191, 130, 0.5);
-
-  .el-input {
-    --el-input-focus-border-color: #25bf82;
-    --el-input-focus-border: #25bf82;
-    ::v-deep() {
-      .el-input__wrapper:focus,
-      .el-input__wrapper:hover,
-      .el-input__wrapper .is-focus {
-        box-shadow: 0 0 0 1px $color-main !important;
-      }
-    }
-  }
-  .el-button--primary {
-    --el-button-bg-color: #25bf82;
-    --el-button-border-color: #25bf82;
-    --el-button-outline-color: #45dda1;
-    --el-button-active-color: #158b5c;
-    --el-button-hover-bg-color: #45dda1;
-    --el-button-hover-border-color: #45dda1;
-    --el-button-active-bg-color: #158b5c;
-    --el-button-active-border-color: #158b5c;
-    --el-button-disabled-text-color: var(--el-color-white);
-    --el-button-disabled-bg-color: #45dda1;
-    --el-button-disabled-border-color: #45dda1;
-  }
-
-  --el-menu-hover-text-color: #25bf82;
-  --el-menu-hover-bg-color: fff;
-}
+@import './styles/style';
 </style>
--- a/sub-operation-service/src/components/costomImg.vue
+++ b/sub-operation-service/src/components/costomImg.vue
@ -1,6 +1,6 @@
 <template>
  <div class="c-custom-img-warp">
-    <el-image :src="isMontage ? getAssetsFile(imgUrl) : imgUrl" :fit="fit" />
+    <el-image :src="isMontage ? (getAssetsFile(imgUrl)?.href ?? '') : imgUrl" :fit="fit" />
    <div v-if="isViewVal" class="viewer-btn-warp">
      <div class="viewer-btn" @click="toPreview">点击查看</div>
    </div>
@ -53,6 +53,7 @@ watch(
    imgUrl.value = props.url;
    isViewVal.value = props.isView;
    srcList = props.previewList;
+    console.log('getAssetsFile', getAssetsFile(imgUrl));
  },
  {
    immediate: true,
--- a/sub-operation-service/src/components/page-layout/index.vue
+++ b/sub-operation-service/src/components/page-layout/index.vue
@ -0,0 +1,48 @@
+<template>
+  <div class="page-layout">
+    <div class="page-layout-left">
+      <page-menu :menus="menus" />
+    </div>
+    <div class="page-layout-main">
+      <slot></slot>
+    </div>
+  </div>
+</template>
+<script setup name="page-layout">
+const props = defineProps({
+  menus: { type: Array, default: () => [] },
+  showMenu: {
+    type: Boolean,
+    default: true,
+  },
+});
+</script>
+<style lang="scss" scoped>
+.page-layout {
+  width: $width-main;
+  margin: 0 auto;
+  height: 100%;
+  min-height: calc(100vh - 230px);
+  @include flex-row();
+
+  &-left,
+  &-main {
+    height: 100%;
+    min-height: 100%;
+
+    border-radius: 8px;
+    padding: 8px;
+    overflow-y: auto;
+  }
+  &-left {
+    width: 240px;
+    margin-right: 16px;
+    background: $color-fff;
+  }
+  &-main {
+    flex: 1;
+    width: 100%;
+    overflow: hidden;
+  }
+}
+</style>
--- a/sub-operation-service/src/components/page-menu/index-bak.vue
+++ b/sub-operation-service/src/components/page-menu/index-bak.vue
@ -0,0 +1,126 @@
+<template>
+  <div class="page-menu">
+    <div v-for="menu in menus" :key="menu.name" class="page-menu-item">
+      <div class="menu" :class="isActive(menu) ? 'active' : ''" @click="todo(menu, true)">
+        <span class="item-img"><img :src="getAssetsFile(menu.icon)" /></span>
+        <span class="item-title">{{ menu.meta.title }}</span>
+        <el-icon v-if="!isEmpty(menu?.children)">
+          <template v-if="menu.toggle"><ArrowDownBold /></template>
+          <template v-else><ArrowUpBold /></template>
+        </el-icon>
+      </div>
+      <ul :class="`sub-menu ${menu?.toggle ? 'toggle' : ''}`">
+        <li v-for="item in menu?.children" :key="item.name" :class="isActive(item) ? 'active' : ''" @click="todo(item, false)">
+          <span class="sub-title">{{ item.meta.title }}</span>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+<script setup name="page-menu">
+import { isEmpty, getAssetsFile } from '@/utils';
+import { useRoute, useRouter } from 'vue-router';
+
+const props = defineProps({
+  menus: { type: Array, default: () => [] },
+});
+
+const route = useRoute();
+const router = useRouter();
+
+const isActive = (row) => {
+  return route.path === row.path;
+};
+
+const todo = (row, toggle) => {
+  if (toggle && !isEmpty(row.children)) {
+    row.toggle = !row.toggle;
+    return;
+  }
+  if (typeof row.event === 'function') {
+    row.event(row);
+  } else {
+    router.push(row.path);
+  }
+  console.log(route.path, row.path);
+};
+</script>
+<style lang="scss" scoped>
+.page-menu {
+  width: 100%;
+  height: 100%;
+
+  &-item {
+    width: 100%;
+    @include flex-column();
+    padding: 16px;
+    cursor: pointer;
+
+    .menu {
+      @include flex-row();
+      align-items: center;
+
+      .item-img,
+      .item-title {
+        vertical-align: middle;
+      }
+      .item-img {
+        display: inline-block;
+        width: 32px;
+        height: 32px;
+      }
+      .item-title {
+        flex: 1;
+        font-size: 20px;
+        font-weight: 400;
+        padding-left: 8px;
+        @include ellipsis();
+      }
+      .el-icon {
+        color: $color-primary;
+      }
+
+      &.active {
+        color: $color-primary;
+      }
+    }
+
+    .sub-menu {
+      padding: 10px 0;
+      display: block;
+
+      &.toggle {
+        display: none;
+      }
+
+      li {
+        padding: 16px;
+        @include flex-row();
+        align-items: center;
+
+        &::before {
+          @include icon-space();
+          width: 5px;
+          height: 5px;
+          border-radius: 3px;
+          background-color: #000;
+          margin-right: 22px;
+        }
+
+        .sub-title {
+          font-size: 16px;
+          @include ellipsis();
+        }
+
+        &.active {
+          &::before {
+            background-color: $color-primary;
+          }
+
+          color: $color-primary;
+        }
+      }
+    }
+  }
+}
+</style>
--- a/sub-operation-service/src/components/page-menu/index.vue
+++ b/sub-operation-service/src/components/page-menu/index.vue
@ -0,0 +1,91 @@
+<template>
+  <div class="page-menu">
+    <el-scrollbar wrap-class="page-menu-scrollbar">
+      <el-menu
+        class="page-menu__menu"
+        background-color="#fff"
+        text-color="#000"
+        active-text-color="#25bf82"
+        :collapse-transition="true"
+        :unique-opened="true"
+        :default-active="active"
+        :default-openeds="openeds"
+      >
+        <SubItem v-for="item in menus" :key="item.path" :item="item" />
+      </el-menu>
+    </el-scrollbar>
+  </div>
+</template>
+<script setup name="page-menu">
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { findParentRoute } from '@/utils/router';
+import { isEmpty } from '@/utils';
+import SubItem from '@/layouts/component/Menu/SubItem';
+
+const props = defineProps({
+  menus: { type: Array, default: () => [] },
+});
+
+const route = useRoute();
+
+const openeds = computed(() => {
+  const item = findParentRoute(props.menus, route.path);
+  return !isEmpty(item) ? [item.path] : [];
+});
+
+const active = computed(() => {
+  const item = findParentRoute(props.menus, route.path);
+  return !isEmpty(item) ? item.path : '';
+});
+</script>
+<style lang="scss" scoped>
+.page-menu {
+  width: 100%;
+  height: 100%;
+  background-color: #ffffff;
+  transition: width 0.28s;
+  &-scrollbar {
+    height: calc(100vh - 60px) !important;
+  }
+  :deep(.el-scrollbar__wrap) {
+    height: calc(100vh - 60px) !important;
+  }
+  &__menu {
+    border-right: 0;
+    :deep(.el-menu-item),
+    :deep(.el-sub-menu__title) {
+      font-size: 20px;
+      font-weight: 400;
+
+      &:hover {
+        background-color: #fff;
+        color: $color-primary;
+      }
+    }
+    :deep(.el-menu-item) {
+      @include flex-row();
+      align-items: center;
+      padding: 0 16px !important;
+    }
+    :deep(.el-sub-menu .el-menu-item) {
+      font-size: 16px;
+      padding-left: 50px !important;
+      &:hover {
+        .icon-dot {
+          background-color: $color-primary;
+        }
+      }
+    }
+    :deep(.el-sub-menu .el-icon) {
+      font-size: 20px;
+    }
+    :deep(.el-menu-item.is-active) {
+      background-color: #fff;
+    }
+    &:not(.el-menu--collapse) {
+      height: 100%;
+    }
+  }
+}
+</style>
--- a/sub-operation-service/src/components/page-pagination/index.vue
+++ b/sub-operation-service/src/components/page-pagination/index.vue
@ -0,0 +1,39 @@
+<template>
+  <div class="page-pagination">
+    <el-pagination
+      background
+      hide-on-single-page
+      :page-size="size"
+      :layout="layout"
+      :total="total"
+      @current-change="emit('current-change', $event)"
+      @size-change="emit('size-change', $event)"
+    />
+  </div>
+</template>
+<script setup name="page-pagination">
+const props = defineProps({
+  layout: {
+    type: String,
+    default: 'prev, pager, next',
+  },
+  size: {
+    type: Number,
+    default: 10,
+  },
+  total: {
+    type: Number,
+    default: 0,
+  },
+});
+
+const emit = defineEmits(['current-change', 'size-change']);
+</script>
+<style lang="scss" scoped>
+.page-pagination {
+  width: 100%;
+  padding: 50px 0;
+  display: flex;
+  justify-content: center;
+}
+</style>
--- a/sub-operation-service/src/layouts/component/Header/index.vue
+++ b/sub-operation-service/src/layouts/component/Header/index.vue
@ -59,22 +59,13 @@
 </template>

 <script setup name="layout-header">
-import { computed, ref } from 'vue';
-import { useSettingStore } from '@/store/modules/setting';
-import { usePermissionStore } from '@/store/modules/permission';
+import { ref } from 'vue';
 import { qrImg } from './base64img';
 import AppLink from '../Menu/Link.vue';
-import { useRoute, useRouter } from 'vue-router';
-import { isEmpty, getAssetsFile } from '@/utils';
+import { useRouter } from 'vue-router';
+import { getAssetsFile } from '@/utils';

-const route = useRoute();
 const router = useRouter();
-const SettingStore = useSettingStore();
-const PermissionStore = usePermissionStore();
-const cacheRoutes = computed(() => PermissionStore.keepAliveRoutes);
-const isReload = computed(() => SettingStore.isReload);
-
-const isSubApp = computed(() => route.path.includes('sub'));

 const keyword = ref('');

@ -124,10 +115,6 @@ const toUserCenter = () => {
 </script>

 <style lang="scss" scoped>
-div {
-  box-sizing: border-box;
-}
-
 .layout-header-warp {
  width: 100%;
  text-align: center;
@ -244,10 +231,8 @@ div {
              height: 50px;
              font-size: 18px;
              width: 100%;
-              ::v-deep() {
-                .el-input__wrapper {
-                  padding-right: 100px;
-                }
+              :deep(.el-input__wrapper) {
+                padding-right: 100px;
              }
            }

--- a/sub-operation-service/src/layouts/index.vue
+++ b/sub-operation-service/src/layouts/index.vue
@ -6,11 +6,8 @@
 </template>

 <script setup name="layout">
-import { useSettingStore } from '@/store/modules/setting';
-
 import Header from './component/Header';
 import Main from './component/Main';
-const SettingStore = useSettingStore();
 </script>

 <style lang="scss" scoped>
--- a/sub-operation-service/src/plugins/globalComponents.js
+++ b/sub-operation-service/src/plugins/globalComponents.js
@ -1,15 +1,4 @@
-import * as components from '../../../main/src/components';
-
-// const modules = import.meta.glob('../../../main/src/components/**/**.vue');
-// const components = Object.keys(modules).reduce((acc, path) => {
-//   const component = modules[path].default || modules[path];
-//   const componentName = path
-//     .split('/')
-//     .pop()
-//     .replace(/\.\w+$/, '');
-//   acc[componentName] = component;
-//   return acc;
-// }, {});
+import * as components from '#/components';

 // 全局注册组件
 export const registerGlobalComponents = (app) => {
--- a/sub-operation-service/src/plugins/micro.js
+++ b/sub-operation-service/src/plugins/micro.js
@ -1,6 +1,6 @@
 import { renderWithQiankun, qiankunWindow } from 'vite-plugin-qiankun/dist/helper';

-export const registerMicroApps = (app) => {
+export const registerMicroApps = async (app) => {
  const initQiankun = () => {
    renderWithQiankun({
      bootstrap() {
@ -18,8 +18,9 @@ export const registerMicroApps = (app) => {
      },
    });
  };
-  const render = ({ container }) => {
-    app.mount(container ? container : '#app');
+  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/sub-operation-service/src/router/index.js
+++ b/sub-operation-service/src/router/index.js
@ -3,7 +3,7 @@
 * @Author: zenghua.wang
 * @Date: 2023-06-20 11:48:41
 * @LastEditors: zenghua.wang
- * @LastEditTime: 2025-04-07 17:24:45
+ * @LastEditTime: 2025-04-14 09:27:05
 */
 import { createRouter, createWebHistory } from 'vue-router';
 import Layout from '@/layouts/index.vue';
@ -27,8 +27,8 @@ export const constantRoutes = [
    path: '/sub-operation-service',
    name: 'layout',
    component: Layout,
-    redirect: '/sub-operation-service/home',
-    meta: { title: '首页' },
+    redirect: '/sub-operation-service/ecommerce',
+    meta: { title: '运营服务' },
    children: [
      {
        path: '/sub-operation-service/home',
@ -50,25 +50,25 @@ export const constantRoutes = [
        component: Views,
        redirect: '/sub-operation-service/ecommerce-agricultural',
        name: 'agriculturalParent',
-        meta: { title: '农资交易' },
+        meta: { title: '农资交易', headerActive: 'ecommerce' },
        children: [
          {
            path: '/sub-operation-service/ecommerce-agricultural',
            component: () => import('@/views/ecommerce/index.vue'),
            name: 'agricultural',
-            meta: { title: '农资交易' },
+            meta: { title: '农资交易', headerActive: 'ecommerce' },
          },
          {
            path: '/sub-operation-service/ecommerce-agriculturalDetail',
            component: () => import('@/views/ecommerce/agriculturalDetail.vue'),
            name: 'agriculturalDetail',
-            meta: { title: '农资详情' },
+            meta: { title: '农资详情', headerActive: 'ecommerce' },
          },
          {
            path: '/sub-operation-service/ecommerce-sourceCodeDetail',
            component: () => import('@/views/ecommerce/sourceCodeDetail.vue'),
            name: 'sourceCodeDetail',
-            meta: { title: '溯源详情' },
+            meta: { title: '溯源详情', headerActive: 'ecommerce' },
          },
        ],
      },
@ -77,19 +77,19 @@ export const constantRoutes = [
        component: Views,
        redirect: '/sub-operation-service/ecommerce-purchaser',
        name: 'purchaserParent',
-        meta: { title: '采购商服务' },
+        meta: { title: '采购商服务', headerActive: 'ecommerce' },
        children: [
          {
            path: '/sub-operation-service/ecommerce-purchaser',
            component: () => import('@/views/ecommerce/purchaser.vue'),
            name: 'purchaser',
-            meta: { title: '采购商服务' },
+            meta: { title: '采购商服务', headerActive: 'ecommerce' },
          },
          {
            path: '/sub-operation-service/ecommerce-purchaserDetail',
            component: () => import('@/views/ecommerce/purchaserDetail.vue'),
            name: 'purchaserDetail',
-            meta: { title: '采购详情' },
+            meta: { title: '采购详情', headerActive: 'ecommerce' },
          },
        ],
      },
@ -98,31 +98,38 @@ export const constantRoutes = [
        path: '/sub-operation-service/ecommerce-supplier',
        component: () => import('@/views/ecommerce/supplier.vue'),
        name: 'supplier',
-        meta: { title: '供应商服务' },
+        meta: { title: '供应商服务', headerActive: 'ecommerce' },
      },
      {
        path: '/sub-operation-service/ecommerce-land',
        component: Views,
        redirect: '/sub-operation-service/ecommerce-land',
        name: 'landParent',
-        meta: { title: '土地交易' },
+        meta: { title: '土地交易', headerActive: 'ecommerce' },
        children: [
          {
            path: '/sub-operation-service/ecommerce-land',
            component: () => import('@/views/ecommerce/land.vue'),
            name: 'land',
-            meta: { title: '土地交易' },
+            meta: { title: '土地交易', headerActive: 'ecommerce' },
          },
          {
            path: '/sub-operation-service/ecommerce-landDetail',
            component: () => import('@/views/ecommerce/landDetail.vue'),
            name: 'landDetail',
-            meta: { title: '土地详情' },
+            meta: { title: '土地详情', headerActive: 'ecommerce' },
          },
        ],
      },
    ],
  },
+  {
+    path: '/sub-operation-service/farmingService',
+    name: 'farmingService',
+    component: Layout,
+    // component: () => import('@/views/farmingService/index.vue'),
+    meta: { title: '农事服务', headerActive: 'farmingService' },
+  },
  {
    path: '/sub-operation-service/userCenter',
    name: 'userCentre',
--- a/sub-operation-service/src/router/modules/warehouseLogistics.js
+++ b/sub-operation-service/src/router/modules/warehouseLogistics.js
@ -0,0 +1,81 @@
+import Layout from '@/layouts/index.vue';
+import Views from '@/layouts/Views.vue';
+
+export default [
+  {
+    path: '/sub-operation-service/warehouseLogistics',
+    name: 'warehouseLogistics',
+    component: Layout,
+    redirect: '/sub-operation-service/warehouse',
+    meta: { title: '仓储物流', icon: '' },
+    children: [
+      {
+        path: '/sub-operation-service/warehouse',
+        component: Views,
+        name: 'warehouse',
+        redirect: '/sub-operation-service/warehouse-list',
+        meta: { title: '仓储', icon: 'images/ecommerce/menu1.png' },
+        children: [
+          {
+            path: '/sub-operation-service/warehouse-list',
+            component: () => import('@/views/warehouseLogistics/warehouse/index.vue'),
+            name: 'warehouse-list',
+            meta: { title: '仓储列表', icon: '' },
+            hidden: true,
+          },
+          {
+            path: '/sub-operation-service/warehouse-detail',
+            component: () => import('@/views/warehouseLogistics/warehouse/detail.vue'),
+            name: 'warehouse-detail',
+            meta: { title: '仓储详情', icon: '' },
+            hidden: true,
+          },
+        ],
+      },
+      {
+        path: '/sub-operation-service/logistics',
+        component: Views,
+        name: 'logistics',
+        redirect: '/sub-operation-service/logistics-list',
+        meta: { title: '物流', icon: 'images/ecommerce/menu1.png' },
+        children: [
+          {
+            path: '/sub-operation-service/logistics-list',
+            component: () => import('@/views/warehouseLogistics/logistics/index.vue'),
+            name: 'logistics-list',
+            meta: { title: '物流列表', icon: '' },
+            hidden: true,
+          },
+          {
+            path: '/sub-operation-service/logistics-detail',
+            component: () => import('@/views/warehouseLogistics/logistics/detail.vue'),
+            name: 'logistics-detail',
+            meta: { title: '物流详情', icon: '' },
+            hidden: true,
+          },
+        ],
+      },
+      {
+        path: '/sub-operation-service/test',
+        component: Views,
+        redirect: '/sub-operation-service/test1',
+        name: 'test',
+        meta: { title: '测试', icon: 'images/ecommerce/menu3.png' },
+        children: [
+          {
+            path: '/sub-operation-service/test1',
+            component: () => import('@/views/warehouseLogistics/test/test1.vue'),
+            name: 'test1',
+            meta: { title: '子菜单1', icon: '' },
+          },
+          {
+            path: '/sub-operation-service/test2',
+            component: () => import('@/views/warehouseLogistics/test/test1.vue'),
+            name: 'test2',
+            meta: { title: '子菜单2', icon: '' },
+          },
+        ],
+      },
+    ],
+  },
+];
--- a/sub-operation-service/src/styles/style.scss
+++ b/sub-operation-service/src/styles/style.scss
@ -1,6 +1,6 @@
@import 'common/base.scss';
@import 'common/define.scss';
-@import '@/assets/fonts/iconfont.css';
+// @import '@/assets/fonts/iconfont.css';

 #app {
  position: relative;
@ -18,24 +18,24 @@
  max-height: calc(100vh - 130px);
 }

-.txt-ellipsis{
-  display: -webkit-inline-box; 
-  -webkit-box-orient: vertical; 
-  overflow: hidden; 
-  text-overflow: ellipsis; 
+.txt-ellipsis {
+  display: -webkit-inline-box;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
  word-break: break-all;
-  white-space: normal
+  white-space: normal;
 }
-.clamp1{
-  -webkit-line-clamp: 1; 
-  line-height: 1.5; 
-  max-height: calc(1.5em * 1); 
+.clamp1 {
+  line-clamp: 1;
+  -webkit-line-clamp: 1;
+  line-height: 1.5;
+  max-height: calc(1.5em * 1);
 }

-.clamp2{
-  -webkit-line-clamp: 2; 
-  line-height: 1.5; 
-  max-height: calc(1.5em * 2); 
+.clamp2 {
+  line-clamp: 2;
+  -webkit-line-clamp: 2;
+  line-height: 1.5;
+  max-height: calc(1.5em * 2);
 }
-
-
--- a/sub-operation-service/src/utils/router.js
+++ b/sub-operation-service/src/utils/router.js
@ -109,3 +109,23 @@ export function handleRoutes(routers, pathUrl = '') {
    item.path = path.resolve(pathUrl, item.path);
  });
 }
+
+export function findParentRoute(routes, targetPath) {
+  for (const route of routes) {
+    if (route.children) {
+      for (const child of route.children) {
+        if (child.path === targetPath) {
+          return route;
+        }
+        if (child.children) {
+          for (const grandChild of child.children) {
+            if (grandChild.path === targetPath) {
+              return child;
+            }
+          }
+        }
+      }
+    }
+  }
+  return null;
+}
--- a/sub-operation-service/src/views/ecommerce/agriculturalDetail.vue
+++ b/sub-operation-service/src/views/ecommerce/agriculturalDetail.vue
@ -143,7 +143,7 @@
                      <span>7天</span>
                    </el-descriptions-item>
                  </el-descriptions>
-                  <el-image :src="getAssetsFile('images/ecommerce/' + 'goods.png')" fit="cover" />
+                  <el-image :src="getAssetsFile('images/ecommerce/' + 'goods.png')?.href ?? ''" fit="cover" />
                </div>
                <div v-if="tabVal == 'sourceCode'" class="content-source-code">
                  <div class="code-warp">
--- a/sub-operation-service/src/views/ecommerce/components/banner.vue
+++ b/sub-operation-service/src/views/ecommerce/components/banner.vue
@ -8,8 +8,8 @@
  </div>
 </template>
 <script setup>
-import { ref, reactive, onMounted, watch, computed } from 'vue';
-import { isEmpty, getAssetsFile } from '@/utils';
+import { ref, watch, computed } from 'vue';
+import { getAssetsFile } from '@/utils';
 import costomImg from '@/components/costomImg.vue';

 const props = defineProps({
@ -36,14 +36,14 @@ const props = defineProps({
 });

 let nameVal = ref(props.name);
-let list = reactive(props.imglist);
+let list = ref([]);

 let srcList = computed(() => {
-  let list = [];
-  list = props.imglist.map((m) => {
-    return getAssetsFile(m);
+  let _list = [];
+  _list = props.imglist.map((m) => {
+    return getAssetsFile(m)?.href ?? '';
  });
-  return list;
+  return _list;
 });

 let isViewVal = ref(props.isView);
@ -52,7 +52,7 @@ watch(
  () => (props.list, props.imglist, props.isView),
  () => {
    nameVal.value = props.name;
-    list = props.imglist;
+    list.value = props.imglist;
    isViewVal.value = props.isView;
  },
  {
--- a/sub-operation-service/src/views/ecommerce/components/evaluate.vue
+++ b/sub-operation-service/src/views/ecommerce/components/evaluate.vue
@ -45,7 +45,7 @@
            <div class="evaluate-item-top">
              <div class="user-info">
                <div class="info-img">
-                  <el-image :src="getAssetsFile('images/ecommerce/' + 'goods.png')" fit="cover" />
+                  <el-image :src="getAssetsFile('images/ecommerce/' + 'goods.png')?.href ?? ''" fit="cover" />
                </div>
                <div class="info-txt">
                  <div class="info-txt-pos">
@ -65,7 +65,7 @@
              <div class="content-img">
                <template v-for="(m, indexm) in 2" :key="indexm">
                  <div class="img-item">
-                    <el-image :src="getAssetsFile('images/ecommerce/' + 'pic.png')" fit="cover" />
+                    <el-image :src="getAssetsFile('images/ecommerce/' + 'pic.png')?.href ?? ''" fit="cover" />
                  </div>
                </template>
              </div>
--- a/sub-operation-service/src/views/ecommerce/components/goodsItem.vue
+++ b/sub-operation-service/src/views/ecommerce/components/goodsItem.vue
@ -1,7 +1,7 @@
 <template>
  <div class="c-goods-item-warp" @click="toDetail">
    <div class="goods-img">
-      <el-image :src="getAssetsFile('images/ecommerce/' + 'pic.png')" fit="cover" />
+      <el-image :src="getAssetsFile('images/ecommerce/' + 'pic.png')?.href ?? ''" fit="cover" />
    </div>
    <div class="goods-name txt-ellipsis clamp2">{{ '遇合堂新款禽泰克家禽通用药250遇合堂新款禽泰克家禽通用药250' }}</div>
    <div class="goods-do">
--- a/sub-operation-service/src/views/ecommerce/components/landItem.vue
+++ b/sub-operation-service/src/views/ecommerce/components/landItem.vue
@ -1,7 +1,7 @@
 <template>
  <div class="c-land-item-warp" @click="toDetail">
    <div class="land-img">
-      <el-image :src="getAssetsFile('images/ecommerce/' + 'pic.png')" fit="cover" />
+      <el-image :src="getAssetsFile('images/ecommerce/' + 'pic.png')?.href ?? ''" fit="cover" />
    </div>
    <div class="land-info">
      <div class="land-info-pos">
--- a/sub-operation-service/src/views/ecommerce/components/leftMenu.vue
+++ b/sub-operation-service/src/views/ecommerce/components/leftMenu.vue
@ -3,7 +3,7 @@
    <div class="left-menu">
      <view v-for="(n, index) in leftMenu" :key="index" class="left-menu-item" :class="currentIndex == index ? 'active' : ''" @click="toLink(index)">
        <div class="item-img">
-          <img :src="getAssetsFile('images/ecommerce/' + n.icon)" />
+          <img :src="getAssetsFile('images/ecommerce/' + n.icon)?.href ?? ''" />
        </div>
        <span class="item-title">{{ n.title }}</span>
      </view>
--- a/sub-operation-service/src/views/ecommerce/purchaserDetail.vue
+++ b/sub-operation-service/src/views/ecommerce/purchaserDetail.vue
@ -12,7 +12,7 @@
              <el-col :span="16">
                <div class="purchaser-info-l">
                  <div class="img">
-                    <el-image :src="getAssetsFile('images/ecommerce/' + 'test01.png')" fit="cover" />
+                    <el-image :src="getAssetsFile('images/ecommerce/' + 'test01.png')?.href ?? ''" fit="cover" />
                  </div>
                  <div class="content">
                    <div class="title-warp">
--- a/sub-operation-service/src/views/ecommerce/sourceCodeDetail.vue
+++ b/sub-operation-service/src/views/ecommerce/sourceCodeDetail.vue
@ -10,16 +10,16 @@
              <div class="current-title">溯源详情</div>
            </div>
            <div class="top-img-txt">
-              <el-image :src="getAssetsFile('images/ecommerce/' + 'tracetxt.png')" fit="cover" />
+              <el-image :src="getAssetsFile('images/ecommerce/' + 'tracetxt.png')?.href ?? ''" fit="cover" />
            </div>
            <div class="top-bottom-warp">
              <div v-for="(b, indexb) in bottomList" :key="indexb" class="top-bottom-item">
                <div class="bottom-item-img">
-                  <el-image :src="getAssetsFile('images/ecommerce/' + b.img)" fit="cover" />
+                  <el-image :src="getAssetsFile('images/ecommerce/' + b.img)?.href ?? ''" fit="cover" />
                </div>
              </div>
            </div>
-            <el-image :src="getAssetsFile('images/ecommerce/' + 'traceb.png')" fit="cover" />
+            <el-image :src="getAssetsFile('images/ecommerce/' + 'traceb.png')?.href ?? ''" fit="cover" />
          </div>
          <div class="tab-content-warp">
            <el-tabs v-model="activeCurrent" class="demo-tabs">
@ -164,7 +164,7 @@
                      <!-- <el-image :src="getAssetsFile('images/ecommerce/' + 'pic.png')" fit="none" /> -->
                      <costomImg
                        :url="'images/ecommerce/' + 'pic.png'"
-                        :preview-list="[getAssetsFile('images/ecommerce/' + 'pic.png')]"
+                        :preview-list="[getAssetsFile('images/ecommerce/' + 'pic.png')?.href ?? '']"
                        :is-view="true"
                      ></costomImg>
                      <span class="img-tips">溯源证书</span>
--- a/sub-operation-service/src/views/farmingService/index.vue
+++ b/sub-operation-service/src/views/farmingService/index.vue
@ -0,0 +1,19 @@
+<template>
+  <section>农事服务</section>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue';
+
+/* --------------- data --------------- */
+// #region
+
+// #endregion
+
+/* --------------- methods --------------- */
+// #region
+
+// #endregion
+</script>
+
+<style lang="scss" scoped></style>
--- a/sub-operation-service/src/views/userCenter/shoppingCart.vue
+++ b/sub-operation-service/src/views/userCenter/shoppingCart.vue
@ -24,7 +24,7 @@
              <div class="shop-img">
                <costomImg
                  :url="'images/ecommerce/' + 'pic.png'"
-                  :preview-list="[getAssetsFile('images/ecommerce/' + 'pic.png')]"
+                  :preview-list="[getAssetsFile('images/ecommerce/' + 'pic.png')?.href ?? '']"
                  :is-view="false"
                ></costomImg>
              </div>
@ -41,7 +41,7 @@
                <div class="good-img" @click="toCheckGood(index, indexg)">
                  <costomImg
                    :url="'images/ecommerce/' + 'pic.png'"
-                    :preview-list="[getAssetsFile('images/ecommerce/' + 'pic.png')]"
+                    :preview-list="[getAssetsFile('images/ecommerce/' + 'pic.png')?.href ?? '']"
                    :is-view="false"
                  ></costomImg>
                </div>
--- a/sub-operation-service/src/views/warehouseLogistics/logistics/detail.vue
+++ b/sub-operation-service/src/views/warehouseLogistics/logistics/detail.vue
@ -0,0 +1,19 @@
+<template>
+  <page-layout :menus="state.menus"> 详情 </page-layout>
+</template>
+<script setup name="page-menu">
+import { ref, reactive, watch } from 'vue';
+import { getAssetsFile } from '@/utils';
+import { useRoute, useRouter } from 'vue-router';
+import warehouseLogisticsRoutes from '@/router/modules/warehouseLogistics';
+
+const route = useRoute();
+const router = useRouter();
+
+const state = reactive({
+  menus: warehouseLogisticsRoutes[0].children,
+  query: {},
+  data: {},
+});
+</script>
+<style lang="scss" scoped></style>
--- a/sub-operation-service/src/views/warehouseLogistics/logistics/index.vue
+++ b/sub-operation-service/src/views/warehouseLogistics/logistics/index.vue
@ -0,0 +1,17 @@
+<template>
+  <page-layout :menus="state.menus"> 物流 </page-layout>
+</template>
+<script setup name="page-menu">
+import { ref, reactive, watch } from 'vue';
+import { getAssetsFile } from '@/utils';
+import { useRoute, useRouter } from 'vue-router';
+import warehouseLogisticsRoutes from '@/router/modules/warehouseLogistics';
+
+const route = useRoute();
+const router = useRouter();
+
+const state = reactive({
+  menus: warehouseLogisticsRoutes[0].children,
+});
+</script>
+<style lang="scss" scoped></style>
--- a/sub-operation-service/src/views/warehouseLogistics/test/test1.vue
+++ b/sub-operation-service/src/views/warehouseLogistics/test/test1.vue
@ -0,0 +1,17 @@
+<template>
+  <page-layout :menus="state.menus"> test1 </page-layout>
+</template>
+<script setup name="page-menu">
+import { ref, reactive, watch } from 'vue';
+import { getAssetsFile } from '@/utils';
+import { useRoute, useRouter } from 'vue-router';
+import warehouseLogisticsRoutes from '@/router/modules/warehouseLogistics';
+
+const route = useRoute();
+const router = useRouter();
+
+const state = reactive({
+  menus: warehouseLogisticsRoutes[0].children,
+});
+</script>
+<style lang="scss" scoped></style>
--- a/sub-operation-service/src/views/warehouseLogistics/test/test2.vue
+++ b/sub-operation-service/src/views/warehouseLogistics/test/test2.vue
@ -0,0 +1,17 @@
+<template>
+  <page-layout :menus="state.menus"> test2 </page-layout>
+</template>
+<script setup name="page-menu">
+import { ref, reactive, watch } from 'vue';
+import { getAssetsFile } from '@/utils';
+import { useRoute, useRouter } from 'vue-router';
+import warehouseLogisticsRoutes from '@/router/modules/warehouseLogistics';
+
+const route = useRoute();
+const router = useRouter();
+
+const state = reactive({
+  menus: warehouseLogisticsRoutes[0].children,
+});
+</script>
+<style lang="scss" scoped></style>
--- a/sub-operation-service/src/views/warehouseLogistics/warehouse/detail.vue
+++ b/sub-operation-service/src/views/warehouseLogistics/warehouse/detail.vue
@ -0,0 +1,19 @@
+<template>
+  <page-layout :menus="state.menus"> 详情123 </page-layout>
+</template>
+<script setup name="page-menu">
+import { ref, reactive, watch } from 'vue';
+import { getAssetsFile } from '@/utils';
+import { useRoute, useRouter } from 'vue-router';
+import warehouseLogisticsRoutes from '@/router/modules/warehouseLogistics';
+
+const route = useRoute();
+const router = useRouter();
+
+const state = reactive({
+  menus: warehouseLogisticsRoutes[0].children,
+  query: {},
+  data: {},
+});
+</script>
+<style lang="scss" scoped></style>
--- a/sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue
+++ b/sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue
@ -0,0 +1,214 @@
+<template>
+  <page-layout :menus="state.menus">
+    <el-row :gutter="20">
+      <el-col v-for="(item, index) in state.data" :key="index" :span="12">
+        <el-card class="storage-card" shadow="hover">
+          <div class="storage-content">
+            <div class="storage-content-top" @click="toLink(item)">
+              <el-image :src="item.imageUrl" fit="cover" class="storage-image" />
+              <div class="storage-info">
+                <h3 class="storage-title">{{ item.title }}</h3>
+                <div class="storage-desc">
+                  <span>{{ item.description }}</span>
+                  <i></i>
+                </div>
+                <div class="storage-tags">
+                  <el-tag effect="plain" round>延长仓储</el-tag>
+                  <el-tag effect="plain" round>保鲜储存</el-tag>
+                </div>
+                <div class="storage-location">
+                  <el-icon><Location /></el-icon>
+                  {{ item.location }}
+                </div>
+              </div>
+            </div>
+            <div class="storage-price">
+              <div class="storage-price-left">
+                <span class="price-label">报价</span>
+                <span class="price-amount">¥{{ item.price }}/间/月</span>
+              </div>
+              <el-button type="success" class="contact-btn">
+                <el-icon><ChatDotRound /></el-icon>
+                <span>联系卖家</span>
+              </el-button>
+            </div>
+            <div v-if="item.rank" class="rank-badge">
+              {{ item.rank }}
+            </div>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <page-pagination :total="20" @current-change="currentChange" />
+  </page-layout>
+</template>
+<script setup name="page-menu">
+import { ref, reactive, watch } from 'vue';
+import { getAssetsFile } from '@/utils';
+import { useRoute, useRouter } from 'vue-router';
+import warehouseLogisticsRoutes from '@/router/modules/warehouseLogistics';
+
+const route = useRoute();
+const router = useRouter();
+
+const state = reactive({
+  menus: warehouseLogisticsRoutes[0].children,
+  query: {
+    current: 1,
+  },
+  data: [
+    {
+      imageUrl: '/storage1.jpg',
+      title: '果蔬保鲜仓储',
+      description: '绿鲜蔬选果蔬仓储中心 ',
+      location: '临沧市-耿马县',
+      price: '600.0',
+      rank: '1',
+    },
+    {
+      imageUrl: '/storage2.jpg',
+      title: '果蔬保鲜仓储',
+      description: '绿鲜蔬选果蔬仓储中心',
+      location: '临沧市-耿马县',
+      price: '600.0',
+      rank: '',
+    },
+    {
+      imageUrl: '/storage3.jpg',
+      title: '果蔬保鲜仓储',
+      description: '绿鲜蔬选果蔬仓储中心 ',
+      location: '临沧市-耿马县',
+      price: '600.0',
+      rank: '3',
+    },
+  ],
+});
+
+const currentChange = (current) => {
+  state.query.current = current;
+};
+
+const toLink = (row) => {
+  router.push({
+    path: '/sub-operation-service/warehouse-detail',
+    query: { id: row?.id ?? '100' },
+  });
+};
+</script>
+<style lang="scss" scoped>
+.storage-card {
+  position: relative;
+  overflow: hidden;
+  margin-bottom: 20px;
+  border-radius: 24px;
+  border: 0;
+}
+
+.storage-content {
+  @include flex-column();
+  gap: 16px;
+
+  &-top {
+    @include flex-row();
+    align-items: center;
+  }
+}
+
+.storage-image {
+  width: 120px;
+  height: 120px;
+  margin-right: 16px;
+  border-radius: 8px;
+  object-fit: cover;
+}
+
+.storage-info {
+  padding-right: 50px;
+  flex: 1;
+  cursor: pointer;
+}
+
+.storage-title,
+.storage-desc,
+.storage-tags,
+.storage-location {
+  width: 100%;
+  margin: 10px 0;
+  overflow: hidden;
+}
+
+.storage-title {
+  font-size: 20px;
+  font-weight: 700;
+  color: #000;
+  @include ellipsis();
+}
+
+.storage-desc {
+  font-size: 16px;
+  color: #999;
+  @include ellipsis();
+
+  i {
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+  }
+}
+
+.storage-tags {
+  span {
+    margin-right: 10px;
+  }
+}
+
+.storage-location {
+  display: flex;
+  align-items: center;
+  font-size: 16px;
+  font-weight: 400;
+  color: #000;
+}
+
+.storage-price {
+  display: flex;
+  align-items: center;
+
+  &-left {
+    flex: 1;
+  }
+}
+
+.price-label {
+  font-size: 16px;
+  color: #999;
+  margin-right: 10px;
+}
+
+.price-amount {
+  color: $color-primary;
+  font-size: 20px;
+  font-weight: 700;
+}
+
+.contact-btn {
+  width: 152px;
+  height: 48px;
+  font-size: 20px;
+  border-radius: 8px;
+  background: #25bf82 !important;
+
+  :deep(.el-icon) {
+    margin-right: 10px;
+  }
+}
+
+.rank-badge {
+  position: absolute;
+  top: 0;
+  right: 20px;
+  width: 80px;
+  height: 80px;
+}
+</style>
--- a/sub-operation-service/vite.config.js
+++ b/sub-operation-service/vite.config.js
@ -2,8 +2,8 @@
 * @Descripttion:
 * @Author: zenghua.wang
 * @Date: 2022-09-18 21:24:29
- * @LastEditors: zenghua.wang “1048523306@qq.com”
- * @LastEditTime: 2025-01-20 10:51:23
+ * @LastEditors: zenghua.wang
+ * @LastEditTime: 2025-04-14 09:02:04
 */

 import { defineConfig, loadEnv } from 'vite';
@ -55,6 +55,7 @@ export default defineConfig(({ command, mode }) => {
    resolve: {
      alias: {
        '@': resolve(__dirname, 'src'),
+        '#': resolve(__dirname, '../main/src'),
      },
      extensions: ['.js', '.vue', '.json', '.ts'],
    },