表格文字居中

环境状态按钮增加状态的判断
清洗管理功能修改 增加按钮状态判断
喷涂环境弹窗UI修改

src/components/home/Environment/index.vue

@@ -161,20 +161,20 @@ const onClose = async () => {
 </script>
 
 <template>
-  <FtDialog visible title="喷涂环境设置" width="70%">
-    <div style="padding: 10px;">
+  <FtDialog visible title="喷涂环境设置" width="80%">
+    <div style="padding: 10px;color: var(--el-color-primary);">
       <div style="display: flex; align-items: center; margin: 10px 0;font-size: 15px;justify-content: center;">
-        <div style="display: flex; align-items: center; width: 20%; margin-right: 30px">
-          <span>当前湿度</span>
+        <div style="display: flex; align-items: center; width: 25%; margin-right: 30px">
+          <span class="label-text">当前湿度</span>
           <span class="num-text">{{ systemStore.systemSensor.humidity || '--' }}</span>
-          <span>%RH</span>
+          <span class="label-text">%RH</span>
         </div>
         <div style="display: flex; align-items: center; width: 30%; margin-right: 30px">
-          <span>目标湿度</span>
+          <span class="label-text">目标湿度</span>
           <el-input v-model="humidity" type="number" style="width: 100px; margin: 0 10px" />
-          <span>%RH</span>
+          <span class="label-text">%RH</span>
         </div>
-        <ft-button ref="dehumidifierStartRef" type="primary" :click-handle="dehumidifierStart">
+        <ft-button ref="dehumidifierStartRef" type="primary" :disabled="systemStore.systemStatus.dehumidifierRunning" :click-handle="dehumidifierStart">
           开始除湿
         </ft-button>
         <ft-button :click-handle="dehumidifierStop" :disabled="!systemStore.systemStatus.dehumidifierRunning">
@@ -182,17 +182,17 @@ const onClose = async () => {
         </ft-button>
       </div>
       <div style="display: flex; align-items: center; margin-top: 10px;font-size: 15px;justify-content: center;">
-        <div style="display: flex; align-items: center; width:20%; margin-right: 30px">
-          <span>载玻台温度</span>
+        <div style="display: flex; align-items: center; width:25%; margin-right: 30px">
+          <span class="label-text">当前载玻台温度</span>
           <span class="num-text">{{ systemStore.systemSensor.slideTemperature || '--' }}</span>
-          <span>℃</span>
+          <span class="label-text">℃</span>
         </div>
         <div style="display: flex; align-items: center; width: 30%; margin-right: 30px">
-          <span>目标温度</span>
+          <span class="label-text">目标温度</span>
           <el-input v-model="slideTemperature" type="number" style="width: 100px; margin: 0 10px" />
-          <span>℃</span>
+          <span class="label-text">℃</span>
         </div>
-        <ft-button ref="slideStartRef" type="primary" :click-handle="slideStart">
+        <ft-button ref="slideStartRef" type="primary" :disabled="systemStore.systemStatus.slidePlatHeating" :click-handle="slideStart">
           开始加热
         </ft-button>
         <ft-button :click-handle="slideStop" :disabled="!systemStore.systemStatus.slidePlatHeating">
@@ -200,17 +200,17 @@ const onClose = async () => {
         </ft-button>
       </div>
       <div style="display: flex; align-items: center; margin-top: 10px;font-size: 15px;justify-content: center;">
-        <div style="display: flex; align-items: center; width: 20%; margin-right: 30px">
-          <span>喷头温度</span>
+        <div style="display: flex; align-items: center; width: 25%; margin-right: 30px">
+          <span class="label-text">当前喷头温度</span>
           <span class="num-text">{{ systemStore.systemSensor.nozzleTemperature || '--' }}</span>
-          <span>℃</span>
+          <span class="label-text">℃</span>
         </div>
         <div style="display: flex; align-items: center; width: 30%; margin-right: 30px">
-          <span>目标温度</span>
+          <span class="label-text">目标温度</span>
           <el-input v-model="nozzleTemperature" type="number" style="width: 100px; margin: 0 10px" />
-          <span>℃</span>
+          <span class="label-text">℃</span>
         </div>
-        <ft-button ref="nozzleStartRef" type="primary" :click-handle="nozzleStart">
+        <ft-button ref="nozzleStartRef" type="primary" :disabled="systemStore.systemStatus.nozzleHeating" :click-handle="nozzleStart">
           开始加热
         </ft-button>
         <ft-button :click-handle="nozzleStop" :disabled="!systemStore.systemStatus.nozzleHeating">
@@ -232,4 +232,7 @@ const onClose = async () => {
   font-weight: 900;
   font-size: 70px;
 }
+.label-text {
+  font-size: 50px;
+}
 </style>

src/libs/utils.ts

@@ -36,6 +36,7 @@ export const cmdNameMap = {
   matrix_prefill: '基质预充',
   matrix_prefill_stop: '停止预充',
   nozzle_pipeline_wash: '清洗喷嘴管路',
+  nozzle_pipeline_wash_stop: '结束清洗',
   syringe_pipeline_wash: '清洗注射器管路',
   syringe_pipeline_wash_stop: '结束清洗',
   matrix_spray_start: '开始喷涂',

src/views/clean/index.vue

@@ -6,16 +6,15 @@ import { useSystemStore } from 'stores/useSystemStore'
 import { h, ref } from 'vue'
 
 const systemStore = useSystemStore() // 使用 systemStore
-const clearSpeed = ref()
-
+// 注射器管路清洗开始
 const syringePipelineWashRef = ref()
 const syringePipelineWash = () => {
-  if (!clearSpeed.value) {
-    FtMessage.error('请输入清洗速度')
+  if (!syringeSpeed.value) {
+    FtMessage.error('请输入移动速度')
     return
   }
-  if (clearSpeed.value > 100) {
-    FtMessage.error('清洗速度最大为100 uL/min')
+  if (syringeSpeed.value > 100) {
+    FtMessage.error('移动速度最大为100 uL/min')
     return
   }
   ElMessageBox({
@@ -34,7 +33,7 @@ const syringePipelineWash = () => {
       cmdCode: 'syringe_pipeline_wash',
       cmdId: '',
       params: {
-        speed: clearSpeed.value,
+        speed: syringeSpeed.value,
       },
     }
     try {
@@ -45,17 +44,9 @@ const syringePipelineWash = () => {
     }
   })
 }
-
+// 喷嘴管路清洗开始
 const nozzlePipelineWashRef = ref()
 const nozzlePipelineWash = () => {
-  if (!clearSpeed.value) {
-    FtMessage.error('请输入清洗速度')
-    return
-  }
-  if (clearSpeed.value > 100) {
-    FtMessage.error('清洗速度最大为100 uL/min')
-    return
-  }
   ElMessageBox({
     title: '提示',
     message: h('div', null, [
@@ -72,7 +63,6 @@ const nozzlePipelineWash = () => {
       cmdCode: 'nozzle_pipeline_wash',
       cmdId: '',
       params: {
-        speed: clearSpeed.value,
       },
     }
     try {
@@ -83,44 +73,7 @@ const nozzlePipelineWash = () => {
     }
   })
 }
-console.log(nozzlePipelineWash)
-const valvesWashRef = ref()
-const valvesWash = () => {
-  if (!clearSpeed.value) {
-    FtMessage.error('请输入清洗速度')
-    return
-  }
-  if (clearSpeed.value > 100) {
-    FtMessage.error('清洗速度最大为100 uL/min')
-    return
-  }
-  ElMessageBox({
-    title: '提示',
-    message: h('div', null, [
-      h('p', null, '请检查废液瓶是否已满 '),
-      h('p', null, '请检查设备内是否有异物'),
-    ]),
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    showCancelButton: true,
-    showClose: false,
-  }).then(async () => {
-    valvesWashRef.value.setLoading(true)
-    const params = {
-      cmdCode: 'valves_wash',
-      cmdId: '',
-      params: {
-        speed: clearSpeed.value,
-      },
-    }
-    try {
-      await sendControl(params)
-    }
-    finally {
-      valvesWashRef.value.setLoading(false)
-    }
-  })
-}
+// 注射器管路清洗结束
 const syringePipelineWashStop = async () => {
   const params = {
     cmdCode: 'syringe_pipeline_wash_stop',
@@ -129,43 +82,16 @@ const syringePipelineWashStop = async () => {
   }
   await sendControl(params)
 }
-
-const form = ref({
-  speed: undefined,
-  direction: 'forward',
-})
-
-const pumpStart = ref(false)
-
-const syringePumpInjectionVolumeSet = async () => {
-  if (!form.value.speed) {
-    FtMessage.error('请输入注射泵速度')
-    return
-  }
-  if (form.value.speed > 100) {
-    FtMessage.error('清洗速度最大为100 uL/min')
-    return
-  }
-  const params = {
-    cmdCode: 'syringe_pump_start',
-    cmdId: '',
-    params: {
-      direction: form.value.direction,
-      speed: form.value.speed,
-    },
-  }
-  await sendControl(params, 'debug')
-  pumpStart.value = true
-}
-
-const syringePumpStop = async () => {
+// 喷嘴管路清洗结束
+const nozzlePipelineWashStop = async () => {
   const params = {
-    cmdCode: 'syringe_pump_stop',
+    cmdCode: 'nozzle_pipeline_wash_stop',
     cmdId: '',
+    params: {},
   }
-  await sendControl(params, 'debug')
-  pumpStart.value = false
+  await sendControl(params)
 }
+const syringeSpeed = ref(0)
 </script>
 
 <template>
@@ -173,38 +99,26 @@ const syringePumpStop = async () => {
     <el-row>
       <el-col :span="12">
         <p class="title">
-          注射泵控制
+          清洗注射器管路
         </p>
         <el-form label-width="auto">
           <el-form-item label="移动速度">
-            <el-input v-model="form.speed" type="number" style="width: 100px;margin:0 10px" />
-            <span class="unit-text">ul/min</span>
-          </el-form-item>
-          <el-form-item label="移动方向">
-            <el-radio-group v-model="form.direction" style="margin: 10px">
-              <div style="display: flex">
-                <el-radio value="forward">
-                  前进
-                </el-radio>
-                <el-radio value="backward">
-                  后退
-                </el-radio>
-              </div>
-            </el-radio-group>
+            <el-input v-model="syringeSpeed" type="number" style="width: 100px;margin:0 10px" />
+            <span class="unit-text">uL/min</span>
           </el-form-item>
           <el-form-item>
             <ft-button
-              class="button-style" type="primary" style="margin-left: 10px" :disabled="systemStore.systemStatus.spraying
+              ref="syringePipelineWashRef" class="button-style" type="primary" style="margin-left: 10px" :disabled="systemStore.systemStatus.spraying
                 || systemStore.systemStatus.cleaningSyringePipeline
                 || systemStore.systemStatus.cleaningNozzlePipeline
-                || systemStore.systemStatus.prefilling || pumpStart" :click-handle="syringePumpInjectionVolumeSet"
+                || systemStore.systemStatus.prefilling" :click-handle="syringePipelineWash"
             >
-              开始移动
+              开始清洗
             </ft-button>
           </el-form-item>
           <el-form-item>
-            <ft-button :disabled="!pumpStart" :click-handle="syringePumpStop" class="button-style">
-              停止移动
+            <ft-button :disabled="!systemStore.systemStatus.cleaningSyringePipeline" :click-handle="syringePipelineWashStop" class="button-style">
+              停止清洗
             </ft-button>
           </el-form-item>
         </el-form>
@@ -212,48 +126,28 @@ const syringePumpStop = async () => {
 
       <el-col :span="12">
         <p class="title">
-          清洗控制
+          清洗喷嘴管路
         </p>
         <el-form>
-          <el-form-item label="清洗速度">
+          <!--          <el-form-item label="清洗速度">
             <el-input v-model="clearSpeed" type="number" style="width: 100px;margin:0 10px" />
             <span class="unit-text">uL/min</span>
-          </el-form-item>
-          <el-form-item>
-            <ft-button
-              ref="syringePipelineWashRef" class="button-style" type="primary" :disabled="systemStore.systemStatus.spraying
-                || systemStore.systemStatus.cleaningSyringePipeline
-                || systemStore.systemStatus.cleaningNozzlePipeline
-                || systemStore.systemStatus.prefilling" @click="syringePipelineWash"
-            >
-              清洗注射器管路
-            </ft-button>
-          </el-form-item>
-          <!--          <el-form-item> -->
-          <!--            <ft-button -->
-          <!--              ref="nozzlePipelineWashRef" class="button-style" type="primary" :disabled="systemStore.systemStatus.spraying -->
-          <!--                || systemStore.systemStatus.cleaningSyringePipeline -->
-          <!--                || systemStore.systemStatus.cleaningNozzlePipeline -->
-          <!--                || systemStore.systemStatus.prefilling" @click="nozzlePipelineWash" -->
-          <!--            > -->
-          <!--              清洗喷嘴管路 -->
-          <!--            </ft-button> -->
-          <!--          </el-form-item> -->
+          </el-form-item> -->
           <el-form-item>
             <ft-button
-              ref="valvesWashRef" class="button-style" type="primary" :disabled="systemStore.systemStatus.spraying
+              ref="nozzlePipelineWashRef" class="button-style" type="primary" :disabled="systemStore.systemStatus.spraying
                 || systemStore.systemStatus.cleaningSyringePipeline
                 || systemStore.systemStatus.cleaningNozzlePipeline
-                || systemStore.systemStatus.prefilling" @click="valvesWash"
+                || systemStore.systemStatus.prefilling" @click="nozzlePipelineWash"
             >
-              清洗三通阀
+              开始清洗
             </ft-button>
           </el-form-item>
           <el-form-item>
             <ft-button
               class="button-style"
-              :click-handle="syringePipelineWashStop"
-              :disabled="!systemStore.systemStatus.cleaningSyringePipeline && !systemStore.systemStatus.cleaningNozzlePipeline"
+              :click-handle="nozzlePipelineWashStop"
+              :disabled="!systemStore.systemStatus.cleaningNozzlePipeline"
             >
               结束清洗
             </ft-button>

src/views/log/index.vue

@@ -102,7 +102,7 @@ const viewParams = (row: any) => {
       </el-col>
     </el-row>
     <div class="table-box">
-      <el-table v-loading="loading" show-overflow-tooltip :data="tableData" header-row-class-name="table-header" height="100%" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ textAlign: 'center' }" show-overflow-tooltip :data="tableData" header-row-class-name="table-header" height="100%" @selection-change="handleSelectionChange">
         <el-table-column type="selection" />
         <el-table-column prop="createTime" label="创建时间" />
         <el-table-column prop="status" label="任务状态">
@@ -121,9 +121,9 @@ const viewParams = (row: any) => {
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="">
+        <el-table-column label="操作">
           <template #default="scope">
-            <div class="scope-box">
+            <div class="scope-box" style="display: flex;justify-content: center">
               <FtButton type="primary" @click="viewParams(scope.row)">
                 喷涂参数
               </FtButton>

src/views/matrix/index.vue

@@ -109,9 +109,10 @@ const delHandle = async () => {
       </el-col>
     </el-row>
     <div class="table-box">
-      <el-table v-loading="loading" :data="tableData" header-row-class-name="table-header" height="100%" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :cell-style="{ textAlign: 'center' }" :header-cell-style="{ 'text-align': 'center' }" :data="tableData" header-row-class-name="table-header" height="100%" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="name" label="基质名称" />
+        <el-table-column prop="createTime" label="创建时间" />
       </el-table>
     </div>
 

src/views/matrixCraft/index.vue

@@ -122,6 +122,8 @@ const ok = () => {
     <div class="table-box">
       <el-table
         v-loading="loading"
+        :cell-style="{ textAlign: 'center' }"
+        :header-cell-style="{ 'text-align': 'center' }"
         :data="tableData"
         header-row-class-name="table-header"
         height="100%"

src/views/point/index.vue

@@ -100,7 +100,7 @@ const resetHandle = async () => {
       </el-col>
     </el-row>
     <div class="table-box">
-      <el-table v-loading="loading" :data="tableData" header-row-class-name="table-header" height="100%" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :cell-style="{ textAlign: 'center' }" :header-cell-style="{ 'text-align': 'center' }" :data="tableData" header-row-class-name="table-header" height="100%" @selection-change="handleSelectionChange">
         <el-table-column v-if="systemStore.isDebug" type="selection" width="55" />
         <el-table-column v-if="!systemStore.isDebug" width="35" label="" />
         <el-table-column prop="pointName" label="坐标名称" />

src/views/spraySet/index.vue

@@ -412,7 +412,7 @@ const nozzleStop = async () => {
           <el-input v-model="humidity" type="number" style="width: 100px; margin: 0 10px" />
           <span>%RH</span>
         </div>
-        <ft-button ref="dehumidifierStartRef" type="primary" :click-handle="dehumidifierStart">
+        <ft-button ref="dehumidifierStartRef" type="primary" :disabled="systemStore.systemStatus.dehumidifierRunning" :click-handle="dehumidifierStart">
           开始除湿
         </ft-button>
         <ft-button :click-handle="dehumidifierStop" :disabled="!systemStore.systemStatus.dehumidifierRunning">
@@ -430,7 +430,7 @@ const nozzleStop = async () => {
           <el-input v-model="nozzleTemperature" type="number" style="width: 100px; margin: 0 10px" />
           <span>℃</span>
         </div>
-        <ft-button ref="nozzleStartRef" type="primary" :click-handle="nozzleStart">
+        <ft-button ref="nozzleStartRef" type="primary" :disabled="systemStore.systemStatus.nozzleHeating" :click-handle="nozzleStart">
           开始加热
         </ft-button>
         <ft-button :click-handle="nozzleStop" :disabled="!systemStore.systemStatus.nozzleHeating">
@@ -448,7 +448,7 @@ const nozzleStop = async () => {
           <el-input v-model="slideTemperature" type="number" style="width: 100px; margin: 0 10px" />
           <span>℃</span>
         </div>
-        <ft-button ref="slideStartRef" type="primary" :click-handle="slideStart">
+        <ft-button ref="slideStartRef" type="primary" :disabled="systemStore.systemStatus.slidePlatHeating" :click-handle="slideStart">
           开始加热
         </ft-button>
         <ft-button :click-handle="slideStop" :disabled="!systemStore.systemStatus.slidePlatHeating">