diff --git a/ruoyi-ui/src/api/system/userdatasource.js b/ruoyi-ui/src/api/system/userdatasource.js
index 1ca5ca9..cd5e590 100644
--- a/ruoyi-ui/src/api/system/userdatasource.js
+++ b/ruoyi-ui/src/api/system/userdatasource.js
@@ -1,44 +1,52 @@
-import request from '@/utils/request'
-
-// 查询用户数据列表
-export function listUserdatasource(query) {
-  return request({
-    url: '/system/userdatasource/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询用户数据详细
-export function getUserdatasource(datasourceId) {
-  return request({
-    url: '/system/userdatasource/' + datasourceId,
-    method: 'get'
-  })
-}
-
-// 新增用户数据
-export function addUserdatasource(data) {
-  return request({
-    url: '/system/userdatasource',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改用户数据
-export function updateUserdatasource(data) {
-  return request({
-    url: '/system/userdatasource',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除用户数据
-export function delUserdatasource(datasourceId) {
-  return request({
-    url: '/system/userdatasource/' + datasourceId,
-    method: 'delete'
-  })
-}
+import request from '@/utils/request'
+
+// 查询用户数据列表
+export function listUserdatasource(query) {
+  return request({
+    url: '/system/userdatasource/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户数据详细
+export function getUserdatasource(datasourceId) {
+  return request({
+    url: '/system/userdatasource/' + datasourceId,
+    method: 'get'
+  })
+}
+
+// 新增用户数据
+export function addUserdatasource(data) {
+  return request({
+    url: '/system/userdatasource',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用户数据
+export function updateUserdatasource(data) {
+  return request({
+    url: '/system/userdatasource',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用户数据
+export function delUserdatasource(datasourceId) {
+  return request({
+    url: '/system/userdatasource/' + datasourceId,
+    method: 'delete'
+  })
+}
+
+// 删除用户数据
+export function getDatasourceIdList() {
+  return request({
+    url: '/system/datasource/list' ,
+    method: 'get'
+  })
+}
diff --git a/ruoyi-ui/src/views/system/userdatasource/index.vue b/ruoyi-ui/src/views/system/userdatasource/index.vue
index b44cc4c..926702a 100644
--- a/ruoyi-ui/src/views/system/userdatasource/index.vue
+++ b/ruoyi-ui/src/views/system/userdatasource/index.vue
@@ -1,257 +1,304 @@
-<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="数据ID" prop="datasourceId">
-        <el-input
-          v-model="queryParams.datasourceId"
-          placeholder="请输入数据ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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="['system:userdatasource:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:userdatasource:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:userdatasource:remove']"
-        >删除</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:userdatasource:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="userdatasourceList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="数据ID" align="center" prop="datasourceId" />
-      <el-table-column label="用户ID" align="center" prop="userId" />
-      <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="['system:userdatasource:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:userdatasource:remove']"
-          >删除</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"
-    />
-
-    <!-- 添加或修改用户数据对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listUserdatasource, getUserdatasource, delUserdatasource, addUserdatasource, updateUserdatasource } from "@/api/system/userdatasource";
-
-export default {
-  name: "Userdatasource",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 用户数据表格数据
-      userdatasourceList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        datasourceId: null,
-        userId: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        datasourceId: [
-          { required: true, message: "数据ID不能为空", trigger: "blur" }
-        ],
-        userId: [
-          { required: true, message: "用户ID不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询用户数据列表 */
-    getList() {
-      this.loading = true;
-      listUserdatasource(this.queryParams).then(response => {
-        this.userdatasourceList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        datasourceId: null,
-        userId: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.datasourceId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加用户数据";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const datasourceId = row.datasourceId || this.ids
-      getUserdatasource(datasourceId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改用户数据";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.datasourceId != null) {
-            updateUserdatasource(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addUserdatasource(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const datasourceIds = row.datasourceId || this.ids;
-      this.$modal.confirm('是否确认删除用户数据编号为"' + datasourceIds + '"的数据项？').then(function() {
-        return delUserdatasource(datasourceIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/userdatasource/export', {
-        ...this.queryParams
-      }, `userdatasource_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
+<template>
+  <div class="app-container">
+    <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="68px" size="small">
+      <el-form-item label="数据ID" prop="datasourceId">
+        <el-input
+          v-model="queryParams.datasourceId"
+          clearable
+          placeholder="请输入数据ID"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户ID" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          clearable
+          placeholder="请输入用户ID"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button icon="el-icon-search" size="mini" type="primary" @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
+          v-hasPermi="['system:userdatasource:add']"
+          icon="el-icon-plus"
+          plain
+          size="mini"
+          type="primary"
+          @click="handleAdd"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          v-hasPermi="['system:userdatasource:edit']"
+          :disabled="single"
+          icon="el-icon-edit"
+          plain
+          size="mini"
+          type="success"
+          @click="handleUpdate"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          v-hasPermi="['system:userdatasource:remove']"
+          :disabled="multiple"
+          icon="el-icon-delete"
+          plain
+          size="mini"
+          type="danger"
+          @click="handleDelete"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          v-hasPermi="['system:userdatasource:export']"
+          icon="el-icon-download"
+          plain
+          size="mini"
+          type="warning"
+          @click="handleExport"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="userdatasourceList" @selection-change="handleSelectionChange">
+      <el-table-column align="center" type="selection" width="55"/>
+      <el-table-column align="center" label="数据ID" prop="datasourceId"/>
+      <el-table-column align="center" label="用户ID" prop="userId"/>
+      <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
+        <template slot-scope="scope">
+          <el-button
+            v-hasPermi="['system:userdatasource:edit']"
+            icon="el-icon-edit"
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+          >修改
+          </el-button>
+          <el-button
+            v-hasPermi="['system:userdatasource:remove']"
+            icon="el-icon-delete"
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row)"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.pageNum"
+      :total="total"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改用户数据对话框 -->
+    <el-dialog :title="title" :visible.sync="open" append-to-body width="500px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="数据ID" prop="datasourceId">
+          <el-select
+            v-model="queryParams.datasourceId"
+            clearable
+            placeholder="数据ID"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in datasourceIdList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="用户ID" prop="userId">
+          <el-input
+            v-model="queryParams.userId"
+            clearable
+            placeholder="请输入用户ID"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listUserdatasource,
+  getUserdatasource,
+  delUserdatasource,
+  addUserdatasource,
+  updateUserdatasource,
+  getDatasourceIdList
+} from "@/api/system/userdatasource";
+
+export default {
+  name: "Userdatasource",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户数据表格数据
+      userdatasourceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        datasourceId: null,
+        userId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        datasourceId: [
+          {required: true, message: "数据ID不能为空", trigger: "blur"}
+        ],
+        userId: [
+          {required: true, message: "用户ID不能为空", trigger: "blur"}
+        ]
+      },
+      datasourceIdList: []
+    };
+  },
+  created() {
+    this.getList();
+    getDatasourceIdList().then(e => {
+      console.log(e)
+      this.datasourceIdList = e.rows.map(val => {
+        return {
+          label: val.parkName,
+          value: val.id
+        }
+      })
+    })
+  },
+  methods: {
+    /** 查询用户数据列表 */
+    getList() {
+      this.loading = true;
+      listUserdatasource(this.queryParams).then(response => {
+        this.userdatasourceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        datasourceId: null,
+        userId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.datasourceId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加用户数据";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const datasourceId = row.datasourceId || this.ids
+      getUserdatasource(datasourceId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改用户数据";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.datasourceId != null) {
+            updateUserdatasource(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addUserdatasource(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const datasourceIds = row.datasourceId || this.ids;
+      this.$modal.confirm('是否确认删除用户数据编号为"' + datasourceIds + '"的数据项？').then(function () {
+        return delUserdatasource(datasourceIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/userdatasource/export', {
+        ...this.queryParams
+      }, `userdatasource_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>