diff --git a/src/api/device/videoDevice.js b/src/api/device/videoDevice.js
new file mode 100644
index 00000000..5fb0a509
--- /dev/null
+++ b/src/api/device/videoDevice.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request';
+
+// 查询视频设备列表
+export function queryDevList(query) {
+    return request({
+      url: '/smart-site/dev/queryDevList',
+      method: 'get',
+      params: query
+    })
+}
+
+// 视频设备-新增
+export function addDev(data) {
+    return request({
+      url: '/smart-site/dev/addDev',
+      method: 'post',
+      data
+    })
+}
+
+// 视频设备-修改
+export function editDev(data) {
+    return request({
+      url: '/smart-site/dev/editDev',
+      method: 'post',
+      data
+    })
+}
+
+// 视频设备-删除
+export function delDev(data) {
+    return request({
+      url: '/smart-site/dev/delDev',
+      method: 'post',
+      data
+    })
+}
+
+// 视频设备详情
+export function detailDev(query) {
+    return request({
+      url: '/smart-site/dev/detailDev',
+      method: 'get',
+      params: query
+    })
+}
\ No newline at end of file
diff --git a/src/views/device/videoDevice/index.vue b/src/views/device/videoDevice/index.vue
new file mode 100644
index 00000000..3566e4c6
--- /dev/null
+++ b/src/views/device/videoDevice/index.vue
@@ -0,0 +1,204 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+            label-width="68px">
+            <el-form-item label="关键字" prop="keyWord">
+                <el-input v-model="queryParams.keyWord" placeholder="请输入关键字" clearable
+                    @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备类型" prop="devTypeCode">
+                <el-select v-model="queryParams.devTypeCode" placeholder="设备类型" clearable>
+                    <el-option v-for="dict in dict.type.video_device" :key="dict.value" :label="dict.label"
+                        :value="dict.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                    v-hasPermi="['basic:dev:add']">新增</el-button>
+            </el-col>
+            <!-- <el-col :span="1.5">
+                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+                    v-hasPermi="['system:post:export']">导出</el-button>
+            </el-col> -->
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+        <el-table v-loading="loading" :data="videoDeviceList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="设备名称" align="center" prop="devName" />
+            <el-table-column label="MAC_ID" align="center" prop="macId" />
+            <el-table-column label="设备类型名称" align="center" prop="devTypeName" />
+            <el-table-column label="puid" align="center" prop="puid" />
+            <el-table-column label="国标编码" align="center" prop="gbCode" />
+            <el-table-column label="创建时间" align="center" prop="createTime" width="180"></el-table-column>
+            <el-table-column label="修改时间" align="center" prop="updateTime" width="180"></el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                        v-hasPermi="['basic:dev:edit']">修改</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                        v-hasPermi="['basic:dev:del']">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
+        <!-- 新增/编辑 -->
+        <Devicepop v-if="isflag" :isAdd="isAdd" :rowData="row" @handleQuery="handleQuery" :title="title" @closeDialog="closeDialog"
+            @showColose="showColose" :dataForm="row" :disabled="loading" :width="600" />
+    </div>
+</template>
+
+<script>
+import { queryDevList, delDev } from "@/api/device/videoDevice";
+import Devicepop from "./prop/devicepop.vue";
+export default {
+    name: "videoDevice",
+    dicts: ['video_device'],
+    components: {
+        Devicepop
+    },
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 岗位表格数据
+            videoDeviceList: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                keyWord: '',
+                devTypeCode: ''
+            },
+            // 表单参数
+            form: {},
+            isflag: false,
+            row: {},
+            isAdd: ''
+        };
+    },
+    created() {
+        this.getList();
+    },
+    methods: {
+        /** 视频设备列表 */
+        getList() {
+            this.loading = true;
+            queryDevList(this.queryParams).then(response => {
+                this.videoDeviceList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        closeDialog() {
+            this.isflag = false;
+        },
+        showColose() {
+            this.isflag = false;
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                postId: undefined,
+                postCode: undefined,
+                postName: undefined,
+                postSort: 0,
+                status: "0",
+                remark: undefined
+            };
+            this.resetForm("form");
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.postId)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.title = "新增";
+            this.isAdd = 'add';
+            this.isflag = true;
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.title = "修改";
+            this.isAdd = 'edit';
+            this.row = row;
+            this.isflag = true;
+        },
+        /** 提交按钮 */
+        /* submitForm: function () {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    if (this.form.postId != undefined) {
+                        updatePost(this.form).then(response => {
+                            this.$modal.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        addPost(this.form).then(response => {
+                            this.$modal.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        }, */
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const id = row.id || this.ids;
+            this.$modal.confirm('是否确认删除设备名称为"' + row.devName + '"的数据项？').then(function () {
+                return delDev({ id: id });
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => { });
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download('system/post/export', {
+                ...this.queryParams
+            }, `post_${new Date().getTime()}.xlsx`)
+        }
+    }
+};
+</script>
\ No newline at end of file
diff --git a/src/views/device/videoDevice/prop/devicepop.vue b/src/views/device/videoDevice/prop/devicepop.vue
new file mode 100644
index 00000000..dd5873fd
--- /dev/null
+++ b/src/views/device/videoDevice/prop/devicepop.vue
@@ -0,0 +1,199 @@
+<template>
+  <!-- 小型弹窗，用于完成，删除，保存等操作 -->
+  <el-dialog class="l-dialog" :class="lDialog" :title="title" :visible.sync="dialogVisible" :showClose="true"
+    :closeOnClickModal="false" @close="handleClose" :append-to-body="true">
+    <div>
+      <el-form :model="form" :rules="rules" ref="ruleForm" label-width="110px">
+        <el-form-item label="设备名称" prop="devName">
+          <el-input style="width:100%" v-model="form.devName" placeholder="请输入设备名称" maxlength="64"></el-input>
+        </el-form-item>
+        <el-form-item label="MAC_ID" prop="macId">
+          <el-input style="width:100%" v-model="form.macId" placeholder="请输入MAC_ID" maxlength="32"></el-input>
+        </el-form-item>
+        <el-form-item label="设备类型" prop="devTypeCode">
+          <el-select style="width:100%" ref="devTypeCode" v-model="form.devTypeCode" placeholder="请选择设备类型" clearable>
+            <el-option v-for="dict in dict.type.video_device" :key="dict.value" :label="dict.label"
+              :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="puid" prop="puid">
+          <el-input style="width:100%" v-model="form.puid" placeholder="请输入puid" maxlength="32"></el-input>
+        </el-form-item>
+        <el-form-item label="国标编码" prop="gbCode">
+          <el-input style="width:100%" v-model="form.gbCode" placeholder="请输入国标编码" maxlength="32"></el-input>
+        </el-form-item>
+        <el-form-item label="播放索引" prop="playIdx">
+          <el-input-number style="width:100%" v-model="form.playIdx" controls-position="right" :min="0"
+            :max="11"></el-input-number>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input type="textarea" style="width:100%" v-model="form.remark" placeholder="请输入备注" maxlength="255"></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button class="clear-btn" @click="handleClose" :disabled="disabled">取消</el-button>
+      <el-button type="primary" class="search-btn" :disabled="disabled" @click="submitForm('ruleForm')">确认</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { detailDev, addDev, editDev } from "@/api/device/videoDevice";
+export default {
+  name: "devicepop",
+  props: ["width", "dataForm", "title", "disabled", "isAdd", "rowData"],
+  dicts: ['video_device'],
+  data() {
+    return {
+      roles: [],
+      lDialog: this.width > 500 ? "w700" : "w500",
+      dialogVisible: true,
+      isDisabled: true,
+      form: {
+        devName: null,
+        macId: null,
+        devTypeCode: null,
+        puid: null,
+        gbCode: null,
+        playIdx: 0,
+        remark:null
+      },
+      rules: {
+        devName: [
+          { required: true, message: '设备名称不能为空', trigger: 'blur' }
+        ],
+        macId: [
+          { required: true, message: 'MAC_ID不能为空', trigger: 'blur' }
+        ],
+        devTypeCode: [
+          { required: true, message: '请选择设备类型', trigger: 'change' }
+        ],
+        puid: [
+          { required: true, message: 'puid不能为空', trigger: 'blur' }
+        ],
+        gbCode: [
+          { required: true, message: '国标编码不能为空', trigger: 'blur' }
+        ],
+        playIdx: [
+          { required: true, message: '播放索引不能为空', trigger: 'blur' }
+        ],
+      },
+    };
+  },
+  mounted() {
+    if (this.isAdd === 'add') { // 新增
+    } else if (this.isAdd === 'edit') { // 修改
+      this.queryDetailDev();
+    }
+  },
+  methods: {
+    /**详情*/
+    queryDetailDev() {
+      detailDev({ id: this.rowData.id }).then(res => {
+        this.form = res.data;
+      }).catch(error => {
+
+      })
+    },
+    /*关闭弹窗 */
+    handleClose() {
+      this.dialogVisible = false;
+      this.$emit("closeDialog");
+      setTimeout(() => {
+        this.dialogVisible = true;
+      });
+    },
+    /**确认弹窗 */
+    sureBtnClick() {
+      this.dialogVisible = false;
+      this.$emit("closeDialog");
+      setTimeout(() => {
+        this.dialogVisible = true;
+      });
+    },
+    /**重置表单*/
+    reset() {
+      this.form = {
+        devName: null,
+        macId: null,
+        devTypeCode: null,
+        puid: null,
+        gbCode: null,
+        playIdx: 0
+      };
+      this.resetForm("ruleForm");
+    },
+    handleReuslt(res) {
+      this.$modal.msgSuccess(res.msg);
+      this.reset();
+      this.$emit('handleQuery');
+      this.handleClose();
+    },
+    /**验证 */
+    submitForm(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          let loading = this.$loading({
+            lock: true,
+            text: "数据提交中，请稍候...",
+            background: 'rgba(0,0,0,0.2)',
+            target: this.$el.querySelector('.el-dialog') || document.body
+          })
+          let params = _.cloneDeep(this.form);
+          const selectedText = this.$refs.devTypeCode.selectedLabel;
+          params.devTypeName = selectedText;
+          if (this.isAdd === 'add') {
+            addDev(params).then(res => {
+              loading.close();
+              if (res.code === 200) {
+                this.handleReuslt(res);
+              } else {
+                this.$modal.msgError(res.msg);
+              }
+            }).catch(error => {
+              loading.close();
+            });
+          } else {
+            editDev(params).then(res => {
+              loading.close();
+              if (res.code === 200) {
+                this.handleReuslt(res);
+              } else {
+                this.$modal.msgError(res.msg);
+              }
+            }).catch(error => {
+              loading.close();
+            });
+          }
+        }
+      });
+    }
+  }
+};
+</script>
+<style lang="scss">
+.w700 .el-dialog {
+  width: 700px;
+}
+
+.w500 .el-dialog {
+  width: 500px;
+}
+
+.w500 .el-dialog__header,
+.w700 .el-dialog__header {
+  background: #eeeeee;
+
+  .el-dialog__title {
+    font-size: 16px;
+  }
+}
+
+.yxq .el-range-separator {
+  margin-right: 7px !important;
+}
+
+.el-date-editor--daterange.el-input__inner {
+  width: 260px;
+}
+</style>