From fad1fb16f112388bebe33aff4cb05d0cf00cf8ae Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Thu, 25 Jan 2024 14:01:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E7=9C=8B=E7=BB=91=E5=AE=9A=E7=9A=84=E4=BB=AA?=
 =?UTF-8?q?=E5=99=A8=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flossom-ui/src/views/system/member/index.vue | 71 +++++++++++++++++++-
 1 file changed, 69 insertions(+), 2 deletions(-)

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 @@
         </template>
       </el-table-column>
       <el-table-column label="用户注册时间" align="center" prop="createTime" width="200px"/>
-      <el-table-column label="仪器数量" align="center" prop="devicesNum"/>
+      <el-table-column label="仪器" align="center" prop="devicesNum">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="viewUserInstrumentDetail(scope.row)">
+            {{ scope.row.devicesNum }}
+          </el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="小程序标签" align="center" prop="miniProgramTags" width="150px">
         <template slot-scope="scope">
           <el-tag v-for="item in scope.row.miniProgramTags" :key="item.id">
@@ -722,6 +728,31 @@
         <el-button type="primary" @click="submitBatchOperate">确 定</el-button>
       </div>
     </el-dialog>
+
+    <!-- 查看用户绑定的仪器列表   -->
+    <el-dialog title="仪器绑定" :visible.sync="userInstrumentVisible" width="63%" :before-close="cancelUserInstrumentDialog">
+      <template>
+        <el-table :data="userInstrumentQuery.userInstrumentList" style="width: 100%">
+          <el-table-column type="index" width="50" label="序号" />
+          <el-table-column prop="instrumentName" label="仪器名称" width="150px" />
+          <el-table-column prop="serial" label="仪器序列号" width="200" />
+          <el-table-column prop="serialImage" label="仪器序列号图片" width="150" >
+            <template slot-scope="scope">
+              <el-image v-if="scope.row.serialImage" :src="scope.row.serialImage"
+                        style="width: 100px; height: 100px" ></el-image>
+            </template>
+          </el-table-column>
+          <el-table-column prop="updateTime" label="操作时间" width="200" />
+        </el-table>
+      </template>
+      <pagination
+        v-show="userInstrumentQuery.total>0"
+        :total="userInstrumentQuery.total"
+        :page.sync="userInstrumentQuery.pageNum"
+        :limit.sync="userInstrumentQuery.pageSize"
+        @pagination="getUserInstrumentList"
+      />
+    </el-dialog>
   </div>
 </template>
 
@@ -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 = {