Procházet zdrojové kódy

Merge remote-tracking branch 'origin/dev-frontend'

panqiuyao před 8 měsíci
rodič
revize
63ed512680

+ 9 - 3
frontend/src/views/Photography/detail.vue

@@ -166,7 +166,7 @@
     <!-- 底部按钮 -->
     <div class="footer">
       <!-- <el-button class="button--primary1 footer-button" type="primary" @click="saveConfig">保存配置</el-button> -->
-      <el-button class="button--primary1 footer-button" type="primary" @click="startProcess">开始处理</el-button>
+      <!--  <el-button class="button--primary1 footer-button" type="primary" @click="startProcess">开始处理</el-button>  -->
       <el-button class="button--primary1 footer-button" type="primary" @click="generate">开始生成</el-button>
     </div>
   </div>
@@ -211,7 +211,9 @@ const imageOrder = ref('俯视、侧视、后跟、鞋底、内里、组合、
 const checkSimilar = ref(false) // 同款检验
 const specificPage = ref('')  // 可指定页面独修改
 
-
+// 路由和状态管理初始化
+const route = useRoute();
+const router = useRouter();
 
 // 完成目录
 const completeDirectory = ref('')
@@ -223,6 +225,9 @@ const message = ref('正在为您处理,请稍后')
 const showButton = ref(true)
 
 let templates = ref([])
+let goods_art_nos = ref([])
+
+
 // 状态变量
 const totalPage = ref(0);
 const itemsPerPage = 4; // 每页显示的模板数量
@@ -239,6 +244,7 @@ const form = reactive({
   excelFilePath: 'D:\\MyDocuments\\PythonCode\\MyPython\\red_dragonfly\\deal_pics\\auto_capture_V2\\auto_photo', // 商品基础资料EXCEL文件选择
 })
 onMounted(() => {
+  goods_art_nos.value =  route.query.goods_art_nos
   getCompanyTemplates()
 })
 
@@ -289,7 +295,7 @@ const generate = async function () {
     })
   })
   const params = {
-    goods_art_no: 'ARN1411512',
+    goods_art_no: goods_art_nos.value,
     logo_path: form.logo_path,
     temp_name: form.selectTemplate.template_id,
     excel_path: '',

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

@@ -5,10 +5,6 @@
       :menu="[
         {
           type:'setting'
-        },
-        {
-          name:'跳转主图详情',
-          click:openPhotographyDetail
         }
     ]"
   />
@@ -149,7 +145,7 @@
             />
             <span class="empty-text">暂无数据</span>
           </div>-->
-          <div v-if="goodsList.length" class="next-step button--primary1 flex-col" @click="next"><span
+          <div v-if="goodsList.length" class="next-step button--primary1 flex-col" @click="openPhotographyDetail"><span
               class="next-step-text">拍摄完毕,进入下一步处理</span></div>
         </div>