diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue
index 9b32f2d..a66b42c 100644
--- a/flossom-ui/src/views/system/member/index.vue
+++ b/flossom-ui/src/views/system/member/index.vue
@@ -228,7 +228,13 @@
-
+
+
+
+ {{ scope.row.devicesNum }}
+
+
+
@@ -722,6 +728,31 @@
确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -755,7 +786,7 @@ import {
uObtainUserScriptLog,
delUserScriptLog,
obtainUserIntegralLog,
- getAllInstrument,
+ getAllInstrument, listUserInstrument,
} from "@/api/system/member";
import Treeselect from "@riophae/vue-treeselect";
import {tagTreeSelect} from "@/api/system/wechatTab";
@@ -885,6 +916,17 @@ export default {
orderByColumn: "createTime",
isAsc: "desc"
},
+ // 用户仪器列表
+ userInstrumentVisible: false,
+ userInstrumentQuery: {
+ total: 0,
+ pageNum: 1,
+ pageSize: 10,
+ userId: null,
+ userInstrumentList: null,
+ orderByColumn: "createTime",
+ isAsc: "desc"
+ },
// 导出数据选择字段
exportFieldsVisible: false,
exportFieldsForm: {
@@ -1262,6 +1304,18 @@ export default {
this.batchScriptVisible = false;
}
},
+ cancelUserInstrumentDialog() {
+ this.userInstrumentVisible = false;
+ this.userInstrumentQuery = {
+ total: 0,
+ pageNum: 1,
+ pageSize: 10,
+ userId: null,
+ userInstrumentList: null,
+ orderByColumn: "createTime",
+ isAsc: "desc"
+ }
+ },
/** 查询部门下拉树结构 */
getDeptTree() {
tagTreeSelect({type: 1}).then(response => {
@@ -1842,6 +1896,19 @@ export default {
this.userScriptLogQuery.total = response.total;
});
},
+ // 打开用户仪器列表窗口
+ viewUserInstrumentDetail(row) {
+ this.userInstrumentQuery.userId = row.id;
+ this.getUserInstrumentList();
+ this.userInstrumentVisible = true;
+ },
+ // 分页获取 用户消息列表
+ getUserInstrumentList() {
+ listUserInstrument(this.userInstrumentQuery).then(response => {
+ this.userInstrumentQuery.userInstrumentList = response.rows;
+ this.userInstrumentQuery.total = response.total;
+ });
+ },
// 删除用户消息
delUserScriptLog(row) {
let wxUserScriptLog = {