Merge remote-tracking branch 'origin/master'

device-manager-ui/admin/.env

@@ -11,5 +11,5 @@ VUE_APP_WEBSOCKET_API =127.0.0.1:18222/m
 VUE_APP_PORTAL_URL = http://192.168.0.98:11072
 
 # 站点请求地址
-VUE_APP_SITETREE_URL = http://127.0.0.1:18222/m/site/siteTree
+VUE_APP_SITETREE_URL = http://192.168.0.98:18222/m/site/siteTree
 

device-manager-ui/admin/src/views/device/list.vue

@@ -3,13 +3,11 @@
     <div class="page-header">
       <div>
         <span style="font-size: 14px"
-          ><b>设备列表</b> (<el-link
-            style="margin-left: 10px"
-            type="primary"
-            :underline="false"
-            >{{ siteName }}</el-link
-          >
-          站点编码：{{ siteCode }} )</span
+          ><b>设备列表</b> （
+          <span style="margin-right: 6px">{{ siteName }}</span> 站点编码：{{
+            siteCode
+          }}
+          ）</span
         >
         <el-link
           style="margin-left: 10px"
@@ -178,9 +176,11 @@
     <!-- 查看二维码弹窗 -->
     <el-dialog
       title="设备二维码"
-      :visible.sync="qrCodeDialog.visible" width="350px">
-      <img :src="qrCodeDialog.qrCode">
-      <p style="word-wrap:break-word">{{qrCodeDialog.qrCodeUrl}}</p>
+      :visible.sync="qrCodeDialog.visible"
+      width="350px"
+    >
+      <img :src="qrCodeDialog.qrCode" />
+      <p style="word-wrap: break-word">{{ qrCodeDialog.qrCodeUrl }}</p>
     </el-dialog>
     <!-- <dialog-show ref="dialogform" @ok="getData" /> -->
 
@@ -420,8 +420,8 @@ export default {
     },
     async viewQrCode(id) {
       try {
-            const {qrCode, qrCodeUrl} = await this.$post('/device/viewQrCode', {
-                "id":id
+        const { qrCode, qrCodeUrl } = await this.$post("/device/viewQrCode", {
+          id: id,
         });
         this.qrCodeDialog.qrCode = qrCode;
         this.qrCodeDialog.qrCodeUrl = qrCodeUrl;
@@ -578,7 +578,13 @@ export default {
                     ""
                   )}
                   <span> </span>
-                  <el-button  type="text" size='mini' onClick={()=>this.viewQrCode(row.id)}>二维码</el-button>
+                  <el-button
+                    type="text"
+                    size="mini"
+                    onClick={() => this.viewQrCode(row.id)}
+                  >
+                    二维码
+                  </el-button>
                 </div>
               );
             },

device-manager-ui/admin/src/views/system/user/list.vue

@@ -111,8 +111,8 @@ export default {
     getRoleUsers(id) {
       return new Promise((resolve, reject) => {
         this.$post("/role/user/list", {
-          "userId": id,
-          "size": -1,
+          userId: id,
+          size: -1,
         })
           .then(({ data }) => {
             const result = data.data
@@ -153,8 +153,8 @@ export default {
       },
       config: {
         columns: [
-             { type: "selection",reserveSelection:true, width: 60 },
-          { type: "index", label: "序号",align:"center", width: 50 },
+          { type: "selection", reserveSelection: true, width: 60 },
+          { type: "index", label: "序号", align: "center", width: 50 },
           {
             prop: "loginName",
             label: "登录名称",