form

.env

@@ -1,8 +1,8 @@
 # VITE_BASE_URL=http://192.168.1.194:8899
 # VITE_WEBSOCKET_JAVA_URL=ws://192.168.1.194:8899/websocket/nuclear
 # # VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8899/websocket/nuclear
-# VITE_WEBSOCKET_CAMERA_URL=ws://192.168.1.194:8081/ws/cmd
-# VITE_HOST_URL=http://192.168.1.194:8081/
+VITE_WEBSOCKET_CAMERA_URL=ws://192.168.1.194:8081/ws/cmd
+VITE_HOST_URL=http://192.168.1.194:8081/
 
 
 # VITE_BASE_URL=http://127.0.0.1:8899
@@ -14,5 +14,5 @@
 VITE_BASE_URL=http://192.168.1.111:8899
 VITE_WEBSOCKET_JAVA_URL=ws://192.168.1.111:8899/websocket/nuclear
 # VITE_WEBSOCKET_CAMERA_URL=ws://127.0.0.1:8899/websocket/nuclear
-VITE_WEBSOCKET_CAMERA_URL=ws://192.168.1.111:8081/ws/cmd
-VITE_HOST_URL=http://192.168.1.111:8081/
+# VITE_WEBSOCKET_CAMERA_URL=ws://192.168.1.111:8081/ws/cmd
+# VITE_HOST_URL=http://192.168.1.111:8081/

src/components/Debug.vue

@@ -72,9 +72,29 @@
           </div>
         </div>
         <div class="identify_results">
+          <div class="result_wrap">
             <p class="title">结果</p>
             <div class="result">{{ recognitionResult }}</div>
           </div>
+          <div class="save_form">
+            <t-select
+              v-model="station_core_id"
+              class="demo-select-base"
+              clearable
+              filterable
+              placeholder="请选择堆芯"
+            >
+              <t-option
+                v-for="item in coreList"
+                :value="item.id"
+                :label="item.name"
+                :key="item.id"
+              >
+                {{ item.name }}
+              </t-option>
+            </t-select>
+          </div>
+        </div>
       </div>
     </div>
     <div class="right_camera_container">
@@ -122,10 +142,21 @@ import {
   setExposureTimeRaw,
   getCameraParametersInteger,
 } from '@/command'
+import { coreListApi } from '@/api/info'
 import { MessagePlugin } from 'tdesign-vue-next'
 
 const photoUrl = ref('')
 const recognitionResult = ref('')
+const station_core_id = ref('')
+
+const coreList = ref([])
+
+onMounted(async () => {
+  const res = await coreListApi()
+  if (res?.code == 200) {
+    coreList.value = res?.data?.list
+  }
+})
 
 setInterval(
   () => {
@@ -181,28 +212,19 @@ const handleGetCharacterRecognitionResult = () => {
   }
 }
 const handleGetMechanicalArmState = () => {
-  if (isCameraOpen.value) {
-    // 如果相机打开则发送拍照，如果相机关闭 则提醒用户
   websocketsend(getMechanicalArmState)
-  } else {
-    MessagePlugin('error', { content: '请先开启相机' })
-  }
 }
 
 const handleOpenFlashLight = () => {
-  if (isOpenCamera()) {
   if (!flashStatus.value) {
     websocketsend(openFlashLight)
   }
 }
-}
-const handleCloseFlashLight = () => {
-  if (isOpenCamera()) {
+const handleCloseFlashLight = flag => {
   if (flashStatus.value) {
     websocketsend(closeFlashLight)
   }
 }
-}
 
 const isOpenCamera = () => {
   if (!isCameraOpen.value) {
@@ -290,7 +312,7 @@ const websocketonmessage = e => {
         break
     }
   } else {
-    MessagePlugin('error', { content: 'ws发送指令执行错误' })
+    // MessagePlugin('error', { content: 'ws发送指令执行错误' })
   }
 }
 
@@ -300,7 +322,7 @@ const websocketonopen = () => {
   setTimeout(() => {
     websocketsend(getCameraParametersInteger)
     // 无法获取当前闪光灯是开是关。建议上层代码，初始化时候关闭闪光灯，然后在本地保存一个当前状态
-    handleCloseFlashLight()
+    handleCloseFlashLight(false)
     websocketsend(getFlashBrightnessAnalog)
   }, 1000)
 }
@@ -336,16 +358,12 @@ initWebSocket()
 
 // 业务处理
 const handleExposureTime = value => {
-  if (isOpenCamera()) {
   websocketsend(setExposureTimeRaw(value))
 }
-}
 
 const handleSimulationBrightness = value => {
-  if (isOpenCamera()) {
   websocketsend(setFlashBrightnessAnalog(value))
 }
-}
 
 onUnmounted(() => {
   websock.value.close()
@@ -457,6 +475,9 @@ onUnmounted(() => {
       }
       .identify_results {
         padding-top: 44px;
+        display: flex;
+        .result_wrap {
+          flex: 1;
           .title {
             font-size: 20px;
             font-weight: 500;
@@ -467,6 +488,10 @@ onUnmounted(() => {
             padding: 10px 0;
           }
         }
+        .save_form {
+          flex: 1;
+        }
+      }
     }
   }
   .right_camera_container {

src/components/User.vue

@@ -45,12 +45,6 @@
             >
             </t-input>
           </t-form-item>
-          <t-form-item label="昵称" name="nickname">
-            <t-input
-              v-model="formData.nickname"
-              placeholder="请输入用户名"
-            ></t-input>
-          </t-form-item>
           <t-form-item label="角色权限" name="role">
             <t-radio-group v-model="formData.role">
               <t-radio value="ROLE_ADMIN">管理员</t-radio>
@@ -88,7 +82,6 @@ const INITIAL_DATA = {
   username: '',
   role: '',
   password: '',
-  nickname: '',
 }
 
 export default {
@@ -104,27 +97,6 @@ export default {
             trigger: 'blur',
           },
           { whitespace: true, message: '用户名不能为空' },
-          {
-            min: 8,
-            message: '至少需要8个字符，一个中文等于两个字符',
-            type: 'warning',
-            trigger: 'blur',
-          },
-        ],
-        nickname: [
-          {
-            required: true,
-            message: '昵称不能为空',
-            type: 'error',
-            trigger: 'blur',
-          },
-          { whitespace: true, message: '昵称不能为空' },
-          {
-            min: 2,
-            message: '至少需要2个字符，一个中文等于两个字符',
-            type: 'warning',
-            trigger: 'blur',
-          },
         ],
         password: [
           {
@@ -152,11 +124,6 @@ export default {
           width: 120,
         },
         {
-          colKey: 'nickname',
-          title: '昵称',
-          ellipsis: true,
-        },
-        {
           title: '角色',
           colKey: 'role',
           cell: (h, { row }) => {