Merge remote-tracking branch 'origin/master'

jiangping

2024-12-17 c52a775aeb3386dfab1ac78ac3430ff86934220a

 admin/src/views/business/deviceLed.vue

@@ -2,7 +2,7 @@
    <TableLayout :permissions="['business:device:query']">
        <!-- 搜索表单 -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <el-form-item label="名称" prop="name">
            <el-form-item title="名称" prop="name">
                <el-input v-model="searchForm.name" placeholder="请输入名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <section>
@@ -20,11 +20,10 @@
                :data="tableData.list"
                stripe
            >
                <el-table-column prop="name" label="设备名称"></el-table-column>
                <el-table-column prop="doorName" label="门禁点名称"></el-table-column>
                <el-table-column prop="regionPathName" label="区域名称"></el-table-column>
                <el-table-column prop="doorNo" label="门禁点编号"></el-table-column>
               <el-table-column label="序号"  width="55" fixed><template slot-scope="scope" >{{scope.$index+1}}</template></el-table-column>
               <el-table-column prop="name" label="设备名称"></el-table-column>
                <el-table-column prop="manufature" label="厂商"></el-table-column>
                <el-table-column prop="no" label="设备编号"></el-table-column>
                <el-table-column prop="online" label="在线状态">
                    <template slot-scope="{row}">
                        <span v-if="row.online == 0">离线</span>
@@ -33,19 +32,16 @@
                </el-table-column>
                <el-table-column prop="ip" label="设备ip"></el-table-column>
                <el-table-column prop="port" label="设备端口"></el-table-column>
                <el-table-column label="是否园区入口">
                    <template slot-scope="{row}">
                        <el-switch
                            @change="changeManufature($event, row)"
                            v-model="row.isEntrance"
                            active-color="#13ce66"
                            inactive-color="#ff4949"
                            :active-value="1"
                            :inactive-value="0">
                        </el-switch>
                    </template>
                </el-table-column>
                <el-table-column prop="no" label="设备号"></el-table-column>
              <el-table-column
                  v-if="containPermissions(['business:device:update' ])"
                  label="操作"
                  min-width="120"
                  fixed="right"
              >
                <template slot-scope="{row}">
                  <el-button type="text" @click="$refs.OperaDeviceLedWindow.open('设置屏显内容', row)" icon="el-icon-edit" v-permissions="['business:device:update']">设置屏显内容</el-button>
                </template>
              </el-table-column>
            </el-table>
            <pagination
                @size-change="handleSizeChange"
@@ -55,7 +51,7 @@
            </pagination>
        </template>
        <!-- 新建/修改 -->
<!--        <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>-->
        <OperaDeviceLedWindow ref="OperaDeviceLedWindow" @success="handlePageChange"/>
    </TableLayout>
</template>

@@ -63,12 +59,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 {
      // 搜索