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

frontend/src/views/Developer/index.vue

@@ -209,14 +209,13 @@ async function changeNum(action_name, type, key, min, max) {
         editRowData.value[key] = max;
       }
       ElMessage.error(`${action_name}值应在${min}到${max}之间`);
-      return;
     }
   }
   socketStore.sendMessage({
     type,
     data: {
       action_name,
-      value:Number(editRowData.value[key])
+      value:Number(editRowData.value[key]) || 0
     }
   });
 

frontend/src/views/Photography/check.vue

@@ -88,9 +88,12 @@ function checkConfirm(init){
     menu.push({
       type:'setting'
     })
-    menu.push({
-      type:'developer'
-    })
+    if(useUserInfoStore.userInfo.brand_company_code === '1300'){
+
+      menu.push({
+        type:'developer'
+      })
+    }
   }
   if(!init) previewKey.value++;
 
@@ -102,6 +105,7 @@ function checkConfirm(init){
 
 
 
+
 let interval:any = null
 function showVideo(){
 

frontend/src/views/Photography/shot.vue

@@ -344,6 +344,10 @@ onMounted(async () => {
     console.log('_image_process')
     console.log(result)
     getPhotoRecords()
+    // 延迟两秒再获取一遍数据
+    setTimeout(()=>{
+      getPhotoRecords()
+    },3000)
   })
 
   // 监听拍照完成事件
@@ -355,7 +359,7 @@ onMounted(async () => {
       // 延迟两秒再获取一遍数据
       setTimeout(()=>{
         getPhotoRecords()
-      },2000)
+      },3000)
       takePictureLoading.value = false;
     }
 
@@ -385,6 +389,12 @@ onMounted(async () => {
       socketStore.sendMessage(result.data)
       takePictureLoading.value = true;
 
+      getPhotoRecords()
+      // 延迟两秒再获取一遍数据
+      setTimeout(()=>{
+        getPhotoRecords()
+      },3000)
+
     }
 
   })

frontend/src/views/Setting/index.vue

@@ -9,11 +9,11 @@
         <img src="@/assets/images/setting/icon1a.png" class="nav-icon" v-else/>
         <span>基础配置</span>
       </div>
-      <div class="nav-item" :class="{'active': activeIndex === 1}" @click="activeIndex = 1">
+<!--      <div class="nav-item" :class="{'active': activeIndex === 1}" @click="activeIndex = 1">
         <img src="@/assets/images/setting/icon2.png" class="nav-icon" v-if="activeIndex !== 1"/>
         <img src="@/assets/images/setting/icon2a.png" class="nav-icon" v-else/>
         <span>拍照设置</span>
-      </div>
+      </div>-->
       <div class="nav-item" :class="{'active': activeIndex === 2}" @click="activeIndex = 2">
         <img src="@/assets/images/setting/icon3.png" class="nav-icon" v-if="activeIndex !== 2"/>
         <img src="@/assets/images/setting/icon3a.png" class="nav-icon" v-else/>
@@ -142,14 +142,14 @@
                     </el-select>
                     </div>
                 </div>
-                <div class="form-item">
+<!--                <div class="form-item">
                     <label>运行模式：</label>
                     <div class="select-wrapper">
                     <el-select v-model="formData.other_configs.running_mode" placeholder="请选择">
                       <el-option v-for="item in runModeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
                     </el-select>
                     </div>
-                </div>
+                </div>-->
           </div>
       <!--其他设置-->
           <div class="selectBox" style="padding-top: 0px" v-if="activeIndex === 3">
@@ -444,8 +444,8 @@ const deviceSpeedList = ref([
   { label: '三档', value: '3' },
 ]);
 const runModeList = ref([
-  { label: '普通抠图', value: '普通抠图' },
-  { label: '精细化抠图', value: '精细化抠图' }
+  { label: '普通模式', value: '普通模式' },
+  { label: '待用户确认模式', value: '待用户确认模式' }
 ]);
 const receiverList = ref([
   { label: '蓝牙', value: '1' },