Merge remote-tracking branch 'origin/master'

jiangping

2024-10-30 cf295b38650730cc2fbe3bee19c77fdea411095b

 admin/src/views/platform/platform.vue

@@ -13,10 +13,10 @@
            </el-option>
          </el-select>
        </el-form-item>
        <section>
          <el-button type="primary" @click="search">搜索</el-button>
          <el-button @click="reset">重置</el-button>
        </section>
        <!-- <section> -->
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
        <!-- </section> -->
      </el-form>
    </SearchFormCollapse>
    <!-- 表格和分页 -->
@@ -39,7 +39,7 @@
        <el-table-column prop="workTimeoutAlarmTime" label="作业超时报警时间(分钟）" min-width="180px">
          <template scope="{row}"> {{ row.workTimeoutAlarmTime ? (row.workTimeoutAlarmTime) : '-' }}</template>
        </el-table-column>
        <el-table-column prop="workRate" label="月台作业效率(万只/小时)" min-width="180px"></el-table-column>
        <el-table-column prop="workRate" label="月台作业效率(万支/小时)" min-width="180px"></el-table-column>
        <!-- <el-table-column prop="platformStatus" label="月台状态" min-width="100px">
          <template scope="{row}">
            <span v-if="row.platformStatus == 0">无车</span>
@@ -50,6 +50,7 @@
        </el-table-column> -->
        <el-table-column prop="broadcastNames" label="关联广播" min-width="100px"></el-table-column>
        <el-table-column prop="ledNames" label="关联LED" min-width="100px"></el-table-column>
        <el-table-column prop="ledContent" label="LED空闲文案" min-width="180px"></el-table-column>
        <el-table-column prop="hkDate" label="同步时间" min-width="150px"></el-table-column>
        <el-table-column label="月台状态" fixed="right" width="100px">
          <template slot-scope="{row}">
@@ -63,8 +64,8 @@
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaPlatformWindow.open('编辑月台信息表', row)" icon="el-icon-edit"
              v-permissions="['business:platform:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
              v-permissions="['business:platform:delete']">删除</el-button>
            <!-- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
              v-permissions="['business:platform:delete']">删除</el-button> -->
          </template>
        </el-table-column>
      </el-table>