Merge remote-tracking branch 'origin/master'

2024-02-29 13:14:05 +08:00
parent 864990b446 f278b71ca0
commit 881ade414e
33 changed files with 502 additions and 360 deletions
--- a/acs2/nladmin-ui/src/views/acs/device/customPolicy/task/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/device/customPolicy/task/index.vue
@@ -135,7 +135,7 @@ export default {
  props: {
    parentForm: {
      type: Object,
-      required: true
+      require: true
    }
  },
  cruds() {
--- a/acs2/nladmin-ui/src/views/acs/instruction/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/instruction/index.vue
@@ -166,11 +166,10 @@
        </el-table-column>
        <el-table-column prop="start_point_code" :label="$t('Inst.table.start_point_code')" :min-width="flexWidth('start_point_code',crud.data,$t('Inst.table.start_point_code'))" />
        <el-table-column prop="next_point_code" :label="$t('Inst.table.next_point_code')" :min-width="flexWidth('next_point_code',crud.data,$t('Inst.table.next_point_code'))" />
-        <!--        <el-table-column prop="start_point_code2" label="取货点2" />-->
-        <!--        <el-table-column prop="next_point_code2" label="放货点2" />-->
+        <el-table-column prop="start_point_code2" :label="$t('Inst.table.start_point_code2')" :min-width="flexWidth('start_point_code2',crud.data,$t('Inst.table.start_point_code2'))" />
+        <el-table-column prop="next_point_code2" :label="$t('Inst.table.next_point_code2')" :min-width="flexWidth('next_point_code2',crud.data,$t('Inst.table.snext_point_code2'))" />
        <el-table-column prop="put_point_code" :label="$t('Inst.table.put_point_code')" :min-width="flexWidth('put_point_code',crud.data,$t('Inst.table.put_point_code'))" />
        <el-table-column prop="execute_device_code" :label="$t('Inst.table.execute_device_code')" :min-width="flexWidth('execute_device_code',crud.data,$t('Inst.table.execute_device_code'))" />
-
        <el-table-column prop="carno" :label="$t('Inst.table.carno')" :min-width="flexWidth('carno',crud.data,$t('Inst.table.carno'))" />
        <el-table-column prop="remark" :label="$t('Inst.table.remark')" :min-width="flexWidth('remark',crud.data,$t('Inst.table.remark'))" />
        <el-table-column prop="create_by" :label="$t('Inst.table.create_by')" :min-width="flexWidth('create_by',crud.data,$t('Inst.table.create_by'))" />
--- a/acs2/nladmin-ui/src/views/acs/monitor/device/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/monitor/device/index.vue
@@ -286,7 +286,7 @@ export default {
          this.$refs.child1.setForm(clickObj)
        } else if (clickObj.data.driver_type === 'standard_stacker') {
          this.dialogFormVisible4 = true
-        }else {
+        } else {
          this.dialogFormVisible = true
        }
      }
--- a/acs2/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/task/index.vue
@@ -494,8 +494,8 @@
        <el-table-column prop="start_point_code" :label="$t('task.select.Pickup_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.select.Pickup_point'))" />
        <!--        <el-table-column prop="put_point_code" label="倒料点" width="100" />-->
        <el-table-column prop="next_point_code" :label="$t('task.select.Delivery_point')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Delivery_point'))" />
-        <!--        <el-table-column prop="start_point_code2" label="取货点2" width="120px" />-->
-        <!--        <el-table-column prop="next_point_code2" label="放货点2" width="120px" />-->
+        <el-table-column prop="start_point_code2" :label="$t('task.select.Start_point2')" :min-width="flexWidth('start_point_code2',crud.data,$t('task.select.Start_point2'))" />
+        <el-table-column prop="next_point_code2" :label="$t('task.select.Destination2')" :min-width="flexWidth('next_point_code2',crud.data,$t('task.select.Destination2'))" />
        <!--        <el-table-column prop="compound_task" label="复合任务">-->
        <!--          <template slot-scope="scope">-->
        <!--            <span v-if="scope.row.compound_task==='0' ">否</span>-->
@@ -759,7 +759,11 @@ export default {
      this.dialogVisible = false
    },
    saveBtn() {
+      // 禁用按钮
+      this.isDisabled = true
      crudTask.add(this.form).then(res => {
+        // 请求完成后启用按钮
+        this.isDisabled = false
        this.crud.toQuery()
        this.formDia = false
        this.isDisabled = true
@@ -767,6 +771,10 @@ export default {
      this.extension = [{
        name: '',
        value: '' }]
+      // 设置定时器，等待一定时间后再次允许请求
+      setTimeout(() => {
+        this.isDisabled = false // 可根据具体需求进行调整
+      }, 1000) // 5000 毫秒，即 5 秒钟
    },
    openDialog() {
      this.dialogVisible = true
--- a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue
+++ b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue
@@ -1,5 +1,13 @@
 <template>
  <div style="overflow: hidden">
+    <el-select v-model="value" :placeholder="$t('auto.common.please')" @change="initStageData">
+      <el-option
+        v-for="item in stageParam"
+        :key="item.value"
+        :label="item.label"
+        :value="item.value"
+      />
+    </el-select>
    <el-row>
      <div id="container" className="container" style="min-height: 100%" />
    </el-row>
@@ -186,7 +194,7 @@
        </el-form-item>
        <el-form-item :label="$t('monitor.click.job_command')" prop="toCommand" label-width="120px">
          <el-radio-group v-model="form.toCommand">
-            <el-radio-button :label="7" >{{ $t('monitor.click.recall') }}</el-radio-button>
+            <el-radio-button :label="7">{{ $t('monitor.click.recall') }}</el-radio-button>
            <el-radio-button :label="8">{{ $t('monitor.click.scram') }}</el-radio-button>
            <el-radio-button :label="5">{{ $t('monitor.click.police_clearance') }}</el-radio-button>
          </el-radio-group>
@@ -200,7 +208,7 @@
        <el-form-item :label="$t('monitor.click.stop_task')" prop="stopReceiveTask" label-width="120px">
          <el-switch v-model="form.stopReceiveTask" />
        </el-form-item>
-        <el-form-item :label="$t('monitor.click.requireSucess')"  prop="applySucess" label-width="120px">
+        <el-form-item :label="$t('monitor.click.requireSucess')" prop="applySucess" label-width="120px">
          <el-radio-group v-model="form.requireSucess">
            <el-radio-button :label="0"> {{ $t('auto.common.false') }}</el-radio-button>
            <el-radio-button :label="1">{{ $t('auto.common.true') }}</el-radio-button>
@@ -232,7 +240,7 @@ export default {
  name: 'MonitorDevice',
  data() {
    return {
-      stageParam: 'age', // 舞台参数
+      // stageParam: 'stage_code', // 舞台参数
      dialogDeviceMsgVisible: false, // 显示设备信息的dialog
      device_code: null,
      tops: '20vh', // 初始top
@@ -247,6 +255,15 @@ export default {
      dialogFormVisible6: false,
      dialogFormVisible7: false,
      dialogFormVisible8: false,
+      stageParam: [{// 舞台参数
+        value: 'age',
+        label: 'age'
+      }, {
+        value: 'stage_code',
+        label: 'stage_code'
+      }],
+      value: '',
+      stage_code: '',
      form: {
        device_code: '',
        hasGoodStatus: null,
@@ -342,9 +359,10 @@ export default {
      lf.render(data)
      this.initStageData()
    },
-    initStageData() {
+    initStageData(var1) {
      // 获取舞台数据
-      crudStage.getNewStageDataByCode(this.stageParam).then(res => { // 通过舞台编码获取舞台数据并且赋值到lf对象
+      this.stage_code = var1
+      crudStage.getNewStageDataByCode(this.stage_code).then(res => { // 通过舞台编码获取舞台数据并且赋值到lf对象
        data = JSON.parse(res.stage_data)
        lf.render(data)
        this.initStatus() // 初始化状态
@@ -760,6 +778,7 @@ body {
 ::v-deep.el-radio-button{
  margin-right: 15px;
  border-radius:4px;
+}
  .el-radio-button__inner {
    width: 90px;
    height: 30px;
@@ -773,5 +792,5 @@ body {
    border-color: blue;
    box-shadow: -1px 0 0 0 blue;
  }
-}
+
 </style>