Merge remote-tracking branch 'origin/master'

jiangping

2024-05-31 bf8d85d5f83c2036fb4239d764d33e99c1b62bd3

 admin/src/views/business/device.vue

@@ -8,6 +8,18 @@
            <el-form-item label="区域名称" prop="regionPathName">
                <el-input v-model="searchForm.regionPathName" placeholder="请输入区域名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="是否园区入口" prop="isEntrance">
                <el-select v-model="searchForm.isEntrance" placeholder="请选择">
                    <el-option label="是" value="1"></el-option>
                    <el-option label="否" value="0"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="在线状态" prop="online">
                <el-select v-model="searchForm.online" placeholder="请选择" clearable>
                    <el-option label="离线" value="0"></el-option>
                    <el-option label="在线" value="1"></el-option>
                </el-select>
            </el-form-item>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
@@ -23,22 +35,32 @@
                :data="tableData.list"
                stripe
            >
                <el-table-column prop="name" label="设备名称" min-width="100px"></el-table-column>
                <el-table-column prop="doorName" label="门禁点名称" min-width="100px"></el-table-column>
                <el-table-column prop="regionPathName" label="区域名称" min-width="100px"></el-table-column>
                <el-table-column prop="doorNo" label="门禁点编号" min-width="100px"></el-table-column>
                <el-table-column prop="manufature" label="厂商" min-width="100px"></el-table-column>
                <el-table-column prop="no" label="设备号" min-width="100px"></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.operaDeviceWindow.open('编辑设备信息表', row)" icon="el-icon-edit" v-permissions="['business:company:update']">编辑</el-button>-->
<!--                    </template>-->
<!--                </el-table-column>-->
                <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 prop="manufature" label="厂商"></el-table-column>
                <el-table-column prop="online" label="在线状态">
                    <template slot-scope="{row}">
                        <span v-if="row.online == 0">离线</span>
                        <span v-if="row.online == 1">在线</span>
                    </template>
                </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>
            <pagination
                @size-change="handleSizeChange"
@@ -48,7 +70,7 @@
            </pagination>
        </template>
        <!-- 新建/修改 -->
        <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>
<!--        <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>-->
    </TableLayout>
</template>

@@ -57,7 +79,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaDeviceWindow from '@/components/business/OperaDeviceWindow'
import { syncDevices } from '@/api/business/device'
import { syncDevices, updateEntranceById } from '@/api/business/device'
import { memberSync } from '@/api/business/member'
export default {
  name: 'Device',
@@ -68,7 +90,9 @@
      // 搜索
      searchForm: {
        doorName: '',
        regionPathName: ''
        regionPathName: '',
        isEntrance: '',
        online: ''
      },
      options: []
    }
@@ -83,6 +107,12 @@
    this.search()
  },
  methods: {
    changeManufature(e, row) {
      updateEntranceById({
        id: row.id,
        isEntrance: e
      })
    },
    synchronousData () {
      this.$dialog.actionConfirm('操作确认提醒', '您确认同步全部信息吗？')
        .then(() => {