浏览代码

mod:开发者调试

panqiuyao 8 月之前
父节点
当前提交
d46a6ffb81
共有 2 个文件被更改,包括 141 次插入27 次删除
  1. 2 1
      electron/controller/socket.js
  2. 139 26
      frontend/src/views/Developer/index.vue

+ 2 - 1
electron/controller/socket.js

@@ -9,7 +9,8 @@ const { pyapp } = require('../config/app.config.json')
 
 const typeToMessage = {
   run_mcu_single_finish:"seeting",
-  get_deviation_data:"developer"
+  get_deviation_data:"developer",
+  set_deviation:"developer",
 }
 class SocketController extends Controller {
   constructor(ctx) {

+ 139 - 26
frontend/src/views/Developer/index.vue

@@ -10,13 +10,28 @@
   </el-row>
   <el-row>
     <el-col :span="6">电机偏移mm:</el-col>
-    <el-col :span="12"><el-input v-model="editRowData.camera_high_motor_deviation" type="number"/></el-col>
-    <el-col :span="6"><el-button>设定</el-button></el-col>
+    <el-col :span="12"><el-input
+        @change="changeNum('相机电机','move_deviation','camera_high_motor_deviation',0, 400)"
+        :min="0" :max="400"
+        :step="1"
+        v-model="editRowData.camera_high_motor_deviation" type="number"/>
+         <div class="error-msg">最小0,最大400</div>
+    </el-col>
+    <el-col :span="6"><el-button
+        @click="changeNum('相机电机','set_deviation','camera_high_motor_deviation',0, 400)"
+    >设定</el-button></el-col>
   </el-row>
   <el-row class="mar-top-10">
     <el-col :span="6">舵机偏移(度):</el-col>
-    <el-col :span="12"><el-input v-model="editRowData.camera_steering_deviation" type="number"/></el-col>
-    <el-col :span="6"><el-button>设定</el-button></el-col>
+
+    <el-col :span="12"><el-input
+        @change="changeNum('相机舵机','move_deviation','camera_steering_deviation',-40, 40)"
+        :min="-40" :max="40"
+        :step="0.1"
+        v-model="editRowData.camera_steering_deviation" type="number"/>
+      <div class="error-msg">最小-40,最大40</div>
+    </el-col>
+    <el-col :span="6"><el-button @click="changeNum('相机舵机','set_deviation','camera_steering_deviation',-40, 40)">设定</el-button></el-col>
   </el-row>
 
 
@@ -26,13 +41,26 @@
   </el-row>
   <el-row>
     <el-col :span="6">角度偏移 (度):</el-col>
-    <el-col :span="12"><el-input v-model="editRowData.turntable_steering_deviation" type="number"/></el-col>
-    <el-col :span="6"><el-button>设定</el-button></el-col>
+    <el-col :span="12"><el-input
+        @change="changeNum('转盘舵机','move_deviation','turntable_steering_deviation',-720, 720)"
+        :min="-720" :max="720"
+        :step="1"
+        v-model="editRowData.turntable_steering_deviation" type="number"/>
+      <div class="error-msg">最小-720,最大720</div>
+    </el-col>
+    <el-col :span="6"><el-button  @click="changeNum('转盘舵机','set_deviation','turntable_steering_deviation',-720, 720)">设定</el-button></el-col>
   </el-row>
   <el-row class="mar-top-10">
     <el-col :span="6">前后偏移:</el-col>
-    <el-col :span="12"><el-input v-model="editRowData.turntable_front_end_deviation" type="number"/></el-col>
-    <el-col :span="6"><el-button>设定</el-button></el-col>
+
+    <el-col :span="12"><el-input
+        @change="changeNum('转盘前后电机','move_deviation','turntable_front_end_deviation',0, 950)"
+        :min="0" :max="950"
+        :step="1"
+        v-model="editRowData.turntable_front_end_deviation" type="number"/>
+      <div class="error-msg">最小0,最大950</div>
+    </el-col>
+    <el-col :span="6"><el-button @click="changeNum('转盘前后电机','set_deviation','turntable_front_end_deviation',0, 950)">设定</el-button></el-col>
   </el-row>
 
 
@@ -42,23 +70,48 @@
   </el-row>
   <el-row>
     <el-col :span="6">中位:</el-col>
-    <el-col :span="12"><el-input v-model="editRowData.overturn_steering_middle" type="number"/></el-col>
-    <el-col :span="6"><el-button>设定</el-button></el-col>
+
+    <el-col :span="12"><el-input
+        @change="changeNum('翻板舵机中位','move_deviation','overturn_steering_middle',0, 180)"
+        :min="0" :max="180"
+        :step="0.5"
+        v-model="editRowData.overturn_steering_middle" type="number"/>
+      <div class="error-msg">最小0,最大180</div>
+    </el-col>
+    <el-col :span="6"><el-button @click="changeNum('翻板舵机中位','set_deviation','overturn_steering_middle',0, 180)">设定</el-button></el-col>
   </el-row>
   <el-row class="mar-top-10">
     <el-col :span="6">高位:</el-col>
-    <el-col :span="12"><el-input v-model="editRowData.overturn_steering_high" type="number"/></el-col>
-    <el-col :span="6"><el-button>设定</el-button></el-col>
+    <el-col :span="12"><el-input
+        @change="changeNum('翻板舵机高位','move_deviation','overturn_steering_high',0, 180)"
+        :min="0" :max="180"
+        :step="0.5"
+        v-model="editRowData.overturn_steering_high" type="number"/>
+      <div class="error-msg">最小0,最大180</div>
+    </el-col>
+    <el-col :span="6"><el-button  @click="changeNum('翻板舵机高位','set_deviation','overturn_steering_high',0, 180)">设定</el-button></el-col>
   </el-row>
   <el-row class="mar-top-10">
     <el-col :span="6">上升速度:</el-col>
-    <el-col :span="12"><el-input v-model="editRowData.overturn_steering_up_speed" type="number"/></el-col>
-    <el-col :span="6"><el-button>设定</el-button></el-col>
+    <el-col :span="12"><el-input
+        @change="changeNum('翻板舵机上升速度','move_deviation','overturn_steering_up_speed',0, 10)"
+        :min="0" :max="10"
+        :step="1"
+        v-model="editRowData.overturn_steering_up_speed" type="number"/>
+      <div class="error-msg">最小0,最大10</div>
+    </el-col>
+    <el-col :span="6"><el-button @click="changeNum('翻板舵机上升速度','set_deviation','overturn_steering_up_speed',0, 10)">设定</el-button></el-col>
   </el-row>
   <el-row class="mar-top-10">
     <el-col :span="6">下降速度:</el-col>
-    <el-col :span="12"><el-input v-model="editRowData.overturn_steering_down_speed" type="number"/></el-col>
-    <el-col :span="6"><el-button>设定</el-button></el-col>
+    <el-col :span="12"><el-input
+        @change="changeNum('翻板舵机下降速度','move_deviation','overturn_steering_down_speed',0, 10)"
+        :min="0" :max="10"
+        :step="1"
+        v-model="editRowData.overturn_steering_down_speed" type="number"/>
+      <div class="error-msg">最小0,最大10</div>
+    </el-col>
+    <el-col :span="6"><el-button  @click="changeNum('翻板舵机下降速度','set_deviation','overturn_steering_down_speed',0, 10)">设定</el-button></el-col>
   </el-row>
 
 
@@ -84,7 +137,7 @@ const clientStore = client();
 const socketStore = socket()
 
 
-const editRowData = reactive({
+const editRowData = ref({
   "camera_high_motor_deviation": '',
   "camera_steering_deviation": '',
   "turntable_steering_deviation": '',
@@ -113,15 +166,15 @@ async function  get_deviation(){
       console.log('_get_deviation_data')
       console.log(result)
       if(result.code === 0){
-        editRowData.camera_high_motor_deviation = result.data.camera_high_motor_deviation
-        editRowData.camera_steering_deviation = result.data.camera_steering_deviation
-        editRowData.turntable_steering_deviation = result.data.turntable_steering_deviation
-        editRowData.turntable_front_end_deviation = result.data.turntable_front_end_deviation
-
-        editRowData.overturn_steering_middle = result.data.overturn_steering_middle
-        editRowData.overturn_steering_high = result.data.overturn_steering_high
-        editRowData.overturn_steering_up_speed = result.data.overturn_steering_up_speed
-        editRowData.overturn_steering_down_speed = result.data.overturn_steering_down_speed
+        editRowData.value.camera_high_motor_deviation = result.data.camera_high_motor_deviation
+        editRowData.value.camera_steering_deviation = result.data.camera_steering_deviation
+        editRowData.value.turntable_steering_deviation = result.data.turntable_steering_deviation
+        editRowData.value.turntable_front_end_deviation = result.data.turntable_front_end_deviation
+
+        editRowData.value.overturn_steering_middle = result.data.overturn_steering_middle
+        editRowData.value.overturn_steering_high = result.data.overturn_steering_high
+        editRowData.value.overturn_steering_up_speed = result.data.overturn_steering_up_speed
+        editRowData.value.overturn_steering_down_speed = result.data.overturn_steering_down_speed
       }else if(result.msg){
         ElMessage.error(result.msg)
       }
@@ -143,7 +196,67 @@ async function  connect_mcu__init(){
   }
 }
 
+
+
+
+//设置 移动 调整
+async function changeNum(action_name, type, key, min, max) {
+  if(key && (min || max)){
+    if(editRowData.value[key] < min || editRowData.value[key] > max){
+      if(editRowData.value[key] < min){
+        editRowData.value[key] = min;
+      }else{
+        editRowData.value[key] = max;
+      }
+      ElMessage.error(`${action_name}值应在${min}到${max}之间`);
+      return;
+    }
+  }
+  socketStore.sendMessage({
+    type,
+    data: {
+      action_name,
+      value:Number(editRowData.value[key])
+    }
+  });
+
+  clientStore.ipc.removeAllListeners(icpList.socket.message+'_set_deviation');
+  clientStore.ipc.on(icpList.socket.message+'_set_deviation', (event, result) => {
+    console.log('set_deviation')
+    console.log(result)
+    if(result.code === 0){
+      ElMessage.success(result.msg)
+    }else if(result.msg){
+      ElMessage.error(result.msg)
+    }
+    clientStore.ipc.removeAllListeners(icpList.socket.message+'_get_deviation_data');
+  });
+
+}
+
+
+
 </script>
 
 <style scoped lang="scss">
+.el-col {
+    position: relative;
+  ::v-deep {
+    .error-msg{
+      display: none;
+      position: absolute;
+      top: 41px;
+      top: 28px;
+      left: 8px;
+      z-index: 22;
+      color: #dc2626;
+      font-size: 12px;
+    }
+    &:hover{
+      .error-msg{
+        display: block;
+      }
+    }
+  }
+}
 </style>