From ce3b61f7e811acdbf12187e09e418806ab02fe41 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Thu, 25 Jan 2024 10:57:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0=E4=BB=AA=E5=99=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flossom-ui/src/views/system/member/index.vue | 54 +++++++++++++-------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue
index 9d108a5..9b32f2d 100644
--- a/flossom-ui/src/views/system/member/index.vue
+++ b/flossom-ui/src/views/system/member/index.vue
@@ -104,16 +104,16 @@
           align="right">
         </el-date-picker>
       </el-form-item>
-      <!--      <el-form-item label="仪器绑定" prop="devicesTags">-->
-      <!--        <el-select v-model="queryParams.devicesName" multiple placeholder="请选择">-->
-      <!--          <el-option-->
-      <!--            v-for="item in devicesName"-->
-      <!--            :key="item.value"-->
-      <!--            :label="item.label"-->
-      <!--            :value="item.value">-->
-      <!--          </el-option>-->
-      <!--        </el-select>-->
-      <!--      </el-form-item>-->
+      <el-form-item label="仪器绑定" prop="devicesTags">
+        <el-select v-model="queryParams.devicesIdList" multiple placeholder="请选择">
+          <el-option
+            v-for="item in deviceList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="仪器数量" prop="credit">
         <el-input-number :min="0" :precision="0" v-model="queryParams.deviceNumStart"
                          @keyup.enter.native="handleQuery"></el-input-number>
@@ -313,7 +313,8 @@
       <el-dialog width="30%" title="修改用户备注" :visible.sync="editRemarkVisible" append-to-body>
         <el-form ref="form" :model="editRemarkForm" label-width="50px">
           <el-form-item label="备注 " prop="content">
-            <el-input v-model="editRemarkForm.content" type="textarea" placeholder="请输入备注" show-word-limit minlength="1"
+            <el-input v-model="editRemarkForm.content" type="textarea" placeholder="请输入备注" show-word-limit
+                      minlength="1"
                       maxlength="100"/>
           </el-form-item>
         </el-form>
@@ -747,8 +748,14 @@ import {
   allAddRemark,
   getMiniProgramTagsTree,
   scriptTreeSelect,
-  editRemark, delRemark,
-  openOrCloseClock, openOrCloseActivity, uObtainUserScriptLog, delUserScriptLog, obtainUserIntegralLog,
+  editRemark,
+  delRemark,
+  openOrCloseClock,
+  openOrCloseActivity,
+  uObtainUserScriptLog,
+  delUserScriptLog,
+  obtainUserIntegralLog,
+  getAllInstrument,
 } from "@/api/system/member";
 import Treeselect from "@riophae/vue-treeselect";
 import {tagTreeSelect} from "@/api/system/wechatTab";
@@ -791,6 +798,8 @@ export default {
         userRegisterNum: 0,
         userDeviceNum: 0
       },
+      // 查询条件：仪器列表
+      deviceList: [],
       // 查询条件，小程序二级标签
       miniProgramTags: [],
       // 小程序标签树
@@ -935,7 +944,7 @@ export default {
         loginTime: null,
         status: null,
         // createTime: [],
-        devicesName: [],  //仪器绑定
+        devicesIdList: [],  //仪器绑定
         wecomTags: [], // 外部标签
         miniProgramTags: [], // 小程序标签
         purchaseChannels: [], // 购买渠道
@@ -1024,6 +1033,8 @@ export default {
     // 获取标签树
     this.getDeptTree();
     this.getScriptTree();
+    // 获取仪器列表
+    this.getAllInstrument();
   },
   methods: {
     /** 查询用户列表 */
@@ -1035,7 +1046,7 @@ export default {
         this.loading = false;
       });
     },
-    dateUtil(date){
+    dateUtil(date) {
       // 获取年份、月份和日期
       const year = date.getFullYear().toString(); // 四位数表示的年份
       const months = (date.getMonth() + 1).toString().padStart(2, '0'); // 补零后的两位数表示的月份
@@ -1043,7 +1054,14 @@ export default {
       const hours = date.getHours().toString().padStart(2, '0'); // 补全两位数的小时
       const minutes = date.getMinutes().toString().padStart(2, '0'); // 补全两位数的分钟
       const seconds = date.getSeconds().toString().padStart(2, '0');
-      return  `${year}-${months}-${day} ${hours}:${minutes}:${seconds}`;
+      return `${year}-${months}-${day} ${hours}:${minutes}:${seconds}`;
+    },
+    // 获取仪器列表
+    getAllInstrument() {
+      getAllInstrument().then(Response => {
+        this.deviceList = Response.data;
+        console.log(this.deviceList);
+      })
     },
     getUserCount() {
       selectUserCount().then(Response => {
@@ -1087,7 +1105,7 @@ export default {
       this.queryParams.cityId = null;
       this.queryParams.areaId = null;
       getRegionByPid(pid).then(Response => {
-          this.cityList = Response.data;
+        this.cityList = Response.data;
       })
     },
     getAreaByPid(pid) {
@@ -1096,7 +1114,7 @@ export default {
       }
       this.queryParams.areaId = null;
       getRegionByPid(pid).then(Response => {
-          this.areaList = Response.data;
+        this.areaList = Response.data;
       })
     },
     // 查询条件-省市区清空