Browse Source

refactor(frontend): 适配衣服拍摄功能

- 修改了多个组件中的文本和提示信息,以适应衣服拍摄而不是鞋子拍摄
- 调整了遥控器界面布局,移除了不必要的按钮
- 更新了拍摄流程的描述,以适应新的拍摄对象
panqiuyao 3 tháng trước cách đây
mục cha
commit
c1661672af

+ 1 - 1
frontend/src/components/check/index.vue

@@ -43,7 +43,7 @@
             <div class="step-title">自我检查</div>
             <div class="check-result">
               <p>补光灯电源和连接器是否正常连上。</p>
-              <p>请检查红外线器是否正常显示。</p>
+              <!-- <p>请检查红外线器是否正常显示。</p> -->
             </div>
           </div>
         </el-timeline-item>

+ 2 - 2
frontend/src/views/Photography/check.vue

@@ -14,10 +14,10 @@
           <div class="left-panel flex-col justify-between">
             <div class="tips-container flex-row" v-if="show">
                 <spanc  v-if="isSetting" class="tips-tex">
-                  请在圆盘上摆上鞋子(注意左右脚),要求鞋外侧朝向拍照机,鞋子中轴线和红外线对齐,如果光亮不够,可以打开环境光源,关闭闪光灯。
+                  请将衣服穿在假人身上,要求衣服外侧朝向拍照机,如果光亮不够,可以打开环境光源,关闭闪光灯。
                 </spanc>
                 <span v-else class="tips-tex">
-                  请在圆盘上摆上鞋子(注意左右脚),要求鞋外侧朝向拍照机,鞋子中轴线和红外线对齐,如果光亮不够,可以打开环境光源,关闭闪光灯。
+                  请将衣服穿在假人身上,要求衣服外侧朝向拍照机,如果光亮不够,可以打开环境光源,关闭闪光灯。
                 </span>
             </div>
             <div class="camera-preview  flex col center ">

+ 6 - 6
frontend/src/views/Photography/components/editRow.vue

@@ -23,17 +23,17 @@
         </el-input>
         <div class="error-msg">最小-5,最大30</div>
       </el-form-item>
-      <el-form-item label="转盘前后位置">
+<!--      <el-form-item label="转盘前后位置">
         <el-input v-model="editRowData.turntable_position" @change="changeNum('turntable_position_motor',0, 800)" :min="0" :max="800" :step="1"  style="width: 170px;" type="number">
         </el-input>
         <div class="error-msg">最小0,最大800</div>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="转盘角度">
         <el-input v-model="editRowData.turntable_angle" @change="changeNum('turntable_steering',-720, 720)" :min="-720" :max="720" :step="1"  style="width: 170px;" type="number">
         </el-input>
         <div class="error-msg">最小-720,最大720</div>
       </el-form-item>
-      <el-form-item label="鞋子翻转">
+<!--      <el-form-item label="鞋子翻转">
         <div class="flex-row">
           <el-radio-group v-model="editRowData.shoe_upturn">
             <el-radio :label="true">翻转</el-radio>
@@ -41,13 +41,13 @@
           </el-radio-group>
           <a class="cursor-pointer" @click="changeNum('overturn_steering')" v-log="{ describe: { action: '点击测试翻转' } }">测试翻转</a>
         </div>
-      </el-form-item>
-      <el-form-item label="LED灯光开光" @change="changeNum('laser_position')">
+      </el-form-item>-->
+<!--      <el-form-item label="LED灯光开光" @change="changeNum('laser_position')">
         <el-radio-group v-model="editRowData.led_switch">
           <el-radio :label="false">关闭</el-radio>
           <el-radio :label="true">开启</el-radio>
         </el-radio-group>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="对焦次数">
         <el-input v-model="editRowData.number_focus" @change="changeNum('take_picture',0, 1)" :min="0" :max="1" :step="1"  style="width: 170px;" type="number">
         </el-input>

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

@@ -247,7 +247,7 @@
             <img src="@/assets/images/Photography/zhuangshi.png" style="width: 32px; height: 32px;" />
             详情资料准备 (2选1)
 
-            <el-button v-if="form.dataType == '1'" type="text" class="mar-left-10 fs-16"  @click="downloadExcel" v-log="{ describe: { action: '点击下载Excel模板' } }">下载商品基础资料模版</el-button>
+<!--            <el-button v-if="form.dataType == '1'" type="text" class="mar-left-10 fs-16"  @click="downloadExcel" v-log="{ describe: { action: '点击下载Excel模板' } }">下载商品基础资料模版</el-button>-->
           </div>
         </div>
 

+ 4 - 4
frontend/src/views/Photography/shot.vue

@@ -44,11 +44,11 @@
           </div>
           <div class="step-number flex-col"><span class="text_22">2</span></div>
           <div class="step-two flex-col justify-between">
-            <span class="step-title">第二步:启动拍摄(根据按遥控器左右键启动)</span>
+            <span class="step-title">第二步:启动拍摄</span>
             <div class="shooting-container flex-col">
               <div class="shooting-tips flex-row justify-between">
                 <img class="info-icon" referrerpolicy="no-referrer" src="@/assets/images/Photography/info-icon.png" />
-                <span class="tips-text">遥控左右按键可启动拍摄,中间按钮可在拍摄5张主图后解锁,用于拍摄自定义图</span>
+                <span class="tips-text">遥控拍摄按键可启动拍摄,单拍按钮可在拍摄5张主图后解锁,用于拍摄自定义图</span>
               </div>
               <div class="wifi mar-top-20">
                 <img  referrerpolicy="no-referrer"
@@ -617,7 +617,7 @@ const reTakePicture = async (img)=>{
   }
   async function this_re_take_picture(){
 
-    await ElMessageBox.alert('已复位到该视图下,请把鞋子摆放完毕之后,点击按钮开始重拍', '提示',{
+    await ElMessageBox.alert('已复位到该视图下,点击按钮开始重拍', '提示',{
       confirmButtonText:"开始重拍",
       showClose:false,
       closeOnClickModal:false,
@@ -881,7 +881,7 @@ const checkInfoStore = checkInfo()
 checkInfoStore.set_blue_tooth_scan_NO('')
 watchEffect(async ()=>{
   if(checkInfoStore.blue_tooth_scan_NO){
-    ElMessage.success('商品货号'+checkInfoStore.blue_tooth_scan_NO+'获取成功,请在遥控器上按下左或右脚按键,启动拍摄')
+    ElMessage.success('商品货号'+checkInfoStore.blue_tooth_scan_NO+'获取成功,请在遥控器上按下拍摄按键,启动拍摄')
     goods_art_no.value = checkInfoStore.blue_tooth_scan_NO
     checkInfoStore.set_blue_tooth_scan_NO('')
   }

+ 11 - 6
frontend/src/views/RemoteControl/index.vue

@@ -8,13 +8,18 @@
   <div class="remote-control_main-container">
     <div class="te-c"  style="color: #8C92A7">遥控器模拟器</div>
     <el-row align="middle" class="mar-top-50">
-      <el-col :span="3"></el-col>
-      <el-col :span="6"><div class="button up" @click="runLeft">左脚</div></el-col>
-      <el-col :span="6"><div class="button up" @click="run_take_picture">拍照</div></el-col>
-      <el-col :span="6"><div class="button up" @click="runRight">右脚</div></el-col>
-      <el-col :span="3"></el-col>
+      <el-col :span="9"></el-col>
+      <el-col :span="6"><div class="button up" @click="runLeft">拍摄</div></el-col>
+      <!--      <el-col :span="6"><div class="button up" @click="runRight">右脚</div></el-col>-->
+      <el-col :span="9"></el-col>
     </el-row>
     <el-row align="middle">
+      <el-col :span="9"></el-col>
+      <el-col :span="6"><div class="button up" @click="run_take_picture">单拍</div></el-col>
+      <!--      <el-col :span="6"><div class="button up" @click="runRight">右脚</div></el-col>-->
+      <el-col :span="9"></el-col>
+    </el-row>
+<!--    <el-row align="middle">
       <el-col :span="6"></el-col>
       <el-col :span="6">
         <div class="button up" @click="switchLED(1)" v-log="{ describe: { action: 'LED开启' } }">LED开</div>
@@ -26,7 +31,7 @@
       <el-col :span="4"></el-col>
     </el-row>
     <div class="te-c  fs-14"  style="color: #8C92A7">左脚控制左脚鞋启动拍摄</div>
-    <div class="te-c  fs-14"  style="color: #8C92A7">右脚控制右脚鞋启动拍摄</div>
+    <div class="te-c  fs-14"  style="color: #8C92A7">右脚控制右脚鞋启动拍摄</div>-->
   </div>
 
 </template>

+ 2 - 2
frontend/src/views/Setting/components/action_config.vue

@@ -1,10 +1,10 @@
 <template>
 
-  <el-tabs v-model="topsTab" type="card" class="top_tabs" :disabled="isSortMode">
+<!--  <el-tabs v-model="topsTab" type="card" class="top_tabs" :disabled="isSortMode">
     <el-tab-pane label="执行左脚程序" name="left">
     </el-tab-pane>
     <el-tab-pane label="执行右脚程序" name="right"></el-tab-pane>
-  </el-tabs>
+  </el-tabs>-->
 
   <div class="two_tabs">
       <div class="item"

+ 3 - 3
frontend/src/views/Setting/index.vue

@@ -23,7 +23,7 @@
       <div class="nav-item" v-if="configInfoStore.appModel === 1" :class="{'active': activeIndex === 4}"  @click="toggleTab(4)" v-log="{ describe: { action: '点击切换设置Tab', tab: '左右脚程序设置' } }">
         <img src="@/assets/images/setting/icon4.png" class="nav-icon" v-if="activeIndex !== 4"/>
         <img src="@/assets/images/setting/icon4a.png" class="nav-icon" v-else/>
-        <span>左右脚程序设置</span>
+        <span>程序设置</span>
       </div>
     </nav>
 
@@ -86,14 +86,14 @@
       <template v-if="activeIndex === 2">
 
         <div class="selectBox" style="padding-top: 0px" >
-          <div class="form-item">
+<!--          <div class="form-item">
             <label>产品类型:</label>
             <div class="select-wrapper">
               <el-select v-model="formData.other_configs.product_type" placeholder="请选择">
                 <el-option v-for="item in productTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
               </el-select>
             </div>
-          </div>
+          </div>-->
           <div class="form-item">
             <label>默认抠图模式:</label>
             <div class="select-wrapper">