add:监控页面堆垛机设置及路由设备类型

2024-01-05 18:15:28 +08:00
parent 3579c35983
commit 15eb0cb560
10 changed files with 191 additions and 68 deletions
--- a/acs/nladmin-ui/src/i18n/langs/route/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/route/en.js
@@ -10,7 +10,9 @@ export default {
    'table_title': {
      'route_plan_id': 'Routing Scheme',
      'device_code': 'Current Device Name',
+      'device_type': 'Current Device Type',
      'next_device_code': 'Post Device Name',
+      'next_device_type': 'Post Device Type',
      'type': 'Route Type',
      'transport_route': 'Transport Route',
      'agv_route': 'AGV Route',
--- a/acs/nladmin-ui/src/i18n/langs/route/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/route/in.js
@@ -10,7 +10,9 @@ export default {
    'table_title': {
      'route_plan_id': 'Skema Rute ',
      'device_code': 'Nama Divais Saat Ini',
+      'device_type': 'Nama Divais Saat Tipe',
      'next_device_code': 'Nama Perangkat Rear',
+      'next_device_type': 'Nama Perangkat Tipe',
      'type': 'Jenis Rute',
      'transport_rute': 'Rute Pengiriman',
      'agv_rute': 'Agv Rute',
--- a/acs/nladmin-ui/src/i18n/langs/route/zh.js
+++ b/acs/nladmin-ui/src/i18n/langs/route/zh.js
@@ -10,7 +10,9 @@ export default {
    'table_title': {
      'route_plan_id': '路由方案',
      'device_code': '当前设备名称',
+      'device_type': '设备类型',
      'next_device_code': '后置设备名称',
+      'next_device_type': '后置设备类型',
      'type': '路由类型',
      'transport_route': '输送路由',
      'agv_route': 'agv路由',
--- a/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue
+++ b/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue
@@ -152,7 +152,10 @@
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="text" @click="crud.cancelCU">{{ $t('task.select.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('task.select.Confirm') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{
+            $t('task.select.Confirm')
+          }}
+          </el-button>
        </div>
      </el-dialog>
      <!--表格渲染-->
@@ -167,7 +170,12 @@
      >
        <el-table-column type="selection" width="55" />
        <el-table-column v-if="false" prop="line_uuid" label="路线标识" />
-        <el-table-column prop="device_code" :label="$t('device.device_table_title.device_encoding')" :min-width="flexWidth('device_code',crud.data,$t('device.device_table_title.device_encoding'))" />
+        <el-table-column
+          prop="device_code"
+          :label="$t('device.device_table_title.device_encoding')"
+          :min-width="flexWidth('device_code',crud.data,$t('device.device_table_title.device_encoding'))"
+        />
+        <el-table-column prop="start_device_type" min-width="120" :label="$t('route.table_title.device_type')" />
        <el-table-column v-if="false" prop="device_code" :label="$t('device.device_table_title.device_name')" />
        <el-table-column prop="type" :label="$t('route.table_title.type')">
          <template slot-scope="scope">
@@ -177,10 +185,15 @@
        </el-table-column>
        <el-table-column prop="next_device_code" min-width="120" :label="$t('route.table_title.next_device_code')" />
        <el-table-column v-if="false" prop="next_device_code" min-width="120" label="后置设备名称" />
-        <el-table-column v-if="false" prop="next_device_code" min-width="120" label="后置设备类型" />
+        <el-table-column prop="next_device_type" min-width="120" :label="$t('route.table_title.next_device_type')" />
        <el-table-column prop="weights" :label="$t('route.table_title.weights')" />

-        <el-table-column :label="$t('auto.common.is_on')" align="center" prop="is_active" :min-width="flexWidth('is_active',crud.data,$t('auto.common.is_on'))">
+        <el-table-column
+          :label="$t('auto.common.is_on')"
+          align="center"
+          prop="is_active"
+          :min-width="flexWidth('is_active',crud.data,$t('auto.common.is_on'))"
+        >
          <template slot-scope="scope">
            <el-switch
              v-model="scope.row.is_active"
--- a/acs/nladmin-ui/src/views/system/monitor/device/index.vue
+++ b/acs/nladmin-ui/src/views/system/monitor/device/index.vue
@@ -177,6 +177,35 @@
        <el-button type="primary" @click="saveBarcode">确 定</el-button>
      </div>
    </el-dialog>
+
+    <!--   堆垛机弹出框 -->
+    <el-dialog title="设备设置" :visible.sync="dialogFormVisible8" width="35%">
+      <el-form :model="form" size="small">
+        <el-form-item label="设备编号" prop="device_code" label-width="120px">
+          <el-input v-model="form.device_code" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="作业命令" prop="toCommand" label-width="120px">
+          <el-radio-group v-model="form.toCommand">
+            <el-radio-button :label="7">召回</el-radio-button>
+            <el-radio-button :label="8">急停</el-radio-button>
+            <el-radio-button :label="5">清警</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="禁止入库" prop="prohibitInWarehouse" label-width="120px">
+          <el-switch v-model="form.prohibitInWarehouse" />
+        </el-form-item>
+        <el-form-item label="禁止出库" prop="prohibitOutWarehouse" label-width="120px">
+          <el-switch v-model="form.prohibitOutWarehouse" />
+        </el-form-item>
+        <el-form-item label="停止任务" prop="stopReceiveTask" label-width="120px">
+          <el-switch v-model="form.stopReceiveTask" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible8 = false">取 消</el-button>
+        <el-button type="primary" @click="dialogSave">确 定</el-button>
+      </div>
+    </el-dialog>
  </div>
 </template>

@@ -211,6 +240,7 @@ export default {
      dialogFormVisible5: false,
      dialogFormVisible6: false,
      dialogFormVisible7: false,
+      dialogFormVisible8: false,
      form: {
        device_code: '',
        hasGoodStatus: null,
@@ -221,7 +251,11 @@ export default {
        requireSucess: '',
        fullrequireSucess: '',
        is_disable: '',
-        applySucess: ''
+        applySucess: '',
+        toCommand: null,
+        prohibitInWarehouse: false,
+        prohibitOutWarehouse: false,
+        stopReceiveTask: false
      },
      allDeviceMsg: [],
      msgTop: '200px',
@@ -312,7 +346,7 @@ export default {
      this.timer = setInterval(() => { // 定时刷新设备的状态信息
        console.log('定时器启动')
        this.initStatus()
-      }, 2000)
+      }, 200000)
    },
    editDevice(id) {
      let item = ''
@@ -353,6 +387,8 @@ export default {
          this.dialogFormVisible7 = true
        } else if (clickObj.data.driver_type === 'standard_conveyor_control_with_scanner') {
          this.dialogFormVisible6 = true
+        } else if (clickObj.data.driver_type === 'double_station_stacker') {
+          this.dialogFormVisible8 = true
        } else {
          this.dialogFormVisible = true
        }
@@ -368,6 +404,10 @@ export default {
      this.form.applySucess = clickObj.data.applySucess
      this.form.barcode = clickObj.data.barcode
      this.form.hand_barcode = clickObj.data.hand_barcode
+      this.form.prohibitInWarehouse = clickObj.data.prohibitInWarehouse
+      this.form.prohibitOutWarehouse = clickObj.data.prohibitOutWarehouse
+      this.form.stopReceiveTask = clickObj.data.stopReceiveTask
+      this.form.toCommand = null
    },
    moveShow(nodeData) { // 点击之后显示出来的数据----只需要设备信息
      let item = ''
@@ -646,6 +686,7 @@ export default {
        this.dialogFormVisible5 = false
        this.dialogFormVisible6 = false
        this.dialogFormVisible7 = false
+        this.dialogFormVisible8 = false
        this.initStageData()
      }).catch(err => {
        this.dialogFormVisible = false
@@ -653,6 +694,7 @@ export default {
        this.dialogFormVisible4 = false
        this.dialogFormVisible5 = false
        this.dialogFormVisible7 = false
+        this.dialogFormVisible8 = false
        console.log(err.response.data.message)
      })
    },