diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 64f39ff..991e996 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -73,7 +73,7 @@ const menuList = ref([
   {
     label: '基础数据管理',icon:'data', children: [
       {label: '育种基地管理',href:'/basicData/breedingBase'},
-      {label: '数据采集设备管理'},
+      {label: '数据采集设备管理',href:'/basicData/dataGather'},
       {label: '作物品种管理'},
     ]
   },
diff --git a/src/router/index.js b/src/router/index.js
index 5672f4f..fa531d2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -182,6 +182,20 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/basicData',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'dataGather',
+        component: () => import('@/views/basicData/dataGather/index.vue'),
+        name: 'dataGather',
+        meta: { title: '数据采集设备管理' }
+      }
+    ]
+  },
 ]
 
 // 动态路由，基于用户权限动态去加载
diff --git a/src/views/basicData/dataGather/index.vue b/src/views/basicData/dataGather/index.vue
new file mode 100644
index 0000000..94187ab
--- /dev/null
+++ b/src/views/basicData/dataGather/index.vue
@@ -0,0 +1,295 @@
+<!--数据采集设备管理-->
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--用户数据-->
+      <el-col :span="24" :xs="24">
+        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+          <el-row :gutter="10">
+            <el-col :span="6">
+              <el-form-item label="设备编码">
+                <el-input
+                    v-model="queryParams.userName"
+                    placeholder="请输入设备编码"
+                    clearable
+                    @keyup.enter="handleQuery"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="设备类型">
+                <el-input
+                    v-model="queryParams.userName"
+                    placeholder="请输入设备类型"
+                    clearable
+                    @keyup.enter="handleQuery"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="所属基地">
+                <el-select v-model="queryParams.areaCode" filterable clearable>
+                  <el-option v-for="item in data.pcTextArr" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="状态" prop="status">
+                <el-select v-model="queryParams.status" placeholder="状态" clearable style="width: 200px">
+                  <el-option
+                      v-for="dict in sys_normal_disable"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+          <el-button type="primary" icon="Download" @click="exportExcel">导出Excel</el-button>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center"/>
+          <el-table-column label="设备ID" align="center" key="userId" prop="userId" v-if="columns[0].visible"/>
+          <el-table-column label="设备编码" align="center" key="userName" prop="userName" v-if="columns[1].visible"
+                           :show-overflow-tooltip="true"/>
+          <el-table-column label="设备类型" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
+                           :show-overflow-tooltip="true"/>
+          <el-table-column label="设备型号" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+                           :show-overflow-tooltip="true"/>
+          <el-table-column label="设备厂商" align="center" key="phonenumber" prop="phonenumber"
+                           v-if="columns[4].visible" width="120"/>
+          <el-table-column label="所属基地/资源圃" align="center" key="phonenumber" prop="phonenumber"
+                           v-if="columns[5].visible" width="120"/>
+          <el-table-column label="当前状态" align="center" key="phonenumber" prop="phonenumber"
+                           v-if="columns[6].visible" width="120"/>
+          <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+            <template #default="scope">
+              <el-button link type="primary" @click="toView(scope.row)">详情</el-button>
+              <el-button link type="primary" @click="handleUpdate(scope.row)">配置基地</el-button>
+            </template>
+          </el-table-column>
+          <template #empty>
+            <el-result
+                title="暂无数据">
+              <template #icon>
+                <i-database-fail theme="outline" size="38" fill="#9b9b9b"/>
+              </template>
+            </el-result>
+          </template>
+        </el-table>
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <left-drawer v-model="showView" title="设备详情">
+      <div>
+        <el-form :model="formData" ref="formRef">
+          <el-form-item label="设备ID：" prop="baseName">
+            <div>{{ formData.baseName }}</div>
+          </el-form-item>
+          <el-form-item label="设备编码：" prop="baseName">
+            <div>{{ formData.baseName }}</div>
+          </el-form-item>
+          <el-form-item label="设备类型：" prop="baseName">
+            <div>{{ formData.baseName }}</div>
+          </el-form-item>
+          <el-form-item label="设备型号：" prop="baseName">
+            <div>{{ formData.baseName }}</div>
+          </el-form-item>
+          <el-form-item label="设备厂商：" prop="baseName">
+            <div>{{ formData.baseName }}</div>
+          </el-form-item>
+          <el-form-item label="设备主体：" prop="baseName">
+            <div>{{ formData.baseName }}</div>
+          </el-form-item>
+          <el-form-item label="所属项目：" prop="baseName">
+            <div>{{ formData.baseName }}</div>
+          </el-form-item>
+          <el-form-item label="当前状态：" prop="baseName">
+            <div>{{ formData.baseName }}</div>
+          </el-form-item>
+          <el-form-item label="所属基地/资源圃：" prop="baseName">
+            <div>{{ formData.baseName }}</div>
+          </el-form-item>
+        </el-form>
+      </div>
+      <template #footer>
+        <el-button @click="showView = false">关闭</el-button>
+      </template>
+    </left-drawer>
+    <left-drawer v-model="showUpdateBase" title="配置设备所属基地">
+      <div>
+        <el-form :model="formData" ref="formRef" label-position="top">
+          <div class="belongs-base-info">
+            <div class="belongs-base-info-item">
+              <div class="label">设备ID：</div>
+              <div>{{ formData.baseName }}111</div>
+            </div>
+            <div class="belongs-base-info-item">
+              <div class="label">设备编码：</div>
+              <div>{{ formData.baseName }}222</div>
+            </div>
+            <div class="belongs-base-info-item">
+              <div class="label">设备型号：</div>
+              <div>{{ formData.baseName }}333</div>
+            </div>
+          </div>
+          <el-form-item label="所属基地/资源圃" prop="baseName">
+            <el-select v-model="queryParams.areaCode" filterable clearable>
+              <el-option v-for="item in data.pcTextArr" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+      <template #footer>
+        <el-button type="primary" :loading="loading" @click="saveMassif">保存</el-button>
+        <el-button @click="showUpdateBase = false">取消</el-button>
+      </template>
+    </left-drawer>
+  </div>
+</template>
+
+<script setup name="User">
+import {
+  changeUserStatus,
+  listUser,
+  resetUserPwd,
+  delUser,
+  getUser,
+  updateUser,
+  addUser,
+  deptTreeSelect
+} from "@/api/system/user";
+
+const router = useRouter();
+const {proxy} = getCurrentInstance();
+const {sys_normal_disable} = proxy.useDict("sys_normal_disable");
+const tableList = ref([]);
+const open = ref(false);
+const loading = ref(false);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+// 查看页面
+const showView = ref(false)
+// 配置基地
+const showUpdateBase = ref(false)
+const dateRange = ref([]);
+// 列显隐信息
+const columns = ref([
+  {key: 0, label: `设备ID`, visible: true},
+  {key: 1, label: `设备编码`, visible: true},
+  {key: 2, label: `设备类型`, visible: true},
+  {key: 3, label: `设备型号`, visible: true},
+  {key: 4, label: `设备厂商`, visible: true},
+  {key: 5, label: `所属基地/资源圃`, visible: true},
+  {key: 6, label: `当前状态`, visible: true},
+]);
+const exportExcel = () => {
+
+}
+const formData = ref({})
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    userName: undefined,
+    plantingSeason: 2023,
+    status: undefined,
+    deptId: undefined
+  },
+});
+const {queryParams, form,} = toRefs(data);
+
+/** 查询用户列表 */
+function getList() {
+  loading.value = true;
+  listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(res => {
+    loading.value = false;
+    tableList.value = res.rows;
+    total.value = res.total;
+  });
+};
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+function resetQuery() {
+  dateRange.value = [];
+  proxy.resetForm("queryRef");
+  queryParams.value.deptId = undefined;
+  proxy.$refs.deptTreeRef.setCurrentKey(null);
+  handleQuery();
+};
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.userId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+const toView = (row) => {
+  formData.value = row
+  showView.value = true
+}
+const handleUpdate = (row) => {
+  formData.value = row
+  showUpdateBase.value = true
+}
+</script>
+<style scoped lang="scss">
+.base-title {
+  margin: 10px 0;
+
+  .handoff-model {
+    padding-right: 20px;
+    text-align: right;
+  }
+}
+
+.belongs-base-info {
+  &-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 10px 0;
+    .label{
+      color: var(--el-text-color-regular);
+      font-size: var(--el-form-label-font-size);
+    }
+  }
+  border: 1px solid #d0d0d0;
+  border-radius: 10px;
+  padding: 10px 20px;
+  margin-bottom: 10px;
+}
+
+.el-form-item {
+  width: 100%;
+}
+</style>