Merge remote-tracking branch 'origin/master'

acs2/nladmin-ui/src/views/acs/device/driver/rgv.vue

@@ -188,6 +188,23 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="RGV位置" prop="direction" label-width="100px">
+              <el-select
+                v-model="form.direction"
+                filterable
+                clearable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in directions"
+                  :key="item.key"
+                  :label="item.label"
+                  :value="item.key"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -358,6 +375,13 @@ export default {
         label: '2楼'
       }],
       address: '',
+      directions: [{
+        key: '1',
+        label: '左边'
+      }, {
+        key: '2',
+        label: '右边'
+      }],
       configLoading: false,
       dataOpcservers: [],
       dataOpcPlcs: [],