fanghuisheng 3 роки тому
батько
коміт
87afd0d84e
4 змінених файлів з 45 додано та 40 видалено
  1. 5 4
      src/App.vue
  2. 0 1
      src/main.js
  3. 27 26
      src/store/index.js
  4. 13 9
      src/views/login/index.vue

+ 5 - 4
src/App.vue

@@ -9,18 +9,20 @@ import store from '@/store'
 
 export default defineComponent({
   setup() {
-    let hasToken = store.getters['user/accessToken']
     // let router = useRouter();
 
     watchEffect((fn, options) => {
       fn, options
+      var hasToken = store.getters['user/accessToken']
+
       if (!hasToken) {
         // router.push({
         //   path: '/login',
         // })
-      } else {
-        console.log(2)
+      }
 
+      if (hasToken) {
+        store.commit('publicSiteList') //获取站点下拉信息
       }
     })
     return {
@@ -28,7 +30,6 @@ export default defineComponent({
     }
   },
 })
-
 </script>
 
 <style lang="less">

+ 0 - 1
src/main.js

@@ -71,5 +71,4 @@ router.beforeEach((to) => {
 
 router.afterEach((to) => {
     to
-
 })

+ 27 - 26
src/store/index.js

@@ -74,6 +74,7 @@ export default createStore({
                 .then((requset) => {
                     if (requset.status === 'SUCCESS') {
                         state.siteList = requset.data
+                        state.siteId = requset.data[0].id
                     } else {
                         ElMessage.error(requset.msg)
                     }
@@ -94,19 +95,19 @@ export default createStore({
                             requset.data.map((val) => {
                                 // if (val.children.length > 0) {
                                 state.deviceList.push({
-                                        deviceCode: val.deviceCode,
-                                        deviceName: val.deviceName,
-                                        id: val.id,
-                                        children: val.children.length > 0 ?
-                                            val.children.map((val) => {
-                                                return {
-                                                    deviceCode: val.variableCoding,
-                                                    deviceName: val.variableName,
-                                                    id: val.id,
-                                                }
-                                            }) : val.children,
-                                    })
-                                    // }
+                                    deviceCode: val.deviceCode,
+                                    deviceName: val.deviceName,
+                                    id: val.id,
+                                    children: val.children.length > 0 ?
+                                        val.children.map((val) => {
+                                            return {
+                                                deviceCode: val.variableCoding,
+                                                deviceName: val.variableName,
+                                                id: val.id,
+                                            }
+                                        }) : val.children,
+                                })
+                                // }
                             })
                         } else {
                             ElMessage.error(requset.msg)
@@ -130,10 +131,10 @@ export default createStore({
                     if (requset.status === 'SUCCESS') {
                         state.authorities = []
                         var menuObj = requset.data;
-                        menuObj.forEach(function(item) {
-                                state.authorities.push(item.menuName)
-                            })
-                            // console.log(state.authorities)
+                        menuObj.forEach(function (item) {
+                            state.authorities.push(item.menuName)
+                        })
+                        // console.log(state.authorities)
                     } else {
                         ElMessage.error(requset.msg)
                     }
@@ -164,7 +165,7 @@ export default createStore({
                 var HH = time[i].getHours() < 10 ? '0' + time[i].getHours() : time[i].getHours()
                 var MM = time[i].getMinutes() < 10 ? '0' + time[i].getMinutes() : time[i].getMinutes()
                 var SS = time[i].getSeconds() < 10 ? '0' + time[i].getSeconds() : time[i].getSeconds()
-                    // console.log(Y + '-' + M + '-' + D + ' ' + HH + ':' + MM + ':' + SS)
+                // console.log(Y + '-' + M + '-' + D + ' ' + HH + ':' + MM + ':' + SS)
                 state.Time_Data.push(Y + '-' + M + '-' + D + ' ' + HH + ':' + MM + ':' + SS)
             }
         },
@@ -188,8 +189,8 @@ export default createStore({
                 k = k + 24 * 60 * 60 * 1000;
             }
             state.timearr = arrTime
-                // return arrTime;
-                // 时间格式处理
+            // return arrTime;
+            // 时间格式处理
             function datetimeparse(timestamp, format, prefix) {
                 if (typeof timestamp == "string") {
                     timestamp = Number(timestamp);
@@ -221,20 +222,20 @@ export default createStore({
                 let YYYY = dateobj.getFullYear();
                 let MM =
                     dateobj.getMonth() > 8 ?
-                    dateobj.getMonth() + 1 :
-                    "0" + (dateobj.getMonth() + 1);
+                        dateobj.getMonth() + 1 :
+                        "0" + (dateobj.getMonth() + 1);
                 let DD =
                     dateobj.getDate() > 9 ? dateobj.getDate() : "0" + dateobj.getDate();
                 let HH =
                     dateobj.getHours() > 9 ? dateobj.getHours() : "0" + dateobj.getHours();
                 let mm =
                     dateobj.getMinutes() > 9 ?
-                    dateobj.getMinutes() :
-                    "0" + dateobj.getMinutes();
+                        dateobj.getMinutes() :
+                        "0" + dateobj.getMinutes();
                 let ss =
                     dateobj.getSeconds() > 9 ?
-                    dateobj.getSeconds() :
-                    "0" + dateobj.getSeconds();
+                        dateobj.getSeconds() :
+                        "0" + dateobj.getSeconds();
                 let output = "";
                 let separator = "/";
                 if (format) {

+ 13 - 9
src/views/login/index.vue

@@ -4,8 +4,9 @@
       <a-col :xs="0" :md="0" :sm="12" :lg="14" :xl="16"></a-col>
       <a-col :xs="24" :sm="24" :md="12" :lg="10" :xl="6">
         <div class="login-container-form">
-          <div class="login-container-hello">hello!</div>
-          <div class="login-container-title">欢迎来到 {{ title }}</div>
+          <div class="login-container-title" style="text-align: center">
+            伍继智能物联云
+          </div>
           <a-form :model="form" @submit="handleSubmit" @submit.prevent>
             <a-form-item>
               <a-input v-model:value="form.username" placeholder="Username">
@@ -28,7 +29,7 @@
 
             <a-form-item>
               <JcRange
-              :status="status"
+                :status="status"
                 @successFun="onSuccess()"
                 @errorFun="onError()"
               ></JcRange>
@@ -38,7 +39,11 @@
               <a-button
                 type="primary"
                 html-type="submit"
-                :disabled="form.username === '' || form.password === ''||status==false"
+                :disabled="
+                  form.username === '' ||
+                  form.password === '' ||
+                  status == false
+                "
               >
                 登录
               </a-button>
@@ -96,8 +101,8 @@ export default {
     },
   },
   mounted() {
-    this.form.username = ''   //admin
-    this.form.password = ''   //admin123
+    this.form.username = '' //admin
+    this.form.password = '' //admin123
 
     const router = useRouter()
     console.log(router)
@@ -117,7 +122,6 @@ export default {
     onSuccess() {
       console.log('滑块成功')
       this.status = true
-   
     },
     onError() {
       console.log('滑块失败')
@@ -126,7 +130,7 @@ export default {
 
     async handleSubmit() {
       await this.login(this.form)
-        await this.$router.push(this.handleRoute())
+      await this.$router.push(this.handleRoute())
     },
   },
 }
@@ -139,7 +143,7 @@ export default {
   background-size: cover;
   &-form {
     width: calc(100% - 40px);
-    min-width:360px;
+    min-width: 360px;
     height: 440px;
     padding: 4vh;
     margin-top: calc((100vh - 380px) / 2);