Browse Source

日常开发

林旭祥 6 months ago
parent
commit
0612705f36
2 changed files with 49 additions and 4 deletions
  1. 43 2
      src/views/gesture/index.vue
  2. 6 2
      src/views/login/mobile.vue

+ 43 - 2
src/views/gesture/index.vue

@@ -14,6 +14,9 @@
         </swiper-slide>
       </swiper>
     </div>
+    <div class="erweima"> <img :src="erweima" />
+      <span>扫码遥控</span>
+    </div>
     <OptionWindow ref="optionWindowRef" :projectList="projectList" />
   </div>
 </template>
@@ -22,8 +25,10 @@
 import { handWs, startDevice, stateHand, startHand, closeHand } from '@/utils/handWs'
 import { Swiper, SwiperSlide } from 'swiper/vue';
 import { Navigation } from 'swiper/modules';
+import QRCode from "qrcode";
 import 'swiper/css';
 import 'swiper/scss/navigation';
+
 const router = useRouter();
 const route = useRoute();
 const { proxy } = getCurrentInstance() as any;
@@ -34,8 +39,10 @@ const data = reactive<any>({
   timerManager: {},
   device_info: {},
   listenWs: false,//是否监听手势
+  erweima: '',
+  sid: '',
 });
-const { mySwiper, projectList, timerManager, device_info, listenWs } = toRefs(data);
+const { mySwiper, projectList, timerManager, device_info, listenWs, erweima, sid } = toRefs(data);
 
 /**
  * 清空定时任务
@@ -209,7 +216,7 @@ const getTips = () => {
 //获取个人信息
 const getUserInfo = () => {
   let userInfo = localStorage.getItem("userInfo") || '';
-  if(userInfo){
+  if (userInfo) {
     return false;
   }
   let params = {};
@@ -222,12 +229,26 @@ const getUserInfo = () => {
   });
 };
 
+/**
+ * 获取二维码
+*/
+const getErweima = () => {
+  let deviceid = localStorage.getItem("deviceid") || '';
+  QRCode.toDataURL(
+    `${location.origin}/#/login/mobile?sid=${sid}&deviceid=${deviceid}`
+  )
+    .then((res: any) => {
+      erweima.value = res;
+    })
+}
+
 onBeforeMount(() => {
   //加载设备WS
   handWs((e: any) => {
     //发送设备
     if (e?.wksid) {
       console.log("e.wksid", e.wksid)
+      sid.value = e.wksid;
       listenWs.value = true;
       let deviceid = localStorage.getItem("deviceid");
       startDevice({ deviceid: deviceid })
@@ -276,6 +297,8 @@ onBeforeMount(() => {
 onMounted(() => {
   getInitExam();
   getUserInfo();
+  //登录码
+  getErweima();
 })
 onBeforeUnmount(() => {
   listenWs.value = false;
@@ -368,4 +391,22 @@ $waiPadding: 6.51rem;
     }
   }
 }
+
+.erweima {
+  position: absolute;
+  right: 3.87rem;
+  bottom: 3.87rem;
+  text-align: center;
+
+  img {
+    width: 6.625rem;
+  }
+
+  span {
+    display: block;
+    color: #FFFFFF;
+    font-size: 1.1rem;
+    padding-top: 3px;
+  }
+}
 </style>

+ 6 - 2
src/views/login/mobile.vue

@@ -123,16 +123,20 @@ const getCmdtest = (data: any) => {
 
 onMounted(() => {
   let sid = route.query.sid;
+  let deviceid = route.query.deviceid;
   if (sid == undefined && !sid) {
     proxy?.$modal.msgError("缺少SID,请重新扫码!");
     return false;
   }
   //测试环境默认密码
   if (import.meta.env.DEV) {
-    loginForm.value.deviceid = '38715692';
+    loginForm.value.deviceid = deviceid ? deviceid : '38715692';
     loginForm.value.username = 'manage1';
     loginForm.value.password = 'trops@2022';
   }
+  if (deviceid) {
+    loginForm.value.deviceid = deviceid;
+  }
 })
 </script>
 
@@ -177,7 +181,7 @@ onMounted(() => {
           margin-bottom: 4.5rem;
           display: flex;
           justify-content: center;
-          
+
           .login-input {
             width: 100%;
             height: 10rem;