Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-09-18 6ef869b1adcf3a5bb8e4c3117dc507d173f13fd8

 admin/src/components/business/OperaPlatformWindow.vue

@@ -50,11 +50,11 @@
      <el-form-item label="月台作业效率(万只/小时)：" prop="workRate">
        <el-input type="number"  v-model="form.workRate" placeholder="请输入月台作业效率(万只/小时)" v-trim/>
      </el-form-item>
      <el-form-item label="作业超时报警时间(分钟)：" prop="workTimeoutAlermTime">
        <el-input type="number"  v-model="form.workTimeoutAlermTime" placeholder="请输入作业超时报警时间(分钟)" v-trim/>
      <el-form-item label="作业超时报警时间(分钟)：" prop="workTimeoutAlarmTime">
        <el-input type="number"  v-model="form.workTimeoutAlarmTime" placeholder="请输入作业超时报警时间(分钟)" v-trim/>
      </el-form-item>
      <el-form-item label="停留超时报警时间(分钟）：" prop="stayTmeoutAlermTime">
        <el-input type="number"  v-model="form.stayTmeoutAlermTime" placeholder="请输入请输入停留超时报警时间(分钟)" v-trim/>
      <el-form-item label="停留超时报警时间(分钟）：" prop="stayTmeoutAlarmTime">
        <el-input type="number"  v-model="form.stayTmeoutAlarmTime" placeholder="请输入停留超时报警时间(分钟)" v-trim/>
      </el-form-item>
    </el-form>
  </GlobalWindow>
@@ -86,8 +86,8 @@
        endTime: '',
        workingNum: 1,
        workRate: '',
        stayTmeoutAlermTime: '',
        workTimeoutAlermTime: '',
        stayTmeoutAlarmTime: '',
        workTimeoutAlarmTime: '',
      },
      // 验证规则
      rules: {
@@ -110,6 +110,9 @@
    open (title, target) {
      this.title = title
      this.visible = true
      this.loadGroupList()
      this.loadLedList()
      this.loadBroadcastList()
      // 新建
      if (target == null) {
        this.$nextTick(() => {
@@ -126,9 +129,6 @@
        }
        this.form.workingNum = this.form.workingNum || 1
      })
      this.loadGroupList()
      this.loadLedList()
      this.loadBroadcastList()
    },
    loadGroupList () {
      allList({})