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

main/src/micro/app.js

@@ -1,6 +1,6 @@
 import actions from './actions';
 
-const { VITE_APP_SUB_OS, VITE_APP_SUB_ADMIN, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS, VITE_APP_SUB_GSR } = import.meta.env;
+const { VITE_APP_SUB_OS, VITE_APP_SUB_OA, VITE_APP_SUB_ADMIN, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS, VITE_APP_SUB_GSR } = import.meta.env;
 
 export const leftApps = [
   {
@@ -12,7 +12,7 @@ export const leftApps = [
   },
   {
     name: 'sub-operation-admin',
-    entry: VITE_APP_SUB_OS,
+    entry: VITE_APP_SUB_OA,
     activeRule: '/sub-operation-admin',
     title: '管理后台',
     icon: 'images/platform/icon-admin.png',
@@ -77,7 +77,7 @@ export const defaultApps = [
   },
   {
     name: 'sub-operation-admin',
-    entry: VITE_APP_SUB_OS,
+    entry: VITE_APP_SUB_OA,
     activeRule: '/sub-operation-admin',
     title: '运营管理后台',
     icon: 'images/platform/icon-admin.png',

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

@@ -9,11 +9,11 @@
       </layout-link>
     </template>
     <template v-else-if="level === 2 && !isCollapse">
-      <el-dropdown trigger="hover" placement="right-start" :show-timeout="100" @visible-change="(val) => (isDropdownOpen = val)">
+      <el-dropdown trigger="hover" placement="right-start" style="width: 100%" :show-timeout="100" @visible-change="(val) => (isDropdownOpen = val)">
         <span class="el-dropdown-link el-menu-item" @mouseenter.prevent>
           <layout-icon :size="20" :icon="item.meta?.icon" />
           <span>{{ item.meta?.title }}</span>
-          <el-icon class="arrow-icon" v-if="item.children?.length">
+          <el-icon v-if="item.children?.length" :size="12" class="arrow-icon">
             <component :is="isDropdownOpen ? 'arrow-left' : 'arrow-right'" />
           </el-icon>
         </span>
@@ -114,11 +114,10 @@ const hasOneShowingChild = (children = [], parent) => {
   justify-content: space-between;
   width: 100%;
   box-sizing: border-box;
+  padding-right: 10px;
 }
 
 .arrow-icon {
   margin-left: auto;
-  font-size: 14px;
-  color: #999;
 }
 </style>

sub-government-affairs-service/src/views/trace/search/index.vue

@@ -34,6 +34,8 @@ import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 import { useApp } from '@/hooks';
 import { isEmpty, getAssetsFile } from '@/utils';
+import { GetTraceDetail } from '@/apis/trace/coding';
+import { ElMessageBox } from 'element-plus';
 
 const { VITE_APP_NAME } = import.meta.env;
 const router = useRouter();
@@ -45,7 +47,32 @@ const onSearch = () => {
     app.$message.error('请输入溯源码进行查询！');
     return;
   }
-  router.push({ path: `/${VITE_APP_NAME}/trace-info`, query: { code: code.value } });
+
+  GetTraceDetail({ id: code.value })
+    .then((res) => {
+      if (res.code === 200) {
+        if (!isEmpty(res.data.basicInfo)) {
+          router.push({
+            path: `/${import.meta.env.VITE_APP_NAME}/trace-info`,
+            query: { code: code.value },
+          });
+        } else {
+          ElMessageBox.alert('溯源码[' + code.value + ']不存在！', '提示', {
+            confirmButtonText: '确定',
+            type: 'error',
+            callback: () => {
+              // 用户点击确定后的回调（可选）
+            },
+          });
+        }
+      } else {
+        app.$message.error(res.msg || '请求失败');
+      }
+    })
+    .catch((error) => {
+      app.$message.error(error.message || '网络错误');
+    });
+  // router.push({ path: `/${VITE_APP_NAME}/trace-info`, query: { code: code.value } });
 };
 </script>
 <style lang="scss" scoped>

sub-operation-service/components.d.ts

@@ -9,6 +9,7 @@ declare module 'vue' {
   export interface GlobalComponents {
     CenterMap: typeof import('./src/components/centerMap.vue')['default']
     CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default']
+    copy: typeof import('./src/components/custom-scroll-title copy/index.vue')['default']
     CostomImg: typeof import('./src/components/costomImg.vue')['default']
     CustomBack: typeof import('./src/components/customBack.vue')['default']
     CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default']