|
|
@@ -32,7 +32,9 @@
|
|
|
</lay-select>
|
|
|
</lay-form-item>
|
|
|
<lay-form-item label="所属人" prop="userName">
|
|
|
- <lay-input v-model="pageParams.userName" />
|
|
|
+ <lay-select v-model="pageParams.userName">
|
|
|
+ <lay-select-option v-for="item in userList" :value="item.value" :label="item.value" />
|
|
|
+ </lay-select>
|
|
|
</lay-form-item>
|
|
|
<div class="form-button-wp">
|
|
|
<lay-button @click="getPageInfo(true)">搜索</lay-button>
|
|
|
@@ -144,7 +146,7 @@ import Transfers from "./components/Transfers.vue";
|
|
|
import Copy from "./components/Copy.vue";
|
|
|
import TableButton from "@/components/TableButton.vue";
|
|
|
import { timeConverts } from "@/utils/index";
|
|
|
-import { get_robot_list, delete_robot, set_robot_status, set_robot_reset_capital, update_robot_batch, survive_robot, restore_robot } from "@/api";
|
|
|
+import { get_robot_list, delete_robot, set_robot_status, set_robot_reset_capital, update_robot_batch, survive_robot, restore_robot, get_user_list_all } from "@/api";
|
|
|
|
|
|
const ROBOT_STATUS: any = reactive({
|
|
|
STOPPED: "已停止",
|
|
|
@@ -215,6 +217,8 @@ const columns = ref([
|
|
|
let dataSource = ref([]);
|
|
|
let selectedKeys = ref([]);
|
|
|
let collectInfo = ref(`[0/0] 利润:<span class="primary-color">0(0%)</span> 初始:<span class="primary-color">0</span> 现有:<span class="primary-color">0</span>`);
|
|
|
+let userList = ref();
|
|
|
+
|
|
|
// 请求机器人列表
|
|
|
const getPageInfo = (isSearch?: boolean) => {
|
|
|
if (isSearch) pageParams.pageNum = 1;
|
|
|
@@ -229,6 +233,16 @@ const getPageInfo = (isSearch?: boolean) => {
|
|
|
});
|
|
|
};
|
|
|
getPageInfo();
|
|
|
+
|
|
|
+// 获取用户列表
|
|
|
+const get_user_list = () => {
|
|
|
+ const params = {};
|
|
|
+ get_user_list_all(params, (data: any) => {
|
|
|
+ userList.value = data.data;
|
|
|
+ });
|
|
|
+};
|
|
|
+get_user_list();
|
|
|
+
|
|
|
let refreshInterval = setInterval(() => {
|
|
|
get_robot_list(pageParams, (data: any) => {
|
|
|
if (data.code == 200) {
|