From f971c83141e500c2ae03e7554b0d83e3c040d0c9 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Tue, 16 Jul 2024 16:39:34 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96,?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/logback-spring.xml     |  2 +-
 acs2/nladmin-system/nlsso-server/pom.xml      |  2 +-
 .../src/views/system/monitor/device/index.vue | 39 ++++++++++---------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/acs/nladmin-system/src/main/resources/logback-spring.xml b/acs/nladmin-system/src/main/resources/logback-spring.xml
index 347dcd797..1c6138993 100644
--- a/acs/nladmin-system/src/main/resources/logback-spring.xml
+++ b/acs/nladmin-system/src/main/resources/logback-spring.xml
@@ -76,7 +76,7 @@ https://juejin.cn/post/6844903775631572999
     </appender>
 
     <!--异步到文件-->
-    <appender name="asyncFileAppender" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
+    <appender name="asyncFileAppender" class="ch.qos.logback.classic.AsyncAppender">
         <discardingThreshold>0</discardingThreshold>
         <queueSize>500</queueSize>
         <appender-ref ref="FILE"/>
diff --git a/acs2/nladmin-system/nlsso-server/pom.xml b/acs2/nladmin-system/nlsso-server/pom.xml
index 210d346cb..d351f489a 100644
--- a/acs2/nladmin-system/nlsso-server/pom.xml
+++ b/acs2/nladmin-system/nlsso-server/pom.xml
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.dromara.dynamictp</groupId>
             <artifactId>dynamic-tp-spring-boot-starter-adapter-webserver</artifactId>
-            <version>1.1.6.1</version>
+            <version>1.1.7</version>
         </dependency>
 
         <!-- Lucence核心包 -->
diff --git a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue
index 8e199e288..f2f0de071 100644
--- a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue
+++ b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue
@@ -9,7 +9,7 @@
       />
     </el-select>
     <el-row>
-      <div id="container" className="container" style="min-height: 100%"/>
+      <div id="container" className="container" style="min-height: 100%" />
     </el-row>
     <!--点击设备显示信息-->
     <el-dialog
@@ -41,10 +41,10 @@
     <el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible" width="35%">
       <el-form :model="form" size="small">
         <el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
         <el-form-item :label="$t('monitor.click.bar_code')" label-width="120px">
-          <el-input v-model="form.hand_barcode" :disabled="false"/>
+          <el-input v-model="form.hand_barcode" :disabled="false" />
         </el-form-item>
         <el-form-item :label="$t('monitor.click.request_flag')" prop="requireSucess" label-width="120px">
           <el-radio-group v-model="form.requireSucess">
@@ -62,7 +62,7 @@
     <el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible3" width="35%">
       <el-form :model="form" size="small">
         <el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="80px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
         <el-form-item :label="$t('monitor.click.device_status')" label-width="80px">
           <el-radio-group v-model="form.hasGoodStatus">
@@ -72,7 +72,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="$t('monitor.click.material_code')" prop="material_type" label-width="80px">
-          <el-input v-model="form.material_type"/>
+          <el-input v-model="form.material_type" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -85,7 +85,7 @@
     <el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible4" width="35%">
       <el-form :model="form" size="small">
         <el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
         <el-form-item :label="$t('monitor.click.disabled_manipulator')" prop="is_disable" label-width="120px">
           <el-radio-group v-model="form.is_disable">
@@ -109,7 +109,7 @@
     <el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible5" width="35%">
       <el-form :model="form" size="small">
         <el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
         <el-form-item :label="$t('monitor.click.request_flag')" prop="requireSucess" label-width="120px">
           <el-radio-group v-model="form.requireSucess">
@@ -127,10 +127,10 @@
     <el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible7" width="35%">
       <el-form :model="form" size="small">
         <el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
         <el-form-item :label="$t('monitor.click.bar_code')" label-width="120px">
-          <el-input v-model="form.hand_barcode" :disabled="false"/>
+          <el-input v-model="form.hand_barcode" :disabled="false" />
         </el-form-item>
         <el-form-item :label="$t('monitor.click.request_flag')" prop="requireSucess" label-width="120px">
           <el-radio-group v-model="form.requireSucess">
@@ -154,7 +154,7 @@
     <el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible6" width="35%">
       <el-form :model="form" size="small">
         <el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
         <el-form-item label="申请指令标记" prop="requireSucess" label-width="120px">
           <el-radio-group v-model="form.requireSucess">
@@ -179,11 +179,11 @@
     <el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible1" width="35%">
       <el-form :model="form" size="small">
         <el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="80px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
 
         <el-form-item :label="$t('monitor.click.bar_code')" prop="device_code" label-width="80px">
-          <el-input v-model="form.barcode" :disabled="false"/>
+          <el-input v-model="form.barcode" :disabled="false" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -196,7 +196,7 @@
     <el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible8" width="35%">
       <el-form :model="form" size="small">
         <el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
         <el-form-item :label="$t('monitor.click.job_command')" prop="toCommand" label-width="120px">
           <el-radio-group v-model="form.toCommand">
@@ -206,13 +206,13 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="$t('monitor.click.keep_out_of_storage')" prop="prohibitInWarehouse" label-width="120px">
-          <el-switch v-model="form.prohibitInWarehouse"/>
+          <el-switch v-model="form.prohibitInWarehouse" />
         </el-form-item>
         <el-form-item :label="$t('monitor.click.no_release')" prop="prohibitOutWarehouse" label-width="120px">
-          <el-switch v-model="form.prohibitOutWarehouse"/>
+          <el-switch v-model="form.prohibitOutWarehouse" />
         </el-form-item>
         <el-form-item :label="$t('monitor.click.stop_task')" prop="stopReceiveTask" label-width="120px">
-          <el-switch v-model="form.stopReceiveTask"/>
+          <el-switch v-model="form.stopReceiveTask" />
         </el-form-item>
         <el-form-item :label="$t('monitor.click.requireSucess')" prop="applySucess" label-width="120px">
           <el-radio-group v-model="form.requireSucess">
@@ -229,13 +229,13 @@
     <el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible10" width="35%">
       <el-form :model="form" size="small">
         <el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
         <el-form-item :label="$t('monitor.click.bar_code')" label-width="120px">
-          <el-input v-model="form.hand_barcode" :disabled="false"/>
+          <el-input v-model="form.hand_barcode" :disabled="false" />
         </el-form-item>
         <el-form-item :label="$t('monitor.click.material_code')" label-width="120px">
-          <el-input v-model="form.hand_material_barcode" :disabled="false"/>
+          <el-input v-model="form.hand_material_barcode" :disabled="false" />
         </el-form-item>
         <el-form-item :label="$t('monitor.click.request_flag')" prop="requireSucess" label-width="120px">
           <el-radio-group v-model="form.requireSucess">
@@ -1020,3 +1020,4 @@ body {
 }
 
 </style>
+