Merge remote-tracking branch 'origin/master'

jiangping

2024-10-21 d4be41ccac01b155c7a067c73f2045f9ea0aa805

 admin/src/views/platform/platform.vue

@@ -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>