Browse Source

Merge remote-tracking branch 'origin/dev-frontend_0701' into dev-frontend_0702

panqiuyao 4 months ago
parent
commit
27741bc36a

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

@@ -1,9 +1,9 @@
 <template>
-  <div class="editrow_wrap" v-if="initStatus" v-loading="captureLoading">
+  <div class="editrow_wrap" v-if="initStatus">
     <div class="config-type">参数值编辑:
       <!-- <el-checkbox v-model="isDefault">开启运动调试</el-checkbox>-->
     </div>
-    <el-form class="editForm" :model="editRowData" label-width="100px" >
+    <el-form class="editForm" :model="editRowData"  v-loading="captureLoading" label-width="100px" >
       <el-form-item label="动作名称">
         <el-input v-model="editRowData.action_name" :disabled="editRowData.is_system" style="width: 170px;"/>
       </el-form-item>
@@ -19,9 +19,9 @@
         <div class="error-msg">最小0,最大350</div>
       </el-form-item>
       <el-form-item label="相机倾角">
-        <el-input v-model="editRowData.camera_angle" :min="-40" :max="40" :step=".1" @change="changeNum('camera_steering',-40, 40)" style="width: 170px;" type="number">
+        <el-input v-model="editRowData.camera_angle" :min="-5" :max="30" :step=".1" @change="changeNum('camera_steering',-40, 40)" style="width: 170px;" type="number">
         </el-input>
-        <div class="error-msg">最小-40,最大40</div>
+        <div class="error-msg">最小-5,最大30</div>
       </el-form-item>
       <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">
@@ -66,8 +66,8 @@
     </el-form>
     <div class="btn-row mar-top-20">
       <div class="normal-btn" @click="close" v-if="id">取消</div>
-      <div class="normal-btn"  v-if="!id && editRowData.is_system" @click="testShoesFlip">运行</div>
-      <div class="primary-btn" @click="saveRow">{{ id ? '保存并关闭' : '保存' }}</div>
+      <div class="normal-btn"  v-loading="captureLoading"  v-if="!id && editRowData.is_system" @click="testShoesFlip">运行</div>
+      <div class="primary-btn"  v-loading="captureLoading" @click="saveRow">{{ id ? '保存并关闭' : '保存' }}</div>
       </div>
   </div>
 

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

@@ -539,7 +539,10 @@ const reTakePicture = async (img)=>{
   async function this_re_take_picture(){
 
     await ElMessageBox.alert('已复位到该视图下,请把鞋子摆放完毕之后,点击按钮开始重拍', '提示',{
-      confirmButtonText:"开始重拍"
+      confirmButtonText:"开始重拍",
+      showClose:false,
+      closeOnClickModal:false,
+      closeOnPressEscape:false
     })