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

2025-05-28 12:06:05 +08:00 · 2025-05-28 12:06:05 +08:00 · 1c12f64534
commit 1c12f64534
parent 9ccec564ff cd166e3acb
13 changed files with 46 additions and 37 deletions
--- a/sub-operation-admin/index.html
+++ b/sub-operation-admin/index.html
@ -5,7 +5,7 @@
  <meta charset="UTF-8" />
  <link rel="icon" type="image/svg+xml" href="/logo.png" />
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>政务服务</title>
+  <title>运营服务</title>
 </head>

 <body>
@ -13,4 +13,4 @@
  <script type="module" src="/src/main.js"></script>
 </body>

-</html>
+</html>
--- a/sub-operation-service/src/assets/images/warehouseLogistics/menu1.png
+++ b/sub-operation-service/src/assets/images/warehouseLogistics/menu1.png
--- a/sub-operation-service/src/assets/images/warehouseLogistics/menu3.png
+++ b/sub-operation-service/src/assets/images/warehouseLogistics/menu3.png
--- a/sub-operation-service/src/assets/images/warehouseLogistics/position.png
+++ b/sub-operation-service/src/assets/images/warehouseLogistics/position.png
--- a/sub-operation-service/src/assets/images/warehouseLogistics/top1.png
+++ b/sub-operation-service/src/assets/images/warehouseLogistics/top1.png
--- a/sub-operation-service/src/assets/images/warehouseLogistics/top2.png
+++ b/sub-operation-service/src/assets/images/warehouseLogistics/top2.png
--- a/sub-operation-service/src/assets/images/warehouseLogistics/top3.png
+++ b/sub-operation-service/src/assets/images/warehouseLogistics/top3.png
--- a/sub-operation-service/src/assets/images/warehouseLogistics/优先级.png
+++ b/sub-operation-service/src/assets/images/warehouseLogistics/优先级.png
--- a/sub-operation-service/src/assets/images/warehouseLogistics/认证.png
+++ b/sub-operation-service/src/assets/images/warehouseLogistics/认证.png
--- a/sub-operation-service/src/layouts/component/Menu/SubItem.vue
+++ b/sub-operation-service/src/layouts/component/Menu/SubItem.vue
@ -10,14 +10,15 @@
    <template v-if="!item.alwaysShow && hasOneShowingChild(item.children, item)">
      <layout-link v-if="onlyOneChild.meta" :to="onlyOneChild.path">
        <el-menu-item :index="onlyOneChild.path">
-          <layout-icon :size="20" :icon="onlyOneChild?.meta?.icon" />
+          <img v-if="onlyOneChild.meta.icon" :src="getAssetsFile(onlyOneChild.meta.icon)" style="height: 20px; margin-right: 20px" alt="" />
+          <!--          <layout-icon :size="20" :icon="onlyOneChild?.meta?.icon ? getAssetsFile(onlyOneChild.meta.icon) : undefined" />-->
          <template #title>{{ onlyOneChild.meta && onlyOneChild.meta?.title }}</template>
        </el-menu-item>
      </layout-link>
    </template>
    <el-sub-menu v-else :index="item.path" teleported>
      <template #title>
-        <layout-icon :size="20" :icon="item?.meta?.icon" />
+        <!--        <layout-icon :size="20" :icon="item?.meta?.icon ? getAssetsFile(item.meta.icon) : undefined" />-->
        <span>{{ item.meta && item.meta?.title }}</span>
      </template>
      <sub-item v-for="child in item.children" :key="child.path" :item="child" />
@ -30,6 +31,7 @@ import { ref } from 'vue';
 // import { isExternal } from '@/utils/validate.js';
 import LayoutLink from './Link';
 import LayoutIcon from './Icon';
+import { getAssetsFile } from '@/utils/index.js';
 // import path from 'path-browserify';

 defineProps({
@ -65,7 +67,6 @@ const hasOneShowingChild = (children = [], parent) => {
    onlyOneChild.value = { ...parent, noShowingChildren: true };
    return true;
  }
-
  return false;
 };

--- a/sub-operation-service/src/router/index.js
+++ b/sub-operation-service/src/router/index.js
@ -230,14 +230,20 @@ export const constantRoutes = [
    path: '/sub-operation-service/warehouseLogistics',
    name: 'warehouseLogistics',
    component: Layout,
-    redirect: '/sub-operation-service/warehouseLogistics/index',
+    redirect: '/sub-operation-service/warehouse',
    meta: { title: '仓储物流' },
    children: [
      {
-        path: '/sub-operation-service/warehouseLogistics/index',
-        component: () => import('@/views/warehouseLogistics/index.vue'),
-        name: 'warehouseLogisticsMain',
-        meta: { title: '仓储物流首页' },
+        path: '/sub-operation-service/warehouse',
+        component: () => import('@/views/warehouseLogistics/warehouse/index.vue'),
+        name: 'warehouseMain',
+        meta: { title: '仓储首页' },
+      },
+      {
+        path: '/sub-operation-service/logistics',
+        component: () => import('@/views/warehouseLogistics/logistics/index.vue'),
+        name: 'logistics-list',
+        meta: { title: '物流首页' },
      },
    ],
  },
--- a/sub-operation-service/src/router/modules/warehouseLogistics.js
+++ b/sub-operation-service/src/router/modules/warehouseLogistics.js
@ -43,7 +43,7 @@ export default [
            path: '/sub-operation-service/logistics-list',
            component: () => import('@/views/warehouseLogistics/logistics/index.vue'),
            name: 'logistics-list',
-            meta: { title: '物流列表', icon: '' },
+            meta: { title: '物流', icon: '' },
            hidden: true,
          },
          {
@ -55,27 +55,27 @@ export default [
          },
        ],
      },
-      {
-        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: '' },
-          },
-        ],
-      },
+      // {
+      //   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/views/warehouseLogistics/warehouse/index.vue
+++ b/sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue
@ -10,11 +10,12 @@
                <h3 class="storage-title">{{ item.title }}</h3>
                <div class="storage-desc">
                  <span>{{ item.description }}</span>
-                  <i></i>
+                  <img :src="getAssetsFile('images/warehouseLogistics/认证.png')" alt="" style="width: 20px" />
+                  <img :src="getAssetsFile('images/warehouseLogistics/优先级.png')" alt="" style="width: 20px" />
                </div>
                <div class="storage-tags">
-                  <el-tag effect="plain" round>延长仓储</el-tag>
-                  <el-tag effect="plain" round>保鲜储存</el-tag>
+                  <el-tag effect="plain" round style="background-color: rgba(37, 191, 130, 0.2); color: #25bf82">延长仓储</el-tag>
+                  <el-tag effect="plain" round style="background-color: rgba(37, 191, 130, 0.2); color: #25bf82">保鲜储存</el-tag>
                </div>
                <div class="storage-location">
                  <el-icon><Location /></el-icon>
@ -33,7 +34,8 @@
              </el-button>
            </div>
            <div v-if="item.rank" class="rank-badge">
-              {{ item.rank }}
+              <!--              {{ item.rank }}-->
+              <img :src="getAssetsFile('images/warehouseLogistics/top' + item.rank + '.png')" alt="" style="width: 80px" />
            </div>
          </div>
        </el-card>
@ -72,7 +74,7 @@ const state = reactive({
      description: '绿鲜蔬选果蔬仓储中心',
      location: '临沧市-耿马县',
      price: '600.0',
-      rank: '',
+      rank: '2',
    },
    {
      imageUrl: '/storage3.jpg',