瀏覽代碼

feat(frontend): 优化用户信息显示与摄影详情页功能

- 修改用户昵称显示逻辑,优先显示账号名
- 摄影详情页重构货号参数获取方式为计算属性
- 摄影图片处理页增强埋点日志记录
- 摄影图片处理页新增窗口打开功能
- 优化货号选择逻辑并增加错误提示
- 移除冗余的用户信息展示代码
panqiuyao 1 周之前
父節點
當前提交
8894e056bf

+ 1 - 2
frontend/src/components/header-bar/blue-header.vue

@@ -8,8 +8,7 @@
       <div class="blue-header-bar__user">
         <span class="blue-header-bar__user-label">昵称:</span>
         <span class="blue-header-bar__user-name">
-          {{ useUserInfoStore.userInfo.nick_name
-            || useUserInfoStore.userInfo.account_name
+          {{  useUserInfoStore.userInfo.account_name
             || useUserInfoStore.userInfo.real_name
             || useUserInfoStore.userInfo.login_name
             || '未登录' }}

+ 0 - 3
frontend/src/components/header-bar/index.vue

@@ -81,9 +81,6 @@
       <div class="header-bar__button header-bar__button__user" v-if="showUser">
         <el-dropdown>
           <span class="el-dropdown-link">
-            {{useUserInfoStore.userInfo.account_name}}--
-            {{useUserInfoStore.userInfo.real_name}}--
-            {{useUserInfoStore.userInfo.login_name}}--
             {{ useUserInfoStore.userInfo.account_name || useUserInfoStore.userInfo.real_name || useUserInfoStore.userInfo.login_name }}
           </span>
           <template #dropdown>

+ 5 - 1
frontend/src/views/Photography/detail.vue

@@ -617,13 +617,17 @@ const scrollMessageListToBottom = () => {
 }
 
 let templates = ref([])
-let goods_art_nos = ref([])
+// let goods_art_nos = ref([])
 let partErrList = ref([])
 const excel_template_url = ref('')
 // 是否正在请求接口
 const requesting = ref(false)
 
 
+const goods_art_nos = computed(() => {
+  const goods_art_data = route.query.goods_art_nos
+  return  Array.isArray(goods_art_data) ? goods_art_data : [goods_art_data]
+})
 
 
 

+ 41 - 2
frontend/src/views/Photography/processImage.vue

@@ -128,7 +128,12 @@ import { onMounted, onBeforeUnmount, ref, computed } from 'vue'
 import HardwareCheck from '@/components/check/index.vue'
 import usePhotography from './mixin/usePhotography'
 import generate from '@/utils/menus/generate'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage,ElMessageBox } from 'element-plus'
+import { clickLog, setLogInfo } from '@/utils/log'
+import {useRoute, useRouter} from "vue-router";
+import client from "@/stores/modules/client";
+import icpList from '@/utils/ipc'
+import { getFilePath, getRouterUrl } from '@/utils/appfun'
 
 const {
   loading,
@@ -141,12 +146,46 @@ const {
   getFilePath,
   getPhotoRecords,
   delGoods,
-  openPhotographyDetail,
   onGenerateCLick,
   initEventListeners,
   cleanupEventListeners,
 } = usePhotography()
 
+
+const Router = useRouter()
+const route = useRoute();
+const clientStore = client();
+// 覆盖 openPhotographyDetail 方法,只传递选中的货号
+const openPhotographyDetail = () => {
+
+  if (selectedGoods.value.size === 0) {
+    ElMessage.error('请选择要生成的货号')
+    return;
+  }
+  // 埋点:开始生成
+  clickLog({ describe: { action: '开始生成', goods_count: selectedGoods.value.size, goods_art_nos: Array.from(selectedGoods.value) } }, route);
+  console.log(Array.from(selectedGoods.value));
+  console.log(selectedGoods.value);
+
+  const { href } = Router.resolve({
+    name: 'PhotographyDetail',
+    query: {
+      goods_art_nos: Array.from(selectedGoods.value),
+    }
+  })
+
+  clientStore.ipc.removeAllListeners(icpList.utils.openMain);
+  let params = {
+    title: '主图与详情生成',
+    width: 3840,
+    height: 2160,
+    frame: true,
+    id: "PhotographyDetail",
+    url: getRouterUrl(href)
+  }
+  clientStore.ipc.send(icpList.utils.openMain, params);
+}
+
 // 选中的货号列表
 const selectedGoods = ref<Set<string>>(new Set())