add日志检索单选框.分拣机械手对接位入库

acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_press.vue

@@ -594,31 +594,31 @@ export default {
             this.data2[val].db = beforeStr + '.W224'
           }
           if (this.data2[val].code.indexOf('to_size_error') !== -1) {
-            this.data2[val].db = beforeStr + '.W228'
+            this.data2[val].db = beforeStr + '.REAL228'
           }
           if (this.data2[val].code.indexOf('to_single_weight') !== -1) {
-            this.data2[val].db = beforeStr + '.W232'
+            this.data2[val].db = beforeStr + '.REAL232'
           }
           if (this.data2[val].code.indexOf('to_drawing_address') !== -1) {
-            this.data2[val].db = beforeStr + '.W236'
+            this.data2[val].db = beforeStr + '.REAL236'
           }
           if (this.data2[val].code.indexOf('to_standard_weight') !== -1) {
-            this.data2[val].db = beforeStr + '.W240'
+            this.data2[val].db = beforeStr + '.REAL240'
           }
           if (this.data2[val].code.indexOf('to_detection_error') !== -1) {
-            this.data2[val].db = beforeStr + '.W244'
+            this.data2[val].db = beforeStr + '.REAL244'
           }
           if (this.data2[val].code.indexOf('to_standard_size_height1') !== -1) {
-            this.data2[val].db = beforeStr + '.W248'
+            this.data2[val].db = beforeStr + '.REAL248'
           }
           if (this.data2[val].code.indexOf('to_standard_size_height2') !== -1) {
-            this.data2[val].db = beforeStr + '.W252'
+            this.data2[val].db = beforeStr + '.REAL252'
           }
           if (this.data2[val].code.indexOf('to_standard_size_height3') !== -1) {
-            this.data2[val].db = beforeStr + '.W256'
+            this.data2[val].db = beforeStr + '.REAL256'
           }
           if (this.data2[val].code.indexOf('to_standard_size_height4') !== -1) {
-            this.data2[val].db = beforeStr + '.W260'
+            this.data2[val].db = beforeStr + '.REAL260'
           }
         }
       }

acs/nladmin-ui/src/views/monitor/lucene/search.vue

@@ -1,13 +1,44 @@
 <template>
   <div v-if="crud.props.searchToggle">
-    <el-input
+
+    <!-- <el-input
       v-model="query.device_code"
       clearable
       size="small"
       placeholder="请输入你要搜索的设备号"
       style="width: 200px;"
       class="filter-item"
-    />
+    /> -->
+        <!-- <el-select
+          v-model="query.device_code"
+          clearable
+          filterable
+          size="small"
+          placeholder="请输入你要搜索的设备号"
+          class="filter-item"
+          style="width: 190px"
+          @change="crud.toQuery"
+        >
+        <el-option v-for="item in device_codes" :key="item.id" :label="item.label" :value="item.value" />
+        </el-select> -->
+    <el-select
+      v-model="query.device_code"
+      filterable
+      ref="test"
+      clearable
+      reserveKeyword
+      @change="crud.toQuery"
+      placeholder="设备号"
+      style="width: 190px;"
+    >
+      <el-option
+        v-for="item in deviceList"
+        :key="item.device_code"
+        :label="item.device_code"
+        :value="item.device_code"
+      />
+    </el-select>
+
     <el-input
       v-model="query.method"
       clearable
@@ -69,6 +100,7 @@
 <script>
 import { header } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
+import deviceCrud from '@/api/acs/device/device'
 
 export default {
   components: { rrOperation },
@@ -104,10 +136,15 @@ export default {
         }]
       },
       value1: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)],
-      value2: ''
+      value2: '',
+      deviceList: [],
+      device_code: '',
     }
   },
   created() {
+    deviceCrud.selectDeviceList().then(data => {
+        this.deviceList = data
+      })
   }
 }
 </script>