Merge remote-tracking branch 'origin/master'

k94314517

2024-09-29 2d2ac91d76af6ef4d755555c7623ee4e016a3066

 admin/src/views/business/deviceLed.vue

@@ -41,7 +41,7 @@
            </pagination>
        </template>
        <!-- 新建/修改 -->
<!--        <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>-->
        <OperaDeviceLedWindow ref="OperaDeviceLedWindow" @success="handlePageChange"/>
    </TableLayout>
</template>

@@ -49,12 +49,12 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaDeviceWindow from '@/components/business/OperaDeviceWindow'
import OperaDeviceLedWindow from '@/components/business/OperaDeviceLedWindow'
import { syncDevices, updateEntranceById } from '@/api/business/device'
export default {
  name: 'Device',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaDeviceWindow },
  components: { TableLayout, Pagination, OperaDeviceLedWindow },
  data () {
    return {
      // 搜索