多租户测试调整

vue/src/api/iot/tool.js

@@ -18,3 +18,12 @@ export function register(data) {
     data: data
   })
 }
+
+// 查询用户列表
+export function listUser(query) {
+  return request({
+    url: '/iot/tool/userList',
+    method: 'get',
+    params: query
+  })
+}

vue/src/assets/icons/svg/share.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1654884749180" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12269" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M569.979 703.801c-29.354 0-49.096 19.741-49.096 49.094 0 29.356 19.741 49.092 49.096 49.092s49.096-19.735 49.097-49.092C619.075 723.542 599.334 703.801 569.979 703.801zM308.003 508.892c-29.353 0-49.099 19.741-49.099 49.098 0 29.349 19.746 49.097 49.099 49.097 29.354 0 49.097-19.748 49.097-49.097C357.1 528.633 337.357 508.892 308.003 508.892zM749.263 180.695 119.553 180.695c-19.667 0-35.55 6.997-47.654 20.988-12.103 13.995-18.151 31.958-18.151 53.896l0 637.652c0 20.424 7.186 38.196 21.559 53.321 14.37 15.134 30.634 22.697 48.785 22.697L758.34 969.249c21.183 0 38.954-7.374 53.329-22.128 14.37-14.748 21.555-30.821 21.555-48.222l0-626.3c0-27.235-6.616-49.358-19.855-66.379C800.135 189.207 778.766 180.695 749.263 180.695zM569.955 859.316c-58.713 0-106.455-43.612-106.455-102.32 0-9.874 1.78-19.24 4.311-28.342l-104.07-77.413c-16.686 10.855-34.451 13.171-55.794 13.171-58.706 0-106.446-47.745-106.446-106.451 0-58.708 47.74-106.449 106.446-106.449 29.063 0 53.316 7.632 72.562 26.584l87.943-53.995c-3.723-10.86-6.2-18.201-6.2-30.311 0-58.706 47.747-106.448 106.454-106.448 58.705 0 106.445 47.742 106.445 106.448 0 58.709-47.741 106.452-106.445 106.452-27.308 0-49.938-6.492-68.811-23.469l-90.259 53.396c2.819 9.525 4.787 19.423 4.787 29.886 0 17.532-0.554 29.723-8.086 44.329l89.915 69.788c19.316-19.613 44.085-27.723 73.727-27.723 58.733 0 106.424 47.711 106.422 106.42C676.4 811.575 628.655 859.316 569.955 859.316zM941.673 82.851c-19.289-21.182-61.434-31.77-93.204-31.77L326.147 51.081c-17.399 0-32.336 6.048-44.818 18.152-12.479 12.102-18.719 26.855-18.719 44.25l0 10.215 519.925 0c46.896 0 69.1 1.773 88.766 19.168 19.668 17.399 21.192 34.811 21.192 77.172l-0.001 608.252 14.575 0c17.399 0 32.338-6.056 44.817-18.158 12.482-12.096 18.721-26.852 18.721-44.244L970.605 170.702C970.605 143.473 960.965 104.032 941.673 82.851zM568.727 442.89c29.355 0 49.097-19.746 49.097-49.1 0-29.351-19.74-49.096-49.097-49.096-29.348 0-49.096 19.745-49.096 49.096C519.631 423.144 539.379 442.89 568.727 442.89z" p-id="12270" fill="#67C23A"></path></svg>

vue/src/views/iot/device/device-edit.vue

@@ -368,7 +368,7 @@ export default {
                                 if (this.form.status == 2) {
                                     this.deviceStatus = 1;
                                 }
-                                this.$modal.alertSuccess("新增成功, 可以烧录sdk到设备了");
+                                this.$modal.alertSuccess("添加设备成功");
                                 this.loadMap();
                             }
                         });

vue/src/views/iot/device/index.vue

@@ -33,7 +33,9 @@
                     <el-row type="flex" :gutter="10" justify="space-between">
                         <el-col :span="20" style="text-align:left;">
                             <el-link type="" :underline="false" @click="handleEditDevice(item)" style="font-weight:bold;font-size:16px;line-height:32px;">
-                                <svg-icon icon-class="device" /> {{item.deviceName}}
+                                <svg-icon icon-class="device" v-if="item.isOwner==1" /> 
+                                <svg-icon icon-class="share" v-else /> 
+                                {{item.deviceName}}
                                 <el-tag size="mini" type="info">Version {{item.firmwareVersion}}</el-tag>
                             </el-link>
                         </el-col>

vue/src/views/iot/device/user-list.vue

@@ -40,7 +40,7 @@
 <script>
 import {
     listUser
-} from "@/api/system/user";
+} from "@/api/iot/tool";
 import {
     addDeviceUser,
     addDeviceUsers,

vue/src/views/iot/group/device-list.vue

@@ -15,6 +15,12 @@
         <el-table-column label="设备名称" align="center" prop="deviceName" />
         <el-table-column label="设备编号" align="center" prop="serialNumber" />
         <el-table-column label="产品名称" align="center" prop="productName" />
+        <el-table-column label="设备类型" align="center">
+             <template slot-scope="scope">
+                <el-tag type="success" v-if="scope.row.isOwner==0">分享</el-tag>
+                <el-tag type="primary" v-else>拥有</el-tag>
+            </template>
+        </el-table-column>
         <el-table-column label="设备状态" align="center" prop="status">
             <template slot-scope="scope">
                 <dict-tag :options="dict.type.iot_device_status" :value="scope.row.status" />