Merge remote-tracking branch 'origin/master'

src/views/home/index.vue

@@ -74,11 +74,23 @@ const receiveOkHandle = async (data: Log.LogItem & { channelCode: 'CHANNEL_1' |
 
 const cardClick = async (item: System.ChannelState) => {
   const channel = systemStore.systemStatus.channelState.find(channel => channel.channelCode === item.channelCode)
+  channel!.selected = !channel?.selected
   await sync({
     channels: [
       {
         channelCode: item.channelCode,
-        selected: !channel?.selected,
+        selected: channel?.selected,
+      },
+    ],
+  })
+}
+
+const volumeChange = async (item: System.ChannelState) => {
+  await sync({
+    channels: [
+      {
+        channelCode: item.channelCode,
+        targetVolume: item.targetVolume,
       },
     ],
   })
@@ -99,7 +111,7 @@ const cardClick = async (item: System.ChannelState) => {
           img(:src="item.selected ?  solutionSelectIcon: solutionIcon" alt="")
           span 每次加液体积
         div.solution-box(@click.stop)
-          el-select(v-model="item.targetVolume" placeholder="请选择" no-data-text="无数据, 请添加对应配方" :disabled="!item.solutionName")
+          el-select(v-model="item.targetVolume" placeholder="请选择" no-data-text="无数据, 请添加对应配方" :disabled="!item.solutionName" @change="() => volumeChange(item)")
             el-option(v-for="vol in volumeMap[item.channelCode]" :key="vol.id" :label="vol.volume" :value="vol.volume")
           div.unit mL
       div.input-box(@click.stop)

src/views/setting/device/index.vue

@@ -1,9 +1,25 @@
 <script setup lang="ts">
+import { useSystemStore } from 'stores/systemStore'
+import { computed } from 'vue'
 
+const systemStore = useSystemStore()
+const version = computed(() => {
+  return __APP_VERSION__
+})
 </script>
 
 <template>
-  <div>123</div>
+  <div>
+    <p>
+      <span>软件版本: </span>
+      <span>{{ systemStore.systemStatus.version }}</span>
+      <span>{{ version }}</span>
+    </p>
+    <p>
+      <span>设备SN: </span>
+      <span>{{ systemStore.systemStatus.system }}</span>
+    </p>
+  </div>
 </template>
 
 <style scoped lang="scss">

src/views/setting/index.vue

@@ -18,10 +18,10 @@ const settingList = ref([
     label: '设备信息',
     value: '/device',
   },
-  {
-    label: '手柄绑定',
-    value: '/handle',
-  },
+  // {
+  //   label: '手柄绑定',
+  //   value: '/handle',
+  // },
 ])
 
 const routerClickHandle = (path: string) => {