修改用户数据添加表单

ruoyi-ui/src/api/system/userdatasource.js

@@ -42,3 +42,11 @@ export function delUserdatasource(datasourceId) {
     method: 'delete'
   })
 }
+
+// 删除用户数据
+export function getDatasourceIdList() {
+  return request({
+    url: '/system/datasource/list' ,
+    method: 'get'
+  })
+}

ruoyi-ui/src/views/system/userdatasource/index.vue

@@ -1,24 +1,24 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <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"
-          placeholder="请输入数据ID"
           clearable
+          placeholder="请输入数据ID"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="用户ID" prop="userId">
         <el-input
           v-model="queryParams.userId"
-          placeholder="请输入用户ID"
           clearable
+          placeholder="请输入用户ID"
           @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-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>
@@ -26,84 +26,113 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
+          v-hasPermi="['system:userdatasource:add']"
-          plain
           icon="el-icon-plus"
+          plain
           size="mini"
+          type="primary"
           @click="handleAdd"
-          v-hasPermi="['system:userdatasource:add']"
+        >新增
-        >新增</el-button>
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
+          v-hasPermi="['system:userdatasource:edit']"
-          plain
+          :disabled="single"
           icon="el-icon-edit"
+          plain
           size="mini"
-          :disabled="single"
+          type="success"
           @click="handleUpdate"
-          v-hasPermi="['system:userdatasource:edit']"
+        >修改
-        >修改</el-button>
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
+          v-hasPermi="['system:userdatasource:remove']"
-          plain
+          :disabled="multiple"
           icon="el-icon-delete"
+          plain
           size="mini"
-          :disabled="multiple"
+          type="danger"
           @click="handleDelete"
-          v-hasPermi="['system:userdatasource:remove']"
+        >删除
-        >删除</el-button>
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
+          v-hasPermi="['system:userdatasource:export']"
-          plain
           icon="el-icon-download"
+          plain
           size="mini"
+          type="warning"
           @click="handleExport"
-          v-hasPermi="['system:userdatasource:export']"
+        >导出
-        >导出</el-button>
+        </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 align="center" type="selection" width="55"/>
-      <el-table-column label="数据ID" align="center" prop="datasourceId" />
+      <el-table-column align="center" label="数据ID" prop="datasourceId"/>
-      <el-table-column label="用户ID" align="center" prop="userId" />
+      <el-table-column align="center" label="用户ID" prop="userId"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <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"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:userdatasource:edit']"
+          >修改
-          >修改</el-button>
+          </el-button>
           <el-button
+            v-hasPermi="['system:userdatasource:remove']"
+            icon="el-icon-delete"
             size="mini"
             type="text"
-            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:userdatasource:remove']"
+          >删除
-          >删除</el-button>
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
       v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.pageNum"
+      :total="total"
       @pagination="getList"
     />
 
     <!-- 添加或修改用户数据对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <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>
@@ -114,7 +143,14 @@
 </template>
 
 <script>
-import { listUserdatasource, getUserdatasource, delUserdatasource, addUserdatasource, updateUserdatasource } from "@/api/system/userdatasource";
+import {
+  listUserdatasource,
+  getUserdatasource,
+  delUserdatasource,
+  addUserdatasource,
+  updateUserdatasource,
+  getDatasourceIdList
+} from "@/api/system/userdatasource";
 
 export default {
   name: "Userdatasource",
@@ -150,16 +186,26 @@ export default {
       // 表单校验
       rules: {
         datasourceId: [
-          { required: true, message: "数据ID不能为空", trigger: "blur" }
+          {required: true, message: "数据ID不能为空", trigger: "blur"}
         ],
         userId: [
-          { required: true, message: "用户ID不能为空", trigger: "blur" }
+          {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: {
     /** 查询用户数据列表 */
@@ -197,7 +243,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.datasourceId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -239,12 +285,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const datasourceIds = row.datasourceId || this.ids;
-      this.$modal.confirm('是否确认删除用户数据编号为"' + datasourceIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除用户数据编号为"' + datasourceIds + '"的数据项？').then(function () {
         return delUserdatasource(datasourceIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {