Merge remote-tracking branch 'origin/master'

doum

14 小时以前 ace847c89da4a0a772aa513b4343d8fc54a0adc9

 admin/src/views/platform/set/index.vue

@@ -25,7 +25,13 @@
      </el-table-column>
      <el-table-column
        prop="workingNum"
        label="同时作业车辆数"
        label="同时叫号数量"
        min-width="100"
        show-overflow-tooltip
      />
      <el-table-column
        prop="callReadyNum"
        label="同时准备数量"
        min-width="100"
        show-overflow-tooltip
      />
@@ -116,10 +122,14 @@
            format="HH:mm"
          />
        </el-form-item>
        <el-form-item label="同时作业车辆数">
        <el-form-item label="同时叫号数量">
          <el-input v-model="param.workingNum" class="w300"></el-input>
          <span class="ml10">个</span>
        </el-form-item>
        <el-form-item label="同时准备数量">
          <el-input v-model="param.callReadyNum" class="w300"></el-input>
          <span class="ml10">个</span>
        </el-form-item>
        <el-form-item label="停留超时报警时间">
          <el-input
            v-model="param.alermTime"